/*
 *
 * Author:
 *   Anders Carlsson (andersca@gnu.org)
 *
 * (C) 2000 Ximian, Inc.
 */

#include <config.h>
#include <gnome.h>
#include <bonobo.h>
#include <liboaf/liboaf.h>

#include "e-util/e-gui-utils.h"
#include "component-factory.h"

static void
init_corba (gint argc, gchar **argv)
{
	gnome_init_with_popt_table ("evolution-notes-component", VERSION, argc, argv,
				    oaf_popt_options, 0, NULL);
	oaf_init (argc, argv);
}

static void
init_bonobo (void)
{
	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {
		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,
			  _("Notes Component: Could not initialize bonobo"));
		exit (1);
	}
}

gint
main (gint argc, gchar **argv)
{
	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);
	textdomain (PACKAGE);

	init_corba (argc, argv);
	init_bonobo ();
	
	e_setup_base_dir ();
	
	notes_factory_init ();
	component_factory_init ();
	
	bonobo_main ();

	return 0;
}
'/~lantw44/cgit-data/cgit.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/~lantw44/cgit/'>index</a> : <a title='gsoc2013-evolution' href='/~lantw44/cgit/gsoc2013-evolution/'>gsoc2013-evolution</a></td><td class='form'><form method='get'>
<input type='hidden' name='id' value='0f79a64eddac4dc910abbe3077949ba42656fe64'/><select name='h' onchange='this.form.submit();'>
<option value='archive-integration'>archive-integration</option>
<option value='archive-integration-review'>archive-integration-review</option>
<option value='master'>master</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Google Summer of Code 2013 - GNOME - Archive Integration workspace</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/~lantw44/cgit/gsoc2013-evolution/about/?h=BUG_BUDDY_1_2'>about</a><a href='/~lantw44/cgit/gsoc2013-evolution/?h=BUG_BUDDY_1_2'>summary</a><a href='/~lantw44/cgit/gsoc2013-evolution/refs/?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>refs</a><a href='/~lantw44/cgit/gsoc2013-evolution/log/?h=BUG_BUDDY_1_2'>log</a><a href='/~lantw44/cgit/gsoc2013-evolution/tree/?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>tree</a><a class='active' href='/~lantw44/cgit/gsoc2013-evolution/commit/?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>commit</a><a href='/~lantw44/cgit/gsoc2013-evolution/diff/?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>diff</a><a href='/~lantw44/cgit/gsoc2013-evolution/stats/?h=BUG_BUDDY_1_2'>stats</a></td><td class='form'><form class='right' method='get' action='/~lantw44/cgit/gsoc2013-evolution/log/'>
<input type='hidden' name='h' value='BUG_BUDDY_1_2'/><input type='hidden' name='id' value='0f79a64eddac4dc910abbe3077949ba42656fe64'/><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='BUG_BUDDY_1_2'/><input type='hidden' name='id' value='0f79a64eddac4dc910abbe3077949ba42656fe64'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>nobody &lt;nobody@localhost&gt;</td><td class='right'>2000-11-07 05:40:14 +0800</td></tr>
<tr><th>committer</th><td>nobody &lt;nobody@localhost&gt;</td><td class='right'>2000-11-07 05:40:14 +0800</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/~lantw44/cgit/gsoc2013-evolution/commit/?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>0f79a64eddac4dc910abbe3077949ba42656fe64</a> (<a href='/~lantw44/cgit/gsoc2013-evolution/patch/?id=0f79a64eddac4dc910abbe3077949ba42656fe64'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/~lantw44/cgit/gsoc2013-evolution/tree/?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>786145ed8b82796d89e41d2ed37058c0097ace13</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/~lantw44/cgit/gsoc2013-evolution/commit/?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>b4c61eba8055f666fd8a2270879a6f9722faa2b3</a> (<a href='/~lantw44/cgit/gsoc2013-evolution/diff/?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64&amp;id2=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/~lantw44/cgit/gsoc2013-evolution/snapshot/gsoc2013-evolution-0f79a64eddac4dc910abbe3077949ba42656fe64.tar.gz'>gsoc2013-evolution-0f79a64eddac4dc910abbe3077949ba42656fe64.tar.gz</a><br/><a href='/~lantw44/cgit/gsoc2013-evolution/snapshot/gsoc2013-evolution-0f79a64eddac4dc910abbe3077949ba42656fe64.tar.zst'>gsoc2013-evolution-0f79a64eddac4dc910abbe3077949ba42656fe64.tar.zst</a><br/><a href='/~lantw44/cgit/gsoc2013-evolution/snapshot/gsoc2013-evolution-0f79a64eddac4dc910abbe3077949ba42656fe64.zip'>gsoc2013-evolution-0f79a64eddac4dc910abbe3077949ba42656fe64.zip</a><br/></td></tr></table>
<div class='commit-subject'>This commit was manufactured by cvs2svn to create tag<span class='decoration'><a class='tag-annotated-deco' href='/~lantw44/cgit/gsoc2013-evolution/tag/?h=BUG_BUDDY_1_2'>BUG_BUDDY_1_2</a></span></div><div class='commit-msg'>'BUG_BUDDY_1_2'.

svn path=/tags/BUG_BUDDY_1_2/; revision=6436
</div><div class='diffstat-header'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>AUTHORS</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/COPYING?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ChangeLog</a></td><td class='right'>5695</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 32.1%;'/><td class='none' style='width: 67.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/HACKING?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/NEWS?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>NEWS</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/README?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>README</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>acconfig.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/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/ChangeLog</a></td><td class='right'>3005</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.9%;'/><td class='none' style='width: 83.1%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/.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/addressbook/backend/ebook/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/Makefile.am</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/backend/ebook/TODO?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-book-view-listener.c</a></td><td class='right'>408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-view-listener.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-book-view-listener.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/addressbook/backend/ebook/e-book-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-book-view.c</a></td><td class='right'>328</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/ebook/e-book-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-book-view.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/addressbook/backend/ebook/e-book.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-book.c</a></td><td class='right'>1066</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/backend/ebook/e-book.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-book.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/addressbook/backend/ebook/e-card-cursor.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-pairs.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-card-simple.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/backend/ebook/e-card-simple.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-card-simple.h</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-card-types.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/addressbook/backend/ebook/e-card.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-card.c</a></td><td class='right'>3383</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.1%;'/><td class='none' style='width: 80.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.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/e-card.h</a></td><td class='right'>148</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-gnomecard-addressbook.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/load-gnomecard-addressbook.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/load-pine-addressbook.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/load-pine-addressbook.c</a></td><td class='right'>167</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/ebook/test-card.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/test-client-list.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/addressbook/backend/ebook/test-client.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/ebook/test-client.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/addressbook/backend/idl/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/idl/addressbook.idl</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/pas/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/Makefile.am</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/backend/pas/TODO?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-backend-file.c</a></td><td class='right'>1443</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.1%;'/><td class='none' style='width: 91.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend-file.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-backend-ldap.c</a></td><td class='right'>1846</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.4%;'/><td class='none' style='width: 89.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-backend-ldap.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-backend.c</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/pas/pas-backend.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-backend.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/addressbook/backend/pas/pas-book-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-book-factory.c</a></td><td class='right'>595</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/addressbook/backend/pas/pas-book-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-book-view.c</a></td><td class='right'>334</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/backend/pas/pas-book-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-book-view.h</a></td><td class='right'>55</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-book.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/addressbook/backend/pas/pas-book.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/backend/pas/pas-book.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/addressbook/backend/pas/pas-card-cursor.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/conduit/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/conduit/.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/conduit/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/conduit/Makefile.am</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/addressbook/conduit/address-conduit-config.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/conduit/address-conduit-config.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/conduit/address-conduit-control-applet.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/conduit/address-conduit-control-applet.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/conduit/address-conduit.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/conduit/address-conduit.c</a></td><td class='right'>959</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/addressbook/conduit/address-conduit.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/conduit/address-conduit.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/conduit/e-address-conduit-control-applet.desktop?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/conduit/e-address-conduit-control-applet.desktop</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/addressbook/conduit/e-address.conduit.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/conduit/e-address.conduit.in</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/contact-editor/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/Makefile.am</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/addressbook/contact-editor/arrow.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/contact-editor.glade</a></td><td class='right'>2455</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/addressbook/contact-editor/e-contact-editor-address.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/e-contact-editor-address.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/contact-editor/e-contact-editor-address.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/e-contact-editor-address.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-categories.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/e-contact-editor-categories.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/contact-editor/e-contact-editor-categories.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-confirm-delete.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/e-contact-editor-confirm-delete.glade</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/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/e-contact-editor-confirm-delete.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/addressbook/contact-editor/e-contact-editor-fullname.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/e-contact-editor-fullname.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/addressbook/contact-editor/e-contact-editor-fullname.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/e-contact-editor.c</a></td><td class='right'>1748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.9%;'/><td class='none' style='width: 90.1%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/e-contact-editor.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/addressbook/contact-editor/e-contact-save-as.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/fulladdr.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/fulladdr.glade</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/contact-editor/fulladdr.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/fulladdr.glade.h</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/addressbook/contact-editor/fullname-strings.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/contact-editor/fullname.glade</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/gui/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in</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/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo</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/addressbook/gui/component/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/Makefile.am</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/addressbook/gui/component/addressbook-component.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/addressbook-component.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/addressbook/gui/component/addressbook-component.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/addressbook-factory.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/addressbook/gui/component/addressbook.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/addressbook.c</a></td><td class='right'>629</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/addressbook.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/addressbook.oafinfo</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/addressbook/gui/component/e-cardlist-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/e-cardlist-model.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/addressbook/gui/component/e-cardlist-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/e-ldap-server-dialog.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/component/e-ldap-server-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/e-ldap-server-dialog.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/e-ldap-storage.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/e-ldap-storage.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/addressbook/gui/component/e-ldap-storage.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/e-ldap-storage.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/gui/component/ldap-server-dialog.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/ldap-server-dialog.glade</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/ldap-server-dialog.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/ldap-server-dialog.glade.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/addressbook/gui/component/select-names/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/.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/component/select-names/Evolution-Addressbook-SelectNames.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.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/addressbook/gui/component/select-names/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/Makefile.am</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/gui/component/select-names/e-select-names-bonobo.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-bonobo.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/addressbook/gui/component/select-names/e-select-names-bonobo.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-bonobo.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/addressbook/gui/component/select-names/e-select-names-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-factory.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/addressbook/gui/component/select-names/e-select-names-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-factory.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-manager.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-manager.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/select-names/e-select-names-manager.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-manager.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/gui/component/select-names/e-select-names-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-model.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/addressbook/gui/component/select-names/e-select-names-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-model.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/addressbook/gui/component/select-names/e-select-names-table-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-table-model.c</a></td><td class='right'>353</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/select-names/e-select-names-table-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-table-model.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/e-select-names-text-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-text-model.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/addressbook/gui/component/select-names/e-select-names-text-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names-text-model.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/gui/component/select-names/e-select-names.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names.c</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/component/select-names/e-select-names.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/e-select-names.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/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/evolution-addressbook-select-names.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/addressbook/gui/component/select-names/recipient.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/recipient.glade</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/component/select-names/select-names.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/select-names.glade</a></td><td class='right'>247</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/select-names.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/component/select-names/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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/Makefile.am</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/addressbook/gui/contact-editor/arrow.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/contact-editor.glade</a></td><td class='right'>2455</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/addressbook/gui/contact-editor/e-contact-editor-address.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/e-contact-editor-address.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/contact-editor/e-contact-editor-address.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/e-contact-editor-address.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-categories.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/e-contact-editor-categories.c</a></td><td class='right'>452</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/contact-editor/e-contact-editor-categories.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-confirm-delete.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade</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/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/e-contact-editor-confirm-delete.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/addressbook/gui/contact-editor/e-contact-editor-fullname.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/e-contact-editor-fullname.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/addressbook/gui/contact-editor/e-contact-editor-fullname.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/e-contact-editor.c</a></td><td class='right'>1748</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.9%;'/><td class='none' style='width: 90.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/e-contact-editor.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/e-contact-editor.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/addressbook/gui/contact-editor/e-contact-save-as.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/fulladdr.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/fulladdr.glade</a></td><td class='right'>477</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.7%;'/><td class='none' style='width: 97.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/contact-editor/fulladdr.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/fulladdr.glade.h</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/addressbook/gui/contact-editor/fullname-strings.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/contact-editor/fullname.glade</a></td><td class='right'>389</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/search/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/search/.cvsignore</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/search/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/search/Makefile.am</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/search/addresstypes.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/search/addresstypes.xml</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/gui/search/e-addressbook-search-dialog.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/search/e-addressbook-search-dialog.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/search/e-addressbook-search-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/search/e-addressbook-search-dialog.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/addressbook/gui/widgets/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/.cvsignore</a></td><td class='right'>12</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/Makefile.am</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/alphabet.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-addressbook-model.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-addressbook-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-addressbook-model.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/gui/widgets/e-addressbook-search.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-addressbook-search.c</a></td><td class='right'>333</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/widgets/e-addressbook-search.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-addressbook-search.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-addressbook-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-addressbook-view.c</a></td><td class='right'>731</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-addressbook-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-addressbook-view.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/widgets/e-minicard-control.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-control.c</a></td><td class='right'>331</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/widgets/e-minicard-control.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-control.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-label.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-label.c</a></td><td class='right'>444</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-widget.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-view-widget.c</a></td><td class='right'>276</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.6%;'/><td class='none' style='width: 98.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-view-widget.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-view-widget.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/widgets/e-minicard-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-view.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/widgets/e-minicard-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-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/addressbook/gui/widgets/e-minicard-widget-test.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-widget-test.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/addressbook/gui/widgets/e-minicard-widget.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-widget.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.3%;'/><td class='none' style='width: 98.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard-widget.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard-widget.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/widgets/e-minicard.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard.c</a></td><td class='right'>816</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/gui/widgets/e-minicard.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/e-minicard.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/gui/widgets/test-reflow.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/printing/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/printing/Makefile.am</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-envelope.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/printing/e-contact-print-envelope.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/addressbook/printing/e-contact-print-envelope.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/printing/e-contact-print-envelope.h</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print-style-editor.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/printing/e-contact-print.c</a></td><td class='right'>1113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/addressbook/printing/e-contact-print.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>addressbook/printing/e-contact-print.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/addressbook/printing/medbook.ecps?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/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/art/add-attachment.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/add-attachment.png</a></td><td class='right'>bin</td><td class='graph'>746 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/add-service.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/add-service.png</a></td><td class='right'>bin</td><td class='graph'>505 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/attachment.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/compose-message.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/compose-message.png</a></td><td class='right'>bin</td><td class='graph'>803 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/copy-message.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/copy-message.png</a></td><td class='right'>bin</td><td class='graph'>457 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/empty.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/evolution-contacts-mini.png</a></td><td class='right'>bin</td><td class='graph'>417 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/evolution-contacts.png</a></td><td class='right'>bin</td><td class='graph'>2288 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/evolution-inbox-mini.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/fetch-mail.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/fetch-mail.png</a></td><td class='right'>bin</td><td class='graph'>1027 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/forward.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/forward.png</a></td><td class='right'>bin</td><td class='graph'>1016 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/globe.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/move-message.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/move-message.png</a></td><td class='right'>bin</td><td class='graph'>449 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/pin.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/pin.png</a></td><td class='right'>bin</td><td class='graph'>354 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/priority-high.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/reply-to-all.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/reply-to-all.png</a></td><td class='right'>bin</td><td class='graph'>1264 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/reply.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/reply.png</a></td><td class='right'>bin</td><td class='graph'>1107 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-high.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/score-high.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-higher.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/score-higher.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-highest.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/score-highest.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-low.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/score-low.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-lower.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/score-lower.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-lowest.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/score-lowest.xpm</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/score-normal.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/score-normal.xpm</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/send.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/send.png</a></td><td class='right'>bin</td><td class='graph'>1041 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-close.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/service-close.png</a></td><td class='right'>bin</td><td class='graph'>201 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-configure.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/service-configure.png</a></td><td class='right'>bin</td><td class='graph'>215 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-down.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/service-down.png</a></td><td class='right'>bin</td><td class='graph'>148 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-left.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/service-left.png</a></td><td class='right'>bin</td><td class='graph'>136 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-right.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/service-right.png</a></td><td class='right'>bin</td><td class='graph'>134 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/service-up.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/service-up.png</a></td><td class='right'>bin</td><td class='graph'>129 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/splash.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/splash.png</a></td><td class='right'>bin</td><td class='graph'>178621 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/tree-expanded.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/tree-expanded.xpm</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/art/tree-unexpanded.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>art/tree-unexpanded.xpm</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/autogen.sh?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/.cvsignore</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/AUTHORS?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/ChangeLog</a></td><td class='right'>7413</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 41.8%;'/><td class='none' style='width: 58.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/TODO?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-client/.cvsignore</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/calendar/cal-client/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-client/Makefile.am</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/cal-client/cal-client.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-client/cal-client.c</a></td><td class='right'>1408</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/cal-client/cal-client.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-client/cal-client.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/calendar/cal-client/cal-listener.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-client/cal-listener.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/calendar/cal-client/cal-listener.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-client/cal-listener.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/cal-client/client-test.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-client/client-test.c</a></td><td class='right'>213</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-client/test.ics?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-client/test.ics</a></td><td class='right'>318</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/cal-util/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/.cvsignore</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/Makefile.am</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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-component.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/cal-component.c</a></td><td class='right'>3662</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.6%;'/><td class='none' style='width: 79.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-component.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/cal-component.h</a></td><td class='right'>314</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/cal-util/cal-recur.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/cal-recur.c</a></td><td class='right'>3662</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 20.6%;'/><td class='none' style='width: 79.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-recur.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/cal-recur.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/calendar/cal-util/cal-util.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/cal-util.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/calendar/cal-util/cal-util.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/cal-util.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/calendar/cal-util/calobj.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/calobj.c</a></td><td class='right'>2008</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/calobj.h</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/cal-util/icalendar-save.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/icalendar.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/calendar/cal-util/icalendar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/test-recur.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/cal-util/timeutil.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/cal-util/timeutil.c</a></td><td class='right'>560</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/calendar/cal-util/timeutil.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/Makefile.am</a></td><td class='right'>1</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/calendar/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/.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/conduits/calendar/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/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/calendar/conduits/calendar/calendar-conduit-config.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/calendar-conduit-config.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/conduits/calendar/calendar-conduit-control-applet.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/calendar-conduit-control-applet.c</a></td><td class='right'>342</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/conduits/calendar/calendar-conduit-control-applet.desktop?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/calendar-conduit-control-applet.desktop</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/conduits/calendar/calendar-conduit.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/calendar-conduit.c</a></td><td class='right'>1140</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/calendar/conduits/calendar/calendar-conduit.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/calendar-conduit.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/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop</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/calendar/conduits/calendar/e-calendar.conduit.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/calendar/e-calendar.conduit.in</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/todo/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/todo/.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/conduits/todo/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/todo/Makefile.am</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/calendar/conduits/todo/e-todo-conduit-control-applet.desktop?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/todo/e-todo-conduit-control-applet.desktop</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/calendar/conduits/todo/e-todo.conduit.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/todo/e-todo.conduit.in</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/todo/todo-conduit-config.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/todo/todo-conduit-config.h</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/conduits/todo/todo-conduit-control-applet.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/todo/todo-conduit-control-applet.c</a></td><td class='right'>341</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/conduits/todo/todo-conduit.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/todo/todo-conduit.c</a></td><td class='right'>1014</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/conduits/todo/todo-conduit.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/conduits/todo/todo-conduit.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/gui/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/.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/calendar/gui/Evolution-Composer.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/Evolution-Composer.h</a></td><td class='right'>369</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/GNOME_Evolution_Calendar.oaf.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/GNOME_Evolution_Calendar.oaf.in</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/calendar/gui/GNOME_Evolution_Calendar.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/GNOME_Evolution_Calendar.oafinfo</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/calendar/gui/GNOME_Evolution_Calendar_Control.oaf.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in</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/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo</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/calendar/gui/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/Makefile.am</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/calendar/gui/alarm-notify/alarm-notify-dialog.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/alarm-notify/alarm-notify-dialog.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-notify-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/alarm-notify/alarm.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/calendar/gui/alarm-notify/alarm.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/alarm.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/calendar/gui/alarm.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/calendar-commands.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-commands.c</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/calendar-commands.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-commands.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/calendar/gui/calendar-component.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-component.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/calendar/gui/calendar-component.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-component.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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-config.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-config.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/calendar/gui/calendar-config.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-config.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/calendar/gui/calendar-control.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-model.c</a></td><td class='right'>2011</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/calendar-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-model.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/calendar/gui/calendar-summary.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-summary.c</a></td><td class='right'>135</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-summary.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/calendar-summary.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/calendar/gui/check-filled.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/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/calendar/gui/component-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/component-factory.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/calendar/gui/component-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/component-factory.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/control-factory.c</a></td><td class='right'>185</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/control-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dayview.xpm</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/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'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/alarm-notify-dialog.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/alarm-notify-dialog.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/dialogs/cal-prefs-dialog.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/cal-prefs-dialog.c</a></td><td class='right'>462</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/gui/dialogs/cal-prefs-dialog.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/cal-prefs-dialog.glade</a></td><td class='right'>1243</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/dialogs/cal-prefs-dialog.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/cal-prefs-dialog.glade.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/calendar/gui/dialogs/cal-prefs-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/cal-prefs-dialog.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-editor-dialog.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/task-editor-dialog.glade</a></td><td class='right'>706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-editor-dialog.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/task-editor-dialog.glade.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/calendar/gui/dialogs/task-editor.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/task-editor.c</a></td><td class='right'>1182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.7%;'/><td class='none' style='width: 93.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/dialogs/task-editor.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/task-editor.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/gui/dialogs/task-page.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/dialogs/task-page.glade</a></td><td class='right'>706</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.0%;'/><td class='none' style='width: 96.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-calendar-table.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-calendar-table.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-calendar-table.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-calendar-table.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/calendar/gui/e-day-view-main-item.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-day-view-main-item.c</a></td><td class='right'>662</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-day-view-time-item.c</a></td><td class='right'>547</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.1%;'/><td class='none' style='width: 96.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-day-view-time-item.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-day-view-top-item.c</a></td><td class='right'>592</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-day-view.c</a></td><td class='right'>6083</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 34.3%;'/><td class='none' style='width: 65.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-day-view.h</a></td><td class='right'>565</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/calendar/gui/e-itip-control.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-itip-control.c</a></td><td class='right'>476</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/calendar/gui/e-itip-control.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-itip-control.glade</a></td><td class='right'>455</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/gui/e-itip-control.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-itip-control.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-meeting-dialog.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-meeting-dialog.glade</a></td><td class='right'>473</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/calendar/gui/e-meeting-edit.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-meeting-edit.c</a></td><td class='right'>997</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/e-meeting-edit.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-meeting-edit.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/calendar/gui/e-week-view-event-item.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-week-view-event-item.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/calendar/gui/e-week-view-event-item.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-week-view-main-item.c</a></td><td class='right'>388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view-main-item.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-week-view.c</a></td><td class='right'>3182</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.9%;'/><td class='none' style='width: 82.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/e-week-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/e-week-view.h</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/event-editor-dialog.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/event-editor-dialog.glade</a></td><td class='right'>1370</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 92.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-dialog.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/event-editor-dialog.glade.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/calendar/gui/event-editor.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/event-editor.c</a></td><td class='right'>2633</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.8%;'/><td class='none' style='width: 85.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/event-editor.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/evolution-calendar-control.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/evolution-calendar.oafinfo</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/calendar/gui/getdate.y?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/getdate.y</a></td><td class='right'>1004</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.7%;'/><td class='none' style='width: 94.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/gncal-todo.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/gncal-todo.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/gncal-todo.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/gncal-todo.h</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/gnome-cal.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/gnome-cal.c</a></td><td class='right'>2307</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.0%;'/><td class='none' style='width: 87.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-cal.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/gnome-cal.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/gnome-cal.html?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/goto.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/gui/jump.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/main.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/main.c</a></td><td class='right'>91</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/mark.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/mark.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/monthview.xpm</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/print.c</a></td><td class='right'>1315</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/calendar/gui/print.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/prop.c</a></td><td class='right'>941</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/recur.xpm</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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/task-assigned-to.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/task-assigned-to.xpm</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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/task-assigned.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/task-assigned.xpm</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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/task-recurring.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/task-recurring.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/calendar/gui/task.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/task.xpm</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/calendar/gui/test.vcf?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/topic.dat?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/weekday-picker.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/weekday-picker.c</a></td><td class='right'>536</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/weekday-picker.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/weekday-picker.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/gui/weekview.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/weekview.xpm</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/workweekview.xpm</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/gui/yearview.xpm</a></td><td class='right'>44</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/calendar/idl/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/idl/evolution-calendar.idl</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/calendar/pcs/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/Makefile.am</a></td><td class='right'>42</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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-backend-file.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/cal-backend-file.c</a></td><td class='right'>1099</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/calendar/pcs/cal-backend-file.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/cal-backend-file.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/cal-backend.c</a></td><td class='right'>767</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/calendar/pcs/cal-backend.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/cal-backend.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/calendar/pcs/cal-common.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/cal-factory.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/calendar/pcs/cal-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/cal-factory.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/calendar/pcs/cal.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/cal.c</a></td><td class='right'>766</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/calendar/pcs/cal.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>calendar/pcs/cal.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/calendar/pcs/job.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/.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/CODING.STYLE?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/ChangeLog</a></td><td class='right'>7150</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 40.3%;'/><td class='none' style='width: 59.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/Makefile.am</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/camel/README?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/broken-date-parser.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/broken-date-parser.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/broken-date-parser.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/broken-date-parser.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/camel/camel-address.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-address.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/camel/camel-address.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-charset-map-private.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-charset-map-private.h</a></td><td class='right'>4345</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 24.5%;'/><td class='none' style='width: 75.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-charset-map.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-charset-map.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-charset-map.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-charset-map.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-data-wrapper.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-data-wrapper.c</a></td><td class='right'>270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-data-wrapper.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-data-wrapper.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/camel/camel-exception-list.def?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-exception-list.def</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-search.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-folder-search.c</a></td><td class='right'>731</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/camel/camel-folder-search.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-folder-search.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-folder-summary.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-folder-summary.c</a></td><td class='right'>1682</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.5%;'/><td class='none' style='width: 90.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-folder-summary.h</a></td><td class='right'>233</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-folder.c</a></td><td class='right'>1360</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 92.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-folder.h</a></td><td class='right'>297</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-internet-address.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-internet-address.c</a></td><td class='right'>282</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-medium.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-medium.c</a></td><td class='right'>266</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-medium.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-basic.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/camel/camel-mime-filter-basic.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-charset.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-charset.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-crlf.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/camel/camel-mime-filter-crlf.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-from.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/camel/camel-mime-filter-from.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-from.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/camel/camel-mime-filter-index.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-index.c</a></td><td class='right'>156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-index.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-linewrap.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-linewrap.c</a></td><td class='right'>140</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-linewrap.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-linewrap.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-mime-filter-save.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter-save.c</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-filter-save.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-filter.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/camel-mime-message.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-message.c</a></td><td class='right'>738</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/camel/camel-mime-message.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-message.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-mime-parser.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-parser.c</a></td><td class='right'>1902</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/camel/camel-mime-parser.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-parser.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-mime-part-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-part-utils.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/camel/camel-mime-part-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-part.c</a></td><td class='right'>747</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/camel/camel-mime-part.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-part.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/camel/camel-mime-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-utils.c</a></td><td class='right'>3070</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 17.3%;'/><td class='none' style='width: 82.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-mime-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-mime-utils.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/camel/camel-movemail.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-movemail.c</a></td><td class='right'>592</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/camel-movemail.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-multipart.c</a></td><td class='right'>520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-multipart.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-multipart.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/camel/camel-news-address.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-news-address.c</a></td><td class='right'>65</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-news-address.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-object.c</a></td><td class='right'>973</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.5%;'/><td class='none' style='width: 94.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-object.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-object.h</a></td><td class='right'>147</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-provider.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-provider.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/camel/camel-provider.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-provider.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-remote-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-remote-store.c</a></td><td class='right'>491</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-remote-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-remote-store.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/camel-seekable-stream.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-seekable-stream.c</a></td><td class='right'>201</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.1%;'/><td class='none' style='width: 98.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-seekable-stream.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-seekable-substream.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/camel/camel-seekable-substream.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-service.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-service.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-service.h</a></td><td class='right'>125</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-session.c</a></td><td class='right'>455</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-session.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-session.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/camel/camel-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-store.c</a></td><td class='right'>652</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/camel/camel-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-store.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-buffer.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-stream-buffer.c</a></td><td class='right'>453</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.6%;'/><td class='none' style='width: 97.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-buffer.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-stream-filter.c</a></td><td class='right'>384</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/camel-stream-filter.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-stream-fs.c</a></td><td class='right'>298</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-stream-mem.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-stream.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/camel/camel-stream.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-transport.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-transport.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/camel/camel-transport.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-transport.h</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-uid-cache.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-uid-cache.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-uid-cache.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-uid-cache.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/camel/camel-url.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-url.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-url.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel-url.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/camel.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/camel.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/camel/camel.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/providers/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/Makefile.am</a></td><td class='right'>7</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/cache/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/.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/cache/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/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/cache/camel-cache-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/camel-cache-folder.c</a></td><td class='right'>810</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.6%;'/><td class='none' style='width: 95.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/cache/camel-cache-folder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/camel-cache-folder.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/cache/camel-cache-map.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/camel-cache-map.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/cache/camel-cache-map.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/camel-cache-map.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/cache/camel-cache-provider.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/camel-cache-provider.c</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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/cache/camel-cache-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/camel-cache-store.c</a></td><td class='right'>297</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/providers/cache/camel-cache-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/camel-cache-store.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/cache/libcamelcache.urls?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/cache/libcamelcache.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/imap/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/Makefile.am</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/imap/camel-imap-auth.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-auth.c</a></td><td class='right'>195</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-auth.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-auth.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/camel/providers/imap/camel-imap-command.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-command.c</a></td><td class='right'>406</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-command.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-command.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/imap/camel-imap-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-folder.c</a></td><td class='right'>850</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/camel/providers/imap/camel-imap-folder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-folder.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/imap/camel-imap-provider.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-provider.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/camel/providers/imap/camel-imap-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-store.c</a></td><td class='right'>788</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/imap/camel-imap-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-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/imap/camel-imap-stream.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-stream.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/imap/camel-imap-stream.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/camel-imap-summary.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-summary.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/camel/providers/imap/camel-imap-summary.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-summary.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/camel/providers/imap/camel-imap-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-utils.c</a></td><td class='right'>688</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/imap/camel-imap-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/imap/camel-imap-utils.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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/libcamelimap.urls?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/maildir/Makefile.am</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/maildir/camel-maildir-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mbox/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/mbox/camel-mbox-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mbox/camel-mbox-folder.c</a></td><td class='right'>620</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/mbox/camel-mbox-folder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mbox/camel-mbox-folder.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/providers/mbox/camel-mbox-provider.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mbox/camel-mbox-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/mbox/camel-mbox-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mbox/camel-mbox-store.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/providers/mbox/camel-mbox-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mbox/camel-mbox-store.h</a></td><td class='right'>68</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mbox/camel-mbox-summary.c</a></td><td class='right'>894</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/camel/providers/mbox/camel-mbox-summary.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mbox/camel-mbox-summary.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/libcamelmbox.urls?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/mh/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/.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/mh/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/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/mh/camel-mh-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/camel-mh-folder.c</a></td><td class='right'>534</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/mh/camel-mh-folder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/camel-mh-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/mh/camel-mh-provider.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/camel-mh-provider.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/camel/providers/mh/camel-mh-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/camel-mh-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/mh/camel-mh-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/camel-mh-store.h</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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-summary.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/camel-mh-summary.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/providers/mh/camel-mh-summary.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/camel-mh-summary.h</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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/libcamelmh.urls?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/mh/libcamelmh.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/Makefile.am</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/camel/providers/nntp/camel-nntp-auth.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-auth.c</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/providers/nntp/camel-nntp-auth.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-auth.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/camel/providers/nntp/camel-nntp-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-folder.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/camel/providers/nntp/camel-nntp-folder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-grouplist.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-grouplist.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/camel/providers/nntp/camel-nntp-grouplist.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-grouplist.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/camel/providers/nntp/camel-nntp-newsrc.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-newsrc.c</a></td><td class='right'>573</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/camel/providers/nntp/camel-nntp-newsrc.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-newsrc.h</a></td><td class='right'>34</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-provider.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/providers/nntp/camel-nntp-resp-codes.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-resp-codes.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/camel/providers/nntp/camel-nntp-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-store.c</a></td><td class='right'>870</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/camel/providers/nntp/camel-nntp-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-store.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/nntp/camel-nntp-types.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-types.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/camel/providers/nntp/camel-nntp-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/nntp/camel-nntp-utils.c</a></td><td class='right'>249</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/nntp/camel-nntp-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/pop3/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/camel/providers/pop3/camel-pop3-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/pop3/camel-pop3-folder.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/pop3/camel-pop3-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/pop3/camel-pop3-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/pop3/camel-pop3-store.c</a></td><td class='right'>700</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/pop3/camel-pop3-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/pop3/camel-pop3-store.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/camel/providers/pop3/libcamelpop3.urls?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/sendmail/Makefile.am</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/sendmail/camel-sendmail-provider.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/sendmail/camel-sendmail-transport.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/sendmail/camel-sendmail-transport.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/smtp/Makefile.am</a></td><td class='right'>33</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/smtp/camel-smtp-provider.c</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/smtp/camel-smtp-transport.c</a></td><td class='right'>788</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/vee/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'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/vee/camel-vee-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/vee/camel-vee-folder.c</a></td><td class='right'>524</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/camel/providers/vee/camel-vee-folder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/vee/camel-vee-folder.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/camel/providers/vee/camel-vee-provider.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/vee/camel-vee-provider.c</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/vee/camel-vee-store.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/vee/camel-vee-store.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/camel/providers/vee/camel-vee-store.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/providers/vee/camel-vee-store.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/camel/providers/vee/libcamelvee.urls?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/string-utils.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/string-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>camel/string-utils.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/composer/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/.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/composer/ChangeLog?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/ChangeLog</a></td><td class='right'>947</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/composer/Composer.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/Composer.idl</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/Evolution-Composer.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/Evolution-Composer.idl</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/composer/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/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/composer/bad-icon.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/bad-icon.xpm</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-icon-list.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-icon-list.c</a></td><td class='right'>2666</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 15.0%;'/><td class='none' style='width: 85.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-icon-list.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-icon-list.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-attachment-bar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer-attachment-bar.c</a></td><td class='right'>779</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/composer/e-msg-composer-attachment-bar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer-attachment-bar.h</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer-attachment.c</a></td><td class='right'>442</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/composer/e-msg-composer-attachment.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer-attachment.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-hdrs.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer-hdrs.c</a></td><td class='right'>712</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/composer/e-msg-composer-hdrs.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer-hdrs.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/composer/e-msg-composer-select-file.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer-select-file.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer.c</a></td><td class='right'>1904</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/composer/e-msg-composer.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/e-msg-composer.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/composer/evolution-composer.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/evolution-composer.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/composer/evolution-composer.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/evolution-composer.h</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/listener.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/listener.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/composer/listener.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>composer/listener.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/configure.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>configure.in</a></td><td class='right'>699</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/data/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>data/Makefile.am</a></td><td class='right'>6</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/data/evolution.desktop?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>data/evolution.desktop</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/data/evolution.keys?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>data/evolution.keys</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/default_user/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/ChangeLog</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/default_user/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/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/ldapservers.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/ldapservers.xml</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/local/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/local/Contacts/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Drafts/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/Executive-Summary/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/local/Executive-Summary/.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/Executive-Summary/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/local/Executive-Summary/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/Executive-Summary/folder-metadata.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/local/Executive-Summary/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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/local/Makefile.am</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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/Outbox/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/Sent/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/local/Sent/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Sent/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/local/Sent/Makefile.am</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Sent/folder-metadata.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/local/Sent/folder-metadata.xml</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/default_user/local/Trash/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>default_user/shortcuts.xml</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/devel-docs/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/.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/doc/C/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/Makefile.am</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/apx-authors.sgml</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/apx-bugs.sgml</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/apx-fdl.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/apx-fdl.sgml</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/doc/C/apx-gloss.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/apx-gloss.sgml</a></td><td class='right'>432</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/doc/C/apx-gpl.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/apx-gpl.sgml</a></td><td class='right'>414</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/config-prefs.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/config-prefs.sgml</a></td><td class='right'>647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/doc/C/config-setupassist.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/config-setupassist.sgml</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/doc/C/config-sync.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/config-sync.sgml</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/doc/C/evolution-guide.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/evolution-guide.sgml</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/doc/C/fig/calendar.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/calendar.png</a></td><td class='right'>bin</td><td class='graph'>30227 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/config-cal.png</a></td><td class='right'>bin</td><td class='graph'>6898 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/config-mail.png</a></td><td class='right'>bin</td><td class='graph'>8680 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/contact-editor.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/contact-editor.png</a></td><td class='right'>bin</td><td class='graph'>37707 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/contact.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/contact.png</a></td><td class='right'>bin</td><td class='graph'>27020 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/filter-assist-fig.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/filter-assist-fig.png</a></td><td class='right'>bin</td><td class='graph'>6644 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/filter-new-fig.png</a></td><td class='right'>bin</td><td class='graph'>7826 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/mail-composer.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/mail-composer.png</a></td><td class='right'>bin</td><td class='graph'>15277 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/mail-inbox.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/mail-inbox.png</a></td><td class='right'>bin</td><td class='graph'>31474 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/mainwindow-pic.png</a></td><td class='right'>bin</td><td class='graph'>166348 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/print-dest.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/print-dest.png</a></td><td class='right'>bin</td><td class='graph'>7219 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/fig/print-preview.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/print-preview.png</a></td><td class='right'>bin</td><td class='graph'>26643 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/fig/vfolder-createrule-fig.png</a></td><td class='right'>bin</td><td class='graph'>7621 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/C/menuref.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/menuref.sgml</a></td><td class='right'>1315</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/doc/C/preface.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/preface.sgml</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/doc/C/usage-calendar.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/usage-calendar.sgml</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/doc/C/usage-contact.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/usage-contact.sgml</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/doc/C/usage-mail.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/usage-mail.sgml</a></td><td class='right'>1382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.8%;'/><td class='none' style='width: 92.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-mainwindow.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/usage-mainwindow.sgml</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/doc/C/usage-notes.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/usage-notes.sgml</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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/usage-print.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/usage-print.sgml</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/doc/C/usage-sync.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/C/usage-sync.sgml</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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/COPYING-DOCS?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/COPYING-DOCS</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/doc/Camel-Classes?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/ChangeLog</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/doc/Design?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/Keybindings?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/Keybindings</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/devel/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/.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/devel/ChangeLog?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/ChangeLog</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/doc/devel/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/Makefile.am</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/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/doc/devel/calendar/architecture.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/architecture.sgml</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/doc/devel/calendar/cal-client/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/.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/doc/devel/calendar/cal-client/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/Makefile.am</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/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/evolution-cal-client-decl.txt</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/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/evolution-cal-client-sections.txt</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/doc/devel/calendar/cal-client/evolution-cal-client.args?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/evolution-cal-client.args</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/evolution-cal-client.hierarchy</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/evolution-cal-client.signals?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/evolution-cal-client.signals</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/doc/devel/calendar/cal-client/evolution-cal-client.types?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/evolution-cal-client.types</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-client/tmpl/cal-client.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/tmpl/cal-client.sgml</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/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/.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/doc/devel/calendar/cal-util/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/Makefile.am</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/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/evolution-cal-util-decl.txt</a></td><td class='right'>852</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/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/evolution-cal-util-sections.txt</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/doc/devel/calendar/cal-util/evolution-cal-util.args?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/evolution-cal-util.args</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/evolution-cal-util.hierarchy</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util.signals?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/evolution-cal-util.signals</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/evolution-cal-util.types?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/evolution-cal-util.types</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/tmpl/cal-component.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/tmpl/cal-component.sgml</a></td><td class='right'>934</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/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/tmpl/cal-recur.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/doc/devel/calendar/cal-util/tmpl/cal-util.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/tmpl/cal-util.sgml</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/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/cal-util/tmpl/timeutil.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/cal-util/tmpl/timeutil.sgml</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/evolution-calendar.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/evolution-calendar.sgml</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/doc/devel/calendar/public-reference.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/public-reference.sgml</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/calendar/reference.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/calendar/reference.sgml</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/doc/devel/evolution-devel-guide.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>doc/devel/evolution-devel-guide.sgml</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/doc/white-papers/calendar/calendar.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/ChangeLog</a></td><td class='right'>749</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/e-util/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/Makefile.am</a></td><td class='right'>50</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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-dialog-widgets.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-dialog-widgets.c</a></td><td class='right'>826</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/e-util/e-dialog-widgets.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-gtk-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-gtk-utils.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-gtk-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-gtk-utils.h</a></td><td class='right'>39</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-gui-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-gui-utils.c</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-gui-utils.h</a></td><td class='right'>8</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-html-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-html-utils.c</a></td><td class='right'>252</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-iterator.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-iterator.c</a></td><td class='right'>186</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-iterator.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-iterator.h</a></td><td class='right'>69</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-list-iterator.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-list-iterator.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/e-util/e-list-iterator.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-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/e-util/e-list.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-list.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/e-util/e-list.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-list.h</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-pilot-map.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-pilot-map.c</a></td><td class='right'>263</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/e-util/e-pilot-map.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-pilot-map.h</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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-sexp.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-sexp.c</a></td><td class='right'>1164</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-text-event-processor-emacs-like.c</a></td><td class='right'>497</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/e-util/e-text-event-processor-emacs-like.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-text-event-processor.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/e-util/e-text-event-processor.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-util.c</a></td><td class='right'>525</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.0%;'/><td class='none' style='width: 97.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/e-util.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-util.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/e-util/e-xml-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-xml-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/e-util/e-xml-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/e-xml-utils.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/e-util/ename/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/ename/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/e-util/ename/TODO?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/ename/TODO</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/e-address-western.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/ename/e-address-western.c</a></td><td class='right'>446</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/e-util/ename/e-address-western.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/ename/e-address-western.h</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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/e-name-western-tables.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/ename/e-name-western-tables.h</a></td><td class='right'>74</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/e-util/ename/e-name-western.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/ename/e-name-western.c</a></td><td class='right'>870</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/ename/test-ename-western-gtk.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/e-util/ename/test-ename-western.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/e-util/md5-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/md5-utils.c</a></td><td class='right'>362</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/e-util/md5-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>e-util/md5-utils.h</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>evolution.desktop</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/evolution.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/executive-summary/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/.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/executive-summary/ChangeLog?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/ChangeLog</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/executive-summary/GNOME_Evolution_Summary.oaf.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/GNOME_Evolution_Summary.oaf.in</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/GNOME_Evolution_Summary.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/GNOME_Evolution_Summary.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/executive-summary/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/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/executive-summary/component/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/.cvsignore</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/Makefile.am</a></td><td class='right'>62</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/component-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/component-factory.c</a></td><td class='right'>157</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/component-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/component-factory.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/e-summary-factory.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/executive-summary/component/e-summary-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/e-summary-factory.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/executive-summary/component/e-summary-url.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/e-summary-url.c</a></td><td class='right'>567</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/executive-summary/component/e-summary-url.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/e-summary-url.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/executive-summary/component/e-summary-util.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/e-summary-util.c</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary-util.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/e-summary-util.h</a></td><td class='right'>29</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/e-summary.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/e-summary.c</a></td><td class='right'>813</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/executive-summary/component/e-summary.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/e-summary.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/executive-summary/component/executive-summary.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/executive-summary.png</a></td><td class='right'>bin</td><td class='graph'>25562 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/component/main.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/component/main.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/executive-summary/default-header.html?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/default-header.html</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-executive-summary.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-executive-summary.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/executive-summary/evolution-services/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/.cvsignore</a></td><td class='right'>11</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/Makefile.am</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/executive-summary/evolution-services/executive-summary-client.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary-client.c</a></td><td class='right'>174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/executive-summary/evolution-services/executive-summary-client.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary-client.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/executive-summary/evolution-services/executive-summary-component-client.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary-component-client.c</a></td><td class='right'>338</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/executive-summary/evolution-services/executive-summary-component-client.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary-component-client.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/evolution-services/executive-summary-component-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary-component-view.c</a></td><td class='right'>345</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/executive-summary/evolution-services/executive-summary-component-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary-component-view.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/executive-summary/evolution-services/executive-summary-component.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary-component.c</a></td><td class='right'>502</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/executive-summary/evolution-services/executive-summary-component.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary-component.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/executive-summary/evolution-services/executive-summary.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary.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/executive-summary/evolution-services/executive-summary.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/evolution-services/executive-summary.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.4%;'/><td class='none' style='width: 99.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/idl/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/Executive-Summary.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/idl/Executive-Summary.idl</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/executive-summary/idl/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/idl/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/executive-summary/idl/Summary.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/idl/Summary.idl</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/idl/SummaryComponent.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/idl/SummaryComponent.idl</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/executive-summary/test-service/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/test-service/.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/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in</a></td><td class='right'>27</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/test-service/GNOME_Evolution_Summary_test.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/executive-summary/test-service/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/test-service/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/executive-summary/test-service/main.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/test-service/main.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/executive-summary/test-service/test-service.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/test-service/test-service.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/executive-summary/widgets/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/.cvsignore</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/Makefile.am</a></td><td class='right'>32</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-subwindow.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/e-summary-subwindow.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/executive-summary/widgets/e-summary-subwindow.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/e-summary-subwindow.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/executive-summary/widgets/e-summary-title-button.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/e-summary-title-button.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/executive-summary/widgets/e-summary-title-button.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/e-summary-title-button.h</a></td><td class='right'>54</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-titlebar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/e-summary-titlebar.c</a></td><td class='right'>412</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.3%;'/><td class='none' style='width: 97.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/e-summary-titlebar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/e-summary-titlebar.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/executive-summary/widgets/edit.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/edit.xpm</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/esummary-window-test.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/esummary-window-test.c</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/executive-summary/widgets/shade.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/shade.xpm</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/executive-summary/widgets/x.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>executive-summary/widgets/x.xpm</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/ChangeLog</a></td><td class='right'>1203</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/filter/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/Makefile.am</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/filter/filter-code.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-code.c</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.7%;'/><td class='none' style='width: 99.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/filter-code.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-code.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/filter/filter-colour.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-colour.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/filter/filter-colour.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-colour.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/filter/filter-context.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-context.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/filter/filter-context.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-context.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/filter/filter-datespec.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-datespec.c</a></td><td class='right'>731</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/filter/filter-datespec.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-datespec.h</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-driver.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-driver.c</a></td><td class='right'>804</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/filter/filter-driver.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-driver.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/filter/filter-editor.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-editor.c</a></td><td class='right'>494</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/filter/filter-editor.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-editor.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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-element.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-element.c</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/filter/filter-element.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-element.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/filter/filter-filter.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-filter.c</a></td><td class='right'>458</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/filter/filter-filter.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-filter.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/filter/filter-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-folder.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/filter/filter-folder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-folder.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/filter/filter-input.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-input.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/filter/filter-input.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-input.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/filter/filter-message-search.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-message-search.c</a></td><td class='right'>711</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/filter/filter-message-search.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-message-search.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/filter/filter-option.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-option.c</a></td><td class='right'>332</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/filter/filter-option.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-option.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/filter/filter-part.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-part.c</a></td><td class='right'>471</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/filter/filter-part.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-part.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/filter-rule.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-rule.c</a></td><td class='right'>666</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/filter/filter-rule.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-rule.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/filter/filter-score.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-score.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-score.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-score.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/filter/filter-url.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-url.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/filter/filter-url.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter-url.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/filter/filter.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter.glade</a></td><td class='right'>705</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/filter/filter.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filter.glade.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/filter/filtertypes.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/filtertypes.xml</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/filter/libfilter-i18n.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/libfilter-i18n.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/filter/rule-context.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/rule-context.c</a></td><td class='right'>432</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/filter/rule-context.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/rule-context.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/filter/score-context.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/score-context.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/filter/score-context.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/score-context.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/score-editor.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/score-editor.c</a></td><td class='right'>327</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/score-editor.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/score-editor.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/filter/score-rule.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/score-rule.c</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/filter/score-rule.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/score-rule.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/filter/vfolder-context.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/vfolder-context.c</a></td><td class='right'>116</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/vfolder-context.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/vfolder-context.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/filter/vfolder-editor.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/vfolder-editor.c</a></td><td class='right'>390</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/filter/vfolder-editor.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/vfolder-editor.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfolder-rule.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/vfolder-rule.c</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/filter/vfolder-rule.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/vfolder-rule.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/filter/vfoldertypes.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>filter/vfoldertypes.xml</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/.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/help/C/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/Makefile.am</a></td><td class='right'>59</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/apx-authors.sgml</a></td><td class='right'>75</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/apx-bugs.sgml</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/apx-fdl.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/apx-fdl.sgml</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/help/C/apx-gloss.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/apx-gloss.sgml</a></td><td class='right'>432</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/apx-gpl.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/apx-gpl.sgml</a></td><td class='right'>414</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/help/C/config-prefs.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/config-prefs.sgml</a></td><td class='right'>647</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/help/C/config-setupassist.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/config-setupassist.sgml</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/help/C/config-sync.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/config-sync.sgml</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/help/C/evolution-guide.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/evolution-guide.sgml</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/help/C/fig/calendar.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/calendar.png</a></td><td class='right'>bin</td><td class='graph'>30227 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/config-cal.png</a></td><td class='right'>bin</td><td class='graph'>6898 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/config-mail.png</a></td><td class='right'>bin</td><td class='graph'>8680 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/contact-editor.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/contact-editor.png</a></td><td class='right'>bin</td><td class='graph'>37707 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/contact.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/contact.png</a></td><td class='right'>bin</td><td class='graph'>27020 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/filter-assist-fig.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/filter-assist-fig.png</a></td><td class='right'>bin</td><td class='graph'>6644 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/filter-new-fig.png</a></td><td class='right'>bin</td><td class='graph'>7826 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/mail-composer.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/mail-composer.png</a></td><td class='right'>bin</td><td class='graph'>15277 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/mail-inbox.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/mail-inbox.png</a></td><td class='right'>bin</td><td class='graph'>31474 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/mainwindow-pic.png</a></td><td class='right'>bin</td><td class='graph'>166348 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/print-dest.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/print-dest.png</a></td><td class='right'>bin</td><td class='graph'>7219 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/fig/print-preview.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/print-preview.png</a></td><td class='right'>bin</td><td class='graph'>26643 -> 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/fig/vfolder-createrule-fig.png</a></td><td class='right'>bin</td><td class='graph'>7621 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/menuref.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/menuref.sgml</a></td><td class='right'>1315</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/help/C/preface.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/preface.sgml</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.4%;'/><td class='none' style='width: 97.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-calendar.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/usage-calendar.sgml</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/help/C/usage-contact.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/usage-contact.sgml</a></td><td class='right'>617</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.5%;'/><td class='none' style='width: 96.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-mail.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/usage-mail.sgml</a></td><td class='right'>1382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.8%;'/><td class='none' style='width: 92.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-mainwindow.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/usage-mainwindow.sgml</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/help/C/usage-notes.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/usage-notes.sgml</a></td><td class='right'>49</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/C/usage-print.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/usage-print.sgml</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/help/C/usage-sync.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/C/usage-sync.sgml</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/COPYING-DOCS?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/COPYING-DOCS</a></td><td class='right'>355</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/help/Camel-Classes?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/ChangeLog</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/help/Design?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/Keybindings?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/Keybindings</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/devel/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/.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/devel/ChangeLog?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/ChangeLog</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/help/devel/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/Makefile.am</a></td><td class='right'>64</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/devel/calendar/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/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/help/devel/calendar/architecture.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/architecture.sgml</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/help/devel/calendar/cal-client/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/.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/help/devel/calendar/cal-client/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/Makefile.am</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/help/devel/calendar/cal-client/evolution-cal-client-decl.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/evolution-cal-client-decl.txt</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/help/devel/calendar/cal-client/evolution-cal-client-sections.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/evolution-cal-client-sections.txt</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/help/devel/calendar/cal-client/evolution-cal-client.args?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/evolution-cal-client.args</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/cal-client/evolution-cal-client.hierarchy?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/evolution-cal-client.hierarchy</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/cal-client/evolution-cal-client.signals?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/evolution-cal-client.signals</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/help/devel/calendar/cal-client/evolution-cal-client.types?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/evolution-cal-client.types</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/cal-client/tmpl/cal-client.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/tmpl/cal-client.sgml</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/help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml</a></td><td class='right'>10</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/cal-util/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/.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/help/devel/calendar/cal-util/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/Makefile.am</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/help/devel/calendar/cal-util/evolution-cal-util-decl.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/evolution-cal-util-decl.txt</a></td><td class='right'>852</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/help/devel/calendar/cal-util/evolution-cal-util-sections.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/evolution-cal-util-sections.txt</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/help/devel/calendar/cal-util/evolution-cal-util.args?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/evolution-cal-util.args</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/cal-util/evolution-cal-util.hierarchy?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/evolution-cal-util.hierarchy</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/cal-util/evolution-cal-util.signals?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/evolution-cal-util.signals</a></td><td class='right'>0</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/cal-util/evolution-cal-util.types?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/evolution-cal-util.types</a></td><td class='right'>4</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/cal-util/tmpl/cal-component.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/tmpl/cal-component.sgml</a></td><td class='right'>934</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/help/devel/calendar/cal-util/tmpl/cal-recur.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/tmpl/cal-recur.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/help/devel/calendar/cal-util/tmpl/cal-util.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/tmpl/cal-util.sgml</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/help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml</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/help/devel/calendar/cal-util/tmpl/timeutil.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/cal-util/tmpl/timeutil.sgml</a></td><td class='right'>260</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.5%;'/><td class='none' style='width: 98.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/evolution-calendar.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/evolution-calendar.sgml</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/help/devel/calendar/public-reference.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/public-reference.sgml</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/calendar/reference.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/calendar/reference.sgml</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/help/devel/evolution-devel-guide.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>help/devel/evolution-devel-guide.sgml</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/help/white-papers/calendar/calendar.sgml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/.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/libibex/COPYING.LIB?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/ChangeLog</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/libibex/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/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/libibex/TODO?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/block.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/block.c</a></td><td class='right'>595</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/libibex/block.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/block.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/libibex/diskarray.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/diskarray.c</a></td><td class='right'>255</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.4%;'/><td class='none' style='width: 98.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libibex/disktail.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/disktail.c</a></td><td class='right'>814</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/libibex/dumpindex.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/dumpindex.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/libibex/hash.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/hash.c</a></td><td class='right'>859</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/libibex/ibex.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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_block.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/ibex_block.c</a></td><td class='right'>313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/libibex/ibex_db.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/ibex_db.c</a></td><td class='right'>512</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/libibex/ibex_internal.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/ibex_internal.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/libibex/index.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/index.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/libibex/lookup.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/wordindex.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/wordindex.c</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/libibex/wordindex.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/wordindex.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/libibex/wordindexmem.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libibex/wordindexmem.c</a></td><td class='right'>721</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/libical/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/COPYING?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/ChangeLog</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/libical/INSTALL?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/INSTALL</a></td><td class='right'>24</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/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/libical/NEWS?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/NEWS</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/libical/README?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/README</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/libical/TEST?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/THANKS</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/TODO?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/TODO</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/libical/acconfig.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/configure.in</a></td><td class='right'>51</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/design-data/components.txt</a></td><td class='right'>22</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/design-data/param-c-types.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/design-data/prop-to-value.txt</a></td><td class='right'>57</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/doc/UsingLibical.lyx</a></td><td class='right'>1555</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/doc/UsingLibical.ps?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/doc/UsingLibical.ps</a></td><td class='right'>1605</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/doc/UsingLibical.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/doc/UsingLibical.txt</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/libical/examples/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/examples/.cvsignore</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/examples/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/examples/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/examples/access_components.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/examples/access_components.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/examples/access_properties_and_parameters.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/examples/access_properties_and_parameters.c</a></td><td class='right'>145</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/examples/errors.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/examples/errors.c</a></td><td class='right'>70</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/examples/main.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/examples/main.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/libical/examples/parse_text.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/examples/parse_text.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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/install-sh?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/scripts/mkderivedvalues.pl</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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/scripts/mkparameterrestrictions.pl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/Makefile.am</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/libical/src/libical/ical.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/ical.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/libical/src/libical/icalcomponent.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalcomponent.c</a></td><td class='right'>925</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.2%;'/><td class='none' style='width: 94.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalcomponent.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalcomponent.h</a></td><td class='right'>152</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalenums.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalenums.c</a></td><td class='right'>618</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalenums.h</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/icalerror.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/icallexer.l?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalmemory.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/libical/src/libical/icalmemory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalmemory.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/libical/src/libical/icalmime.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalmime.c</a></td><td class='right'>325</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/icalmime.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalmime.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/libical/src/libical/icalparameter.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalparameter.c</a></td><td class='right'>2039</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.5%;'/><td class='none' style='width: 88.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/icalparameter.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalparameter.h</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalparser.c</a></td><td class='right'>1009</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/src/libical/icalparser.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalparser.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/libical/src/libical/icalproperty.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalproperty.c</a></td><td class='right'>3484</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.6%;'/><td class='none' style='width: 80.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/icalproperty.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalproperty.h</a></td><td class='right'>396</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.2%;'/><td class='none' style='width: 97.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalrecur.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalrecur.c</a></td><td class='right'>1174</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/libical/src/libical/icalrecur.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalrecur.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/libical/src/libical/icalrestriction.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalrestriction.c</a></td><td class='right'>1587</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/icalrestriction.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalrestriction.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/libical/src/libical/icaltime.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icaltime.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/libical/src/libical/icaltime.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icaltime.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/libical/src/libical/icaltypes.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icaltypes.c</a></td><td class='right'>297</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icaltypes.h</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalvalue.c</a></td><td class='right'>2139</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/libical/src/libical/icalvalue.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalvalue.h</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/libical/src/libical/icalversion.h.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalyacc.c</a></td><td class='right'>1727</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.7%;'/><td class='none' style='width: 90.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/icalyacc.y?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/icalyacc.y</a></td><td class='right'>491</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libical/pvl.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/pvl.c</a></td><td class='right'>761</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/pvl.h</a></td><td class='right'>94</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/sspm.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/sspm.c</a></td><td class='right'>1191</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/libical/src/libical/sspm.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libical/sspm.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/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/libical/src/libicalss/icalcalendar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalcalendar.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalcalendar.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/icalcsdb.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalcsdb.h</a></td><td class='right'>67</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/icalcstp.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalcstp.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalss/icaldirset.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icaldirset.c</a></td><td class='right'>718</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/libicalss/icaldirset.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icaldirset.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/libical/src/libicalss/icalfileset.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalfileset.c</a></td><td class='right'>427</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/icalfileset.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalfileset.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/libical/src/libicalss/icalfilesetimpl.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalfilesetimpl.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/libical/src/libicalss/icalgauge.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalgauge.c</a></td><td class='right'>208</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/libical/src/libicalss/icalgauge.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalgauge.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/libical/src/libicalss/icalset.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalset.c</a></td><td class='right'>86</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/libicalss/icalset.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalss/icalset.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/.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/libical/src/libicalvcal/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/Makefile.am</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/README.TXT?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/README.TXT</a></td><td class='right'>951</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.4%;'/><td class='none' style='width: 94.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/icalvcal.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/icalvcal.c</a></td><td class='right'>498</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.8%;'/><td class='none' style='width: 97.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/icalvcal.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/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/libicalvcal/port.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/port.h</a></td><td class='right'>88</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/libicalvcal/vcaltest.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/vcaltest.c</a></td><td class='right'>118</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/libicalvcal/vcaltmp.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/vcaltmp.c</a></td><td class='right'>337</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.9%;'/><td class='none' style='width: 98.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vcaltmp.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/vcaltmp.h</a></td><td class='right'>128</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/libicalvcal/vcc.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/vcc.c</a></td><td class='right'>2141</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/libical/src/libicalvcal/vcc.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/vcc.h</a></td><td class='right'>80</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/libicalvcal/vcc.y?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/vcc.y</a></td><td class='right'>1218</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/libicalvcal/vctest.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/vctest.c</a></td><td class='right'>95</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/libicalvcal/vobject.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/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/libical/src/libicalvcal/vobject.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/libicalvcal/vobject.h</a></td><td class='right'>366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/test/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/.cvsignore</a></td><td class='right'>18</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/Makefile.am</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/copycluster.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/findobj.c</a></td><td class='right'>72</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/icaltestparser.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/libical/src/test/recur.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/recur.c</a></td><td class='right'>96</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/test/regression.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/regression.c</a></td><td class='right'>1568</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/src/test/storage.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/storage.c</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/libical/src/test/stow.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/stow.c</a></td><td class='right'>849</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/test/testmime.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/testmime.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/libical/src/test/testvcal.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/src/test/testvcal.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/libical/test-data/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/2446.ics?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/3?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/test-data/Makefile.am</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/complex-mime.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/test-data/complex-mime.txt</a></td><td class='right'>81</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-data/recur.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/test-data/recur.txt</a></td><td class='right'>632</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/libical/test-data/simple-mime.txt?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/test-data/simple-mime.txt</a></td><td class='right'>26</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/libical/test-data/smallcluster.ics?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/stresstest.ics?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/test-data/stresstest.ics</a></td><td class='right'>178</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/test-data/user-cal.vcf?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libical/test-data/user-cal.vcf</a></td><td class='right'>76</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/libversit/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>libversit/vcc.y</a></td><td class='right'>1262</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/ChangeLog</a></td><td class='right'>6070</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 34.2%;'/><td class='none' style='width: 65.8%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/GNOME_Evolution_Mail.oaf.in</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/mail/GNOME_Evolution_Mail.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/GNOME_Evolution_Mail.oafinfo</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/mail/Mail.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/Makefile.am</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/mail/README.async?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/README.async</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/mail/component-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/component-factory.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/mail/component-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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.oafinfo?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/evolution-mail.oafinfo</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/mail/folder-browser-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/folder-browser-factory.c</a></td><td class='right'>247</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/mail/folder-browser-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/folder-browser-factory.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/mail/folder-browser.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/folder-browser.c</a></td><td class='right'>826</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/mail/folder-browser.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/folder-browser.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/mail/local-config.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/local-config.glade</a></td><td class='right'>220</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.2%;'/><td class='none' style='width: 98.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-autofilter.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-autofilter.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/mail/mail-autofilter.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-autofilter.h</a></td><td class='right'>53</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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-callbacks.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-callbacks.c</a></td><td class='right'>946</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 5.3%;'/><td class='none' style='width: 94.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-callbacks.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-callbacks.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/mail/mail-config-druid.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-config-druid.glade</a></td><td class='right'>2876</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.2%;'/><td class='none' style='width: 83.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config-druid.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-config-druid.glade.h</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/mail/mail-config-gui.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-config-gui.c</a></td><td class='right'>2388</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.5%;'/><td class='none' style='width: 86.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-config-gui.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-config-gui.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/mail/mail-config.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-config.c</a></td><td class='right'>572</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/mail/mail-config.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-config.glade</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/mail/mail-config.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-config.glade.h</a></td><td class='right'>28</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-config.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-config.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/mail/mail-crypto.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-crypto.c</a></td><td class='right'>694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-crypto.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-crypto.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/mail/mail-display.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-display.c</a></td><td class='right'>852</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.8%;'/><td class='none' style='width: 95.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-display.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-display.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/mail/mail-format.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-format.c</a></td><td class='right'>1798</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 10.1%;'/><td class='none' style='width: 89.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-identify.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-identify.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/mail/mail-local-storage.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-local-storage.c</a></td><td class='right'>188</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/mail-local-storage.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-local-storage.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/mail/mail-local.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-local.c</a></td><td class='right'>519</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/mail/mail-local.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-local.h</a></td><td class='right'>37</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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-mlist-magic.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-mlist-magic.c</a></td><td class='right'>262</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/mail/mail-mlist-magic.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-mlist-magic.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/mail/mail-ops.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-ops.c</a></td><td class='right'>2313</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.0%;'/><td class='none' style='width: 87.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-ops.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-ops.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/mail/mail-search-dialogue.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-search-dialogue.c</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/mail/mail-search-dialogue.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-search-dialogue.h</a></td><td class='right'>61</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 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-session.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-session.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/mail/mail-summary.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-summary.c</a></td><td class='right'>375</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.1%;'/><td class='none' style='width: 97.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-summary.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-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/mail/mail-threads.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-threads.c</a></td><td class='right'>1126</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/mail/mail-threads.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-threads.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/mail/mail-tools.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-tools.c</a></td><td class='right'>550</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/mail/mail-tools.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-tools.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/mail/mail-types.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-types.h</a></td><td class='right'>40</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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-vfolder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-vfolder.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/mail/mail-vfolder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-vfolder.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/mail/mail-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail-view.c</a></td><td class='right'>265</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/mail/mail.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/mail.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/mail/main.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/main.c</a></td><td class='right'>106</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/message-list.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/message-list.c</a></td><td class='right'>2161</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/mail/message-list.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/message-list.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/mail/message-thread.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/message-thread.c</a></td><td class='right'>744</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/mail/message-thread.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/message-thread.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/mail/session.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/session.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/mail/subscribe-dialog.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/subscribe-dialog.c</a></td><td class='right'>1188</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/mail/subscribe-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/subscribe-dialog.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/mail/test-mail.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/test-mail.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/mail/test-thread.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>mail/test-thread.c</a></td><td class='right'>230</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/notes/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>notes/Makefile.am</a></td><td class='right'>30</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 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/component-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>notes/component-factory.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/notes/component-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>notes/e-note.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/notes/e-note.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>notes/main.c</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/test-notes.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/ChangeLog</a></td><td class='right'>982</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/po/Makefile.i18npatch?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/Makefile.i18npatch</a></td><td class='right'>63</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/po/POTFILES.ignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/POTFILES.ignore</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/po/POTFILES.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/POTFILES.in</a></td><td class='right'>163</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/README.tools?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/ca.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/ca.po</a></td><td class='right'>6242</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 35.2%;'/><td class='none' style='width: 64.8%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/da.po</a></td><td class='right'>6964</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 39.3%;'/><td class='none' style='width: 60.7%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/de.po</a></td><td class='right'>5797</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 32.7%;'/><td class='none' style='width: 67.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/el.po</a></td><td class='right'>3771</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 21.3%;'/><td class='none' style='width: 78.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/en_GB.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/en_GB.po</a></td><td class='right'>4659</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 26.3%;'/><td class='none' style='width: 73.7%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/es.po</a></td><td class='right'>5961</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 33.6%;'/><td class='none' style='width: 66.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/fi.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/fi.po</a></td><td class='right'>6576</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 37.1%;'/><td class='none' style='width: 62.9%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/fr.po</a></td><td class='right'>5805</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 32.7%;'/><td class='none' style='width: 67.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ga.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/ga.po</a></td><td class='right'>455</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/po/gl.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/gl.po</a></td><td class='right'>6889</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 38.8%;'/><td class='none' style='width: 61.2%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/hu.po</a></td><td class='right'>3904</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 22.0%;'/><td class='none' style='width: 78.0%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/it.po</a></td><td class='right'>6694</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 37.7%;'/><td class='none' style='width: 62.3%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/ja.po</a></td><td class='right'>5740</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 32.4%;'/><td class='none' style='width: 67.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ko.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/ko.po</a></td><td class='right'>4680</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 26.4%;'/><td class='none' style='width: 73.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/lt.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/lt.po</a></td><td class='right'>6580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 37.1%;'/><td class='none' style='width: 62.9%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/nl.po</a></td><td class='right'>8520</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 48.0%;'/><td class='none' style='width: 52.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/nn.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/nn.po</a></td><td class='right'>4993</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 28.1%;'/><td class='none' style='width: 71.9%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/no.po</a></td><td class='right'>6945</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 39.2%;'/><td class='none' style='width: 60.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/pl.po</a></td><td class='right'>5470</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 30.8%;'/><td class='none' style='width: 69.2%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/pt_BR.po</a></td><td class='right'>6707</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 37.8%;'/><td class='none' style='width: 62.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ru.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/ru.po</a></td><td class='right'>6907</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 38.9%;'/><td class='none' style='width: 61.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/sl.po</a></td><td class='right'>7156</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 40.3%;'/><td class='none' style='width: 59.7%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/sv.po</a></td><td class='right'>7048</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 39.7%;'/><td class='none' style='width: 60.3%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/tr.po</a></td><td class='right'>3376</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.0%;'/><td class='none' style='width: 81.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/po/ui-extract.pl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/ui-extract.pl</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/po/uk.po?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/uk.po</a></td><td class='right'>5677</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 32.0%;'/><td class='none' style='width: 68.0%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>po/update.pl</a></td><td class='right'>349</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.0%;'/><td class='none' style='width: 98.0%;'/></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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/ChangeLog</a></td><td class='right'>2996</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 16.9%;'/><td class='none' style='width: 83.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-LocalStorage.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Evolution-LocalStorage.idl</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/shell/Evolution-Session.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Evolution-Session.idl</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/shell/Evolution-Shell.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Evolution-Shell.idl</a></td><td class='right'>82</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-ShellComponent.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Evolution-ShellComponent.idl</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/Evolution-ShellView.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Evolution-ShellView.idl</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/Evolution-Storage.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Evolution-Storage.idl</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/shell/Evolution-StorageSetView.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Evolution-StorageSetView.idl</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/Evolution.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Evolution.idl</a></td><td class='right'>19</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/Makefile.am</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/shell/README?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/README</a></td><td class='right'>14</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-component-registry.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-component-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-component-registry.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-component-registry.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-corba-storage-registry.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-corba-storage.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-corba-storage.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-tree.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-folder-tree.c</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/shell/e-folder-tree.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-folder-tree.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/shell/e-folder-type-registry.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-folder-type-registry.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/shell/e-folder-type-registry.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-folder.c</a></td><td class='right'>311</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-folder.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-folder.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/shell/e-local-folder.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-local-storage.c</a></td><td class='right'>669</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/shell/e-local-storage.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-local-storage.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/shell/e-setup.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-setup.c</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-setup.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-folder-creation-dialog.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/shell/e-shell-folder-creation-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-folder-selection-dialog.c</a></td><td class='right'>382</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-selection-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-folder-selection-dialog.h</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-folder-title-bar.c</a></td><td class='right'>544</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/shell/e-shell-folder-title-bar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-folder-title-bar.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/shell/e-shell-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-view-menu.c</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/shell/e-shell-view-menu.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-view-menu.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/shell/e-shell-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-view.c</a></td><td class='right'>1622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.1%;'/><td class='none' style='width: 90.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-shell-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell-view.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-shell.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell.c</a></td><td class='right'>1099</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/shell/e-shell.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shell.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/shell/e-shortcuts-view-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shortcuts-view-model.c</a></td><td class='right'>297</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-shortcuts-view-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shortcuts-view-model.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/shell/e-shortcuts-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shortcuts-view.c</a></td><td class='right'>548</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/shell/e-shortcuts-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shortcuts.c</a></td><td class='right'>789</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/shell/e-shortcuts.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-shortcuts.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-splash.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-splash.c</a></td><td class='right'>400</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/shell/e-splash.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-splash.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-storage-set-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-storage-set-view.c</a></td><td class='right'>1113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.3%;'/><td class='none' style='width: 93.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/e-storage-set-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-storage-set-view.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/shell/e-storage-set.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-storage-set.c</a></td><td class='right'>604</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/shell/e-storage-set.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-storage-set.h</a></td><td class='right'>113</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-storage.c</a></td><td class='right'>493</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-storage.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/e-storage.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/shell/evolution-local-storage.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-local-storage.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/evolution-local-storage.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-local-storage.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/evolution-session.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-session.c</a></td><td class='right'>215</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/evolution-session.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-session.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/shell/evolution-shell-client.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-shell-client.c</a></td><td class='right'>370</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/evolution-shell-client.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-shell-client.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/shell/evolution-shell-component-client.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-shell-component-client.c</a></td><td class='right'>528</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/evolution-shell-component-client.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-shell-component-client.h</a></td><td class='right'>100</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.6%;'/><td class='none' style='width: 99.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-shell-component.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-shell-component.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/shell/evolution-shell-component.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-shell-component.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/shell/evolution-shell-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-shell-view.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/shell/evolution-shell-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-shell-view.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/shell/evolution-storage-listener.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage-listener.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/shell/evolution-storage-listener.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage-listener.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/shell/evolution-storage-set-view-factory.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage-set-view-factory.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/shell/evolution-storage-set-view-factory.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage-set-view-factory.h</a></td><td class='right'>31</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.2%;'/><td class='none' style='width: 99.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/evolution-storage-set-view-listener.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage-set-view-listener.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/evolution-storage-set-view-listener.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage-set-view-listener.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/shell/evolution-storage-set-view.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage-set-view.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/shell/evolution-storage-set-view.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage-set-view.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/shell/evolution-storage.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage.c</a></td><td class='right'>665</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/shell/evolution-storage.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/evolution-storage.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/shell/glade/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/glade/Makefile.am</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/glade/e-shell-folder-creation-dialog.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/glade/e-shell-folder-creation-dialog.glade</a></td><td class='right'>169</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.0%;'/><td class='none' style='width: 99.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/shell/main.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>shell/main.c</a></td><td class='right'>184</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/stamp.h.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>tests/Makefile.am</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/tests/test-movemail.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>tools/killev</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'>-rwxr-xr-x</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/tools/verify-evolution-install.sh?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>tools/verify-evolution-install.sh</a></td><td class='right'>640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/ui/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/.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/ui/ChangeLog?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/ChangeLog</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/ui/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/Makefile.am</a></td><td class='right'>17</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-addressbook-ldap.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-addressbook-ldap.xml</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/ui/evolution-addressbook.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-addressbook.xml</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/ui/evolution-calendar.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-calendar.xml</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/ui/evolution-contact-editor.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-contact-editor.xml</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/ui/evolution-event-editor.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-event-editor.xml</a></td><td class='right'>350</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/ui/evolution-executive-summary.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-executive-summary.xml</a></td><td class='right'>9</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/ui/evolution-mail.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-mail.xml</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/ui/evolution-message-composer.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-message-composer.xml</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/ui/evolution-subscribe.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-subscribe.xml</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/ui/evolution-task-editor-dialog.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution-task-editor-dialog.xml</a></td><td class='right'>361</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/ui/evolution.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>ui/evolution.xml</a></td><td class='right'>120</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/ChangeLog?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/ChangeLog</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/widgets/LICENSE?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/Makefile.am</a></td><td class='right'>5</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/meeting-time-sel/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/ChangeLog?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/meeting-time-sel/ChangeLog</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/meeting-time-sel/LICENSE?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/meeting-time-sel/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/widgets/meeting-time-sel/e-meeting-time-sel-item.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/meeting-time-sel/e-meeting-time-sel-item.c</a></td><td class='right'>987</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/widgets/meeting-time-sel/e-meeting-time-sel-item.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/meeting-time-sel/e-meeting-time-sel.c</a></td><td class='right'>3298</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 18.6%;'/><td class='none' style='width: 81.4%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/meeting-time-sel/e-meeting-time-sel.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/menus/gal-define-views-dialog.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/menus/gal-define-views-dialog.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/widgets/menus/gal-define-views-dialog.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/menus/gal-define-views-dialog.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/menus/gal-define-views.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/menus/gal-define-views.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/widgets/misc/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/.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/widgets/misc/ChangeLog?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/ChangeLog</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/widgets/misc/Makefile.am?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/Makefile.am</a></td><td class='right'>52</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.3%;'/><td class='none' style='width: 99.7%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-calendar-item.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-calendar-item.c</a></td><td class='right'>2801</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/widgets/misc/e-calendar-item.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-calendar-item.h</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/widgets/misc/e-calendar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-calendar.c</a></td><td class='right'>622</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-calendar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-calendar.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/widgets/misc/e-canvas-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-vbox.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-canvas-vbox.c</a></td><td class='right'>321</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/misc/e-canvas-vbox.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-canvas-vbox.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/widgets/misc/e-canvas.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-canvas.c</a></td><td class='right'>693</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 3.9%;'/><td class='none' style='width: 96.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-canvas.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-canvas.h</a></td><td class='right'>121</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-clipped-label.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/widgets/misc/e-clipped-label.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-colors.c</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/misc/e-colors.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-colors.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/misc/e-cursors.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/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/widgets/misc/e-cursors.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-cursors.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/widgets/misc/e-dateedit.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-dateedit.c</a></td><td class='right'>1177</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/widgets/misc/e-dateedit.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-dateedit.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/widgets/misc/e-gui-utils.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-gui-utils.c</a></td><td class='right'>204</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-gui-utils.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-gui-utils.h</a></td><td class='right'>20</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-popup-menu.c</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/widgets/misc/e-popup-menu.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-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/widgets/misc/e-printable.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-reflow.c</a></td><td class='right'>859</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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-title-bar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-title-bar.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/widgets/misc/e-title-bar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-title-bar.h</a></td><td class='right'>87</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-unicode.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-unicode.c</a></td><td class='right'>1226</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 6.9%;'/><td class='none' style='width: 93.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/e-unicode.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/e-unicode.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/misc/pixmaps/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/pixmaps/.cvsignore</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.0%;'/><td class='none' style='width: 100.0%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/misc/pixmaps/cursor_cross.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-calendar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/test-calendar.c</a></td><td class='right'>217</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/test-color.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/test-color.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/widgets/misc/test-dateedit.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/misc/test-dateedit.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/widgets/misc/test-title-bar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/ChangeLog</a></td><td class='right'>324</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/shortcut-bar/LICENSE?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/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/widgets/shortcut-bar/e-group-bar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/e-group-bar.c</a></td><td class='right'>1556</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 8.8%;'/><td class='none' style='width: 91.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/shortcut-bar/e-group-bar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/e-icon-bar-bg-item.c</a></td><td class='right'>374</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/e-icon-bar.c</a></td><td class='right'>1643</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.3%;'/><td class='none' style='width: 90.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/e-icon-bar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/e-icon-bar.h</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/shortcut-bar/e-shortcut-bar.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/e-shortcut-bar.c</a></td><td class='right'>799</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 4.5%;'/><td class='none' style='width: 95.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/shortcut-bar/e-shortcut-bar.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/e-shortcut-bar.h</a></td><td class='right'>138</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-shortcut-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/e-shortcut-model.c</a></td><td class='right'>556</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/shortcut-bar/e-shortcut-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/e-shortcut-model.h</a></td><td class='right'>139</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/shortcut-bar/test-shortcut-bar.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/widgets/table/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/.cvsignore</a></td><td class='right'>13</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-cell-text.c</a></td><td class='right'>2580</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 14.5%;'/><td class='none' style='width: 85.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-text.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-cell-text.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/widgets/table/e-cell-toggle.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-cell-toggle.c</a></td><td class='right'>315</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 1.8%;'/><td class='none' style='width: 98.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-cell-toggle.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-cell-tree.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/widgets/table/e-cell-tree.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-cell-tree.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-cell.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-cell.c</a></td><td class='right'>223</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-cell.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-cell.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/widgets/table/e-table-click-to-add.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-click-to-add.c</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/widgets/table/e-table-click-to-add.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-click-to-add.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/widgets/table/e-table-col-dnd.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-col.c</a></td><td class='right'>179</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-col.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-col.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-table-column-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-specification.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-column-specification.c</a></td><td class='right'>119</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-column-specification.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-column-specification.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/widgets/table/e-table-column.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-field.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-config-field.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-config-field.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-config-field.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/e-table-config.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-config.c</a></td><td class='right'>312</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-config.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-config.glade</a></td><td class='right'>2000</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/table/e-table-config.glade.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-config.glade.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/widgets/table/e-table-config.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-config.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/widgets/table/e-table-defines.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-defines.h</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-example-1.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-example-1.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/widgets/table/e-table-example-2.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-example-2.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-extras.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-extras.c</a></td><td class='right'>170</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-extras.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-extras.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-table-field-chooser-dialog.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-field-chooser-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/widgets/table/e-table-field-chooser-item.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-field-chooser-item.c</a></td><td class='right'>623</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/e-table-field-chooser-item.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-field-chooser-item.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/widgets/table/e-table-field-chooser.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-field-chooser.c</a></td><td class='right'>248</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-group-container.c</a></td><td class='right'>1270</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.2%;'/><td class='none' style='width: 92.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group-container.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-group-container.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-table-group-leaf.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-group-leaf.c</a></td><td class='right'>438</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group-leaf.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-group-leaf.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/widgets/table/e-table-group.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-group.c</a></td><td class='right'>445</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 2.5%;'/><td class='none' style='width: 97.5%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-group.glade?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-group.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/table/e-table-header-item.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-header-item.c</a></td><td class='right'>1640</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 9.2%;'/><td class='none' style='width: 90.8%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-header-item.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-header-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/table/e-table-header.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-header.c</a></td><td class='right'>681</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/table/e-table-header.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-header.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-item.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-item.c</a></td><td class='right'>2381</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 13.4%;'/><td class='none' style='width: 86.6%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-item.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-item.h</a></td><td class='right'>144</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.8%;'/><td class='none' style='width: 99.2%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-model.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/widgets/table/e-table-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-model.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/table/e-table-one.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-one.c</a></td><td class='right'>236</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-one.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-one.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/table/e-table-scrolled.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-scrolled.c</a></td><td class='right'>433</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-scrolled.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-scrolled.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-selection-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-selection-model.c</a></td><td class='right'>564</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-selection-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-selection-model.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/table/e-table-simple.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-simple.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/table/e-table-simple.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-simple.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-size-test.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-size-test.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/widgets/table/e-table-sort-info.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-sort-info.c</a></td><td class='right'>297</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-sort-info.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-sort-info.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/table/e-table-sorted-variable.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-sorted-variable.c</a></td><td class='right'>670</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/table/e-table-sorted-variable.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-sorted-variable.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/widgets/table/e-table-sorted.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-sorter.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-sorter.c</a></td><td class='right'>295</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-sorter.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-sorter.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-specification.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-specification.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/e-table-specification.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-specification.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/widgets/table/e-table-state.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-state.c</a></td><td class='right'>165</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.9%;'/><td class='none' style='width: 99.1%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table-state.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-state.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/e-table-subset-variable.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-subset-variable.c</a></td><td class='right'>193</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-subset-variable.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-table-subset.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-subset.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/widgets/table/e-table-subset.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-subset.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/widgets/table/e-table-text-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-text-model.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-text-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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-tooltip.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table-tooltip.h</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/widgets/table/e-table-tree.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table.c</a></td><td class='right'>2094</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 11.8%;'/><td class='none' style='width: 88.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.dia?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table.dia</a></td><td class='right'>bin</td><td class='graph'>4514 -> 0 bytes<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-table.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-table.h</a></td><td class='right'>278</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-tree-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-tree-model.c</a></td><td class='right'>1366</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 7.7%;'/><td class='none' style='width: 92.3%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/e-tree-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-tree-model.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/widgets/table/e-tree-simple.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-tree-simple.c</a></td><td class='right'>173</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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-tree-simple.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/e-tree-simple.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/widgets/table/image1.png?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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/spec.xml?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/spec.xml</a></td><td class='right'>21</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/test-check.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/widgets/table/test-cols.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/test-cols.c</a></td><td class='right'>250</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/test-table.c</a></td><td class='right'>394</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/tree-expanded.xpm</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/table/tree-unexpanded.xpm?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/table/tree-unexpanded.xpm</a></td><td class='right'>23</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.1%;'/><td class='none' style='width: 99.9%;'/></tr></table></td></tr>
<tr><td class='mode'>-rw-r--r--</td><td class='del'><a href='/~lantw44/cgit/gsoc2013-evolution/diff/widgets/text/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/.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/text/e-entry-test.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-entry-test.c</a></td><td class='right'>79</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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-entry.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-entry.c</a></td><td class='right'>431</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/text/e-entry.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-entry.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/widgets/text/e-table-text-model.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-table-text-model.c</a></td><td class='right'>225</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/text/e-table-text-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-text-event-processor-emacs-like.c</a></td><td class='right'>497</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/widgets/text/e-text-event-processor-emacs-like.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-text-event-processor.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/widgets/text/e-text-event-processor.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-text-model.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/widgets/text/e-text-model.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-text-test.c</a></td><td class='right'>155</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 0.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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-text.c</a></td><td class='right'>3439</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 19.4%;'/><td class='none' style='width: 80.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.h?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>widgets/text/e-text.h</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/wombat/.cvsignore?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>wombat/ChangeLog</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/wombat/GNOME_Evolution_Wombat.oaf.in?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>wombat/Makefile.am</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/wombat/wombat.c?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>wombat/wombat.c</a></td><td class='right'>224</td><td class='graph'><table summary='file diffstat' width='100%'><tr><td class='add' style='width: 0.0%;'/><td class='rem' style='width: 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/wombat/wombat.idl?h=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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=BUG_BUDDY_1_2&amp;id=0f79a64eddac4dc910abbe3077949ba42656fe64'>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'>1711 files changed, 0 insertions, 607692 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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>.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 5156573f32..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/AUTHORS?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>AUTHORS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,66 +0,0 @@</div><div class='del'>-Evolution was written by:</div><div class='del'>-</div><div class='del'>-Addressbook</div><div class='del'>-	Arturo Esponosa &lt;arturo@nuclecu.unam.mx&gt; (Original Gnomecard author)</div><div class='del'>-	Nat Friedman &lt;nat@helixcode.com&gt;</div><div class='del'>-	Chris Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>-	Chris Toshok &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-Artwork</div><div class='del'>-	Tuomas Kuosmanen &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-Calendar</div><div class='del'>-	Seth Alves &lt;seth@helixcode.com&gt;</div><div class='del'>-	Eric Busboom &lt;eric@softwarestudio.org&gt; (libical author)</div><div class='del'>-	Arturo Esponosa &lt;arturo@nuclecu.unam.mx&gt; (Gnomecal contributor)</div><div class='del'>-	Damon Chaplin &lt;damon@helixcode.com&gt;</div><div class='del'>-	Federico Mena-Quintero &lt;federico@helixcode.com&gt;</div><div class='del'>-	Russell Steinthal &lt;rms39@columbia.edu&gt; (Gnomecal maintainer)</div><div class='del'>-</div><div class='del'>-Documentation</div><div class='del'>-	Kevin Breit &lt;battery841@mypad.com&gt;</div><div class='del'>-	Aaron Weber &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-Mailer</div><div class='del'>-	Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>-	Matt Loper &lt;matt@helixcode.com&gt;</div><div class='del'>-	Ettore Perazzoli &lt;ettore@helixcode.com&gt;</div><div class='del'>-	Jeff Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>-	Peter Williams &lt;peterw@helixcode.com&gt;</div><div class='del'>-	Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>-	Michael Zucchi &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-Notes</div><div class='del'>-	Anders Carlsson &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-Shell</div><div class='del'>-	Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>-	Ettore Perazzoli &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-Translations</div><div class='del'>-	Akira TAGOH &lt;tagoh@gnome.gr.jp&gt;</div><div class='del'>-	Andraz Tori &lt;andraz.tori1@guest.arnes.si&gt;</div><div class='del'>-	Andreas Hyden &lt;a.hyden@cyberpoint.se&gt;</div><div class='del'>-	Arjan Scherpenisse &lt;acscherp@wins.uva.nl&gt;</div><div class='del'>-	Clara Tattoni &lt;clara.tattoni@libero.it&gt;</div><div class='del'>-	Fatih Demir &lt;kabalak@gmx.net&gt;</div><div class='del'>-	GNOME PL Team &lt;gnomepl@pandora.info.bielsko.pl&gt;</div><div class='del'>-	Gustavo Maciel Dias Vieira &lt;gdvieira@zaz.com.br&gt;</div><div class='del'>-	Héctor García Alvarez &lt;hector@scouts-es.org&gt;</div><div class='del'>-	Jesús Bravo Álvarez &lt;jba@pobox.com&gt;</div><div class='del'>-	Keld Simonsen &lt;keld@dkuug.dk&gt;</div><div class='del'>-	Matthias Warkus &lt;mawa@iname.com&gt;</div><div class='del'>-	Spiros Papadimitriou &lt;spapadim+@cs.cmu.edu&gt;</div><div class='del'>-	Sung-Hyun Nam &lt;namsh@kldp.org&gt;</div><div class='del'>-	Szabolcs BAN &lt;shooby@gnome.hu&gt;</div><div class='del'>-	Tiago Antão &lt;tiagoantao@bigfoot.com&gt;</div><div class='del'>-	Valek Filippov &lt;frob@df.ru&gt;</div><div class='del'>-	Vincent Renardias &lt;vincent@redhat.com&gt;</div><div class='del'>-	Yuri Syrota &lt;rasta@renome.rovno.ua&gt;</div><div class='del'>-</div><div class='del'>-Widgets</div><div class='del'>-	Damon Chaplin &lt;damon@helixcode.com&gt;</div><div class='del'>-	Miguel de Icaza &lt;miguel@helixcode.com&gt;</div><div class='del'>-	Chris Lahey &lt;clahey@helixcode.com&gt;</div><div class='del'>-	Federico Mena-Quintero &lt;federico@helixcode.com&gt;</div><div class='del'>-	Chris Toshok &lt;toshok@helixcode.com&gt;</div><div class='head'>diff --git a/COPYING b/COPYING<br/>deleted file mode 100644<br/>index d60c31a97a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/COPYING?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 bd44e8882b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5695 +0,0 @@</div><div class='del'>-2000-11-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GTKHTML_LIBS): ${prefix} doesn't get defaulted</div><div class='del'>-	until the end of configure, so check if it's "NONE" and use</div><div class='del'>-	${ac_default_prefix} if so.</div><div class='del'>-</div><div class='del'>-2000-11-06  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GTKHTML_LIBS): also look for HTMLEditor.idl in</div><div class='del'>-	${prefix}/share/gtkhtml</div><div class='del'>-</div><div class='del'>-2000-11-03  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (BONOBO_HTML_GNOME_CFLAGS): raise required version</div><div class='del'>-	number to 0.8</div><div class='del'>-	added check for HTMLEditor.idl file</div><div class='del'>-</div><div class='del'>-2000-11-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal 0.2.1.2.</div><div class='del'>-</div><div class='del'>-2000-11-02  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require Bonobo-0.27+</div><div class='del'>-</div><div class='del'>-2000-11-01  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/ename/.cvsignore, addressbook/gui/minicard/.cvsignore,</div><div class='del'>-	calendar/doc/.cvsignore, widgets/e-paned/.cvsignore,</div><div class='del'>-	widgets/e-table/.cvsignore, widgets/e-text/.cvsignore: added these</div><div class='del'>-	files.</div><div class='del'>-	* calendar/gui/.cvsignore, composer/.cvsignore,</div><div class='del'>-	executive-summary/.cvsignore, executive-summary/component/.cvsignore,</div><div class='del'>-	po/.cvsignore: added some files to ignore.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook-factory.c, mail/main.c,</div><div class='del'>-	shell/main.c, calendar/gui/main.c, notes/main.c,</div><div class='del'>-	executive-summary/component/main.c: call *textdomain() only if</div><div class='del'>-	ENABLE_NLS is defined.</div><div class='del'>-</div><div class='del'>-2000-11-01  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added lt to ALL_LINGUAS.</div><div class='del'>-	</div><div class='del'>-2000-10-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: fix up printing of kerberos configuration status</div><div class='del'>-</div><div class='del'>-2000-10-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require gal cvs version.</div><div class='del'>-</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/killev: Kill executive summary components</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added executive-summary stuff</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the executive-summary subdirs.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR</div><div class='del'>-</div><div class='del'>-	* configure.in: set localedir here to use in Makefiles.</div><div class='del'>-	(AM_GNOME_GETTEXT doesn't actually always set it to</div><div class='del'>-	$(datadir)/locale).</div><div class='del'>-</div><div class='del'>-2000-10-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the gal check to check for gal 0.2.1.</div><div class='del'>-</div><div class='del'>-2000-10-22  Robert Brady  &lt;rwb197@zepler.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added "en_GB" to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2000-10-20  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/component-factory.c (control_activate_cb): </div><div class='del'>-</div><div class='del'>-2000-10-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (General, Addressbook): Updated NEWS for addressbook and</div><div class='del'>-	ETable.</div><div class='del'>-</div><div class='del'>-2000-10-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated the gal check to check for gal 0.2.</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_MICRO_VERSION): 6.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.</div><div class='del'>-	(dist-hook:): Removed.</div><div class='del'>-</div><div class='del'>-2000-10-18  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/component-factory.c (control_activate, control_deactivate),</div><div class='del'>-	(create_view): cripple, not worth updating to new UI code.</div><div class='del'>-</div><div class='del'>-2000-10-17  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/splash.png: This looks happier than the dark piece of rusty</div><div class='del'>-	metal. And the Big Dig in Boston is ugly looking too. Finnish</div><div class='del'>-	road poles are much more cool!</div><div class='del'>-</div><div class='del'>-2000-10-15  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/verify-evolution-install.sh (libcamelvee): Check</div><div class='del'>-	for linkage against version 0.5 libcamelvee, not version 0.3.</div><div class='del'>-	This should track with the version of Evolution itself.</div><div class='del'>-	(rm -f $ldddfile): Remove a temporary file.</div><div class='del'>-</div><div class='del'>-2000-10-15  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added "nn" to ALL_LINGUAS.</div><div class='del'>-	</div><div class='del'>-2000-10-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Add `splash.png'.</div><div class='del'>-</div><div class='del'>-2000-10-14  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/splash.png: umm.. it's a splash screen image.</div><div class='del'>-</div><div class='del'>-2000-10-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix bonobo error message</div><div class='del'>-</div><div class='del'>-2000-10-11  Jesse Pavel		&lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.keys: Added support for the text/calendar and</div><div class='del'>-	text/x-calendar MIME types.</div><div class='del'>-</div><div class='del'>-2000-10-10  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added lt to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2000-10-10  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/gui/recur.xpm: Updated round-we-go-thingy icon..</div><div class='del'>-</div><div class='del'>-2000-10-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/empty.xpm: make it transparent instead of white.</div><div class='del'>-</div><div class='del'>-2000-10-06  Christophe Merlet  &lt;christophe@merlet.net&gt;</div><div class='del'>-</div><div class='del'>-	* *.desktop: Added french strings.</div><div class='del'>-</div><div class='del'>-2000-10-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am (EXTRA_DIST): Add verify-evolution-install.sh</div><div class='del'>-	to EXTRA_DIST</div><div class='del'>-</div><div class='del'>-2000-10-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for isblank</div><div class='del'>-</div><div class='del'>-	* config.h.in: </div><div class='del'>-	* acconfig.h: #undef HAVE_ISBLANK</div><div class='del'>-</div><div class='del'>-2000-10-05  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump Bonobo requirement to &gt;= 0.20</div><div class='del'>-</div><div class='del'>-2000-10-05  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* executive-summary/*: Added the executive summary stuff.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-executive-summary.xml: New.</div><div class='del'>-</div><div class='del'>-	* art/add-service.png: New icon.</div><div class='del'>-</div><div class='del'>-2000-10-03  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-addressbook-ldap.xml,</div><div class='del'>-	* ui/evolution-addressbook.xml,</div><div class='del'>-	* ui/evolution-calendar.xml,</div><div class='del'>-	* ui/evolution-contact-editor.xml:</div><div class='del'>-	Fixed typo `_decr' -&gt; `_descr', so some missing tooltips will appear.</div><div class='del'>-	Also fixed some typos in descr values.</div><div class='del'>-</div><div class='del'>-2000-09-29  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/Makefile.am (XML_FILES): Install the new evolution-subscribe.xml</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-2000-09-29  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-mail.xml: add a Settings/Manage Subscriptions...</div><div class='del'>-	menu item.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-subscribe.xml: add a File/Close menu item.</div><div class='del'>-</div><div class='del'>-2000-09-28  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-subscribe.xml: add a FolderSearch control, and</div><div class='del'>-	change "Refresh" to "RefreshList".</div><div class='del'>-</div><div class='del'>-2000-09-27  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-subscribe.xml: add an Refresh List button..</div><div class='del'>-</div><div class='del'>-2000-09-27  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/Makefile.am (XML_FILES): add evolution-subscribe.xml.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-subscribe.xml: new file.</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-mail.xml: Moved the (un)select all menu items over</div><div class='del'>-	to the Edit menu - this looks nicer.</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-mail.xml: Added some new menu items to the Message</div><div class='del'>-	menu like (un)select all and moved "mark as read" to the Message</div><div class='del'>-	menu.</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Moved addressbook/ename to e-util/ename so</div><div class='del'>-	generate e-util/ename/Makefile and don't generate</div><div class='del'>-	addressbook/ename/Makefile</div><div class='del'>-</div><div class='del'>-2000-09-23  Tuomas Kuosmanen  &lt;tigert@localhost&gt;</div><div class='del'>-</div><div class='del'>-	* art/attachment.xpm</div><div class='del'>-	* art/add-attachment.png: OOPS. The attachment.xpm was not the one </div><div class='del'>-	I thought, so I accidentally replaced the paperclip icon in the mail</div><div class='del'>-	list column, which wasnt my intention. I hope this works now. The old </div><div class='del'>-	one is back, instead the toolbar icon to add attachment is now called</div><div class='del'>-	"add-attachment.png" as you can see also from above. Bummer. Sorry :)</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* libversit/vcc.y: Fixed some warnings.  Fixed a bug where quoted</div><div class='del'>-	printable fields were reading in semi-colons that should have been</div><div class='del'>-	field separators.</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/Makefile.am: Added evolution-addressbook-ldap.xml.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-addressbook-ldap.xml: New file.  (A Variation on</div><div class='del'>-	evolution-addressbook.xml)</div><div class='del'>-</div><div class='del'>-	* ui/evolution-addressbook.xml: Added View All and Stop buttons.</div><div class='del'>-</div><div class='del'>-2000-09-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/evolution-calendar.xml: Removed the AboutCalendar stuff.</div><div class='del'>-</div><div class='del'>-	* ui/evolution.xml: Fix mis-spelling of "calendar".</div><div class='del'>-</div><div class='del'>-2000-09-21  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/component-factory.c (control_activate): upd.</div><div class='del'>-</div><div class='del'>-2000-09-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/.cvsignore: Added a cvsignore file here.</div><div class='del'>-</div><div class='del'>-2000-09-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ui/Makefile.am (XML_FILES): Added evolution-contact-editor.xml.</div><div class='del'>-</div><div class='del'>-	* ui/evolution-contact-editor.xml: New file for the UI for the</div><div class='del'>-	evolution contact editor.</div><div class='del'>-</div><div class='del'>-2000-09-20  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/attachment.xpm</div><div class='del'>-	* art/send.png: new icons for "compose mail" dialog...</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: alter the krb4 check a bit to deal with configure</div><div class='del'>-	cache suckage. (If you do AC_CHECK_LIB with the same library and</div><div class='del'>-	function name but different LDFLAGS, it will still use the result</div><div class='del'>-	of the previous check. So use a different function the second</div><div class='del'>-	time.)</div><div class='del'>-</div><div class='del'>-2000-09-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: add gal as a dependency</div><div class='del'>-</div><div class='del'>-2000-09-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/score-*.xpm: stupid looking icons for use with displaying</div><div class='del'>-	scores in the message-list view. These need a makeover BADLY ;-)</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added check for gnome-app-lib.  Removed</div><div class='del'>-	directories that have been moved to gal.</div><div class='del'>-</div><div class='del'>-2000-09-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, evolution.spec.in: remove spec file. We haven't</div><div class='del'>-	been keeping it up to date, and it's only good for RH anyway, and</div><div class='del'>-	if people really want a spec file they can get it from our SRPMs.</div><div class='del'>-</div><div class='del'>-2000-09-07  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require Bonobo 0.19</div><div class='del'>-</div><div class='del'>-2000-09-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added widgets/e-reflow/Makefile.  Replaced</div><div class='del'>-	addressbook/gui/minicard/Makefile with</div><div class='del'>-	addressbook/gui/widgets/Makefile.</div><div class='del'>-</div><div class='del'>-2000-09-13  Tuomas Kuosmanen  &lt;tigert@localhost&gt;</div><div class='del'>-</div><div class='del'>-	* art/pin.png: added icon for the folder tree "pin down" button</div><div class='del'>-</div><div class='del'>-2000-09-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Calendar): Pilot stuff</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: The notes subdir isn't actually used, so remove</div><div class='del'>-	it.</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: 0.5.</div><div class='del'>-</div><div class='del'>-2000-09-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mailer): Added Sent/Outbox feature descriptions</div><div class='del'>-</div><div class='del'>-2000-09-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS (Mailer): add most (but not all) 0.5 Mailer features</div><div class='del'>-</div><div class='del'>-	* configure.in: s/Sentbox/Sent/</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (buttonsdir): Install the new button icons into</div><div class='del'>-	`$(datadir)/images/evolution/buttons'.</div><div class='del'>-</div><div class='del'>-2000-09-11  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/fetch-mail.png</div><div class='del'>-	* art/compose-message.png</div><div class='del'>-	* art/reply.png</div><div class='del'>-	* art/reply-to-all.png</div><div class='del'>-	* art/forward.png</div><div class='del'>-	* art/move-message.png</div><div class='del'>-	* art/copy-message.png: New icons for the main window toolbar</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* NEWS: Added 0.5 changes for ETable and Addressbook.</div><div class='del'>-</div><div class='del'>-2000-09-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Add a mention of the verify-evolution-install.sh script</div><div class='del'>-	in tools/.</div><div class='del'>-</div><div class='del'>-2000-09-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Reversed my last change as it broke configure, how do I get it so</div><div class='del'>-	that we can do folders with spaces in the name!?</div><div class='del'>-</div><div class='del'>-2000-09-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Renamed default_user/local/Sentbox to</div><div class='del'>-	default_user/local/Sent\ Mail as Ettore and Danw are picky about</div><div class='del'>-	folder names </div><div class='del'>-</div><div class='del'>-2000-09-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added calendar/conduits/Makefile,</div><div class='del'>-	calendar/conduits/calendar/Makefile and</div><div class='del'>-	calendar/conduits/todo/Makefile to the list of makefiles to</div><div class='del'>-	output.</div><div class='del'>-</div><div class='del'>-2000-09-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add default_user/local/Sentbox/Makefile to the</div><div class='del'>-	list of makefiles to output</div><div class='del'>-</div><div class='del'>-2000-08-31  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (kerberos): Check and see if krb_sendauth needs</div><div class='del'>-	prototyping. (#define NEED_KRB_SENDAUTH_PROTO). Also check</div><div class='del'>-	for a libkrb that doesn't need -ldes.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: #undef it</div><div class='del'>-</div><div class='del'>-2000-08-30  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: AC_DEFINE(USING_GNOME_PRINT_0_20)</div><div class='del'>-</div><div class='del'>-	* acconfig.h: #undef that</div><div class='del'>-</div><div class='del'>-2000-08-30  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Robustify the kerberos checks.</div><div class='del'>-</div><div class='del'>-2000-08-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: decruft</div><div class='del'>-</div><div class='del'>-2000-08-28  Jesus Bravo Alvarez  &lt;jba@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added Portuguese (pt) to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Require oafized bonobo</div><div class='del'>-</div><div class='del'>-2000-08-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Ahem.  If you add dependencies on libraries, make</div><div class='del'>-	sure things still build.  Fixed the libunicode foo.</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c (_get_position_from_xy): Don't crash on illegal string</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c (e_text_event): Use e_utf8_from_gtk_event_key</div><div class='del'>-	to translate GDK_KEY_PRESS to insertable UTF-8 string</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* announcement-0.4.1.txt: Updated dependency list.</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Use byte based UTF-8 syntax</div><div class='del'>-	</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* announcement-0.4.1.txt: Announcement message</div><div class='del'>-</div><div class='del'>-2000-08-19  Mathieu Lacage &lt;mathieu@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	Fixes compile for non-standard prefixes. Mainly in idl</div><div class='del'>-	compilation where -I`gnome-config --datadir`/idl is replaced</div><div class='del'>-	by `gnome-config --cflags idl` (ugly but it works at least)</div><div class='del'>-	and add some random _CFLAGS here and there and _LIBS for linking.</div><div class='del'>-	* addressbook/gui/component/select-names/Makefile.am</div><div class='del'>-	* composer/Makefile.am</div><div class='del'>-	* e-util/Makefile.am</div><div class='del'>-	* filter/Makefile.am</div><div class='del'>-	* mail/Makefile.am</div><div class='del'>-	* shell/Makefile.am</div><div class='del'>-	* widgets/e-text/Makefile.am</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-08-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,</div><div class='del'>-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added code</div><div class='del'>-	to make handle position persist across resizes.</div><div class='del'>-</div><div class='del'>-2000-08-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-20  arik devens  &lt;arik@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am (INCLUDES): added UNICODE_CFLAGS</div><div class='del'>-	support so that compiling in an alternate prefix works.</div><div class='del'>-</div><div class='del'>-2000-08-19  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.h: Commented out Suckfont, added EFont</div><div class='del'>-	* widgets/e-text/e-text.c: Ported to UTF-8</div><div class='del'>-</div><div class='del'>-2000-08-18  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (gnome-vfs): Check for new enough gnome-vfs</div><div class='del'>-	(needs gnome_vfs_mime_get_default_action_without_fallback)</div><div class='del'>-</div><div class='del'>-2000-08-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Generate</div><div class='del'>-	doc/devel/calendar/cal-util/Makefile.</div><div class='del'>-</div><div class='del'>-2000-08-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for db1/db.h too, which is what</div><div class='del'>-	RH 7.0 uses for the old db headers. Patch from Kenny Graunke</div><div class='del'>-	&lt;kwg@teleport.com&gt;</div><div class='del'>-</div><div class='del'>-2000-08-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: offer --enable-pilot-conduits to add pilot</div><div class='del'>-	conduits if the user wants them.</div><div class='del'>-</div><div class='del'>-2000-08-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Fix the name of the binary to look for for PGP5</div><div class='del'>-</div><div class='del'>-2000-08-12  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for Bonobo 0.17</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/gui/search/Makefile.</div><div class='del'>-</div><div class='del'>-2000-08-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, README: Depend on gnome-vfs 0.3</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/.cvsignore, widgets/e-text/Makefile.am,</div><div class='del'>-	widgets/e-text/e-entry-test.c: Added a test for the EEntry widget.</div><div class='del'>-</div><div class='del'>-2000-08-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* data/evolution.keys: New file containing MIME keys for</div><div class='del'>-	Evolution. Currently just the addressbook minicard display.</div><div class='del'>-</div><div class='del'>-	* data/Makefile.am (mime_DATA): add evolution.keys</div><div class='del'>-</div><div class='del'>-2000-08-09  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_DIR): Remove the warning about camel-async.</div><div class='del'>-</div><div class='del'>-2000-08-08  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Reenable the calendar. Oops.</div><div class='del'>-</div><div class='del'>-2000-08-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tools/verify-evolution-install.sh: Look for oafinfo files in</div><div class='del'>-	oaf's prefix, not gnome-libs's. Allow binaries to be installed</div><div class='del'>-	anywhere in $PATH.</div><div class='del'>-</div><div class='del'>-	* configure.in, README: Update the README and the text of the</div><div class='del'>-	Bonobo configure check to match reality. Remove the 0.15 vs</div><div class='del'>-	0.15-and-a-half check since we require post-0.16 now.</div><div class='del'>-</div><div class='del'>-2000-08-03  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove gconf check</div><div class='del'>-</div><div class='del'>-2000-08-03 Alastair McKinstry &lt;mckinstry@computer.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): Add Irish translation</div><div class='del'>-</div><div class='del'>-2000-08-02  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: update for BonoboX</div><div class='del'>-</div><div class='del'>-2000-08-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Add camel/providers/nntp</div><div class='del'>-</div><div class='del'>-2000-08-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made clicking choose the right</div><div class='del'>-	character even if show_borders is on.</div><div class='del'>-</div><div class='del'>-2000-08-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: Add checks for GPG, PGP 5 and PGP 2.</div><div class='del'>-	Only record the first one found.</div><div class='del'>-</div><div class='del'>-2000-08-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): removed calendar/doc/*</div><div class='del'>-</div><div class='del'>-2000-08-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added mh provider.</div><div class='del'>-</div><div class='del'>-2000-07-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gconf_client_get_default (gconf 0.5 vs</div><div class='del'>-	newer)</div><div class='del'>-</div><div class='del'>-2000-07-26  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Bump version number to 0.3.</div><div class='del'>-</div><div class='del'>-2000-07-26  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-table/e-table-scrolled.c (right_click_proxy): Default</div><div class='del'>-	the return value to 0.</div><div class='del'>-</div><div class='del'>-2000-07-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: some unrelated changes: check for mkdtemp,</div><div class='del'>-	gnome_vfs_mime_get_default_action_without_fallback, and a</div><div class='del'>-	setuid/setgid movemail binary.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: add MOVEMAIL_PATH</div><div class='del'>-</div><div class='del'>-2000-07-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/conduit/Makefile.</div><div class='del'>-</div><div class='del'>-2000-07-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made focus in not change your selection</div><div class='del'>-	position.</div><div class='del'>-</div><div class='del'>-2000-07-21  Szabolcs BAN &lt;shooby@gnome.hu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/gui/event-editor.c: Typo fix</div><div class='del'>-</div><div class='del'>-2000-07-20  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (THREADS_CFLAGS): Make threads mandatory</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-2000-07-19  Fatih Demir	&lt;kabalak@gmx.net&gt;</div><div class='del'>-	</div><div class='del'>-	* evolution.desktop &amp; data/evolution.desktop: Added</div><div class='del'>-		the Turkish desktop entries.</div><div class='del'>-</div><div class='del'>-2000-07-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EVOLUTION_DIR): Typo fix.</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added the doc/devel Makefiles.</div><div class='del'>-	(EVOLUTION_DIR): Substitute EVOLUTION_DIR for the top_srcdir.</div><div class='del'>-	Added checks for gtk-doc.</div><div class='del'>-</div><div class='del'>-2000-07-13  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (end): Bigass warnings for camel-async branch</div><div class='del'>-	(remove them later).</div><div class='del'>-</div><div class='del'>-2000-07-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Make gnome-print-0.20 mandatory.  We will bail out</div><div class='del'>-	with CVS HEAD versions to avoid breakage.</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Version 0.2.</div><div class='del'>-</div><div class='del'>-	* configure.in: Reverse the GtkHTML check.</div><div class='del'>-</div><div class='del'>-2000-07-10  Jeffrey Stedfast &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated to check for required GtkHTML and</div><div class='del'>-	gnome-print</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Remove the conduits stuff for now.  They depend on</div><div class='del'>-	CVS gnome-pilot, and this is not good for the release.</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: updates</div><div class='del'>-</div><div class='del'>-2000-07-10  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added makefiles for calendar conduits</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add a check for Bonobo 0.15 vs Bonobo post-0.15</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Don't draw quite as large a "flat_box".</div><div class='del'>-	If draw_borders is TRUE, cause the cursor to change even if not</div><div class='del'>-	editing.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-entry.c: Removed some border padding and set</div><div class='del'>-	the "draw_borders" argument of the contained GtkText.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widget/e-text/e-text.h: Added a</div><div class='del'>-	"draw_borders" argument which, if set, makes the EText look more</div><div class='del'>-	like a GtkEntry.</div><div class='del'>-</div><div class='del'>-2000-07-09  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-contacts.png: updated so it has better contrast</div><div class='del'>-	against the background.</div><div class='del'>-</div><div class='del'>-	* art/evolution-contacts-small.png: Fits the style of the new contacts</div><div class='del'>-	icon, this is a sigle card.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text-model.c (e_text_model_real_get_text):</div><div class='del'>-	Return "" instead of NULL.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: Fixed EXTRA_DIST for make distcheck.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-entry.c: Set "anchor" and "fill_clip_rectangle"</div><div class='del'>-	arguments.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added</div><div class='del'>-	"fill_clip_rectangle" argument which describes whether to accept</div><div class='del'>-	clicks throughout the clipping rectangle.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-entry.c: Fixed some typos.</div><div class='del'>-</div><div class='del'>-2000-07-07  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-contacts.png: Changed icon (hi ettore)</div><div class='del'>-	The old handshake one was a little too firm handshake..</div><div class='del'>-	this is a rolodex icon..</div><div class='del'>-</div><div class='del'>-2000-07-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: make pthreads not required again, since they</div><div class='del'>-	aren't, and remove widgets/e-toolbar/Makefile from AC_OUTPUT since</div><div class='del'>-	that dir doesn't exist any more.</div><div class='del'>-</div><div class='del'>-2000-07-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): remove the default_user Directories</div><div class='del'>-	dir.</div><div class='del'>-</div><div class='del'>-2000-07-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am, libical/configure.in: Fixed some make distcheck</div><div class='del'>-	errors.</div><div class='del'>-</div><div class='del'>-2000-07-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GNOME_VFS_CFLAGS): Define.</div><div class='del'>-	(GNOME_VFS_LIBS): Define.</div><div class='del'>-</div><div class='del'>-2000-07-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add</div><div class='del'>-	`addressbook/gui/component/select-names/Makefile' to the</div><div class='del'>-	`AC_OUTPUT()' list.</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Added e-entry.c and e-entry.h.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-entry.c, widgets/e-text/e-entry.h: New files to</div><div class='del'>-	be a widget containing a text item.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fixed some spacing.</div><div class='del'>-</div><div class='del'>-2000-06-29  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/component-factory.c (owner_set_cb): Get an</div><div class='del'>-	EvolutionShellClient instead of an Evolution_Shell to match the</div><div class='del'>-	changes in libeshell.</div><div class='del'>-</div><div class='del'>-2000-06-29  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in:  Re-enable GNOME_PILOT_CHECK.</div><div class='del'>-	Change AC_MSG_CHECKING([For...]) to [for...]. It's the little</div><div class='del'>-	things that matter.</div><div class='del'>-</div><div class='del'>-2000-06-28  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: `AM_PATH_GCONF'.</div><div class='del'>-</div><div class='del'>-2000-06-27  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ctime_r): Check for whether ctime_r takes</div><div class='del'>-	two (Linux) or three (Solaris) arguments.</div><div class='del'>-	(AC_OUTPUT): Don't create notes/Makefile twice.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Add CTIME_R_THREE_ARGS to the list.</div><div class='del'>-	</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Calculate height including if</div><div class='del'>-	clip_height is set to -1.</div><div class='del'>-	</div><div class='del'>-2000-06-26  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (THREADS_CFLAGS): Add option --enable-broken-threads</div><div class='del'>-	to turn on the threading stuff in evolution-mail. Defaults to no.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Add USE_BROKEN_THREADS to the list.</div><div class='del'>-	</div><div class='del'>-2000-06-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Use `glib-config' instead of `$GLIB_CONFIG' as the</div><div class='del'>-	latter is not actually defined anywhere.</div><div class='del'>-</div><div class='del'>-2000-06-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (pthread stuff): Make threads required due</div><div class='del'>-	to threaded evolution-mail. Subst in the THREADS_LIBS et</div><div class='del'>-	al.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: Remove USE_THREADS conditional as we</div><div class='del'>-	always use threads now.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fixed some vertical scroll bugs.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fix a bug with intial vertical scroll.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/e-note.c, widgets/meeting-time-sel/e-meeting-time-sel.c,</div><div class='del'>-	widgets/shortcut-bar/e-icon-bar.c: Removed the usage of "x" and</div><div class='del'>-	"y" arguments to EText.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed the</div><div class='del'>-	"x" and "y" arguments to EText.   Added vertical scrolling.</div><div class='del'>-</div><div class='del'>-2000-06-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/meeting-time-sel/e-meeting-time-sel-item.c: </div><div class='del'>-	* widgets/meeting-time-sel/e-meeting-time-sel.c: fixed a few warnings.</div><div class='del'>-</div><div class='del'>-2000-06-17  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made EText use the font from the</div><div class='del'>-	canvas's style if one isn't set.</div><div class='del'>-</div><div class='del'>-2000-06-17  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/meeting-time-sel/*: updated to use EText items rather than</div><div class='del'>-	GtkEntry widgets and added support for adding new rows.</div><div class='del'>-</div><div class='del'>-2000-06-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: bye bye goad</div><div class='del'>-</div><div class='del'>-2000-06-14  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README (http): added command to co ORBit.</div><div class='del'>-</div><div class='del'>-2000-06-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added IMAP into the build</div><div class='del'>-</div><div class='del'>-2000-06-13  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* notes/Makefile.am (SHELL_OBJS): Removed.</div><div class='del'>-	(evolution_notes_LDADD): Link with</div><div class='del'>-	`$(top_builddir)/shell/libeshell.a'.</div><div class='del'>-</div><div class='del'>-2000-06-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am (SUBDIRS): build `misc' before everything</div><div class='del'>-	else.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Install `evolution.png' and `evolution.desktop'</div><div class='del'>-	where appropriate.</div><div class='del'>-</div><div class='del'>-	* evolution.png: New.  For now, it's just a copy of</div><div class='del'>-	`art/evolution-inbox.png'.</div><div class='del'>-</div><div class='del'>-	* evolution.desktop: New.</div><div class='del'>-</div><div class='del'>-2000-06-10  Zbigniew Chyla  &lt;chyla@buy.pl&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added pl (Polish) to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2000-06-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added new directory `shell/glade'.</div><div class='del'>-</div><div class='del'>-2000-06-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,</div><div class='del'>-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Added a</div><div class='del'>-	"quantum" argument for making the panes move in jumps.</div><div class='del'>-</div><div class='del'>-2000-06-07  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in:  Create notes/Makefile</div><div class='del'>-</div><div class='del'>-	* notes/*: Add preliminary yellow sticky notes.</div><div class='del'>-</div><div class='del'>-2000-06-05	Mathieu Lacage	&lt;mathieu@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/Makefile.am: make it </div><div class='del'>-	compile: add proper bonobo linking params.</div><div class='del'>-	* addressbook/gui/minicard/Makefile.am: idem.</div><div class='del'>-	* wombat/Makefile.am: add BONOBO_VFS_GNOME_CFLAGS.</div><div class='del'>-	cleanup some useless includes and libs.</div><div class='del'>-</div><div class='del'>-2000-06-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): Add `it' and `de'.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Released Evolution 0.1.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test-movemail.c: Reverted removal of e_setup_base_dir.</div><div class='del'>-</div><div class='del'>-2000-06-02  Jesus Bravo Alvarez  &lt;jba@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added pt (Portuguese) to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2000-06-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Update dependencies. Rewrite the GOAD vs OAF thing some</div><div class='del'>-	more to reflect OAF's new ascendency. Make the fact that you don't</div><div class='del'>-	need pilot stuff clearer. Add some new directories to the</div><div class='del'>-	directory layout section.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/misc/e-clipped-label.c: Free the finish data.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test-movemail.c (main): Don't call e_setup_base_dir.</div><div class='del'>-</div><div class='del'>-2000-06-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): add doc, doc/C</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): add doc</div><div class='del'>-</div><div class='del'>-2000-05-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/misc/e-scroll-frame.[ch]: Imported GtkScrollFrame from</div><div class='del'>-	EOG and renamed it to EScrollFrame.</div><div class='del'>-</div><div class='del'>-	* widgets/misc/Makefile.am (libemiscwidgets_a_SOURCES): Added</div><div class='del'>-	e-scroll-frame.[ch].</div><div class='del'>-</div><div class='del'>-2000-05-30  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-vpaned.c (e_vpaned_handle_shown): Show the</div><div class='del'>-	handle even if the requisition for the child is zero.</div><div class='del'>-	* widgets/e-paned/e-hpaned.c (e_hpaned_handle_shown): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-26  Héctor García Alvarez &lt;hector@scouts-es.org&gt;</div><div class='del'>-</div><div class='del'>-        * configure.in: Added Spanish language</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-vpaned.c: Fixed a</div><div class='del'>-	bug where we were resizing a non-existent window.</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/e-hpaned.c, widgets/e-paned/e-paned.c,</div><div class='del'>-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c: Made</div><div class='del'>-	the handlebar disappear if either side is empty, hidden, or</div><div class='del'>-	requests 0 size.</div><div class='del'>-</div><div class='del'>-2000-05-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added widgets/e-paned/Makefile.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: Switched from GtkPaned to</div><div class='del'>-	EPaned.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added e-paned directory.</div><div class='del'>-</div><div class='del'>-	* widgets/e-paned/, widgets/e-paned/.cvsignore,</div><div class='del'>-	widgets/e-paned/Makefile.am, widgets/e-paned/e-hpaned.c,</div><div class='del'>-	widgets/e-paned/e-hpaned.h, widgets/e-paned/e-paned.c,</div><div class='del'>-	widgets/e-paned/e-paned.h, widgets/e-paned/e-vpaned.c,</div><div class='del'>-	widgets/e-paned/e-vpaned.h: New widget based completely on</div><div class='del'>-	GtkPaned from 1.4.  This will be more advanced soon.</div><div class='del'>-</div><div class='del'>-2000-05-22  Jeff Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Readded camel/providers/smtp </div><div class='del'>-</div><div class='del'>-2000-05-22  Szabolcs BAN &lt;shooby@gnome.hu&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added Hungarian language</div><div class='del'>-</div><div class='del'>-2000-05-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): add camel/providers/vee</div><div class='del'>-</div><div class='del'>-2000-05-16  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: Install the mini icons.</div><div class='del'>-</div><div class='del'>-2000-05-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: add --with-purify-options support, and default it</div><div class='del'>-	to what we at helix need</div><div class='del'>-</div><div class='del'>-Tue May 16 06:11:40 2000  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-calendar-mini.png art/evolution-inbox-mini.png</div><div class='del'>- 	art/evolution-tasks-mini.png art/evolution-contacts-mini.png</div><div class='del'>- 	art/evolution-notes-mini.png: new mini-icons for the tree view</div><div class='del'>-	of folders and stuff.</div><div class='del'>-</div><div class='del'>-2000-05-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added calendar/gui/dialogs/Makefile.am.</div><div class='del'>-</div><div class='del'>-2000-05-10  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Added version and availability of required libunicode</div><div class='del'>-	library.</div><div class='del'>-</div><div class='del'>-2000-05-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Update versions needed for gnome-print, bonobo,</div><div class='del'>-	and gtkhtml.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* HACKING: We need a HACKING file.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed dist-hook section.</div><div class='del'>-</div><div class='del'>-	* configure.in: Set the version number.  Added a check for gnome</div><div class='del'>-	window icons.  Removed a bunch of unused Makefiles.</div><div class='del'>-</div><div class='del'>-	* tools/Makefile.am: Created a proper EXTRA_DIST section.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Added</div><div class='del'>-	e-text-event-processor-types.h.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: Added briefcase.png to get installed.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Remove the tooltip callback when</div><div class='del'>-	destroyed.</div><div class='del'>-</div><div class='del'>-2000-05-09  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/pcs/cal-backend.c (cal_backend_add_cal): Return nothing</div><div class='del'>-	for a 'void' function.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widget/e-text/e-text.c, widgets/e-text/e-text.h: Added an</div><div class='del'>-	activate signal.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* configure.in: Added new Directories section for the default_user.</div><div class='del'>-</div><div class='del'>-2000-05-06  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Updated for the new `default_user' directory</div><div class='del'>-	setup.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for purify.</div><div class='del'>-</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a</div><div class='del'>-	"changed" signal that gets sent whenever the text changes.</div><div class='del'>-</div><div class='del'>-2000-05-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Added `--enable-purify' flag.</div><div class='del'>-</div><div class='del'>-2000-05-05  Chris Toshok &lt;toshok@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* shell/Makefile.am: add support for building purified evolution.</div><div class='del'>-</div><div class='del'>-	* shell/.cvsignore: ignore evolution.pure</div><div class='del'>-</div><div class='del'>-2000-05-05  Chris Toshok &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/.cvsignore,</div><div class='del'>-	addressbook/contact-editor/.cvsignore,</div><div class='del'>-	addressbook/gui/component/.cvsignore,</div><div class='del'>-	addressbook/gui/minicard/.cvsignore,</div><div class='del'>-	addressbook/printing/.cvsignore,</div><div class='del'>-	calendar/cal-client/.cvsignore,</div><div class='del'>-	calendar/gui/.cvsignore,</div><div class='del'>-	calendar/pcs/.cvsignore,</div><div class='del'>-	filter/.cvsignore,</div><div class='del'>-	mail/.cvsignore,</div><div class='del'>-	shell/.cvsignore,</div><div class='del'>-	tests/.cvsignore,</div><div class='del'>-	widgets/e-table/.cvsignore,</div><div class='del'>-	widgets/e-text/.cvsignore,</div><div class='del'>-	widgets/meeting-time-sel/.cvsignore,</div><div class='del'>-	widgets/shortcut-bar/.cvsignore,</div><div class='del'>-	wombat/.cvsignore: ignore the .pure directory</div><div class='del'>-</div><div class='del'>-2000-05-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Oops. The Kerberos check was succeeding when it</div><div class='del'>-	shouldn't have (and thus breaking the pop3 build for "normal"</div><div class='del'>-	people). Fix.</div><div class='del'>-</div><div class='del'>-2000-05-03  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (xmlversion): Fix to remove older 'libxml' prefix.</div><div class='del'>-</div><div class='del'>-2000-05-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Do not output `doc/Makefile' because there is</div><div class='del'>-	nothing to generate it from.</div><div class='del'>-</div><div class='del'>-2000-05-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: add some minimal Kerberos checking.</div><div class='del'>-	This isn't intended to be generically useful at this point, it's</div><div class='del'>-	just there to give me a second POP auth mechanism to play with.</div><div class='del'>-</div><div class='del'>-	Also remove a bit of cruft, and reorganize configure.in a bit.</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test13.c: And here too.</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): REmoved gmime-utils.h</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (LDADD): Add libeutil to default link line.</div><div class='del'>-	(test_movemail_LDADD): Fixed order for libutil linking.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-	* tests/ui-tests/Makefile.am: same.</div><div class='del'>-	* widgets/e-text/Makefile.am: same.</div><div class='del'>-	* widgets/meeting-time-sel/Makefile.am: same.</div><div class='del'>-</div><div class='del'>-2000-05-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test11.c (main): *sigh* moved back to sync api.</div><div class='del'>-</div><div class='del'>-2000-05-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test11.c (search_cb): Try deleting messages ...</div><div class='del'>-	(main): Fix for provider api changes.</div><div class='del'>-</div><div class='del'>-2000-05-01  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Check if bonobo uses oaf, so you don't</div><div class='del'>-	need to specify --enable-oaf.</div><div class='del'>-</div><div class='del'>-2000-04-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h: New configured #define `USING_OAF'.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added `--enable-oaf' option and corresponding</div><div class='del'>-	`OAF_LIBS' and `OAF_FLAGS' variables.  Code friendly provided by</div><div class='del'>-	Maciej Stachowiak &lt;mjs@eazel.com&gt;.</div><div class='del'>-</div><div class='del'>-2000-04-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test10.c: Fix for removal of camelmimebodypart, and changes</div><div class='del'>-	to recipient stuff.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c: Fix for removal of camelmimebodypart, and changes</div><div class='del'>-	to recipient stuff.</div><div class='del'>-</div><div class='del'>-2000-04-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/ename/Makefile.</div><div class='del'>-</div><div class='del'>-2000-04-27  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: added tools/Makefile.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added tools.</div><div class='del'>-</div><div class='del'>-	* tools/: New directory for tools relating to evolution.</div><div class='del'>-</div><div class='del'>-	* tools/killev: New script for killing all evolution-related</div><div class='del'>-	stuff.</div><div class='del'>-</div><div class='del'>-        * tools/Makefile.am: New file.</div><div class='del'>-	</div><div class='del'>-	* tools/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-2000-04-26  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test13.c (main): And here too.</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): Same here.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Change for removed simpledatawrapper.</div><div class='del'>-</div><div class='del'>-2000-04-26  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/.cvsignore: Added test13.</div><div class='del'>-</div><div class='del'>-	* default_user/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c (e_text_destroy): Kill text-&gt;timer and</div><div class='del'>-	text-&gt;timeout on destroy.</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests: Update for the camel changes.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Remove tests. They aren't terribly</div><div class='del'>-	useful/interesting any more for the most part, and they frequently</div><div class='del'>-	don't compile.</div><div class='del'>-</div><div class='del'>-2000-04-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made the tooltip show up in the correct</div><div class='del'>-	place and configuration when using the "max_lines", "anchor"</div><div class='del'>-	(untested), or "justification" arguments.</div><div class='del'>-</div><div class='del'>-From a patch by Iain Holmes &lt;ih@csd.abdn.ac.uk&gt;</div><div class='del'>-	</div><div class='del'>-	* widgets/e-text/e-text-event-processor-emacs-like.c,</div><div class='del'>-	widget/e-text/e-text-event-processor-types.h,</div><div class='del'>-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Changed C-w and</div><div class='del'>-	C-y to control the X clipboard.  Added double and triple click</div><div class='del'>-	events.</div><div class='del'>-</div><div class='del'>-2000-04-24  Fatih Demir	&lt;kabalak@gmx.net&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in : Added tr to ALL_LINGUAS .</div><div class='del'>-</div><div class='del'>-2000-04-24  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test13.c (main): Fixed for method movements.</div><div class='del'>-</div><div class='del'>-	* tests/test3.c (main): Removed from build, data-wrapper-repository removed.</div><div class='del'>-</div><div class='del'>-2000-04-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): Changed to use construct_from_stream.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Chagned to use construct_from_stream.</div><div class='del'>-</div><div class='del'>-2000-04-24  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* default_user/Makefile.am: new file.</div><div class='del'>-</div><div class='del'>-	* default_user/Main_Shortcuts.xml: New file; is used to fill the</div><div class='del'>-	shortcut bar's "main shortcuts" pane.</div><div class='del'>-</div><div class='del'>-	* default_user/Other_Shortcuts.xml: New file, used to fill the</div><div class='del'>-	shortcut bar's "other shortcuts" pane.</div><div class='del'>-</div><div class='del'>-	* default_user/Inbox.mbox: New file. This is the first message a</div><div class='del'>-	new user will see when they fire up Evolution. Needs work.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: added default_user directory.</div><div class='del'>-	* configure.in: same.</div><div class='del'>-</div><div class='del'>-2000-04-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test10.c: Removed some unecessary includes.  From</div><div class='del'>-	Ali Abdin &lt;aliabdin@aucegypt.edu&gt;</div><div class='del'>-	(create_sample_mime_message): Changed for date api change.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (noinst_PROGRAMS): Put test10 back.</div><div class='del'>-</div><div class='del'>-2000-04-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Changed for date api change.</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test11.c: Fixed some headers.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (noinst_PROGRAMS): Removed test9.</div><div class='del'>-	(noinst_PROGRAMS): Removed test12, temporarirly (nntp not being</div><div class='del'>-	built).</div><div class='del'>-	Removed test10.</div><div class='del'>-</div><div class='del'>-2000-04-20  Yukihiro Nakai &lt;nakai@gnome.gr.jp&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add Japanese to ALL_LINGUAS</div><div class='del'>-</div><div class='del'>-2000-04-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: More detail on exactly what versions of what libraries</div><div class='del'>-	are needed.</div><div class='del'>-</div><div class='del'>-2000-04-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/*: remove camel-log references</div><div class='del'>-</div><div class='del'>-2000-04-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (xmlpatch): Require gnome-xml 1.8.7 (or later,</div><div class='del'>-	but not 2.0). xmlParseMemory's behavior in 1.8.7 is incompatible</div><div class='del'>-	with its behavior in 1.8.6 and earlier.</div><div class='del'>-</div><div class='del'>-	* tests/test-url.c: New program to test CamelURL</div><div class='del'>-</div><div class='del'>-2000-04-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/ebook/test-card.c,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c: Added</div><div class='del'>-	orginizational unit, nickname, and internet free-busy fields.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/contact-editor.glade: Renamed some</div><div class='del'>-	incorrectly named fields.</div><div class='del'>-</div><div class='del'>-2000-04-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/ebook/test-card.c,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.c: Added orginization and role</div><div class='del'>-	fields.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/contact-editor.glade,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor-strings.h: Renamed</div><div class='del'>-	some incorrectly named fields.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c: Added</div><div class='del'>-	orginization and role fields as well as hooking up the birth date</div><div class='del'>-	field.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c: Added a missing include.</div><div class='del'>-</div><div class='del'>-2000-04-15  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c</div><div class='del'>-	(search_entry_activated): New function. Gets called when the quick</div><div class='del'>-	search entry is called on to perform a search.</div><div class='del'>-	(make_quick_search_widget): New function; returns a "quick search"</div><div class='del'>-	widget.</div><div class='del'>-	(control_activate): During the construction of the toolbar, a</div><div class='del'>-	"quick search" widget is included.</div><div class='del'>-</div><div class='del'>-2000-04-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/.cvsignore: add test12</div><div class='del'>-</div><div class='del'>-	* tests/test12.c (main): add test for nntp stuff.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (noinst_PROGRAMS): same.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-04-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/backend/pas/pas-backend-ldap.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c: Added a note field.</div><div class='del'>-</div><div class='del'>-2000-04-15  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.h: #include</div><div class='del'>-	"addressbook/backend/ebook" to make sure we pick up the right</div><div class='del'>-	addressbook.h.  Butt ugly, but at least it makes it possible for</div><div class='del'>-	me to build Evolution.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/Makefile.am (INCLUDES): Use</div><div class='del'>-	`$(builddir)' so that we pick up the IDL-generated includes</div><div class='del'>-	correctly.</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: Likewise.  Also use</div><div class='del'>-	`$(srcdir)'.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am: Use `$(srcdir)' so that</div><div class='del'>-	it works with builddir != srcdir.</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2000-04-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_ensure_connected): don't ldap_simple_bind_s if</div><div class='del'>-	the ldap_open failed, and fix warnings.</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): don't do search if the</div><div class='del'>-	ensure_connected failed, and fix warnings.</div><div class='del'>-	(pas_backend_ldap_search): same.</div><div class='del'>-	(poll_ldap): fix warnings.</div><div class='del'>-	(pas_backend_ldap_process_get_book_view): same.</div><div class='del'>-	(pas_backend_ldap_get_vcard): same.</div><div class='del'>-	(pas_backend_ldap_load_uri): same.</div><div class='del'>-</div><div class='del'>-	* configure.in: quiet configure in the case where it can't find</div><div class='del'>-	ldap libs.</div><div class='del'>-</div><div class='del'>-2000-04-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c (extract_info):</div><div class='del'>-	Check for 0 length fields when building the outgoing ECard.</div><div class='del'>-</div><div class='del'>-2000-04-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-book-view.c: Give correct warnings.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c (e_card_set_arg): g_strdup</div><div class='del'>-	url and title.</div><div class='del'>-</div><div class='del'>-2000-04-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c</div><div class='del'>-	(fill_in_info): reflect the title attribute in the contact editor.</div><div class='del'>-	(extract_info): same.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c: add the title attribute.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/test-reflow.c: add a title.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard.c (remodel): add support for</div><div class='del'>-	the title attribute.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): save out</div><div class='del'>-	the title to the vcard.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-card.c: add title field foo to</div><div class='del'>-	the test.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c: reflect the title field.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.h: un-#if 0 the title field.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c (poll_ldap): new</div><div class='del'>-	function that polls ldap for more search responses.</div><div class='del'>-	(pas_backend_ldap_search): use the async search interface and</div><div class='del'>-	register an idle call to poll for the responses.</div><div class='del'>-	(view_destroy): make sure to g_source_remove the idle id.</div><div class='del'>-</div><div class='del'>-2000-04-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c (entry_compare):</div><div class='del'>-	rework this function to use a table mapping search field names to</div><div class='del'>-	vcard properties and extra information (such as whether or not the</div><div class='del'>-	property is a list.)</div><div class='del'>-	</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c</div><div class='del'>-	(construct_email_list): new function, to build the ECardList for</div><div class='del'>-	email addresses.</div><div class='del'>-	(construct_phone_list): new function, to build the ECardList for</div><div class='del'>-	phone numbers.</div><div class='del'>-	(pas_backend_ldap_search): use a table mapping ldap attributes to</div><div class='del'>-	ecard properties, and use the special list construction functions</div><div class='del'>-	if the property calls for it.  general cleanup.  added a comment</div><div class='del'>-	about not calling ber_free if there was a decoding error.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-04-12  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: Add tigert's contact-dlg-related images.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c (_add_images): Add</div><div class='del'>-	tigert's images.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/Makefile.am: add EVOLUTION_IMAGES.</div><div class='del'>-</div><div class='del'>-2000-04-12  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/house.png, art/malehead.png, art/cellphone.png, </div><div class='del'>-	art/briefcase.png, art/envelope.png, art/globe.png:</div><div class='del'>-	New icons for the contact manager.. more to follow once I get </div><div class='del'>-	around to do more artist work..</div><div class='del'>-</div><div class='del'>-2000-04-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): delay the setting of the</div><div class='del'>-	ldap variable until we've ensured we were connected.  Also, set</div><div class='del'>-	the search limit to LDAP_MAX_SEARCH_RESPONSES (we'll eventually</div><div class='del'>-	want a user setting here i assume.)</div><div class='del'>-	(pas_backend_ldap_search): same here, and also send back lists of</div><div class='del'>-	CARDS_PER_VIEW_NOTIFICATION length in each</div><div class='del'>-	pas_book_view_notify_add call.  also, don't call ber_free if there</div><div class='del'>-	was a decoding error, since the ldap library frees it for us.</div><div class='del'>-</div><div class='del'>-2000-04-11  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (have_pthread): Properly use AC_ARG_WITH</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am (wombat_LDADD): add LDAP_LIBS here.</div><div class='del'>-</div><div class='del'>-	* configure.in: check for -lldap and -llber and if both are</div><div class='del'>-	present include ldap support in the pas/wombat.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am (libpas_la_SOURCES): include</div><div class='del'>-	pas-backend.ldap.c if ENABLE_LDAP.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c: get searching</div><div class='del'>-	working (converting between the sexp and ldap stuff.)</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.c (setup_pas): register the ldap pas backend if</div><div class='del'>-	HAVE_LDAP is defined.</div><div class='del'>-</div><div class='del'>-2000-04-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Changed AC_DEFUN to AC_DEFINE.</div><div class='del'>-</div><div class='del'>-	* acconfig.h: Added HAVE_TIMEZONE and HAVE_TM_GMTOFF.</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for timezone as a variable (as it is in</div><div class='del'>-	linux, but not in freebsd or netbsd.)</div><div class='del'>-</div><div class='del'>-2000-04-11  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-table/e-cell-toggle.c (etog_draw): update for new</div><div class='del'>-	gdk-pixbuf.  Added a disabled chuck of code to do alpha blending</div><div class='del'>-	on pixmaps.</div><div class='del'>-</div><div class='del'>-2000-04-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Moved some logic a bit.  Minor changes.</div><div class='del'>-</div><div class='del'>-00-04-11  Iain Holmes  &lt;ih@csd.abdn.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c</div><div class='del'>-	(e_text_set_args): Recalculate bounds when width or clip_width changes.</div><div class='del'>-	(tooltip_event): Forward clicks on the tooltip onto the text item.</div><div class='del'>-	(_do_tooltip): Correct the origin co-ordinates to the items co-ords.</div><div class='del'>-	(e_text_point): Return 0 when the mouse is on the item.</div><div class='del'>-	(_do_tooltip): Make the tooltip obey the parent items</div><div class='del'>-	line_wrap and max_lines.</div><div class='del'>-</div><div class='del'>-00-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(get_e_card_prop): new function, taking code from func_contains to</div><div class='del'>-	get string properties.</div><div class='del'>-	(entry_compare): new function generic, taking strstr-like function</div><div class='del'>-	as a parameter.</div><div class='del'>-	(func_contains): rewrite function to use entry_compare.</div><div class='del'>-	(is_helper): new helper function to map strcmp to a strstr-like</div><div class='del'>-	function.</div><div class='del'>-	(func_is): new function, implementing "is" for searches.</div><div class='del'>-	(endswith_helper): new function.</div><div class='del'>-	(func_endswith) new function, implementing "endswith" for</div><div class='del'>-	searches.</div><div class='del'>-	(beginswith_helper): new function.</div><div class='del'>-	(func_beginswith): new function, implementing "beginswith" for</div><div class='del'>-	searches.</div><div class='del'>-	(compare_email): new function for searching all email addresses of</div><div class='del'>-	a contact.</div><div class='del'>-	(compare_phone): new function for searching all phone numbers of a</div><div class='del'>-	contact.</div><div class='del'>-	(compare_address): new function for searching all addresses of a</div><div class='del'>-	contact (unimplemented as yet).</div><div class='del'>-	(entry_compare): add support for searching the list items "email",</div><div class='del'>-	"phone" and "address".</div><div class='del'>-	(vcard_matches_search): free the esexp_result.</div><div class='del'>-	(entry_compare): we want comparison functions to take 2 args.</div><div class='del'>-</div><div class='del'>-2000-04-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c: This was setting</div><div class='del'>-	E_REFLOW(view)-&gt;items to NULL too soon.  Fixed now.</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_search): remove spew.</div><div class='del'>-	(pas_backend_file_process_create_card): move the sync to the</div><div class='del'>-	earliest possible point after the db operation.</div><div class='del'>-	(pas_backend_file_process_remove_card): same.</div><div class='del'>-	(pas_backend_file_process_modify_card): same, and call</div><div class='del'>-	pas_book_respond_modify, not pas_book_respond_remove, here.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (card_deleted_cb): new</div><div class='del'>-	function.</div><div class='del'>-	(delete_contact_cb): wire up button to call</div><div class='del'>-	e_minicard_view_remove_selection.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c</div><div class='del'>-	(e_minicard_view_remove_selection): fix warning, and stick "view"</div><div class='del'>-	in the name.</div><div class='del'>-</div><div class='del'>-2000-04-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-view.c,</div><div class='del'>-	addressbook/backend/ebook/e-book.c: Changed some incorrect</div><div class='del'>-	gtk_object_refs and gtk_object_unrefs into bonobo_object_refs and</div><div class='del'>-	bonobo_object_unrefs.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-card-cursor.c: Changed a</div><div class='del'>-	gtk_object_destroy to a gtk_object_unref.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.h: Set a list pointer to</div><div class='del'>-	NULL after freeing its contents.  Added</div><div class='del'>-	e_minicard_view_remove_selection function.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-reflow.c: Set a list pointer to NULL</div><div class='del'>-	after freeing its contents.</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (find_contact_cb):</div><div class='del'>-	implement braindead dialog to input the query string for the view.</div><div class='del'>-</div><div class='del'>-	also, change all callbacks to get the EMinicardView instead of the</div><div class='del'>-	EBook.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c</div><div class='del'>-	(e_minicard_view_get_arg): add missing break.</div><div class='del'>-</div><div class='del'>-2000-04-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.h: Added a "query"</div><div class='del'>-	argument to the e-minicard-view.  Documented all the arguments to</div><div class='del'>-	the e-minicard-view.</div><div class='del'>-</div><div class='del'>-2000-04-10  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c (get_view): change</div><div class='del'>-	the empty search string ("") to the valid (contains "full_name" "").</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am (wombat_LDADD): reorder so libeutil.la comes</div><div class='del'>-	after libpas (since it uses the sexp stuff now.)</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am (INCLUDES): add</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend/ebook</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(view_destroy): free the search context and unref the sexp.</div><div class='del'>-	(string_to_dbt): save the zero byte of strings, so we don't have</div><div class='del'>-	to g_strndup everywhere.</div><div class='del'>-	(func_contains): new function, implementing the (contains) search</div><div class='del'>-	function.</div><div class='del'>-	(vcard_matches_search): generic predicate to tell whether or not a</div><div class='del'>-	vcard entry matches the current book view.</div><div class='del'>-	(pas_backend_file_search): rip some of this code out of</div><div class='del'>-	get_book_view (the portion building the list of cards) and make it</div><div class='del'>-	use the e-sexp stuff.</div><div class='del'>-	(pas_backend_file_process_create_card): use vcard_matches_search</div><div class='del'>-	to only notify if the card will appear in the view.</div><div class='del'>-	(pas_backend_file_process_remove_card): use vcard_matches_search</div><div class='del'>-	to only notify if the card will be removed from the view.</div><div class='del'>-	(pas_backend_file_process_modify_card): use vcard_matches_search</div><div class='del'>-	to notify if the modified card was added, removed, or changed in</div><div class='del'>-	the view.</div><div class='del'>-	</div><div class='del'>-2000-04-10  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (GNOME_PRINT_CFLAGS): Update to support</div><div class='del'>-	--disable-threads correctly.</div><div class='del'>-</div><div class='del'>-2000-04-10  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_book_view): use view != NULL instead</div><div class='del'>-	of checking db_error when we call pas_book_respond_get_book_view)</div><div class='del'>-</div><div class='del'>-2000-04-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for mkstemp</div><div class='del'>-</div><div class='del'>-2000-04-10  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): removed libical stuff since it has its</div><div class='del'>-	own configure.in.</div><div class='del'>-</div><div class='del'>-2000-04-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-view.c: Fixed a bug where I was</div><div class='del'>-	sending the wrong information to some callbacks.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Added an e_card_duplicate</div><div class='del'>-	function.  Made ids get stored in vcards.  Made sure to delete the</div><div class='del'>-	url if it exists.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: Made pas include</div><div class='del'>-	addressbook/backend/ebook/ in the search path.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c: Fixed some bugs and</div><div class='del'>-	made the create card function store the generated id in the card</div><div class='del'>-	being saved.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-book-view.c: Fixed a double free</div><div class='del'>-	bug.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c: Fixed some bugs.</div><div class='del'>-	Made the contact editor actually return a valid card when</div><div class='del'>-	gtk_object_get(editor, "card", ...) is called.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.h: Fixed a copy and</div><div class='del'>-	paste error.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c: Made this get the card</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/Makefile.am: Made this include</div><div class='del'>-	contact-editor directory in the search path and link against</div><div class='del'>-	libecontacteditor so that double clicking can open a dialog.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard.c: Fixed some small bugs.</div><div class='del'>-	Made double clicking open a contact editor dialog if this minicard</div><div class='del'>-	is contained in a minicard view.  (It needs the minicard view to</div><div class='del'>-	get the EBook to save to.</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am: Link wombat against libebook, since</div><div class='del'>-	pas-backend-file now uses ECard.</div><div class='del'>-</div><div class='del'>-2000-04-09  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (control_activate): Make</div><div class='del'>-	"New Contact" menuitem add a card with new_contact_cb().</div><div class='del'>-	</div><div class='del'>-	* addressbook/Makefile.am: Compile contact-editor, _then_ gui,</div><div class='del'>-	since the gui now depends on the contact editor (shouldn't the</div><div class='del'>-	contact-editor directory be moved into 'gui'?).</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (card_added_cb): New</div><div class='del'>-	function. Gets called when a card is successfully added via the</div><div class='del'>-	contact-editor.</div><div class='del'>-	(new_contact_cb): New function. Gets called when a user clicks the</div><div class='del'>-	"new contact" button on the toolbar, and creates a contact-editor</div><div class='del'>-	to edit a new contact entry.</div><div class='del'>-	(control_activate): Call gnome_app_fill_toolbar_with_data()</div><div class='del'>-	instead of gnome_app_fill_toolbar(), so that our toolbar can find</div><div class='del'>-	the right book to add a new card to.</div><div class='del'>-	(addressbook_factory): On an "activate" signal, send the book up</div><div class='del'>-	to control_activate_cb.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook-factory.c (init_bonobo):</div><div class='del'>-	Call glade_gnome_init(), so that our contact-editor (which</div><div class='del'>-	requires glade) doesn't barf.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/Makefile.am: added the contact-editor</div><div class='del'>-	to our libraries and include files.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c</div><div class='del'>-	(e_contact_editor_new): Set "card" gtk property to the passed-in</div><div class='del'>-	card property.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c (addressbook_factory):</div><div class='del'>-	Added gtk_widget_push/pop_colormap/visual, which I assume is</div><div class='del'>-	necessary for canvas use.</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/Makefile.am,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.h,</div><div class='del'>-	addressbook/contact-editor/test-editor.c: Made the contact editor</div><div class='del'>-	load from an ECard.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.c: Added support for the URL</div><div class='del'>-	field.</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c (e_card_get_vcard): Fixed a</div><div class='del'>-	small typo.</div><div class='del'>-</div><div class='del'>-2000-04-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: pixmap_DATA should have been images_DATA (after</div><div class='del'>-	pixmapdir was renamed to imagesdir)</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/.cvsignore,</div><div class='del'>-	addressbook/gui/minicard/Makefile.am,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.h,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.h,</div><div class='del'>-	addressbook/gui/minicard/e-reflow-sorted.c,</div><div class='del'>-	addressbook/gui/minicard/e-reflow-sorted.h,</div><div class='del'>-	addressbook/gui/minicard/e-reflow.c,</div><div class='del'>-	addressbook/gui/minicard/e-reflow.h,</div><div class='del'>-	addressbook/gui/minicard/test-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/test-reflow.c,</div><div class='del'>-	widgets/e-minicard/.cvsignore, widgets/e-minicard/Makefile.am,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.h,</div><div class='del'>-	widgets/e-minicard/e-minicard-view.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-view.h,</div><div class='del'>-	widgets/e-minicard/e-minicard.c, widgets/e-minicard/e-minicard.h,</div><div class='del'>-	widgets/e-minicard/e-reflow-sorted.c,</div><div class='del'>-	widgets/e-minicard/e-reflow-sorted.h,</div><div class='del'>-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/e-reflow.h,</div><div class='del'>-	widgets/e-minicard/test-minicard-label.c,</div><div class='del'>-	widgets/e-minicard/test-minicard-view.c,</div><div class='del'>-	widgets/e-minicard/test-minicard.c,</div><div class='del'>-	widgets/e-minicard/test-reflow.c: CVS move mistake.  Fixed the</div><div class='del'>-	correct changes in the correct places.</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am: pixmap_DATA isn't defined so don't use it as a variable.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/,</div><div class='del'>-	addressbook/gui/component/.cvsignore, addressbook/gui/Makefile.am,</div><div class='del'>-	addressbook/gui/component/addressbook-factory.c,</div><div class='del'>-	addressbook/gui/component/addressbook.c,</div><div class='del'>-	addressbook/gui/component/addressbook.gnorba,</div><div class='del'>-	addressbook/gui/component/addressbook.h: New directory to proivde</div><div class='del'>-	the component for contact management.  Simply uses an e-minicard-view.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard-view.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard-view.h: New subclass of</div><div class='del'>-	e-reflow-sorted that takes an EBook and uses it to compute the</div><div class='del'>-	card data to display.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard.c,</div><div class='del'>-	addressbook/gui/minicard/e-minicard.h: This now backends to a</div><div class='del'>-	ECard instead of a ETableModel.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-reflow.c,</div><div class='del'>-	addressbook/gui/minicard/e-reflow.h: This now has a virtualized</div><div class='del'>-	add method.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-reflow-sorted.c,</div><div class='del'>-	addressbook/gui/minicard/e-reflow-sorted.h: New subclass of</div><div class='del'>-	e-reflow that allows the data to be sorted on the fly.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/test-minicard-view.c: New test to test</div><div class='del'>-	the new minicard view.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/test-reflow.c: Uses the new ECard</div><div class='del'>-	backend of the e-minicard.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/.cvsignore,</div><div class='del'>-	addressbook/gui/minicard/Makefile.am: Added new test.  Fixed</div><div class='del'>-	dependencies.  Added new files.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/, addressbook/gui/Makefile.am,</div><div class='del'>-	addressbook/gui/.cvsignore: New directory for addressbook gui</div><div class='del'>-	bits.  Added subdirectories.  Created an initial .cvsignore.</div><div class='del'>-</div><div class='del'>-	* addressbook/Makefile.am (SUBDIRS): Removed demo and added gui.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c: Added code to do</div><div class='del'>-	notification on bookviews when changes in the backend are made.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-book-view.c,</div><div class='del'>-	addressbook/backend/pas/pas-book-view.h: Added helper functions to</div><div class='del'>-	notify the view about the addition or modification of a single</div><div class='del'>-	card.  Fixed a mistaken extra free.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-list-iterator.h: Fixed</div><div class='del'>-	incorrect parent class.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: Made this accept an</div><div class='del'>-	optional parameter that specifies the vcard to add.</div><div class='del'>-</div><div class='del'>-	* configure.in: Replaced widgets/e-minicard/Makefile and</div><div class='del'>-	addressbook/demo/Makefile with addressbook/gui/minicard/Makefile</div><div class='del'>-	and addressbook/gui/component/Makefile respectively.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Removed e-minicard since it's being moved</div><div class='del'>-	to addressbook/gui/minicard.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Fixed the border width around tooltips</div><div class='del'>-	and made the main tooltip area yellow.</div><div class='del'>-</div><div class='del'>-2000-04-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in, acconfig.h: add SYSTEM_MAIL_DIR</div><div class='del'>-</div><div class='del'>-2000-04-08  Jesus Bravo Alvarez  &lt;jba@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (ALL_LINGUAS): Added Galician (gl).</div><div class='del'>-</div><div class='del'>-2000-04-07  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-	* configure.in: Modified to create camel/providers/smtp/Makefile</div><div class='del'>-</div><div class='del'>-2000-04-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made text tooltips appear in place.</div><div class='del'>-	Iain figured out that to get them to not appear, we hide the</div><div class='del'>-	tooltip when the mouse leaves the tooltip window, not the canvas</div><div class='del'>-	item (this works because the tooltip window always covers the</div><div class='del'>-	canvas item completely.)</div><div class='del'>-</div><div class='del'>-2000-04-07  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/addressbook.c (control_activate_cb): New</div><div class='del'>-	function. Called when the control is (de)activated.</div><div class='del'>-	(control_activate): New function; called when the control is</div><div class='del'>-	activated, and sets up toolbar/menu times.</div><div class='del'>-	(control_deactivate): New function; removes those toolbar/menu</div><div class='del'>-	items.</div><div class='del'>-	(do_nothing_cb): Does nothing :-)</div><div class='del'>-	(addressbook_factory): Hook up to control_activate_cb().</div><div class='del'>-</div><div class='del'>-2000-04-07  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_get_book_view): correctly (well,</div><div class='del'>-	untested) implement.</div><div class='del'>-	(view_destroy): new function.</div><div class='del'>-</div><div class='del'>-2000-04-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:</div><div class='del'>-	Changed calls to e_cell_text_new to match new function signature.</div><div class='del'>-</div><div class='del'>-2000-04-06  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/Makefile.am (images_DATA): Renamed from pixmaps to images. </div><div class='del'>-</div><div class='del'>-2000-04-05  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* README: Added wombat.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text-test.c: Got rid of some runtime errors.</div><div class='del'>-	Changed to "fixed" font so that it will work on everyone's</div><div class='del'>-	machine.  Added a white background rectangle.  Made resizing the</div><div class='del'>-	window resize the contained text item.  Changed to using affines</div><div class='del'>-	(e_canvas_item_move_absolute) instead of "x" and "y" attributes.</div><div class='del'>-	Set the text in the entries so that they match the original values</div><div class='del'>-	of the displayed text object.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c: Fixed some referencing and</div><div class='del'>-	lifetime issues.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Removed an unnecessary get_bounds call.</div><div class='del'>-</div><div class='del'>-	(From a patch by Iain Holmes &lt;ih@csd.abdn.ac.uk&gt;)</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Made tooltips look more like the</div><div class='del'>-	underlying text.  Made tooltips show up more consistently.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/Makefile.am, addressbook/demo/e-test-model.c,</div><div class='del'>-	addressbook/demo/e-test-model.h: Changed this to backend to an</div><div class='del'>-	ebook.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.h,</div><div class='del'>-	addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Fixed const correctness and</div><div class='del'>-	changed a couple of functions to be external.</div><div class='del'>-	</div><div class='del'>-	* addressbook/Makefile.am: Fixed subdir ordering.</div><div class='del'>-</div><div class='del'>-2000-04-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-view.c: Fixed an incorrect</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-view.h,</div><div class='del'>-	addressbook/backend/ebook/e-book.h: Fixed some incorrect function</div><div class='del'>-	pointer declarations.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.h,</div><div class='del'>-	addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/ebook/test-card.c: Built new iterator system</div><div class='del'>-	for getting fields with multiple entries.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am: Added new files</div><div class='del'>-	addressbook/backend/ebook/e-card-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-list-iterator.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-list.c, and</div><div class='del'>-	addressbook/backend/ebook/e-card-list.h.</div><div class='del'>-</div><div class='del'>-2000-04-04  Yuri Syrota  &lt;rasta@renome.rovno.ua&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added uk to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2000-04-04  Andreas Hyden  &lt;a.hyden@cyberpoint.se&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added no and sv to ALL_LINGUAS.</div><div class='del'>-</div><div class='del'>-2000-04-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.h,</div><div class='del'>-	addressbook/backend/ebook/e-card.c: A bit of clean up.</div><div class='del'>-	</div><div class='del'>-	* addressbook/backend/ebook/e-book-types.h,</div><div class='del'>-	addressbook/backend/ebook/e-book-view-listener.c,</div><div class='del'>-	addressbook/backend/ebook/e-book-view-listener.h,</div><div class='del'>-	addressbook/backend/ebook/e-book-view.c,</div><div class='del'>-	addressbook/backend/ebook/e-book-view.h,</div><div class='del'>-	addressbook/backend/pas/pas-book-view.c,</div><div class='del'>-	addressbook/backend/pas/pas-book-view.h: New files for live views.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am,</div><div class='del'>-	addressbook/backend/ebook/e-book-listener.c,</div><div class='del'>-	addressbook/backend/ebook/e-book-listener.h,</div><div class='del'>-	addressbook/backend/ebook/e-book.c,</div><div class='del'>-	addressbook/backend/ebook/e-book.h,</div><div class='del'>-	addressbook/backend/ebook/test-client-list.c,</div><div class='del'>-	addressbook/backend/ebook/test-client.c,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.h,</div><div class='del'>-	addressbook/backend/idl/addressbook.idl: Added live views and</div><div class='del'>-	searching to the interface (neither is working yet.)</div><div class='del'>-</div><div class='del'>-2000-04-01  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/.cvsignore: Added test-movemail.</div><div class='del'>-</div><div class='del'>-	* art/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-2000-03-31  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/demo.c, addressbook/demo/addressbook-widget.c:</div><div class='del'>-	Added some missing gtk_object_refs.</div><div class='del'>-</div><div class='del'>-2000-03-30  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_build_all_cards_list): Get first card (with</div><div class='del'>-	R_FIRST) on first seq().</div><div class='del'>-</div><div class='del'>-2000-03-30  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.h: new-file</div><div class='del'>-	* addressbook/backend/pas/pas-backend-ldap.c: new file</div><div class='del'>-</div><div class='del'>-2000-03-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* configure.in:</div><div class='del'>-	* Makefile.am:</div><div class='del'>-	* art/Makefile.am: install new shortcut bar pixmaps.</div><div class='del'>-</div><div class='del'>-2000-03-30  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-</div><div class='del'>-	* art/evolution-calendar.png art/evolution-inbox.png </div><div class='del'>-	art/evolution-tasks.png	art/evolution-contacts.png </div><div class='del'>-	art/evolution-notes.png evolution-today.png:</div><div class='del'>-	added some artwork for the main shortcutbar.. someone</div><div class='del'>-	could stick them in it.</div><div class='del'>-</div><div class='del'>-2000-03-29  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.c: Fixed management of</div><div class='del'>-	the corba-cursor object by calling CORBA_Object_duplicate on it on</div><div class='del'>-	e-card-cursor creation and calling CORBA_Object_release on</div><div class='del'>-	e-card-cursor destruction.  Also, properly free string returned</div><div class='del'>-	from Evolution_CardCursor_get_nth function.</div><div class='del'>-</div><div class='del'>-2000-03-29  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c (get_cursor_cb): Added</div><div class='del'>-	some debugging.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-listener.c: Added inline</div><div class='del'>-	documentation for exposed functions.</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.c: same.</div><div class='del'>-	* addressbook/backend/ebook/e-card.c: same.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: add calendar compilation back in.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-book-factory.c</div><div class='del'>-	(PAS_BOOK_FACTORY_GOAD_ID): changed to</div><div class='del'>-	"evolution:addressbook-server".</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: no need to install a</div><div class='del'>-	.gnorba file from here, as the wombat.gnorba file in</div><div class='del'>-	evolution/wombat will do its job.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c (ebook_create): if</div><div class='del'>-	ebook_new fails, print a warning and return.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c (CARDSERVER_GOAD_ID): changed</div><div class='del'>-	to "evolution:addressbook-server".</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.c: Changed headerfile path.</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am: Use relative paths to libraries in the build</div><div class='del'>-	tree, rather than requiring libraries (such as libpcs) to already</div><div class='del'>-	be installed.</div><div class='del'>-</div><div class='del'>-2000-03-28  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* wombat/Makefile.am: new file.</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.gnorba: Cleaned up.</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.c (setup_pcs): filled in the rest.</div><div class='del'>-	</div><div class='del'>-	* Makefile.am: added wombat.</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.gnorba: new file.</div><div class='del'>-</div><div class='del'>-	* wombat/.cvsignore: new file.</div><div class='del'>-</div><div class='del'>-	* wombat/wombat.c (setup_pcs): fill out this function some.</div><div class='del'>-</div><div class='del'>-	* configure.in: added wombat.</div><div class='del'>-</div><div class='del'>-2000-03-28  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-card-cursor.c (create_cursor): use</div><div class='del'>-	g_new0 to allocate the BonoboObjectServant.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_build_all_cards_list): remove unnecessary</div><div class='del'>-	strdup/free.</div><div class='del'>-</div><div class='del'>-2000-03-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c: Removed an infinite</div><div class='del'>-	loop.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client-list.c: New test that</div><div class='del'>-	doesn't add an extra database item.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am,</div><div class='del'>-	addressbook/backend/ebook/.cvsignore: Added test-client-list.</div><div class='del'>-</div><div class='del'>-2000-03-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-card-cursor.c: Fixed memory</div><div class='del'>-	allocation.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c: Fixed memory</div><div class='del'>-	allocation.  Made database stuff not do an extra entry.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: Add test for</div><div class='del'>-	get_all_cards functionality.  Changed database name to test.db.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.c: Changed bonobo_object</div><div class='del'>-	to gtk_object in a couple of places.</div><div class='del'>-</div><div class='del'>-2000-03-28  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_create_unique_id): create id's for entries using</div><div class='del'>-	the following format: ("pas-id-%08lX%08X", time(NULL), c++).</div><div class='del'>-	</div><div class='del'>-2000-03-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test-movemail.c: new test program. Can be used to copy POP</div><div class='del'>-	mail into your evolution inbox.</div><div class='del'>-</div><div class='del'>-2000-03-27  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_get_vcard): remove unneeded g_strdup;</div><div class='del'>-	(get_length): implement function.</div><div class='del'>-	(get_nth): implement function.</div><div class='del'>-	(cursor_destroy): free up the internal glist of vcards, and fix</div><div class='del'>-	warning.</div><div class='del'>-	(pas_backend_file_build_all_cards_list): new function, to build up</div><div class='del'>-	the list of cards in the db.</div><div class='del'>-	(pas_backend_file_process_get_all_cards): call</div><div class='del'>-	pas_backend_file_build_+all_cards_list, and fix warning.</div><div class='del'>-</div><div class='del'>-2000-03-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-card.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: Added a section to test</div><div class='del'>-	cursors and returning an id when adding.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-pairs.h: Removed the address</div><div class='del'>-	pairs since they were added to e-card.c.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Made the set_id function take</div><div class='del'>-	a const char *.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-listener.c,</div><div class='del'>-	addressbook/backend/ebook/e-book-listener.h,</div><div class='del'>-	addressbook/backend/ebook/e-book.c,</div><div class='del'>-	addressbook/backend/ebook/e-book.h,</div><div class='del'>-	addressbook/backend/idl/addressbook.idl,</div><div class='del'>-	addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.h: Added a get_all_cards function</div><div class='del'>-	and made the response to the create_card function include the card</div><div class='del'>-	id.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/Makefile.am: Added e-card-cursor.c and</div><div class='del'>-	e-card-cursor.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-cursor.c,</div><div class='del'>-	addressbook/backend/ebook/e-card-cursor.h: New class for proxying</div><div class='del'>-	to an Evolution_CardCursor.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/Makefile.am: Added pas-card-cursor.c and</div><div class='del'>-	pas-card-cursor.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-card-cursor.c,</div><div class='del'>-	addressbook/backend/pas/pas-card-cursor.h: New bonobo class for</div><div class='del'>-	making an Evolution_CardCursor server.</div><div class='del'>-</div><div class='del'>-2000-03-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test9.c (main): This test is basically now invalid.</div><div class='del'>-	* tests/test11.c (main): Fix for async search api.  Probably works.</div><div class='del'>-	Removed camel-mbox-*.h headers, should be private.</div><div class='del'>-</div><div class='del'>-2000-03-27  Tuomas Kuosmanen  &lt;tigert@gimp.org&gt;</div><div class='del'>-	* art/attachment.xpm art/mail-new.xpm art/mail-read.xpm</div><div class='del'>-	art/mail-replied.xpm art/mark.xpm art/meeting.xpm</div><div class='del'>-	art/priority-high.xpm art/priority-low.xpm</div><div class='del'>-</div><div class='del'>-	Added some new icons for the message-list view..</div><div class='del'>-</div><div class='del'>-2000-03-26  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: check for db_185.h (present in newer db</div><div class='del'>-	distributions.)</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_create_unique_id): new function.</div><div class='del'>-	(pas_backend_file_process_create_card): call</div><div class='del'>-	pas_backend_file_create_unique_id and pas_book_notify_add (if the</div><div class='del'>-	db-&gt;put was successful).  also, sync out db.</div><div class='del'>-	(pas_backend_file_process_remove_card): call</div><div class='del'>-	pas_book_notify_remove if the db-&gt;del was successful, and sync out</div><div class='del'>-	db.</div><div class='del'>-	(pas_backend_file_process_modify_card): call</div><div class='del'>-	pas_book_notify_change if db-&gt;put was successful, and sync out db.</div><div class='del'>-	(string_to_dbt): new function.</div><div class='del'>-	(pas_backend_file_process_create_card): use string_to_dbt</div><div class='del'>-	(pas_backend_file_process_remove_card): likewise</div><div class='del'>-	(pas_backend_file_process_modify_card): likewise</div><div class='del'>-	(pas_backend_file_get_vcard): likewise</div><div class='del'>-	(pas_backend_file_upgrade_db): new function, to upgrade a db file</div><div class='del'>-	if we change the data format.</div><div class='del'>-	(pas_backend_file_maybe_upgrade_db): check db version vs. current</div><div class='del'>-	code version, and upgrade it necessary.</div><div class='del'>-	(pas_backend_file_load_uri): call pas_backend_file_maybe_upgrade.</div><div class='del'>-</div><div class='del'>-2000-03-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: Load an ECard instead</div><div class='del'>-	of a VCard and then get the VCard from that ECard.  Just tests</div><div class='del'>-	ECard and the client stuff at the same time.  Also, replaces</div><div class='del'>-	carriage returns with newlines.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c: Fixed a small parity error.</div><div class='del'>-</div><div class='del'>-2000-03-25  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-client.c: create a card and then</div><div class='del'>-	look it up.</div><div class='del'>-</div><div class='del'>-2000-03-26  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c</div><div class='del'>-	(pas_backend_file_process_create_card): add db calls to flesh out</div><div class='del'>-	the interface.  hardcoded id that needs to change, once we decide</div><div class='del'>-	how we're going to create it.</div><div class='del'>-	(pas_backend_file_process_remove_card): add db calls to flesh out</div><div class='del'>-	the interface.</div><div class='del'>-	(pas_backend_file_process_modify_card): likewise</div><div class='del'>-	(pas_backend_file_process_check_connection): likewise</div><div class='del'>-	(pas_backend_file_get_vcard): likewise</div><div class='del'>-	(pas_backend_file_load_uri): likewise</div><div class='del'>-</div><div class='del'>-2000-03-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c: Set the card id properly</div><div class='del'>-	when retrieving a card.</div><div class='del'>-</div><div class='del'>-2000-03-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-sexp.h: Formatting cleanup.</div><div class='del'>-</div><div class='del'>-2000-03-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -&gt; e-sexp.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Added the ability to set the</div><div class='del'>-	card's id (and made getting it work correctly also.)</div><div class='del'>-</div><div class='del'>-2000-03-25  Chris Toshok  &lt;toshok@laptoph.xtoph.org&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c (e_book_pop_op): pass GList*</div><div class='del'>-	as second parameter to g_list_remove_link, not the data pointer.</div><div class='del'>-</div><div class='del'>-2000-03-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-types.h: Removed the</div><div class='del'>-	address-&gt;description field.</div><div class='del'>-	</div><div class='del'>-	* addressbook/backend/ebook/e-card.c: Added VCard output and</div><div class='del'>-	the use of GtkArguments.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/test-card.c: Updated this to use the</div><div class='del'>-	GtkArguments.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book.c: Fixed a memory leak.</div><div class='del'>-</div><div class='del'>-2000-03-25  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ebook/e-book.c,</div><div class='del'>-	ebook/e-book.h,	</div><div class='del'>-	ebook/e-book.h,		</div><div class='del'>-	ebook/e-card-fields.h,</div><div class='del'>-	ebook/e-card.h,</div><div class='del'>-	ebook/e-commerce.h: old, removed. Up-to-date EBook stuff is kept</div><div class='del'>-	in addressbook/backend/ebook.</div><div class='del'>-</div><div class='del'>-2000-03-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-types.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-pairs.h,</div><div class='del'>-	addressbook/backend/ebook/test-card.c: Added parsing and testing</div><div class='del'>-	for name, full name, birthday, telephone, email, and street</div><div class='del'>-	address properties.</div><div class='del'>-</div><div class='del'>-2000-03-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/.cvsignore,</div><div class='del'>-	addressbook/backend/pas/.cvsignore,</div><div class='del'>-	addressbook/backend/idl/.cvsignore,</div><div class='del'>-	addressbook/backend/.cvsignore: Updated .cvsignore files.</div><div class='del'>-</div><div class='del'>-2000-03-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/Makefile.am, configure.in: Added the</div><div class='del'>-	addressbook/backend directory.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/Makefile.am: Removed the libversit directory</div><div class='del'>-	as it's now included in the base evolution directory.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-pairs.h,</div><div class='del'>-	addressbook/backend/ebook/Makefile.am: Changed the place where</div><div class='del'>-	libversit is looked for.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-book-listener.c: Fixed some</div><div class='del'>-	indentation.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card-pairs.h,</div><div class='del'>-	addressbook/backend/ebook/e-card-types.h: Commented out some code</div><div class='del'>-	to get this to compile.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/ebook/e-card.c,</div><div class='del'>-	addressbook/backend/ebook/e-card.h: Turned this into a GTK+</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas.c,</div><div class='del'>-	addressbook/backend/ebook/test-client.c: Include gnome.h and</div><div class='del'>-	gnorba.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/idl/addressbook.idl: Include Bonobo.idl</div><div class='del'>-	instead of bonobo-unknown.idl.</div><div class='del'>-</div><div class='del'>-	* addressbook/backend/pas/pas-backend-file.c,</div><div class='del'>-	addressbook/backend/pas/pas-book.c,</div><div class='del'>-	addressbook/contact-editor/test-editor.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c,</div><div class='del'>-	addressbook/printing/e-contact-print.c,</div><div class='del'>-	addressbook/printing/test-contact-print-style-editor.c,</div><div class='del'>-	addressbook/printing/test-print.c: Killed some warnings.</div><div class='del'>-</div><div class='del'>-2000-03-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Changed gnome_canvas_item_grab_focus to</div><div class='del'>-	e_canvas_item_grab_focus.</div><div class='del'>-</div><div class='del'>-2000-03-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/addressbook-widget.c: Make background pixmap</div><div class='del'>-	get properly set to NULL.</div><div class='del'>-</div><div class='del'>-2000-03-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added the</div><div class='del'>-	ability to access the text event processor.</div><div class='del'>-</div><div class='del'>-2000-03-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/addressbook-widget.c: Made the addressbook</div><div class='del'>-	component look in the users home directory for the addressbook.xml</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-2000-03-20  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/.cvsignore: added filter.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/.cvsignore: added test-addressbook.</div><div class='del'>-</div><div class='del'>-2000-03-17 Elliot Lee &lt;sopwith@redhat.com&gt;</div><div class='del'>-	* calendar/cal-client/Makefile.am,</div><div class='del'>-	calendar/cal-util/Makefile.am, calendar/gui/Makefile.am,</div><div class='del'>-	calendar/pcs/Makefile.am, mail/Makefile.am,</div><div class='del'>-	widgets/e-text/Makefile.am: Fix for srcdir != builddir.</div><div class='del'>-</div><div class='del'>-2000-03-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): build shell before mail, since mail</div><div class='del'>-	relies on the shell idl files being compiled.</div><div class='del'>-</div><div class='del'>-2000-03-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/Makefile.am: Added files for addressbook bonobo</div><div class='del'>-	component.  Changed non bonobo version to compile as</div><div class='del'>-	test-addressbook.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/addressbook.c,</div><div class='del'>-	addressbook/demo/addressbook.gnorba,</div><div class='del'>-	addressbook/demo/addressbook.h,</div><div class='del'>-	addressbook/demo/addressbook-factory.c,</div><div class='del'>-	addressbook/demo/addressbook-widget.c,</div><div class='del'>-	addressbook/demo/addressbook-widget.h: New factory to create an</div><div class='del'>-	addressbook bonobo component.</div><div class='del'>-</div><div class='del'>-2000-03-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/.cvsignore: Added e-text-test.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/e-test-model.c,</div><div class='del'>-	addressbook/demo/e-test-model.h: A model storing data in an array</div><div class='del'>-	of Address objects.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/demo.c: Changed to use</div><div class='del'>-	addressbook/demo/e-test-model.c and</div><div class='del'>-	addressbook/demo/e-test-model.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo/Makefile.am: Added e-test-model.c and</div><div class='del'>-	e-test-model.h.</div><div class='del'>-</div><div class='del'>-2000-03-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Rearranged SUBDIRS for dependencies.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text-model.c, widgets/e-text-model.h: New</div><div class='del'>-	object which stores a piece of text data.  All methods are</div><div class='del'>-	virtual.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Modified this</div><div class='del'>-	to use an ETextModel for its data.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Added e-text-model.c and e-text-model.h.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/test-minicard-label.c: Made this work again.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c,</div><div class='del'>-	widgets/e-minicard/e-minicard.h: Made this use an ETableModel to</div><div class='del'>-	get its data.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard-label.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.h: Added the ability to set</div><div class='del'>-	the text model used for the contained text widget.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/Makefile.am: Added e-table since e-minicard</div><div class='del'>-	is now dependent on an e-table-model for its data.</div><div class='del'>-</div><div class='del'>-	* addressbook/demo, addressbook/demo/.cvsignore,</div><div class='del'>-	addressbook/demo/Makefile.am, addressbook/demo/demo.c,</div><div class='del'>-	addressbook/demo/spec: A new program to test ETable and EMinicard</div><div class='del'>-	integration.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added addressbook/demo/Makefile.</div><div class='del'>-</div><div class='del'>-	* addressbook/Makefile.am: Added the demo/ subdirectory.</div><div class='del'>-</div><div class='del'>-2000-03-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.h,</div><div class='del'>-	widgets/e-minicard/e-reflow.c, widgets/e-minicard/test-reflow.c,</div><div class='del'>-	widgets/e-text/e-text.c, widgets/e-text/e-text.h: Adapted to use</div><div class='del'>-	the new e-canvas reflow system.</div><div class='del'>-</div><div class='del'>-2000-03-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Added a</div><div class='del'>-	"break_characters" argument.  It lets you define a set of</div><div class='del'>-	characters which should cause optional linebreaks to occur.  Made</div><div class='del'>-	setting the "clip_height" argument to -1 mean no height clipping.</div><div class='del'>-	Moved calling the "resize" signal into an idle handler to avoid</div><div class='del'>-	reentering the canvas update loop.  Made EText recalc bounds if</div><div class='del'>-	the affine has changed.  Fixed up tooltip_count (this counts the</div><div class='del'>-	number of ENTER and LEAVE events.)</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text-test.c: Got rid of a few warnings.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard-label.h: Reindent a few lines.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c,</div><div class='del'>-	widgets/e-minicard/e-minicard-label.c: Switch from using "x" and</div><div class='del'>-	"y" to set the children's position to using</div><div class='del'>-	e_canvas_item_move_absolute.</div><div class='del'>-</div><div class='del'>-2000-03-05  Matt Loper  &lt;matt.loper@splashtech.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: Commenting added.</div><div class='del'>-	(on_url_data_requested): renamed from "on_url_requested", to</div><div class='del'>-	reflect that a stream of data is what's actually being asked for.</div><div class='del'>-	(hydrate_persist_stream_from_gstring): New function.</div><div class='del'>-	(camel_stream_to_gstring): New function.</div><div class='del'>-	(on_object_requested): Cleaned up.</div><div class='del'>-</div><div class='del'>-2000-03-04  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/Makefile.am: add bonobo to the build </div><div class='del'>-	process.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (main): </div><div class='del'>-	initialize Bonobo. Use bonobo_main.</div><div class='del'>-	(get_gtk_html_contents_window): set signal handlers</div><div class='del'>-	for url requests and objects requests.</div><div class='del'>-	(on_object_requested): answer to object requests.</div><div class='del'>-</div><div class='del'>-2000-03-03  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (main): initialize</div><div class='del'>-	gdkrgb. Push visual/colormap.</div><div class='del'>-	(on_url_requested): in the case where a camel url is requested, </div><div class='del'>-	write the camel stream to gtkhtml. </div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/Makefile.am (filter_LDADD): add</div><div class='del'>-	gnomeprint in the lib list. </div><div class='del'>-</div><div class='del'>-2000-03-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* configure.in: Build `filter/Makefile'.  Added check for GtkHTML.</div><div class='del'>-	Set `GTKHTML_CFLAGS' and `GTKHTML_LIBS' to the appropriate values</div><div class='del'>-	for linking with GtkHTML.</div><div class='del'>-</div><div class='del'>-2000-03-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added calendar/idl/Makefile,</div><div class='del'>-	calendar/cal-client/Makefile, and calendar/pcs/Makefile to the</div><div class='del'>-	list of files to generate.</div><div class='del'>-</div><div class='del'>-2000-02-29  Iain Holmes  &lt;ih@csd.abdn.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Don't show the tooltip if the text is being</div><div class='del'>-	editted or isn't clipped. Remove the tooltip when editting starts.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Build the test program</div><div class='del'>-</div><div class='del'>-2000-02-29  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/Makefile.am (filter_LDADD): Added test program.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/filterdescription.xml, saveoptions.xml: Data</div><div class='del'>-	files for test program.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/filter.c (main): Test program for filter ui.</div><div class='del'>-</div><div class='del'>-2000-02-28  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/Makefile.am (INCLUDES): Fixed references to</div><div class='del'>-	eutil.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Build e-util before other stuff.</div><div class='del'>-	(SUBDIRS): Build filter after camel.</div><div class='del'>-</div><div class='del'>-2000-02-28  Chris Lahey  &lt;clahey@umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c: Compilation error.</div><div class='del'>-</div><div class='del'>-2000-02-28  Chris Lahey  &lt;clahey@umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Updated these</div><div class='del'>-	to use the canvas ::update system properly.</div><div class='del'>-</div><div class='del'>-2000-02-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* acconfig.h:</div><div class='del'>-	* configure.in: define SENDMAIL_PATH with the path to sendmail.</div><div class='del'>-</div><div class='del'>-2000-02-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h, e-text-event-processor.c,</div><div class='del'>-	e-text-event-processor.h, e-text-event-processor-emacs-like.c,</div><div class='del'>-	e-text-event-processor-emacs-like.h,</div><div class='del'>-	e-text-event-processor-types.h: This were moved to widgets/e-text/</div><div class='del'>-	a while ago but never removed.  They have now been removed.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c, widgets/e-text/e-text.h: Removed some</div><div class='del'>-	warnings from this file.  Made tooltips disappear when you're</div><div class='del'>-	finished with them.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/test-reflow.c,</div><div class='del'>-	widgets/e-minicard/test-minicard.c,</div><div class='del'>-	widgets/e-minicard/test-minicard-label.c: Commented out unused</div><div class='del'>-	about_callback functions.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-reflow.c: Made e-reflow pass an EFocus to</div><div class='del'>-	its e-minicard children.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard.c: Made e-minicard take and return</div><div class='del'>-	an EFocus for its "has_focus" argument.  This makes shift-tab work properly.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/e-minicard-label.c: Made e-minicard-label take and return</div><div class='del'>-	an EFocus for its "has_focus" argument.  Made the font that</div><div class='del'>-	e-minicard-label uses only be allocated once.</div><div class='del'>-	</div><div class='del'>-2000-02-21  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (on_link_clicked): stop</div><div class='del'>-	sscanf() abuse.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: changed references to libibex.a to</div><div class='del'>-	libibex.la.</div><div class='del'>-</div><div class='del'>-	* libical/src/libical/.cvsignore: Added *.lo, *.la, and .libs.</div><div class='del'>-	* libical/src/libicalss/.cvsignore: same.</div><div class='del'>-</div><div class='del'>-	* tests/.cvsignore: Added test11.</div><div class='del'>-</div><div class='del'>-	* libical/Makefile.in: autogenerated file removed from cvs, and</div><div class='del'>-	added to .cvsignore.</div><div class='del'>-	* libical/src/Makefile.in: same.</div><div class='del'>-	* libical/src/libical/Makefile.in: same.</div><div class='del'>-	* libical/src/libicalss/Makefile.in: same.</div><div class='del'>-</div><div class='del'>-2000-02-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (on_link_clicked): </div><div class='del'>-	uggly hack to test part saving and</div><div class='del'>-	b64 streams.</div><div class='del'>-</div><div class='del'>-2000-02-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test10.c:</div><div class='del'>-	* tests/test11.c: update for camel changes</div><div class='del'>-</div><div class='del'>-2000-02-20  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: Changed dependencies on libibex.la to</div><div class='del'>-	libibex.a. In test9_LDADD, placed libcamelmbox.la before</div><div class='del'>-	libibex.la, as the former requires the latter.</div><div class='del'>-</div><div class='del'>-2000-02-20  Iain Holmes  &lt;ih@csd.abdn.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.[ch] (_do_tooltip): Show the text of the item,</div><div class='del'>-	in a tooltip style.</div><div class='del'>-	(e_text_event): Add a timeout on the Enter and remove it on the Leave</div><div class='del'>-	events.</div><div class='del'>-</div><div class='del'>-	* e-text-test.c: New file to test e-text items.</div><div class='del'>-	</div><div class='del'>-2000-02-20  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: added ABOUT-NLS.  </div><div class='del'>-	* ABOUT-NLS: removed.</div><div class='del'>-	</div><div class='del'>-2000-02-19  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (on_link_clicked): When a link</div><div class='del'>-	is clicked, indicate the link with a dialog.</div><div class='del'>-</div><div class='del'>-	* libical/src/test/.cvsignore: Added Makefile.</div><div class='del'>-</div><div class='del'>-	* libical/.cvsignore: Added Makefile, configure, config.status.</div><div class='del'>-</div><div class='del'>-	* libical/src/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* libical/Makefile: autogenerated file removed from cvs.</div><div class='del'>-	* libical/configure: same. </div><div class='del'>-	* libical/config.status: same.</div><div class='del'>-	* libical/src/Makefile: same.</div><div class='del'>-	* libical/src/test/Makefile: same.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/.cvsignore: Added minicard-label-test,</div><div class='del'>-	minicard-test, and reflow-test.</div><div class='del'>-</div><div class='del'>-	* shell/.cvsignore: added files autogenerated from Evolution.idl.</div><div class='del'>-</div><div class='del'>-	* libversit/.cvsignore: Added .libs, vcc.c, vcc.lo, vobject.lo,</div><div class='del'>-	vcaltmp.lo, libversit.la</div><div class='del'>-</div><div class='del'>-	* libical/src/test/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* libical/src/libical/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* libical/src/libicalss/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-	* libical/.cvsignore: New file, with config.log in it.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: minor cleanup.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/.cvsignore: added message-browser.</div><div class='del'>-</div><div class='del'>-2000-02-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test11.c (main): Use a relative path to the mbox provider</div><div class='del'>-	module.</div><div class='del'>-</div><div class='del'>-2000-02-18  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (filename_to_camel_msg): Call</div><div class='del'>-	camel_data_wrapper_set_input_stream, rather than</div><div class='del'>-	camel_data_wrapper_construct_from_stream.  For the whole message,</div><div class='del'>-	allow someone to see the header ("to", "from", etc.).  Clicking on</div><div class='del'>-	tree items to see their elements, now works also.</div><div class='del'>-</div><div class='del'>-2000-02-18  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Make gnomeui the last library on the command line,</div><div class='del'>-	as its path is the one most likely to hold other old libraries</div><div class='del'>-	(libxml) and we need newer versions.</div><div class='del'>-	</div><div class='del'>-	(BONOBO_VFS_GNOME_CFLAGS): Add libical to the</div><div class='del'>-	AC_CONFIG_SUBDIRS </div><div class='del'>-</div><div class='del'>-	(BONOBO_HTML_GNOME_CFLAGS): VFS checking needs to</div><div class='del'>-	go before we rquery them. </div><div class='del'>-</div><div class='del'>-	Use the new method for gnome-print</div><div class='del'>-	checking instead of the old crufty gtk+ based one that nobody can</div><div class='del'>-	debug.  ever.</div><div class='del'>-	</div><div class='del'>-2000-02-16  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (tree_selection_changed): New</div><div class='del'>-	callback function, which will later change the main html window to</div><div class='del'>-	reflect the newly-selected tree item.</div><div class='del'>-	(get_gtk_html_contents_window): New function. Gets the content</div><div class='del'>-	part of a message.</div><div class='del'>-	(get_gtk_html_header_window): New function. Will get the header</div><div class='del'>-	part of a message, when applicable.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (str_tolower): Now returns a new string,</div><div class='del'>-	rather than changing it in place.</div><div class='del'>-	(initialize_camel_formatter): New function; gives a root</div><div class='del'>-	CamelDataWrapper and a stream to a CamelFormatter.</div><div class='del'>-	(camel_formatter_wrapper_to_html): New function. Translates any</div><div class='del'>-	CamelDataWrapper into html.</div><div class='del'>-	(lookup_unique_id): Allows the root object to be a</div><div class='del'>-	CamelDataWrapper, which is more general than the previously</div><div class='del'>-	required CamelMimeMessage.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-02-14  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EXTRA_GNOME_CFLAGS): Add libunicode to CFLAGS/LIBS.</div><div class='del'>-</div><div class='del'>-2000-02-13  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added check for libunicode.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added libibex.</div><div class='del'>-</div><div class='del'>-	* tests/test11.c (main): New test, tests search api.</div><div class='del'>-</div><div class='del'>-2000-02-13  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/test-multipart-mixed.msg: New rfc822 file, which</div><div class='del'>-	crashes message-browser.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (get_gtk_html_window): Takes a</div><div class='del'>-	CamelMimeMessage as a param, rather than a filename.</div><div class='del'>-	(main): Puts our windows in an hpane rather than a vbox. Also</div><div class='del'>-	opens a file dlg box if a filename wasn't given as a first param.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (_init_with_name): Set stream_fs-&gt;fd to</div><div class='del'>-	-1 if we fail to load the file.</div><div class='del'>-	(camel_stream_fs_new_with_name): If stream_fs-&gt;fd is -1, return</div><div class='del'>-	NULL. These changes make it so that a CamelStreamFs won't be</div><div class='del'>-	created if you give it a bogus filename; they may be replaced once</div><div class='del'>-	exception handling is in place.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (handle_tree_item): Expand tree</div><div class='del'>-	items.</div><div class='del'>-	(mime_message_to_html): New function; translates a</div><div class='del'>-	CamelMimeMessage into two strings (one for the header, and one for</div><div class='del'>-	the body).</div><div class='del'>-	(get_gtk_html_window): New function; fills out a window with</div><div class='del'>-	html. The html is taken from a processed rfc822 file, via a</div><div class='del'>-	CamelFormatter.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: Added assertions.</div><div class='del'>-	(handle_text_html): Don't call text_to_html on something that's</div><div class='del'>-	already html.</div><div class='del'>-	(multipart_foreach): function deleted.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: Added preliminary support for</div><div class='del'>-	the viewing of messages via gtkhtml. Lots of commenting. </div><div class='del'>-</div><div class='del'>-2000-02-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c: Fixed the</div><div class='del'>-	location the first time you see the drop down menus for changing</div><div class='del'>-	which phone, email, or snail mail address you see.</div><div class='del'>-</div><div class='del'>-2000-02-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.c (e_text_event): Made a click on a text</div><div class='del'>-	widget set the cursor properly.</div><div class='del'>-</div><div class='del'>-2000-02-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/e-text.h: Removed some arguments from the .h that</div><div class='del'>-	will never be implemented.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-02-10  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c (data_wrapper_repository_init): </div><div class='del'>-	default the text/* mime types to CamelSimpleDataWrapper so</div><div class='del'>-	that Michael can use get_stream. </div><div class='del'>-</div><div class='del'>-2000-02-10  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.h: The superclass is</div><div class='del'>-	actually a seekable stream, not just a stream.</div><div class='del'>-</div><div class='del'>-2000-02-10  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (THREAD_RELATED_TESTS): don't </div><div class='del'>-	build thread related tests if evolution has been</div><div class='del'>-	compiled with no thread support.</div><div class='del'>-</div><div class='del'>-	* configure.in (have_pthread): allow user to enable/disable</div><div class='del'>-	thread support at configure time</div><div class='del'>-	(EXTRA_GNOME_CFLAGS): </div><div class='del'>-	(EXTRA_GNOME_LIBS): thread support is directly </div><div class='del'>-	included in this variable if enabled. No more</div><div class='del'>-	EXTRA_GNOME_CFLAGS_THREADS</div><div class='del'>-	Other special support should be added in </div><div class='del'>-	EXTRA_GNOME_LIBS and EXTRA_GNOME_CFLAGS</div><div class='del'>-	instead of redefining a new variable </div><div class='del'>-	each time we want to add a new lib. </div><div class='del'>-	(bonobo, ....)</div><div class='del'>-</div><div class='del'>-	* camel/camel.c (camel_init): only try to initialize threads if</div><div class='del'>-	we enabled threads support. </div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/Makefile.am (message_browser_LDADD): use</div><div class='del'>-	EXTRA_GNOME_LIBS</div><div class='del'>-</div><div class='del'>-	* configure.in (have_pthread): remove HAVE_PTHREADS</div><div class='del'>-	variable. Define ENABLE_THREADS instead.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am: use ENABLE_THREADS not HAVE_PTHREADS</div><div class='del'>-	to test if we build thread relateed code. </div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am: use EXTRA_GNOME_LIBS, </div><div class='del'>-	not EXTRA_GNOME_LIBS_THREADS</div><div class='del'>-</div><div class='del'>-2000-02-10  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/hash-table-utils.c (g_strcase_hash): Removed a bizarre</div><div class='del'>-	comparison construct for converting case.</div><div class='del'>-</div><div class='del'>-2000-02-09  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):</div><div class='del'>-	Uses case-insensitive compares.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_new): Uses</div><div class='del'>-	case-insensitive compares.</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c (data_wrapper_repository_init):</div><div class='del'>-	Use case-insensitive mime types.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.c (read): Increment the</div><div class='del'>-	copy source address to match the data read offset.</div><div class='del'>-	(seek): Actually implement the seek.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_store_stream_in_buffer): If we get a -1 read,</div><div class='del'>-	DONT update the total bytes, and try and truncate the array in</div><div class='del'>-	reverse.  Eek.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_encoding_from_string):</div><div class='del'>-	This was DEFINETLEY not the right way to do it. strncmp!=strcmp</div><div class='del'>-	(camel_mime_part_encoding_to_string): Handle the default case.</div><div class='del'>-	: include string.h for strcmp() etc.</div><div class='del'>-</div><div class='del'>-2000-02-09  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/test-multipart-alt.msg: New test file; run</div><div class='del'>-	message-browser on it, and it will crash.</div><div class='del'>-</div><div class='del'>-2000-02-09  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (handle_tree_item): </div><div class='del'>-	show the item. </div><div class='del'>-	(handle_tree_item): show the containers and the containees</div><div class='del'>-	(get_message_tree_ctrl): call handle_tree_item</div><div class='del'>-	on the message itself</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_init): </div><div class='del'>-	set the mime type to "mime/message".</div><div class='del'>-	--- THIS IS NOT THE CONTENT TYPE ---</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-body-part.c (camel_mime_body_part_init): </div><div class='del'>-	set the mime type to "body-part". </div><div class='del'>-	--- THIS IS NOT THE CONTENT TYPE ---</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (camel_data_wrapper_set_mime_type): </div><div class='del'>-	mime_type is const. </div><div class='del'>-	(_set_input_stream): really set the input stream</div><div class='del'>-	(_set_output_stream): really set the output stream</div><div class='del'>-	various other typo fixes.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: various typo</div><div class='del'>-	fixes in the ctree construction. </div><div class='del'>-</div><div class='del'>-	* camel/string-utils.c (string_trim): fix braindead</div><div class='del'>-	trailing trim bug.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): </div><div class='del'>-	strip the leading and trailing quotes when constructing the </div><div class='del'>-	content field. This should be done in a more generic </div><div class='del'>-	RFC822 approach, but this fixes a bug that prevent</div><div class='del'>-	matt from analysing some multipart messages.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: reorganize the </div><div class='del'>-	deprecated and new methods. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c </div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): </div><div class='del'>-	Use "From " as the message separating string. </div><div class='del'>-	</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): </div><div class='del'>-	set the mode when creating the mbox file. 	</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): </div><div class='del'>-	ditto</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): </div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-2000-02-09  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c (print_usage_and_quit): Minor</div><div class='del'>-	cleanup.</div><div class='del'>-</div><div class='del'>-2000-02-09  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.c (class_init): Actually</div><div class='del'>-	initialise the class.  It simple couldn't have worked before.</div><div class='del'>-	(camel_simple_data_wrapper_stream_construct): Commented out code</div><div class='del'>-	which crashes just to get something working, memory corruption??</div><div class='del'>-</div><div class='del'>-2000-02-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add new Makefiles to Makefile list.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text/Makefile.am: Build libetext.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard/Makefile.am: Build libeminicard and test</div><div class='del'>-	programs.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Remove all e-text and e-minicard code and</div><div class='del'>-	add them to the SUBDIRS list.</div><div class='del'>-</div><div class='del'>-2000-02-08  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/message-browser.c: New file; shows a message in</div><div class='del'>-	tree format, where multipart's have multiple leaves.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: Changed references from</div><div class='del'>-	'multipart/alternate' to 'multipart/alternative'.</div><div class='del'>-</div><div class='del'>-	* tests/test-formatter.c (convert_to_html_and_print): Use the</div><div class='del'>-	buffer length of the stream to create strings which are then</div><div class='del'>-	printed, rather than printing the stream (which might not have a</div><div class='del'>-	trailing \0) directly.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (str_tolower): New function; makes a</div><div class='del'>-	string lowercase.</div><div class='del'>-</div><div class='del'>-	* tests/test-formatter.c (convert_to_html_and_print): Fixed call</div><div class='del'>-	to 'camel_formatter_mime_message_to_html' to contain correct</div><div class='del'>-	params.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: New member to 'CamelFormatterPrivate',</div><div class='del'>-	'attachments', will be used to let the caller know which items</div><div class='del'>-	should be treated as attachments (as opposed to objects which are</div><div class='del'>-	inline to the body).</div><div class='del'>-	(text_to_html): name changed from 'encode_entities'. Also now</div><div class='del'>-	converts newlines to &lt;br&gt; tags.</div><div class='del'>-	(camel_formatter_mime_message_to_html): Now takes two output</div><div class='del'>-	streams -- one for the header, and one for the body.</div><div class='del'>-	(get_bonobo_tag_for_object): New function; tries to make a tag out</div><div class='del'>-	of (1) the leaf of a mime message and (2) a bonobo object that can</div><div class='del'>-	handle its mime type, but can return NULL if it fails to find the</div><div class='del'>-	mime type.</div><div class='del'>-	(handle_vcard): New function; will write out a vcard as html.</div><div class='del'>-</div><div class='del'>-2000-02-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.h, widgets/e-text.c: Added line wrap and a max</div><div class='del'>-	number of lines (max number of lines is only obeyed if text is not</div><div class='del'>-	being edited).</div><div class='del'>-</div><div class='del'>-2000-02-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.c: Removed an unneccessary</div><div class='del'>-	include of libhnj.  All uses of libhnj are commented out.</div><div class='del'>-</div><div class='del'>-2000-02-07  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (mime_part_to_html): function deleted.</div><div class='del'>-</div><div class='del'>-	* tests/test-formatter.c (print_usage_and_quit): New function,</div><div class='del'>-	which gives usage information.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: made the 'stream' a member of the</div><div class='del'>-	CamelFormatter class, so that streams don't have to be explicitly</div><div class='del'>-	sent as a param where a CamelFormatter is also sent..</div><div class='del'>-	(handle_text_plain): Use 'encode_entities' to change '&lt;' to</div><div class='del'>-	'&amp;gt;', etc.</div><div class='del'>-</div><div class='del'>-2000-02-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (find_preferred_displayable_body_part_in_multipart_alternative): </div><div class='del'>-	(mime_part_to_html): typo fix : </div><div class='del'>-	use find_preferred_displayable_body_part_in_multipart_alternative</div><div class='del'>-	instead of the other names. Allows camel to have no undefined symbols. </div><div class='del'>-</div><div class='del'>-2000-02-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test-formatter.c: New file; intended to test the</div><div class='del'>-	CamelFormatter class.</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: Lots of cleanup, commenting, some new</div><div class='del'>-	functions, and a really basic skeleton for getting bonobo objects</div><div class='del'>-	into the html.</div><div class='del'>-	(encode_entities): New function, stolen from Daniel Velliard.</div><div class='del'>-</div><div class='del'>-2000-01-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print-style-editor.h,</div><div class='del'>-	addressbook/printing/e-contact-print-style-editor.c,</div><div class='del'>-	addressbook/printing/test-contact-print-style-editor.c: Files to</div><div class='del'>-	load the contact print style editor from the glade file.  Doesn't</div><div class='del'>-	really do anything yet.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/Makefile.am: Added style editor stuff.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.glade: Changed a bit.</div><div class='del'>-	Fixed an out of place widget.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/.cvsignore: Added</div><div class='del'>-	contact-print-style-editor-test.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/smallbook.ecps: Fixed up the values to</div><div class='del'>-	match the new types.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/medbook.ecps,</div><div class='del'>-	addressbook/printing/phonelist.ecps: Added two new printing</div><div class='del'>-	styles.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.h: Fixed an incorrect</div><div class='del'>-	comment.</div><div class='del'>-	</div><div class='del'>-	* addressbook/printing/e-contact-print.c: Added columns and letter</div><div class='del'>-	tabs.  Tweaked spacing all over the place.  Fixed card height</div><div class='del'>-	function so that column wrapping is always done correctly.  Added</div><div class='del'>-	pulling of style information from a file.  Added line wrapping</div><div class='del'>-	within each text field.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print-types.h: Added a type field</div><div class='del'>-	for different types of print styles.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c (e_text_command): Handle the grab and ungrab</div><div class='del'>-	command instead of doing focus by hand.  This fixes a problem</div><div class='del'>-	related to the scroll wheel.</div><div class='del'>-	(e_text_command): Reset the blink timer in many more command</div><div class='del'>-	situations so that the cursor blinks less when you're interacting</div><div class='del'>-	with it.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-emacs-like.c: Send the grab focus</div><div class='del'>-	command when starting a selection and the ungrab focus command</div><div class='del'>-	when ending it.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-types.h: Added grab command type</div><div class='del'>-	so that the event processor can tell the widget to grab the focus.</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.c: Redefined all sizes using #defines so that</div><div class='del'>-	they can be tweaked later.  Added scroll wheel handling and set up</div><div class='del'>-	adjustment increments so that the scroll bars will work correctly.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.h: Added minicard focus type enum.  This</div><div class='del'>-	doesn't mean anything yet, but it will later be used to say which</div><div class='del'>-	direction the focus is coming from (below for shift-tab, above for</div><div class='del'>-	tab.)</div><div class='del'>-</div><div class='del'>-2000-01-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c, widgets/e-minicard.c: Use</div><div class='del'>-	e_canvas_item_grab_focus so that it will work with old versions of</div><div class='del'>-	gnome-canvas.</div><div class='del'>-</div><div class='del'>-	* widgets/e-canvas.c, widgets/e-canvas.h: Finished working around</div><div class='del'>-	focus bugs.</div><div class='del'>-</div><div class='del'>-2000-01-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/test-reflow.c: Set the minimum_width.</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.h, widgets/e-reflow.c: Added one more column</div><div class='del'>-	line so that the right edge of the reflow will have a line.  Also</div><div class='del'>-	added a minimum_width so that even if the reflow is thinner than</div><div class='del'>-	the window, when you resize it larger all the lines are drawn.</div><div class='del'>-</div><div class='del'>-2000-01-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.h, widgets/e-reflow.c: Added an arrow cursor</div><div class='del'>-	for the draggable columns.  Made the clickable column area</div><div class='del'>-	larger.  </div><div class='del'>-</div><div class='del'>-	* widgets/e-text.h, widgets/e-text.c: Added an I beam cursor for</div><div class='del'>-	the text item when it is editable.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c: Forward enter and leave</div><div class='del'>-	notifications to the contained editable text item.</div><div class='del'>-</div><div class='del'>-2000-01-26  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c: By looking up a mimetype in a</div><div class='del'>-	hashtable, we can now get a handler function for an arbitrary</div><div class='del'>-	mimetype.</div><div class='del'>-</div><div class='del'>-2000-01-25  Mathieu Lacage &lt;mathieu@advogato.org&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore s: cvs shutup. </div><div class='del'>-</div><div class='del'>-2000-01-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.c, widgets/e-minicard.c: Handle shift-tab</div><div class='del'>-	properly now.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c: Reindented some areas.</div><div class='del'>-</div><div class='del'>-	* widgets/test-reflow.c: Use e-canvas.  Set the back pixmap to</div><div class='del'>-	NULL for the canvas so that scrolling won't flash grey.</div><div class='del'>-</div><div class='del'>-	* widgets/e-canvas.c, widgets/e-canvas.h: These subclass</div><div class='del'>-	GnomeCanvas to work around a few bugs so that evolution will work</div><div class='del'>-	well with old versions of gnome-libs.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added e-canvas.c and e-canvas.h.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/contact-editor.glade: Not much</div><div class='del'>-	change.  Mostly internal reorganization by glade itself.</div><div class='del'>-</div><div class='del'>-2000-01-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/smallbook.ecps: Example contact printing</div><div class='del'>-	style.  Not used yet.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.glade: A glade file for</div><div class='del'>-	editing contact printing styles.  Not used yet.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/test-print.c: Test file for printing.</div><div class='del'>-</div><div class='del'>-	* addressbook/printing/e-contact-print.c,</div><div class='del'>-	addressbook/printing/e-contact-print.h,</div><div class='del'>-	addressbook/printing/e-contact-print-types.h,</div><div class='del'>-	addressbook/printing/Makefile.am, addressbook/printing/.cvsignore:</div><div class='del'>-	New files for contact printing support.</div><div class='del'>-</div><div class='del'>-	* addressbook/Makefile.am (SUBDIRS): Add printing.</div><div class='del'>-</div><div class='del'>-	* configure.in: Check for gnome-print.  Build the</div><div class='del'>-	addressbook/printing Makefile.</div><div class='del'>-</div><div class='del'>-2000-01-24  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: </div><div class='del'>-	* camel/camel-data-wrapper.c </div><div class='del'>-	(_set_input_stream): </div><div class='del'>-	(_get_input_stream): </div><div class='del'>-	(_set_output_stream): </div><div class='del'>-	(_get_output_stream): </div><div class='del'>-	The CamelDataWrapper can now be provided with input and</div><div class='del'>-	output streams, so that nothing has to be kept in memory. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream.c (camel_stream_class_init): </div><div class='del'>-	added the "data_available" signal.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-01-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Added the gnome-pilot and capplet checks; they</div><div class='del'>-	will likely be reworked for the Evolution framework, but for now</div><div class='del'>-	the calendar/ directory needs them.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added checks for gnome-vfs.</div><div class='del'>-</div><div class='del'>-2000-01-24  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.c: </div><div class='del'>-	* camel/camel-seekable-stream.h: </div><div class='del'>-	new files. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.h:  parent class is now</div><div class='del'>-	CamelSeekableStream</div><div class='del'>-	* camel/camel-stream-buffered-fs.h: idem</div><div class='del'>-	* camel/camel-stream-buffered-fs.c: idem</div><div class='del'>-	* camel/camel-stream-mem.h: idem</div><div class='del'>-	* camel/camel-stream-mem.c: idem</div><div class='del'>-	(_seek): change declaration</div><div class='del'>-	* camel/camel-stream-fs.c: parent class is now</div><div class='del'>-	CamelSeekableStream</div><div class='del'>-	(_seek): change declaration</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.h: parent class is now</div><div class='del'>-	CamelSeekableStream</div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.[ch]: converted all </div><div class='del'>-	gint64 variables into guint32. </div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.c (_read): fix stupid bug.</div><div class='del'>-	(_write): ditto. </div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_new): don't</div><div class='del'>-	forget to clean the exception when creating it. </div><div class='del'>-</div><div class='del'>-	* camel/camel-recipient.c (camel_recipient_table_add_list): </div><div class='del'>-	add recipient_list to the recipients, not recipients_list. </div><div class='del'>-	I don't know what that variable was doing here. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-24  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (write_header_info_to_stream): new</div><div class='del'>-	function, broken out from 'camel_formatter_make_html'.</div><div class='del'>-	(write_mimepart_to_stream): same.</div><div class='del'>-	(find_text_body_part_in_multipart_related): new function.</div><div class='del'>-	(camel_formatter_make_html): Now tries to deal with</div><div class='del'>-	multipart/related, multipart/alternate, and text/(plain|html).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-23  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (camel_store_get_session): </div><div class='del'>-	added a public get_session method.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): </div><div class='del'>-	(camel_mbox_load_summary): load/save message sizes in the summary file</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.h: </div><div class='del'>-	added a size field to the message information </div><div class='del'>-	structure. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): </div><div class='del'>-	copy message size to the mbox summary information too. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.c (_seek): updated to </div><div class='del'>-	work with bounded fs streams. </div><div class='del'>-	(_write): ditto.</div><div class='del'>-	(_read): ditto.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.h (struct ): </div><div class='del'>-	added the cur_pos, inf_bound and sup_bound</div><div class='del'>-	members to allow for bounded fs stream. </div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (_set_bounds): new func.</div><div class='del'>-	(_init_with_fd_and_bounds): idem.</div><div class='del'>-	(_init_with_name_and_bounds): idem. </div><div class='del'>-	New functions to allow the usage of bounded fs streams.</div><div class='del'>-</div><div class='del'>-	The bounded fs stream allow, for example, to make a stream</div><div class='del'>-	from a message stored in an mbox file. </div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-2000-01-22  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_check_get_or_maybe_generate_summary_file): </div><div class='del'>-	use the real summary file path instead of a </div><div class='del'>-	stupid hardcoded one. Fixes yet another bug.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): </div><div class='del'>-	don't forget to copy the date too. Fix a very annoying bug.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_append_message): </div><div class='del'>-	implemented. A lot of fixes too. Works now. </div><div class='del'>-	(_get_uid_list): implemented.</div><div class='del'>-</div><div class='del'>-2000-01-21  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test10.c:</div><div class='del'>-	test the mbox provider. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_set_name): </div><div class='del'>-	if camel_folder_get_mode returns an</div><div class='del'>-	exception, return it instead of</div><div class='del'>-	overriding it with a new one.</div><div class='del'>-	(camel_folder_is_open): make the is_open</div><div class='del'>-	method public.</div><div class='del'>-	(_set_name): use the is_open instead of</div><div class='del'>-	get_mode.</div><div class='del'>-	(_set_name): set the fullname even in the case </div><div class='del'>-	where the folder has no parent.</div><div class='del'>-	(_set_name): use %c, not %d to add the </div><div class='del'>-	separator char into the full path.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c: add exception handling everywhere in</div><div class='del'>-	the store related functions arguments. </div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c: idem</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.h: idem</div><div class='del'>-	* camel/providers/mbox/camel-mbox-store.h: idem</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_SOURCES): </div><div class='del'>-	added camel-mbox-provider.c to the mbox provider</div><div class='del'>-	sources. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-provider.c: </div><div class='del'>-	provider registration code.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): implemented</div><div class='del'>-	(_append_message): implemented</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (initialize_buffer): </div><div class='del'>-	use \0 to mark the end of the buffer.</div><div class='del'>-	(read_next_buffer_chunk): ditto.</div><div class='del'>-	(read_header): test the presence of a \0 instead of</div><div class='del'>-	reading the eof field</div><div class='del'>-	(read_message_begining): idem.</div><div class='del'>-	(camel_mbox_parse_file): idem.</div><div class='del'>-	Remove the eof field from the parser</div><div class='del'>-	structure. </div><div class='del'>-	(read_next_buffer_chunk): removed some nasty bugs</div><div class='del'>-	again. </div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-2000-01-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* libversit/vcc.y: Removed the VFS crap; my mistake, it should not</div><div class='del'>-	go here.</div><div class='del'>-</div><div class='del'>-	* configure.in: Added yacc requirements for libversit.</div><div class='del'>-</div><div class='del'>-2000-01-21  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (camel_formatter_make_html): added a</div><div class='del'>-	CamelMimeMessage as a param to this function, and removed it as a</div><div class='del'>-	member of the object.</div><div class='del'>-</div><div class='del'>-2000-01-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): Added libversit/Makefile and</div><div class='del'>-	calendar/Makefile.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added libversit and calendar.</div><div class='del'>-</div><div class='del'>-2000-01-20  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	compute and return the file size. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-20  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c, camel/camel-formatter.h: New</div><div class='del'>-	files. You'll be able to use a CamelFormatter to get</div><div class='del'>-	html-formatted versions of a CamelMimeMessage.</div><div class='del'>-	</div><div class='del'>-2000-01-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-types.h: Changed some line</div><div class='del'>-	spacing.</div><div class='del'>-</div><div class='del'>-	* widgets/test-reflow.c: Connected to the resize signal of the</div><div class='del'>-	reflow.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c: Made width argument set function only</div><div class='del'>-	update if width is different.</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.h, widgets/e-reflow.c: Added draggable column dividers.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/test-editor.c: Open two dialogs for</div><div class='del'>-	more interesting testing.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.h,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.c: Modified to use</div><div class='del'>-	glade.  Added menus to change which phone/address/email entries to</div><div class='del'>-	view.  Added images to the dialog.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor-strings.h,</div><div class='del'>-	addressbook/contact-editor/contact-editor.glade: Glade files for</div><div class='del'>-	the contact editor dialog.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/Makefile.am: Added images and added</div><div class='del'>-	glade stuff.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/arrow.png,</div><div class='del'>-	addressbook/contact-editor/briefcase.png,</div><div class='del'>-	addressbook/contact-editor/netfreebusy.png,</div><div class='del'>-	addressbook/contact-editor/netmeeting.png: Image files for the</div><div class='del'>-	contact editor dialog.</div><div class='del'>-</div><div class='del'>-2000-01-19  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_get_message_count): </div><div class='del'>-	implemented.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): </div><div class='del'>-	(camel_mbox_load_summary): save/load the next uid. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	Compute the next available uid. </div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_create): </div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): </div><div class='del'>-	Set and use the next_uid field properly. </div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.h: added</div><div class='del'>-	an extra field to store the next available uid. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c </div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): </div><div class='del'>-	routine called when the folder is opened. </div><div class='del'>-	Reads or creates the summary file. </div><div class='del'>-	(_create): initialize the internal summary </div><div class='del'>-	structure. </div><div class='del'>-	(_close): save the summary file on closing. </div><div class='del'>-	(_init_with_store): initialize mbox specific</div><div class='del'>-	folder members. </div><div class='del'>-</div><div class='del'>-2000-01-18  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test9.c:</div><div class='del'>-	tests for summary and parsing process of mbox files. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): do</div><div class='del'>-	not use case insensitive comp to detect message separators. Kill </div><div class='del'>-	some nasty bugs in netscape file parsing,</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): </div><div class='del'>-	don't use g_array_append but write directly inside the</div><div class='del'>-	array data instead. Better performance and bug fix. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_load_summary): </div><div class='del'>-	fix the name and bugs. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-summary.h: update the class</div><div class='del'>-	method definition to match the public defs. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-summary.c (camel_mbox_save_summary): </div><div class='del'>-	(mbox_load_summary): summary file read/write routines. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (parsed_information_to_mbox_summary): </div><div class='del'>-	routine to construct the summary after the mbox</div><div class='del'>-	file has been parsed and the x-evolution fields</div><div class='del'>-	inserted. </div><div class='del'>-</div><div class='del'>-2000-01-17  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): </div><div class='del'>-	dont use the x_evolution field but rather the uid to </div><div class='del'>-	determine the presence of "X-Evolution" in the mail. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	parse the status and uid values if the x-evolution</div><div class='del'>-	has been found. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_xev_parse_header_content): </div><div class='del'>-	return the parsed status field correctly. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.h: </div><div class='del'>-	fixed bad prototype.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	parse and store the "To:" header.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.h: </div><div class='del'>-	added a "to" field </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-summary.c: </div><div class='del'>-	create the arrays here. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-summary.h: the list of </div><div class='del'>-	summary information is no longer a GList but </div><div class='del'>-	rather a GArray.</div><div class='del'>-</div><div class='del'>-2000-01-17  Chrsitopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* head.png, phone.png, email.png, web.png, snailmail.png: Images</div><div class='del'>-	for e-contact-editor.c.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/text-editor.c: Test program</div><div class='del'>-	for contact editor widget.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/e-contact-editor.c,</div><div class='del'>-	addressbook/contact-editor/e-contact-editor.h: Contact editor</div><div class='del'>-	widget files.</div><div class='del'>-</div><div class='del'>-	* addressbook/contact-editor/.cvsignore,</div><div class='del'>-	addressbook/contact-editor/Makefile.am: New directory for contact</div><div class='del'>-	editor files.</div><div class='del'>-</div><div class='del'>-	* addressbook/.cvsignore, addressbook/Makefile.am: New directory</div><div class='del'>-	for addressbook files.</div><div class='del'>-</div><div class='del'>-	* widgets/.cvsignore: Added reflow-test.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added addressbook subdirectory.</div><div class='del'>-</div><div class='del'>-	* configure.in, widgets/Makefile.am: Removed widgets/toolbar from</div><div class='del'>-	SUBDIRS since the lack of content was preventing it from</div><div class='del'>-	compiling.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Fixed a crashing bug.</div><div class='del'>-</div><div class='del'>-2000-01-17  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test9.c (main): test for the mbox utils.</div><div class='del'>-</div><div class='del'>-2000-01-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add the gnomecanvaspixbuf argument to gnome-config</div><div class='del'>-	invocations.</div><div class='del'>-</div><div class='del'>-2000-01-17  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): </div><div class='del'>-	(copy_file_chunk): </div><div class='del'>-	(camel_mbox_xev_write_header_content): </div><div class='del'>-	(string_to_flag): </div><div class='del'>-	(flag_to_string): </div><div class='del'>-	(string_to_uid): </div><div class='del'>-	(uid_to_string): </div><div class='del'>-	A bunch of new funcs to handle x-evolution </div><div class='del'>-	private header field. </div><div class='del'>-	(copy_file_chunk): fixed a nasty bug. </div><div class='del'>-	(camel_mbox_write_xev): create the copy file descriptor</div><div class='del'>-	with the proper arguments. Exceptions implememnted.</div><div class='del'>-	(camel_mbox_write_xev): changed the way bytes are counted. </div><div class='del'>-	No more uses the message size cause it did not take into</div><div class='del'>-	account the message separators characters. </div><div class='del'>-	(camel_mbox_write_xev): hopefully fixed the last bugs. </div><div class='del'>-	works ok now. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-01-15  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c </div><div class='del'>-	(camel_mbox_parse_file): </div><div class='del'>-	store the end of headers position. </div><div class='del'>-	</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.h: </div><div class='del'>-	added the end_of_header_position to locate the </div><div class='del'>-	begining of the mail body. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-utils.c (uid_to_string): </div><div class='del'>-	(string_to_uid): </div><div class='del'>-	(flag_to_string): </div><div class='del'>-	(string_to_flag): </div><div class='del'>-	new functions to handle uids and</div><div class='del'>-	flags in the X-Evolution header. </div><div class='del'>-	(camel_mbox_xev_parse_header_content): </div><div class='del'>-	new function to parse an X-Evolution </div><div class='del'>-	header. </div><div class='del'>-	(camel_mbox_xev_write_header_content): </div><div class='del'>-	new function to write the X-Evolution </div><div class='del'>-	header. </div><div class='del'>-</div><div class='del'>-2000-01-13  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (read_next_buffer_chunk): </div><div class='del'>-	eof is true when no more chars are available, not </div><div class='del'>-	when we've read the entire file. </div><div class='del'>-	(initialize_buffer): ditto.</div><div class='del'>-	(read_message_begining): documented.</div><div class='del'>-	(read_header): ditto.</div><div class='del'>-	(new_message_detected): ditto.</div><div class='del'>-	(advance_n_chars): ditto.</div><div class='del'>-	(goto_next_char): ditto.</div><div class='del'>-	(read_next_buffer_chunk): ditto.</div><div class='del'>-	(initialize_buffer): ditto.</div><div class='del'>-	(parser_free): ditto.</div><div class='del'>-	(new_parser): ditto.</div><div class='del'>-</div><div class='del'>-2000-01-12    &lt;clahey@galapagos.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-types.h,</div><div class='del'>-	widgets/e-text-event-processor-emacs-like.c, widgets/e-text.c,</div><div class='del'>-	widgets/e-text.h: Added selection and clipboard support.  Added up</div><div class='del'>-	and down arrow keys.  Fixed choice of font colors for the</div><div class='del'>-	selection to be based on the current style.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c: Caused a click to grab the focus.  Changed</div><div class='del'>-	the fake information added.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c: Forward mouse events to the field</div><div class='del'>-	EText item.</div><div class='del'>-</div><div class='del'>-2000-01-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-canvas-utils.c, widgets/e-canvas-utils.h:</div><div class='del'>-	e_canvas_item_move_absolute is just a helper function not supplied</div><div class='del'>-	by the gnome_canvas.[ch] I put it here so that multiple items can</div><div class='del'>-	use it.</div><div class='del'>-</div><div class='del'>-	* widgets/e-reflow.c, widgets/e-reflow.h: This item contains a</div><div class='del'>-	number of other items and places them into multiple columns.  The</div><div class='del'>-	items contained must support a number of arguments and signals to</div><div class='del'>-	allow the reflow to interact with them.</div><div class='del'>-</div><div class='del'>-	* widgets/test-reflow.c: This is a test program for e-reflow.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Added properly drawn</div><div class='del'>-	selected text.  Added some preliminary code for X selection</div><div class='del'>-	handling and cut &amp; paste.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c, widgets/e-minicard.h: Added ARG_HAS_FOCUS</div><div class='del'>-	handling.  Made label display random for more interesting tests of</div><div class='del'>-	multiple cards.  Tweaked sizing information for better display.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added</div><div class='del'>-	ARG_HAS_FOCUS handling.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added the reflow test and reflow files.</div><div class='del'>-</div><div class='del'>-2000-01-12  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.h (camel_mbox_parse_file): </div><div class='del'>-	Added the prototype of camel_mbox_parse_file. </div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): </div><div class='del'>-	updated in-line documentation.</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (noinst_PROGRAMS): </div><div class='del'>-	remove non updated tests from the build </div><div class='del'>-	process. </div><div class='del'>-</div><div class='del'>-	* corrected a bunch of bugs </div><div class='del'>-	</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c </div><div class='del'>-	(camel_mbox_parse_file): </div><div class='del'>-	parser the subject and date.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.c </div><div class='del'>-	(camel_mbox_parse_file): added the ability to </div><div class='del'>-	follow the parsing progression. </div><div class='del'>-	</div><div class='del'>-	* camel/providers/mbox/camel-mbox-parser.h: </div><div class='del'>-	parse the x-evolution field. </div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (libcamel_la_SOURCES): </div><div class='del'>-	disabled gmime-rfc2047 as it depends on libunicode</div><div class='del'>-	and is not used for the moment. </div><div class='del'>-</div><div class='del'>-2000-01-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c, widgets/e-minicard.h: Added a resize</div><div class='del'>-	signal for when the card changes height.  Made it so that when you</div><div class='del'>-	press tab inside of a field, it goes to the next field.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added a</div><div class='del'>-	resize signal for when the label changes height.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Added a resize signal for</div><div class='del'>-	multiple lines.  Added scrolling based on cursor position.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Removed an extraneous build target.</div><div class='del'>-</div><div class='del'>-2000-01-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor-emacs-like.c: Blocked the tab key</div><div class='del'>-	from getting inserted into the buffer since the renderer doesn't</div><div class='del'>-	know what a tab is.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Fixed a memory leak.  Added</div><div class='del'>-	a blinking cursor and scrolling for the text item.</div><div class='del'>-</div><div class='del'>-2000-01-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/test-minicard.c: Removed some code which got in the way</div><div class='del'>-	of testing properly.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard-label.c (e_minicard_label_realize): Made the</div><div class='del'>-	field text item editable.</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added e-text-event-process*.[ch].</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.c, widgets/e-text.h: Changed these to support</div><div class='del'>-	editing.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text-event-processor.c,</div><div class='del'>-	widgets/e-text-event-processor.h,</div><div class='del'>-	widgets/e-text-event-processor-types.h,</div><div class='del'>-	widgets/e-text-event-processor-emacs-like.c,</div><div class='del'>-	widgets/e-text-event-processor-emacs-like.h: These are a new pair</div><div class='del'>-	of classes which handle all events from the text item and convert</div><div class='del'>-	them into commands.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/Makefile.am: Added minicard and text stuff.</div><div class='del'>-</div><div class='del'>-	* widgets/e-minicard.c, widgets/e-minicard.h,</div><div class='del'>-	widgets/e-minicard-label.c, widgets/e-minicard-label.h: Added</div><div class='del'>-	canvas items for the minicard view in the contact manager.</div><div class='del'>-</div><div class='del'>-	* widgets/test-minicard.c, widgets/test-minicard-label.c: Tests</div><div class='del'>-	for the minicard items.</div><div class='del'>-</div><div class='del'>-	* widgets/e-text.h, widgets/e-text.c: New canvas item.  Based on</div><div class='del'>-	GnomeCanvasText.  Adds ellipsis capabilities.  Used in</div><div class='del'>-	e-minicard*.[ch].</div><div class='del'>-</div><div class='del'>-	* widgets/.cvsignore: Added minicard-test and minicard-label-test.</div><div class='del'>-</div><div class='del'>-2000-01-06  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in: Add Bonobo detection, Bonobo flags for compilation</div><div class='del'>-	for the components and the shell.</div><div class='del'>-</div><div class='del'>-2000-01-06 Elliot Lee &lt;sopwith@redhat.com&gt;</div><div class='del'>-	* composer/Makefile.am, widgets/e-table/Makefile.am: Work with</div><div class='del'>-	builddir != srcdir</div><div class='del'>-</div><div class='del'>-2000-01-05  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (EXTRA_GNOME_CFLAGS_THREADS,</div><div class='del'>-	EXTRA_GNOME_LIBS_THREADS): New variables that hold the thread</div><div class='del'>-	version of the compile/link lines.</div><div class='del'>-</div><div class='del'>-1999-11-20  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (PACKAGE): Raise warning level.</div><div class='del'>-</div><div class='del'>-2000-01-04  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): </div><div class='del'>-	in the io_error label does not return before the </div><div class='del'>-	list has been freed.</div><div class='del'>-</div><div class='del'>-2000-01-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c (_list_subfolders): </div><div class='del'>-	detects netscape ".sdb" folders as well as simple </div><div class='del'>-	non-suffixed folders (as the ones used in pine).</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/string-utils.c (string_prefix): </div><div class='del'>-	finished implementation. </div><div class='del'>-	(string_prefix): added a boolean flag to indicate if the </div><div class='del'>-	suffix has been found. When the suffix does not match, </div><div class='del'>-	return NULL.</div><div class='del'>-</div><div class='del'>-1999-12-26 bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_setv): </div><div class='del'>-	new function. Allow printf-like description</div><div class='del'>-	string constructions. </div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.h: cosmetic changes.</div><div class='del'>-</div><div class='del'>-        * camel/providers/mbox/camel-mbox-store.h:</div><div class='del'>-        * camel/providers/mbox/camel-mbox-store.c:</div><div class='del'>-        * camel/providers/mbox/camel-mbox-folder.h:</div><div class='del'>-        * camel/providers/mbox/camel-mbox-folder.c:</div><div class='del'>-        More work on the mbox provider.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-12-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-store.h: </div><div class='del'>-	* camel/providers/mbox/camel-mbox-store.c: </div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.h: </div><div class='del'>-	* camel/providers/mbox/camel-mbox-folder.c: </div><div class='del'>-	part of the mbox provider.</div><div class='del'>-</div><div class='del'>-1999-12-20  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_set_name): </div><div class='del'>-	check that the folder is closed or raise an exception.</div><div class='del'>-	(_set_name): unset the name fields as soon as possible, </div><div class='del'>-	even if an exception is raised.</div><div class='del'>-</div><div class='del'>-	* configure.in:</div><div class='del'>-	build mbox provider Makefile</div><div class='del'>-	</div><div class='del'>-	* camel/Makefile.am (SUBDIRS): </div><div class='del'>-	re-enable providers compilation</div><div class='del'>-</div><div class='del'>-1999-12-19  Damon Chaplin  &lt;damon@karuna.freeserve.co.uk&gt;</div><div class='del'>-</div><div class='del'>-	* configure.in (AC_OUTPUT): added widgets/meeting-time-sel/Makefile</div><div class='del'>-</div><div class='del'>-1999-12-19  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-utils.c: include camel-log.h</div><div class='del'>-	to avoid unresolved symbols.</div><div class='del'>-</div><div class='del'>-1999-12-18  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_summary): </div><div class='del'>-	documented.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_append_message): </div><div class='del'>-	updated to take the change on append into account.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h: </div><div class='del'>-	updated class def concerning append.</div><div class='del'>-	* camel/camel-folder.c </div><div class='del'>-	(camel_folder_append_message): documented. </div><div class='del'>-	(camel_folder_append_message): don't return the </div><div class='del'>-	message number. Use specific methods instead.</div><div class='del'>-	(_append_message): idem.</div><div class='del'>-</div><div class='del'>-	(_delete): use 	exception mechanism.</div><div class='del'>-	(camel_folder_delete): idem.</div><div class='del'>-	(_delete_messages): idem.</div><div class='del'>-	(camel_folder_delete_messages): idem.</div><div class='del'>-	(_get_parent_folder): idem.</div><div class='del'>-	(camel_folder_get_parent_folder): idem.</div><div class='del'>-	(_get_parent_store): idem.</div><div class='del'>-	(_get_mode): idem.</div><div class='del'>-	(camel_folder_get_parent_store): idem.</div><div class='del'>-	(camel_folder_get_mode): idem.</div><div class='del'>-	(_list_subfolders): idem.</div><div class='del'>-	(camel_folder_list_subfolders): idem.</div><div class='del'>-	(_expunge): idem.</div><div class='del'>-	(camel_folder_expunge): idem.</div><div class='del'>-	(_has_message_number_capability): idem.</div><div class='del'>-	(camel_folder_has_message_number_capability): idem.</div><div class='del'>-	(_get_message_by_number): idem.</div><div class='del'>-	(camel_folder_get_message_by_number): idem.</div><div class='del'>-	(camel_folder_get_message_count): idem.</div><div class='del'>-	(_list_permanent_flags): idem.</div><div class='del'>-	(camel_folder_list_permanent_flags): idem.</div><div class='del'>-	(_copy_message_to): idem.</div><div class='del'>-	(camel_folder_copy_message_to): idem.</div><div class='del'>-	(camel_folder_has_summary_capability): idem.</div><div class='del'>-	(camel_folder_get_summary): idem.</div><div class='del'>-	(camel_folder_has_uid_capability): idem.</div><div class='del'>-	(camel_folder_get_message_uid): idem.</div><div class='del'>-	(_get_message_uid_by_number): idem.</div><div class='del'>-	(camel_folder_get_message_uid_by_number): idem.</div><div class='del'>-	(camel_folder_get_message_by_uid): idem.</div><div class='del'>-	(camel_folder_get_uid_list): idem.</div><div class='del'>-</div><div class='del'>-1999-12-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_set_name): </div><div class='del'>-	use exception mechanism.</div><div class='del'>-	(camel_folder_set_name): idem.</div><div class='del'>-	(camel_folder_set_full_name): idem.</div><div class='del'>-	(_get_name): idem.</div><div class='del'>-	(camel_folder_get_name): idem.</div><div class='del'>-	(_get_full_name): idem.</div><div class='del'>-	(camel_folder_get_full_name): idem.</div><div class='del'>-	(_can_hold_folders): idem.</div><div class='del'>-	(_can_hold_messages): idem.</div><div class='del'>-	(_exists): idem.</div><div class='del'>-	(camel_folder_exists): idem.</div><div class='del'>-	(_is_open): idem.</div><div class='del'>-	(_get_subfolder): idem.</div><div class='del'>-	(camel_folder_get_subfolder): idem.</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_clear): </div><div class='del'>-	New function. Clear an exception.</div><div class='del'>-	(camel_exception_get_id): </div><div class='del'>-	New function. </div><div class='del'>-	(camel_exception_get_description): </div><div class='del'>-	New function. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_set_name): </div><div class='del'>-	Use the exception system. When the folder</div><div class='del'>-	has no parent, don't set its full name </div><div class='del'>-	field.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-1999-12-16  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_expunge): </div><div class='del'>-	(_expunge): </div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_expunge): </div><div class='del'>-	changed the return value. Now returns the list </div><div class='del'>-	of expunged messages</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_init_with_store): </div><div class='del'>-	cleaned up. Use the exception system now.</div><div class='del'>-	(_open): ditto.</div><div class='del'>-	(camel_folder_open): ditto.</div><div class='del'>-	(camel_folder_open_async): ditto.</div><div class='del'>-	(_close):  ditto.</div><div class='del'>-	(camel_folder_close):  ditto.</div><div class='del'>-	(camel_folder_close_async): ditto.</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_set): </div><div class='del'>-	When no exception is given, do nothing, just</div><div class='del'>-	return. </div><div class='del'>-	(camel_exception_set): documented.</div><div class='del'>-	(camel_exception_new): idem.</div><div class='del'>-	(camel_exception_free): idem.</div><div class='del'>-	(camel_exception_xfer): idem.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c:</div><div class='del'>-	* camel/camel-folder.h: more clean-ups. </div><div class='del'>-	Removed message list related code. </div><div class='del'>-	This was braindead design. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-utils.c (camel_aml_expunge_messages): </div><div class='del'>-	implemented. The routines in this file will be</div><div class='del'>-	called by providers to handle the list of</div><div class='del'>-	message already standing in memory. </div><div class='del'>-</div><div class='del'>-1999-12-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-utils.c: </div><div class='del'>-	* camel/camel-folder-utils.h: </div><div class='del'>-	New files, misc utilities for the </div><div class='del'>-	folder providers. Includes active message</div><div class='del'>-	list utilities. </div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder.c (_has_message_number_capability): </div><div class='del'>-	(camel_folder_has_message_number_capability): </div><div class='del'>-	Added this to know if a folder provides </div><div class='del'>-	number-based message access.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_message_count): </div><div class='del'>-	added warning when called directly.</div><div class='del'>-	(_append_message): ditto</div><div class='del'>-	(_open_async):  ditto</div><div class='del'>-	(_close_async):  ditto</div><div class='del'>-	(_delete_messages): ditto </div><div class='del'>-	(_expunge):  ditto</div><div class='del'>-	(_get_message_by_number):  ditto</div><div class='del'>-	(_get_message_uid):  ditto</div><div class='del'>-	(_get_message_uid_by_number):  ditto</div><div class='del'>-	(_get_message_by_uid):  ditto</div><div class='del'>-	(_get_uid_list):  ditto</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_open_async): </div><div class='del'>-	(_open): </div><div class='del'>-	(_close_async): </div><div class='del'>-	(_close): </div><div class='del'>-	(camel_folder_pt_proxy_class_init): </div><div class='del'>-	update </div><div class='del'>-	(_get_message_by_number): </div><div class='del'>-	Update to reflect changes in CamelFolder</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h: </div><div class='del'>-	* camel/camel-folder.c (_get_subfolder): </div><div class='del'>-	(camel_folder_get_subfolder): </div><div class='del'>-	The CamelFolder::get_folder is renamed to </div><div class='del'>-	get_subfolder as it is more intuitive. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_message_by_number): </div><div class='del'>-	(camel_folder_get_message_by_number): </div><div class='del'>-	* camel/camel-folder.h </div><div class='del'>-	(camel_folder_get_message_by_number): </div><div class='del'>-	The get_message method is now named</div><div class='del'>-	get_message_by_number for consistency</div><div class='del'>-	with the _by_uid methods.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.[ch]: </div><div class='del'>-	 clean-ups. </div><div class='del'>-</div><div class='del'>-1999-12-13  Nat Friedman  &lt;nat@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ebook/e-book.h: New file.</div><div class='del'>-	* ebook/e-book.c: New file.</div><div class='del'>-	* ebook/e-card.h: New file.</div><div class='del'>-	* ebook/e-card-fields.h: New file.</div><div class='del'>-	* ebook/e-commerce.h: New file. :-)</div><div class='del'>-</div><div class='del'>-1999-12-08  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Removed the strdup()s, which are not</div><div class='del'>-	deeded anymore.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_set_subject): `subject' made const.</div><div class='del'>-	(camel_mime_message_set_subject): Likewise.</div><div class='del'>-	(_set_from): `from' made const.</div><div class='del'>-	(camel_mime_message_set_from): Likewise.</div><div class='del'>-	(_set_reply_to): Made `reply_to' const.</div><div class='del'>-	(camel_mime_message_set_reply_to): Likewise.</div><div class='del'>-	(_set_set_received_date): Made `received_date' const.</div><div class='del'>-	(camel_mime_message_set_reply_to): Likewise.</div><div class='del'>-	(_set_field): `value' made const.  Also, strdup the string before</div><div class='del'>-	assigning.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.h: Virtual methods changed to use const</div><div class='del'>-	strings when setting header values.</div><div class='del'>-</div><div class='del'>-1999-11-17  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* composer/Makefile.am (EXTRA_DIST): Added `$(glade_DATA)'.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (EXTRA_DIST): Added</div><div class='del'>-	`$(libcamel_extra_sources)'.</div><div class='del'>-	(libcamelinclude_HEADERS): Added `gmime-base64.h'.</div><div class='del'>-</div><div class='del'>-1999-11-17  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_stream): Removed extra ':'</div><div class='del'>-	in the `Mime-Version' header.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/msg-composer-test.c: Removed.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added `composer'.</div><div class='del'>-</div><div class='del'>-	* configure.in: Create `composer/Makefile'.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.c</div><div class='del'>-	(camel_simple_data_wrapper_stream_construct): Updated accordingly.</div><div class='del'>-	(camel_simple_data_wrapper_stream_new): Updated accordingly.</div><div class='del'>-	* camel/camel-stream-data-wrapper.c</div><div class='del'>-	(camel_stream_data_wrapper_construct): Updated accordingly.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: Replaced `IS_CAMEL...()' type check</div><div class='del'>-	macro name with `CAMEL_IS...()'.</div><div class='del'>-	* camel/camel-folder-pt-proxy.h: Likewise.</div><div class='del'>-	* camel/camel-folder-summary.h: Likewise. </div><div class='del'>-	* camel/camel-folder.h: Likewise. </div><div class='del'>-	* camel/camel-medium.h: Likewise. </div><div class='del'>-	* camel/camel-mime-body-part.h: Likewise.</div><div class='del'>-	* camel/camel-mime-message.h: Likewise. </div><div class='del'>-	* camel/camel-mime-part.h: Likewise. </div><div class='del'>-	* camel/camel-multipart.h: Likewise. </div><div class='del'>-	* camel/camel-service.h: Likewise. </div><div class='del'>-	* camel/camel-session.h: Likewise. </div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.h: Likewise. </div><div class='del'>-	* camel/camel-simple-data-wrapper.h: Likewise.</div><div class='del'>-	* camel/camel-store.h: Likewise.</div><div class='del'>-	* camel/camel-stream-buffered-fs.h: Likewise.</div><div class='del'>-	* camel/camel-stream-data-wrapper.h: Likewise. </div><div class='del'>-	* camel/camel-stream-fs.h: Likewise. </div><div class='del'>-	* camel/camel-stream-mem.h: Likewise. </div><div class='del'>-	* camel/camel-stream.h: Likewise. </div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): Updated to match the `RECIPIENT_TYPE'</div><div class='del'>-	changes.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.h: Changed `RECIPIENT_TYPE_TO',</div><div class='del'>-	`RECIPIENT_TYPE_CC' and `RECIPIENT_TYPE_BCC' into</div><div class='del'>-	`CAMEL_RECIPIENT_TYPE_TO', `CAMEL_RECIPIENT_TYPE_CC' and</div><div class='del'>-	`CAMEL_RECIPIENT_TYPE_BCC', respectively.</div><div class='del'>-</div><div class='del'>-1999-11-17  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_stream): Write</div><div class='del'>-	"Mime-Version: 1.0" to the stream.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c: If executed with a file name parameter, attach a</div><div class='del'>-	file with with that name to the email without loading it into</div><div class='del'>-	core, thus demonstrating usage of my latest changes.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_set_encoding): Updated to use</div><div class='del'>-	`CamelMimePartEncodingType'.</div><div class='del'>-	(camel_mime_part_set_encoding): Likewise.</div><div class='del'>-	(_get_encoding): Likewise.</div><div class='del'>-	(camel_mime_part_get_encoding): Likewise.</div><div class='del'>-	(_write_content_to_stream): Honour the `encoding' member.</div><div class='del'>-	(_construct_from_stream): Made static.</div><div class='del'>-	(camel_mime_part_encoding_to_string): New function.</div><div class='del'>-	(_write_to_stream): Write the encoding string using it.</div><div class='del'>-	(camel_mime_part_init): Set encoding to</div><div class='del'>-	`CAMEL_MIME_PART_ENCODING_DEFAULT'.</div><div class='del'>-	(_finalize): Don't free `encoding' anymore.</div><div class='del'>-	(camel_mime_part_encoding_from_string): New function.</div><div class='del'>-	(_parse_header_pair): Use it.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.h: New enum `CamelMimePartEncodingType'.</div><div class='del'>-	Member `encoding' of `struct _CamelMimePart' changed from `gchar</div><div class='del'>-	*' to `CamelMimePartEncodingType'.  All the encoding-related</div><div class='del'>-	methods changed to use this type instead of `gchar *'.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-base64.c (gmime_encode_base64): Got it to work.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (libcamel_la_SOURCES): Compile</div><div class='del'>-	`gmime-base64.c'.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-base64.h: New, previously missing, header.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-data-wrapper.c: New file implementing the</div><div class='del'>-	`CamelStreamDataWrapper' class.</div><div class='del'>-	* camel/camel-stream-data-wrapper.h: Corresponding header.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c: Implemented the `get_stream'</div><div class='del'>-	virtual method.</div><div class='del'>-	(_get_stream): New function implementing the method.</div><div class='del'>-	(camel_simple_data_wrapper_class_init): Install it in the class</div><div class='del'>-	struct.</div><div class='del'>-	(camel_simple_data_wrapper_init): New function initializing the</div><div class='del'>-	`stream' member to NULL,</div><div class='del'>-	(camel_simple_data_wrapper_class_init): Set it as the</div><div class='del'>-	GtkObjectInitFunc.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.h: New member `stream' in</div><div class='del'>-	`struct _CamelSimpleDataWrapper'.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.c: New file implementing</div><div class='del'>-	the `CamelSimpleDataWrapperStream' class.</div><div class='del'>-	* camel/camel-simple-data-wrapper-stream.h: Corresponding header.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (camel_data_wrapper_get_stream): New</div><div class='del'>-	function.</div><div class='del'>-	(_get_stream): New private function, just returning NULL.</div><div class='del'>-	(camel_data_wrapper_class_init): Install it as the default</div><div class='del'>-	`get_stream' virtual method.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: New virtual method `get_stream' in</div><div class='del'>-	`CamelDataWrapperClass'.</div><div class='del'>-	(camel_data_wrapper_get_stream): New function prototype.</div><div class='del'>-</div><div class='del'>-1999-11-05  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/msg-composer-test.c: New file for testing the</div><div class='del'>-	`EMsgComposer' widget.</div><div class='del'>-	* tests/ui-tests/Makefile.am (noinst_PROGRAMS): Compile it.  Do</div><div class='del'>-	not compile `store_listing' for now because it's currently broken.</div><div class='del'>-	(INCLUDES): Added the `widgets' source directory to the include</div><div class='del'>-	path list.</div><div class='del'>-	(LDADD): Removed the MH dependency; link with</div><div class='del'>-	`libevolutionwidgets.la' from the `widgets' directory.</div><div class='del'>-</div><div class='del'>-	* configure.in: Create `widgets/Makefile'.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c (rfc2047_clean): Removed C++-like comment.</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_message_uid_by_number):</div><div class='del'>-	Likewise.</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_get_parameter):</div><div class='del'>-	Likewise.</div><div class='del'>-	* camel/camel.c (camel_init): Likewise.</div><div class='del'>-	* camel/camel-provider.c (camel_provider_register): Likewise.</div><div class='del'>-	* camel/camel-multipart.c (_construct_from_stream): Likewise.</div><div class='del'>-	* camel/camel-mime-part.c (_write_content_to_stream): Likewise.</div><div class='del'>-	* camel/camel-medium.c (camel_medium_class_init): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h (camel_data_wrapper_get_type): Make</div><div class='del'>-	prototype non-static.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (libcamelinclude_HEADERS): Move</div><div class='del'>-	`camel-exception-list.def' from `EXTRA_DIST' to</div><div class='del'>-	`libcamelinclude_HEADERS'.</div><div class='del'>-</div><div class='del'>-	* camel/camel.h: Do not #include &lt;config.h&gt;.</div><div class='del'>-	* camel/data-wrapper-repository.h: Likewise.</div><div class='del'>-</div><div class='del'>-1999-11-05  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/Makefile.am (INCLUDES): Add `-I$(top_srcdir)'.</div><div class='del'>-</div><div class='del'>-1999-10-13  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_close): the </div><div class='del'>-	folder-&gt;close method is now asynchronous.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_folder_open_cb): </div><div class='del'>-	(_open): </div><div class='del'>-	(_folder_open_cb): </div><div class='del'>-	(_open): </div><div class='del'>-	open/close method implemented in the thread proxy</div><div class='del'>-	folder. More to come.</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c (camel_exception_xfer): </div><div class='del'>-	new utility func.</div><div class='del'>-</div><div class='del'>-	* camel/camel-marshal-utils.c: some new marshallers</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c: Some explanations</div><div class='del'>-	on the thread proxy system.</div><div class='del'>-</div><div class='del'>-1999-10-11  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-marshal-utils.c: </div><div class='del'>-	camel/camel-marshal-utils.h:</div><div class='del'>-	Handles operation marshalling. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-thread-proxy.c: </div><div class='del'>-	camel/camel-thread-proxy.h: </div><div class='del'>-	new files. Generic proxy system.</div><div class='del'>-	  </div><div class='del'>-	* camel/camel-folder-pt-proxy.c </div><div class='del'>-	moved all proxy related code in dedicated files.</div><div class='del'>-	</div><div class='del'>-	(camel_folder_pt_proxy_init): </div><div class='del'>-	removed proxy initialisation code</div><div class='del'>-	(_finalize): </div><div class='del'>-	removed proxy finalization code</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* camel/camel-exception.c </div><div class='del'>-	(camel_exception_new): </div><div class='del'>-	(camel_exception_set): </div><div class='del'>-	(camel_exception_free): </div><div class='del'>-	New funcs.</div><div class='del'>-</div><div class='del'>-1999-09-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_async_close): </div><div class='del'>-	implemented.</div><div class='del'>-</div><div class='del'>-	* configure.in:</div><div class='del'>-	Check pthreads.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am: </div><div class='del'>-	camel-folder-pt-proxy.c is only compiled</div><div class='del'>-	when pthreads are available.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder-pt-proxy.c:</div><div class='del'>-	Signal proxying implemenatation. </div><div class='del'>-	(_signal_marshaller_server_side): </div><div class='del'>-	(_signal_marshaller_client_side): </div><div class='del'>-	(_init_signals_proxy): </div><div class='del'>-	Code not is tested and has to be best </div><div class='del'>-	explained as it uses threads conditions and</div><div class='del'>-	gtk signal system.</div><div class='del'>-	(_thread_notification_catch): notify pending signals</div><div class='del'>-	as well as thread availability.</div><div class='del'>-</div><div class='del'>-1999-09-20  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): </div><div class='del'>-	completed</div><div class='del'>-</div><div class='del'>-	Binch of new funcs:</div><div class='del'>-	(_maybe_run_next_op): </div><div class='del'>-	Called by the watch notification when </div><div class='del'>-	a threaded op is completed</div><div class='del'>-	(_thread_notification_catch): </div><div class='del'>-	notification watch call back</div><div class='del'>-	(_init_notify_system): </div><div class='del'>-	set up the notification channel</div><div class='del'>-	(notify_availability): </div><div class='del'>-	called by threads before completion.</div><div class='del'>-</div><div class='del'>-1999-09-18  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_op_exec_or_plan_for_exec): </div><div class='del'>-	new func. Try to exec an operation in a thread</div><div class='del'>-	or queue it if a thread is already busy.</div><div class='del'>-</div><div class='del'>-	* camel/camel-op-queue.c (camel_op_queue_set_service_availability): </div><div class='del'>-	(camel_op_queue_get_service_availability): </div><div class='del'>-	new funcs. </div><div class='del'>-</div><div class='del'>-	* camel/camel-op-queue.c (camel_op_new): </div><div class='del'>-	(camel_op_free): </div><div class='del'>-	new funcs. Uses glib mem chunks.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-09-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_init_with_store): </div><div class='del'>-	added notify io_channel.</div><div class='del'>-</div><div class='del'>-	* camel/camel-op-queue.h: </div><div class='del'>-	* camel/camel-op-queue.c: </div><div class='del'>-	New object. Operation queue. Meant to be used in </div><div class='del'>-	non-blocking proxy objects.</div><div class='del'>-	(camel_op_queue_run_next_op): new func. </div><div class='del'>-	run the next operation.</div><div class='del'>-</div><div class='del'>-1999-09-14  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am (libcamel_la_SOURCES): </div><div class='del'>-	added camel-folder-pt-proxy.[ch] to the build</div><div class='del'>-	process.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-pt-proxy.c (_init_with_store): </div><div class='del'>-	started implementation of the pthread-based </div><div class='del'>-	folder proxy.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-09-08  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/mh-summary.c </div><div class='del'>-	(mh_load_summary): </div><div class='del'>-	(mh_save_summary): </div><div class='del'>-	(mh_create_summary): </div><div class='del'>-	implemented summary (files) for MH folders.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c </div><div class='del'>-	(_get_message_by_uid): implemented.</div><div class='del'>-	(camel_mh_folder_class_init): </div><div class='del'>-	(_get_message_uid): implemented</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_has_uid_capability): </div><div class='del'>-	(camel_folder_get_message_uid): </div><div class='del'>-	(camel_folder_get_message_uid_by_number): </div><div class='del'>-	(camel_folder_get_message_by_uid): </div><div class='del'>-	(camel_folder_get_uid_list): </div><div class='del'>-	Documented UID methods.</div><div class='del'>-	(camel_folder_get_message_uid_by_number): </div><div class='del'>-	const'ified uid.</div><div class='del'>-	(camel_folder_get_message_by_uid): idem</div><div class='del'>-	removed stupid camel_folder_get_message_uid_by_number</div><div class='del'>-	method.</div><div class='del'>-	</div><div class='del'>-	* tests/ui-tests/store_listing.c (close_all): </div><div class='del'>-	close all open folders and stores. (necessary</div><div class='del'>-	for UID list saving ).</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/mh-uid.c (mh_generate_uid_list): </div><div class='del'>-	fix: store UID list in CamelMHFolder object.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_open): </div><div class='del'>-	read or create UID list.</div><div class='del'>-	(_close): save UID list.</div><div class='del'>-</div><div class='del'>-1999-09-07  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.c (md5_get_digest_from_file): </div><div class='del'>-	correct parameter decl (const)</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.h: typo.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/mh-uid.c </div><div class='del'>-	More work on UID stuff for MH.</div><div class='del'>-	(mh_save_uid_list): </div><div class='del'>-	(mh_load_uid_list): </div><div class='del'>-	(mh_generate_uid_list): </div><div class='del'>-	new funcs. Manage on-disk uid list.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/mh-utils.c (mh_is_a_message_file): </div><div class='del'>-	Util routines live here now.</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.c </div><div class='del'>-	Documented all funcs.</div><div class='del'>-	</div><div class='del'>-	(md5_get_digest_from_stream): </div><div class='del'>-	correct typo.</div><div class='del'>-	(md5_get_digest_from_file): </div><div class='del'>-	same typo corrected.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.h : </div><div class='del'>-	raw routines are declared public now.</div><div class='del'>-	Md5 use has to be versatile.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/mh-uid.c (mh_uid_get_for_file): </div><div class='del'>-	new func. Returns an UID for an MH message.</div><div class='del'>-		</div><div class='del'>-1999-09-06  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.h:</div><div class='del'>-	* camel/md5-utils.c:</div><div class='del'>-	changed names to follow camel style.</div><div class='del'>-	(md5_get_digest_from_stream): </div><div class='del'>-	new methods.</div><div class='del'>-	(md5_get_digest_from_file): </div><div class='del'>-	new function : get file md5 signature. </div><div class='del'>-	To be used in providers code.</div><div class='del'>-</div><div class='del'>-	* camel/md5-utils.c: imported md5 coding </div><div class='del'>-	routine from rpm. Compiles.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-09-05  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_has_uid_capability): </div><div class='del'>-	(camel_folder_get_message_uid): </div><div class='del'>-	(camel_folder_get_message_uid_by_number): </div><div class='del'>-	(camel_folder_get_message_by_uid): </div><div class='del'>-	(camel_folder_get_uid_list): </div><div class='del'>-	Basic UID framework.</div><div class='del'>-	</div><div class='del'>-	* devel-docs/misc/ref_and_id_proposition.txt:</div><div class='del'>-	New revision. Some fixes.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h (struct _CamelFolder): added </div><div class='del'>-	uid_capability field.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_close): publicized</div><div class='del'>-	the close method.</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c (show_folder_messages): </div><div class='del'>-	use folder summary instead of opening all messages.</div><div class='del'>-	(show_folder_messages): re-enabled old CPU/Mem consumming</div><div class='del'>-	method. Useful for pop3 for instance.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_create_summary): </div><div class='del'>-	basic and highly non-efficient summary implementation.</div><div class='del'>-	Should be seen as a proof of concept only.</div><div class='del'>-	subfolder summary still has to be implemented.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/maildir/camel-maildir-folder.c (_init_with_store): </div><div class='del'>-	hasn't summary for the moment. </div><div class='del'>-	* camel/providers/maildir/camel-maildir-folder.c</div><div class='del'>-	cosmetic changes.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-09-04  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_create_summary):</div><div class='del'>-	started summary implementation.</div><div class='del'>-	(_open): correct use of open.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_summary): </div><div class='del'>-	get folder associated summary object.</div><div class='del'>-</div><div class='del'>-	* camel/Makefile.am:</div><div class='del'>-	added summary files build</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder-summary.[ch]: </div><div class='del'>-	basic summary framework</div><div class='del'>-</div><div class='del'>-1999-09-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/camel/Makefile.am:</div><div class='del'>-	sgml doc has camel-recipient now.</div><div class='del'>-</div><div class='del'>-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): </div><div class='del'>-	added in-line documentation.</div><div class='del'>-</div><div class='del'>-1999-09-02  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/maildir: Added (experimental) maildir </div><div class='del'>-	provider written by Jukka Zitting &lt;hukka@greywolves.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/providers/Makefile.am (SUBDIRS): build maildir</div><div class='del'>-	provider.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_get_for_protocol):</div><div class='del'>-	bug fix. patch from  Jukka Zitting &lt;hukka@greywolves.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): </div><div class='del'>-	changed decl to fit CRLFunc. </div><div class='del'>-	(_write_recipients_to_stream): </div><div class='del'>-	calls camel_recipient_foreach_recipient_type now.</div><div class='del'>-</div><div class='del'>-	* camel/camel-recipient.c (camel_recipient_foreach_recipient_type): </div><div class='del'>-	new convinience function. Iterate over all recipient types.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_write_header_table_to_stream): </div><div class='del'>-	s/write_header_table_to_stream/gmime_write_header_table_to_stream/</div><div class='del'>-	(gmime_write_header_with_glist_to_stream): </div><div class='del'>-	s/write_header_with_glist_to_stream/gmime_write_header_with_glist_to_stream/</div><div class='del'>-</div><div class='del'>-1999-09-01  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_finalize): </div><div class='del'>-	(_add_recipient): </div><div class='del'>-	(_remove_recipient): </div><div class='del'>-	(_get_recipients): now use CamelRecipientTable</div><div class='del'>-	</div><div class='del'>-	* camel/gmime-content-field.c: </div><div class='del'>-	(gmime_content_field_unref): test if object </div><div class='del'>-	to free is non void.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_finalize): </div><div class='del'>-	(_set_name): </div><div class='del'>-	* camel/camel-mime-part.c (_finalize): </div><div class='del'>-	(_set_description): </div><div class='del'>-	(_set_disposition): </div><div class='del'>-	* camel/camel-service.c (_finalize): </div><div class='del'>-	* camel/camel-stream-fs.c (_finalize): </div><div class='del'>-	* camel/gmime-content-field.c: </div><div class='del'>-	(gmime_content_field_construct_from_string): </div><div class='del'>-</div><div class='del'>-	* camel/url-util.c (g_url_free): </div><div class='del'>-</div><div class='del'>-	When using g_free (obj) don't test if obj != NULL</div><div class='del'>-	g_free () already do that. Thanks to elerium for</div><div class='del'>-	the feedback.</div><div class='del'>-</div><div class='del'>-1999-08-30  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-recipient.c (camel_recipient_get): </div><div class='del'>-	(camel_recipient_remove): </div><div class='del'>-	(camel_recipient_add): </div><div class='del'>-	new func. More work on new independant recipient code. </div><div class='del'>-</div><div class='del'>-1999-08-29  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* MAINTAINERS: updated my e-mail address. </div><div class='del'>-</div><div class='del'>-1999-08-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_set_text): </div><div class='del'>-	text parameter declared const</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part-utils.c (camel_mime_part_store_stream_in_buffer): </div><div class='del'>-	actually test correctly nb_bytes_read_chunk is &gt;0</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c: </div><div class='del'>-	* camel/gmime-content-field.c: </div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c:</div><div class='del'>-	* camel/camel-stream-fs.c:</div><div class='del'>-	include string.h</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-mem.c (_write): return </div><div class='del'>-	the numver of written bytes.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-buffered-fs.c (_eos): </div><div class='del'>-	return sthg</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (default_camel_seek): </div><div class='del'>-	return something.</div><div class='del'>-</div><div class='del'>-1999-08-26  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_get_content_object): </div><div class='del'>-	contruct the content from the buffer before calling</div><div class='del'>-	CamelMedium implementation.</div><div class='del'>-	(_construct_from_stream): Do not construct the content </div><div class='del'>-	by default, just store the content bytes in </div><div class='del'>-	a temporary buffer. Content will be constructed only</div><div class='del'>-	at caller request (when calling CamelMedium::get_content_object)</div><div class='del'>-	Providers with better access to the messages (mbox/MH ...)</div><div class='del'>-	will have to provider lighter implementation, that is</div><div class='del'>-	shall not read content at all unless the caller asks</div><div class='del'>-	for it (again with get_content).</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part-utils.c: new file, groups</div><div class='del'>-	mime-part related utils. Meant to be used by providers</div><div class='del'>-	subclassing MimeMessage.</div><div class='del'>-	(camel_mime_part_construct_headers_from_stream): </div><div class='del'>-	(camel_mime_part_construct_content_from_stream): </div><div class='del'>-	no more useless temporary hash table. </div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): calls</div><div class='del'>-	mime-part-utils functions now.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (_store_header_pair_from_string): </div><div class='del'>-	do not use hash table to store header, use an array instead.</div><div class='del'>-</div><div class='del'>-1999-08-25  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c: now descend from CamelMedium.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): all headers must be strdup'ed</div><div class='del'>-	(main): unref created objects</div><div class='del'>-</div><div class='del'>-	* camel/camel-medium.c (_set_content_object): </div><div class='del'>-	(_get_content_object): these methods are </div><div class='del'>-	in CamelMedium now.</div><div class='del'>-</div><div class='del'>-1999-08-24  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-medium.c (camel_medium_class_init): </div><div class='del'>-	new class. Will handle all sort of information media </div><div class='del'>-	(Mime mail messages, Lotus Notes  mail messages, </div><div class='del'>-	postit notes, faxes, who knows .... :)</div><div class='del'>-	CamelMimePart will inherit from it.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_set_disposition): </div><div class='del'>-	(_set_description):</div><div class='del'>-	description and disposition parameters are now const.</div><div class='del'>-	 </div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_free): added</div><div class='del'>-	assertion code.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_get_message): </div><div class='del'>-	uses buffered stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-buffered-fs.c:</div><div class='del'>-	new stream to accelerate file ops.</div><div class='del'>-</div><div class='del'>-1999-08-20  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): </div><div class='del'>-	name parameter is const. This fixes a bug in destroy ()</div><div class='del'>-</div><div class='del'>-1999-08-18  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: more work on encoder.</div><div class='del'>-</div><div class='del'>-1999-08-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (camel_stream_read): </div><div class='del'>-	return the number of bytes read. </div><div class='del'>-	How can this have ever worked ?</div><div class='del'>-	(camel_stream_flush): don't return anything.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_stream): </div><div class='del'>-	mem leak fixed.</div><div class='del'>-</div><div class='del'>-1999-08-16  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c:</div><div class='del'>-	Now has a popup menu on mailbox tree to allow</div><div class='del'>-	easier tests. Implemented the copy stuff.</div><div class='del'>-	Works well for the MH provider :)))</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_copy_message_to): </div><div class='del'>-	Test MH provider fast copy implemented.</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-1999-08-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_expunge): </div><div class='del'>-	moved the active list readjustment code here.</div><div class='del'>-	Much saner, providers won't have to worry about</div><div class='del'>-	that.</div><div class='del'>-	(_copy_message_to): new method.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_expunge): </div><div class='del'>-	no more active list readjustment stuff.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h: the expunge virtual no more</div><div class='del'>-	returns a list of expunged messages. Now providers</div><div class='del'>-	only have to set the expunge flag on the expunged</div><div class='del'>-	messages.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_message): </div><div class='del'>-	moved the caching code here. Finally, I don't want</div><div class='del'>-	providers to crash the libs with a bad message cache</div><div class='del'>-	implementation. </div><div class='del'>-	(_close): do not call the CamelFolder virtual expunge </div><div class='del'>-	method directly, use camel_folder_expunge() instead.</div><div class='del'>-	(camel_folder_expunge): added the want_list param. </div><div class='del'>-	The client can decide if it wants the expunged message</div><div class='del'>-	list or not. If yes, it'll have to unref the messages </div><div class='del'>-	itself.</div><div class='del'>-</div><div class='del'>-1999-08-14  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c (delete_selected_messages): </div><div class='del'>-	(expunge_selected_folders): </div><div class='del'>-	Implemented deletion/expunge mechanism. </div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_message): </div><div class='del'>-	Added some debug info.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_expunge): </div><div class='del'>-	implemented and tested.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_set_flag): </div><div class='del'>-	changed the old braindead implementation.</div><div class='del'>-	boolean are inserted in the flag hash </div><div class='del'>-	table casted as gpointers.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c: indentation fix</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-08-13  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_message): default implementation</div><div class='del'>-	to be called first by providers methods. It looks in the</div><div class='del'>-	folder message list (in memory) to see if the message has</div><div class='del'>-	not already been retrieved, and in this case, returns </div><div class='del'>-	the same CamelMimeMessage object</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_get_message): set</div><div class='del'>-	message-&gt;message_number correctly.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h (struct _CamelFolder): </div><div class='del'>-	New field (message_list) which will hold a </div><div class='del'>-	reference on each message obtained by the folder,</div><div class='del'>-	which is necessary in order for the caching procedure</div><div class='del'>-	to work (Getting the same message from a folder twice</div><div class='del'>-	will return the same CamelMimeMessage object).</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_message): </div><div class='del'>-	When the store retreives a message put it in its</div><div class='del'>-	message list.</div><div class='del'>-	(_finalize): free message list.</div><div class='del'>-</div><div class='del'>-	* ChangeLog: fix typo (parmanent)</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_permanent_flag_list): </div><div class='del'>-	(camel_folder_get_permanent_flag_list): </div><div class='del'>-	new method, returns the list of permanent</div><div class='del'>-	flags supported by the folder.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_get_flag_list): </div><div class='del'>-	(camel_mime_message_get_flag_list): new method,</div><div class='del'>-	return the list of flag name used by this message.</div><div class='del'>-</div><div class='del'>-	* camel/hash-table-utils.c (g_strcase_equal): </div><div class='del'>-	(g_strcase_hash): those two func go here now.</div><div class='del'>-</div><div class='del'>-	* camel/hash_table_utils.c (hash_table_generic_free): </div><div class='del'>-	free a (gpointer, gpointer) hash table pair.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_init): use</div><div class='del'>-	case insensitive hash table functions. </div><div class='del'>-	(_set_flag): </div><div class='del'>-	(camel_mime_message_set_flag): </div><div class='del'>-	(_get_flag): </div><div class='del'>-	(camel_mime_message_get_flag): </div><div class='del'>-	Use const for flag name, they are now</div><div class='del'>-	duplicated.</div><div class='del'>-</div><div class='del'>-1999-08-12  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c (show_folder_messages): </div><div class='del'>-	remove stupid debug code.</div><div class='del'>-	(add_mail_store): use camel_session_get_store instead</div><div class='del'>-	of creating MH store directly.</div><div class='del'>-	(main): load MH provider.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_register_as_module): </div><div class='del'>-	register new provider.</div><div class='del'>-	(camel_provider_get_for_protocol): </div><div class='del'>-	Now, implementation is correct.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (_finalize): </div><div class='del'>-	* camel/camel-store.h (struct _CamelStore): </div><div class='del'>-	further disabled url_name field use. </div><div class='del'>-	URL will be generated dynamically.</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_get_store_for_protocol): </div><div class='del'>-	compilation and runtime fixes.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-store.c (_init): </div><div class='del'>-	synced with CamelStore.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (_init): </div><div class='del'>-	in CamelStore::init, url_name is now const.</div><div class='del'>-	disabled url_name copy.</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_get_store): </div><div class='del'>-	new function: returns a store for an URL. </div><div class='del'>-	(camel_session_get_store_for_protocol): </div><div class='del'>-	new functionc: returns a store for a given </div><div class='del'>-	store protocol (as IMAP/POP/MH ...)</div><div class='del'>-	* camel/string-utils.c (g_strcase_equal): </div><div class='del'>-	(g_strcase_hash): case insensitive hash table</div><div class='del'>-	funcs.</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_init): hash table</div><div class='del'>-	keys are case insensitive.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_get_for_protocol): </div><div class='del'>-	new function, returns the last registered </div><div class='del'>-	provider for a protocol.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-provider.c: </div><div class='del'>-	new file. MH provider registration stuff.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_register_as_module): </div><div class='del'>-	load a provider from a shared object (plugin).</div><div class='del'>-	(camel_provider_register): register a provider </div><div class='del'>-	"by hand". Used for statically defined providers.</div><div class='del'>-</div><div class='del'>-	* tests/test7.c: new test.</div><div class='del'>-	tests providers loading framework.</div><div class='del'>-</div><div class='del'>-1999-08-11  </div><div class='del'>-</div><div class='del'>-	* camel/camel-service.c (_finalize): </div><div class='del'>-	* camel/camel-stream-fs.c (_finalize): </div><div class='del'>-	(_destroy): close file descriptor.</div><div class='del'>-	* camel/camel-stream-mem.c (_finalize): </div><div class='del'>-	* camel/camel-store.c (_finalize): </div><div class='del'>-	* camel/camel-folder.c (_finalize): </div><div class='del'>-	* camel/camel-multipart.c (_finalize): </div><div class='del'>-	* camel/camel-simple-data-wrapper.c (_finalize): </div><div class='del'>-	* camel/camel-mime-part.c (_finalize): </div><div class='del'>-	implemented destructors.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_ref): </div><div class='del'>-	(gmime_content_field_unref): </div><div class='del'>-	New reference mechanism for GMimeContentField objects.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (_finalize): </div><div class='del'>-	Started implementing destructors.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): </div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_write_to_stream): </div><div class='del'>-	* camel/camel-multipart.c (_construct_from_stream): </div><div class='del'>-	removed forgotten anarchic traces.</div><div class='del'>-</div><div class='del'>-1999-08-10  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/ui-tests/store_listing.c: </div><div class='del'>-	* tests/ui-tests/store_listing.glade:</div><div class='del'>-	Quick and (very) dirty hack to test Camel more</div><div class='del'>-	easily.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_append_message): </div><div class='del'>-	new method.</div><div class='del'>-</div><div class='del'>-1999-08-09  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/misc/ref_and_id_proposition.txt:</div><div class='del'>-	new file. Document message UID and vfolder</div><div class='del'>-	implementation.</div><div class='del'>-</div><div class='del'>-1999-08-08  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: more advanced RFC2047 encoder started.</div><div class='del'>-	</div><div class='del'>-1999-08-08  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_get_message): </div><div class='del'>-	fix. In MH, message number is not related to </div><div class='del'>-	message position in folder.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_is_a_message_file): </div><div class='del'>-	util func.</div><div class='del'>-	(_get_message_count): implemented.</div><div class='del'>-</div><div class='del'>-1999-08-06  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/camel/:</div><div class='del'>-	updated some autogen doc stuff.</div><div class='del'>-	Still don't understand warnings :(</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c: </div><div class='del'>-	* camel/providers/MH/camel-mh-store.c: </div><div class='del'>-	* camel/url-util.c: </div><div class='del'>-	* camel/gmime-content-field.c: </div><div class='del'>-	* camel/camel-store.c: </div><div class='del'>-	various inline doc corrections.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (get_message_count): </div><div class='del'>-	new method. Returns the number of message </div><div class='del'>-	in the folder.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-06  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test6.c: encoder test.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: Fixed decoder bug : sequence</div><div class='del'>-	?= is not always the terminator for an encoded-string.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-06  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): </div><div class='del'>-	stat was not testing the good file. Fixed.</div><div class='del'>-	</div><div class='del'>-	* tests/test4.c (main): added real test for MH folder </div><div class='del'>-	provider. All tested things seem to work OK :)</div><div class='del'>-</div><div class='del'>-1998-08-06  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-	</div><div class='del'>-	* tests/test5.c: test for RFC2047 decoder.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: Improved RFC2047 decoder.</div><div class='del'>-</div><div class='del'>-1999-08-06  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_exists): add debug information</div><div class='del'>-	(_list_subfolders): test if first char in folder name is not '.'</div><div class='del'>-	before adding it to the folder list.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (_init): </div><div class='del'>-	disable session check temporarily</div><div class='del'>-	(_get_separator): </div><div class='del'>-	(_get_folder): new static func. </div><div class='del'>-	Fixed several oddities in class definition. </div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_get_type): </div><div class='del'>-	parent type is CAMEL_STORE_TYPE not CAMEL_FOLDER_TYPE</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c: </div><div class='del'>-	prent class is CamelServiceClass not GtkObjectClass</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c : </div><div class='del'>-	cosmetic changes + use of const when possible.</div><div class='del'>-	(find_host):</div><div class='del'>-	fix a bug: when there is no host and no port don't skip the '/'</div><div class='del'>-	all static find_* func are now named _func_*  </div><div class='del'>-	(g_url_free): destructor func.</div><div class='del'>-	cache field has been disabled. Constructing the url string</div><div class='del'>-	won't be too slow and will occur rarely enough that we</div><div class='del'>-	do not need to add complexity to this code. </div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-store.c: </div><div class='del'>-	parent class is CamelStorClass not GtkObjectClass</div><div class='del'>-</div><div class='del'>-1999-08-05  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test4.c: </div><div class='del'>-	test mh provider.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_get_message): </div><div class='del'>-	implemented</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder.c (_get_message): </div><div class='del'>-	new method. </div><div class='del'>-	(camel_folder_get_message): </div><div class='del'>-	corresponding public call</div><div class='del'>-	</div><div class='del'>-	* camel/README.HACKING: </div><div class='del'>-	Some notes.</div><div class='del'>-</div><div class='del'>-	* camel/CODING.STYLE: </div><div class='del'>-	short note about coding style. </div><div class='del'>-</div><div class='del'>-	* camel/README.COPYRIGHT: </div><div class='del'>-	Note about copyright policy.</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): </div><div class='del'>-	minor typo fixes.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-04  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.c: </div><div class='del'>-	* camel/gmime-rfc2047.h:</div><div class='del'>-	indentation and cosmetic changes.</div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_list_subfolders): </div><div class='del'>-	implemented.</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_delete): </div><div class='del'>-	finshed implementation</div><div class='del'>-	(_delete_messages): implemented.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-04  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-rfc2047.[ch]: added an implemention of RFC2047</div><div class='del'>-	  (support for character sets other than US-ASCII in MIME</div><div class='del'>-	  headers). Not actually called from anywhere yet.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-08-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_create): </div><div class='del'>-	implemented.</div><div class='del'>-	(_delete): started implementation.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_get_folder): default implementation </div><div class='del'>-	calls camel_store_get_folder ().</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_init_with_store): </div><div class='del'>-	implemented.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h (struct _CamelFolder): </div><div class='del'>-	remove useless exist_on_store field.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (_exists): </div><div class='del'>-	do not use exist_on_store field.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_set_name): </div><div class='del'>-	(camel_folder_get_name): </div><div class='del'>-	new public functions </div><div class='del'>-	(_set_name): set full_path.</div><div class='del'>-</div><div class='del'>-	(_set_full_name): </div><div class='del'>-	(camel_folder_set_full_name): </div><div class='del'>-	commented out this functions def. </div><div class='del'>-	It would make things very difficult to handle, and would not </div><div class='del'>-	be very useful. </div><div class='del'>-	</div><div class='del'>-	* camel/providers/MH/camel-mh-store.h: </div><div class='del'>-	* camel/providers/MH/camel-mh-store.c (camel_mh_store_set_toplevel_dir): </div><div class='del'>-	(camel_mh_store_get_toplevel_dir): </div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (_set_name): </div><div class='del'>-	* camel/providers/MH/camel-mh-folder.h: </div><div class='del'>-	use (gchar *) instead of (GString *) everywhere.</div><div class='del'>-	use const when necessary.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-folder.h (struct _CamelFolder): </div><div class='del'>-	removed unused message_list field.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-part.c (_set_content_object): </div><div class='del'>-	There is a probleme here. We can not allow mime part</div><div class='del'>-	content-type field and content_object mime-type to be </div><div class='del'>-	different. I thus chosed to set mime part object </div><div class='del'>-	content field to be freed (if necessary) and set</div><div class='del'>-	to be a pointer to content_object mime type</div><div class='del'>-	field. </div><div class='del'>-	(_construct_from_stream): set content_object mime type</div><div class='del'>-	to be the same as mime_part's one. This is necessary</div><div class='del'>-	because we use _set_content_type. </div><div class='del'>-	</div><div class='del'>-	This two things are a bit hackish ansd may need</div><div class='del'>-	to be redesigned.</div><div class='del'>-	</div><div class='del'>-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): </div><div class='del'>-	use g_strdup_printf and remove a bug.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c (_construct_from_stream): </div><div class='del'>-	more debugging output +  nb_bytes_read is now a signed int </div><div class='del'>-	to avoid bug when eos is encountered.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): </div><div class='del'>-	sync to data_wrapper_repository function name changes. </div><div class='del'>-	Use default "text/plain" type when conten-type field</div><div class='del'>-	is not found. (following RFC 2046 spec).</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c (data_wrapper_repository_set_data_wrapper_type): </div><div class='del'>-	(data_wrapper_repository_get_data_wrapper_type): </div><div class='del'>-	change function name prefix (s/data_wrapper/data_wrapper_repository/)</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_read_part): </div><div class='del'>-	add `\n` at eol but not before boundary.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_stream): </div><div class='del'>-	correct implementation of end of stream detection.</div><div class='del'>-</div><div class='del'>-1999-08-01  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_read_part): </div><div class='del'>-	use a stream to store the part instead of GString. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_set_text): </div><div class='del'>-	set data wrapper content type to "text/plain".</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-mem.c:</div><div class='del'>-	* camel/camel-stream-mem.h:</div><div class='del'>-	new memory buffer based stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (_seek): </div><div class='del'>-	implementation for file system based stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (camel_stream_seek): </div><div class='del'>-	new method.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (camel_stream_fs_class_init): </div><div class='del'>-	pass CamelStreamFsClass instead of CamelStreamClass.</div><div class='del'>-</div><div class='del'>-1999-08-01 bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_write_header_pair_to_stream): </div><div class='del'>-	corrected a bug with memory not allocated for '\0' in strtmp</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_read_line_from_stream): </div><div class='del'>-	do not return NULL when line is empty. </div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_read_part): return true when end</div><div class='del'>-	of multipart is found, not the opposite</div><div class='del'>-</div><div class='del'>-1999-07-31  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_read_line_from_stream): </div><div class='del'>-	Don't return crlf at end of line.</div><div class='del'>-</div><div class='del'>-1999-07-30  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (gmime_read_line_from_stream): </div><div class='del'>-	new function: reads a line from a stream.</div><div class='del'>-	should be in streams utils maybe. </div><div class='del'>-</div><div class='del'>-1999-07-29  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): </div><div class='del'>-	Uses data wrapper repository to find what data wrapper</div><div class='del'>-	to use to construct the content from a stream. When </div><div class='del'>-	no object is registered for the mime type found in</div><div class='del'>-	content type field a CamelSimpleDataWrapper is </div><div class='del'>-	used. </div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-part.c (_get_content_type): </div><div class='del'>-	(camel_mime_part_get_content_type): returns</div><div class='del'>-	a pointer on the content_type field instead </div><div class='del'>-	of the gchar * mime "type/subtype".</div><div class='del'>-</div><div class='del'>-1999-07-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* camel/data-wrapper-repository.c</div><div class='del'>-	* camel/data-wrapper-repository.h</div><div class='del'>-	New files. Handles mime type &lt;-&gt; camel object</div><div class='del'>-	(for example "multipart" &lt;-&gt; CamelMultipart</div><div class='del'>-	* tests/tesst3.c: test data repository thing.</div><div class='del'>-</div><div class='del'>-1999-07-26  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/camel-multipart.c (_write_to_stream): </div><div class='del'>-	implemented output of multipart.</div><div class='del'>-	</div><div class='del'>-	* tests/test1.c (main): testing content objects operations. </div><div class='del'>-</div><div class='del'>-1999-07-25  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_set_text): </div><div class='del'>-	new util function to set a mime part content to be </div><div class='del'>-	a text string.</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_set_buffer_from_text): </div><div class='del'>-	new util func. </div><div class='del'>-	(camel_simple_data_wrapper_new): new func.</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_write_to_stream): </div><div class='del'>-	implemented output of multiparts.</div><div class='del'>-</div><div class='del'>-1999-07-24  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_get_parameter): </div><div class='del'>-	New function. Returns the value associated to a </div><div class='del'>-	mime parameter. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-07-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.h: </div><div class='del'>-	* camel/camel-multipart.c:</div><div class='del'>-	New class. Models multipart mime objects.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-mime-body-part.h: </div><div class='del'>-	* camel/camel-mime-body-part.c: </div><div class='del'>-	New class. Body part is a mime part contained in </div><div class='del'>-	a multipart object.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-07-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-log.h: </div><div class='del'>-	implemented hard log level stuff.</div><div class='del'>-	* came/*.c use "CAMEL_LOG_*" instead of "CAMEL_LOG (*"</div><div class='del'>-	in order to allow hard level switch.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c: </div><div class='del'>-	* tests/test2.c: </div><div class='del'>-	updated to use gchar instead of GString. Tests passed.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-07-19  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c: </div><div class='del'>-	* camel/camel-stream.h: </div><div class='del'>-	"const"-antified</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c: (_construct_from_stream)</div><div class='del'>-	do not use any limit when constructing the object from a stream</div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.c: </div><div class='del'>-	* camel/camel-stream-fs.h: </div><div class='del'>-	* camel/camel-mime-message.c: </div><div class='del'>-	* camel/camel-mime-message.h: </div><div class='del'>-	* camel/camel-session.c: </div><div class='del'>-	* camel/camel-session.h: </div><div class='del'>-	* camel/camel-service.c: </div><div class='del'>-	* camel/camel-service.h:</div><div class='del'>-	* camel/camel-store.c: </div><div class='del'>-	* camel/camel-store.h: </div><div class='del'>-	* camel/camel-folder.c: </div><div class='del'>-	* camel/camel-folder.h: </div><div class='del'>-	* camel/gmime-utils.c: </div><div class='del'>-	* camel/gmime-utils.h: </div><div class='del'>-	GString -&gt; gchar</div><div class='del'>-	constantified what had to be.</div><div class='del'>-	</div><div class='del'>-	* camel/string-utils.c: </div><div class='del'>-	* camel/string-utils.h: </div><div class='del'>-	New files. Meant to replace gstring-util for gchar *</div><div class='del'>-	</div><div class='del'>-1999-07-16  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_construct_from_string): </div><div class='del'>-	GString -&gt; gchar</div><div class='del'>-	use const to indicate copied parameter.</div><div class='del'>-</div><div class='del'>-1999-07-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.c: </div><div class='del'>-	* camel/camel-simple-data-wrapper.h: </div><div class='del'>-	Gstring -&gt; gchar</div><div class='del'>-	</div><div class='del'>-1999-07-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c:  </div><div class='del'>-	* camel/url-util.h: </div><div class='del'>-	Do not use GStrings any more. </div><div class='del'>-	Added assertion code. </div><div class='del'>-	Cosmetic reformating</div><div class='del'>-	</div><div class='del'>-	* AUTHORS:</div><div class='del'>-	* ChangeLog:</div><div class='del'>-	Changed my email address.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-1999-07-13  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-base64.c (gmime_encode_base64): Implemented base64</div><div class='del'>-	encoder based on CamelStreams.  Should the encoder/decoder be a</div><div class='del'>-	Stream itself?</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c: include config.h here.</div><div class='del'>-	* camel/url-util.c: ditto.</div><div class='del'>-	* camel/gstring-util.c: ditto.</div><div class='del'>-	* camel/gmime-content-field.c: ditto.</div><div class='del'>-	* camel/camel-stream.c: ditto.</div><div class='del'>-	* camel/camel-stream-fs.c: ditto.</div><div class='del'>-	* camel/camel-store.c: ditto.</div><div class='del'>-	* camel/camel-simple-data-wrapper.c: ditto.</div><div class='del'>-	* camel/camel-session.c: ditto.</div><div class='del'>-	* camel/camel-service.c: ditto.</div><div class='del'>-	* camel/camel-mime-part.c: ditto.</div><div class='del'>-	* camel/camel-mime-message.c: ditto.</div><div class='del'>-	* camel/camel-log.c: ditto.</div><div class='del'>-	* camel/camel-data-wrapper.c: ditto</div><div class='del'>-	* camel/camel-folder.c: ditto.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (camel_stream_write): Moved api</div><div class='del'>-	documentation to the places that they document.</div><div class='del'>-	(camel_stream_class_init): Virtual classes do not need to have a</div><div class='del'>-	default implementation.  So null them all.</div><div class='del'>-	(camel_stream_write): Return value from write.</div><div class='del'>-	(camel_stream_available): implement.</div><div class='del'>-	(camel_stream_write_strings): documented.</div><div class='del'>-</div><div class='del'>-	* devel-docs/query/virtual-folder-in-depth.sgml: Small</div><div class='del'>-	reformatting</div><div class='del'>-</div><div class='del'>-1999-06-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): now use </div><div class='del'>-	CamelDataWrapper::contruct_form_stream to test </div><div class='del'>-	message parsing</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c: </div><div class='del'>-	* camel/camel-data-wrapper.h: </div><div class='del'>-	construct_from_stream no longer has maximimum size arg.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_construct_from_stream): new.</div><div class='del'>-	Construct the mime_part from a stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c:</div><div class='del'>-	new field (content_type) and associated methods.</div><div class='del'>-	(camel_mime_part_init): initialize content_type field.</div><div class='del'>-	(_parse_header_pair): now set content_type MimePart field</div><div class='del'>-	instead of using DataWrapper Mime typing facility.</div><div class='del'>-</div><div class='del'>-1999-06-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: </div><div class='del'>-	s/content_type/mime_type/</div><div class='del'>-</div><div class='del'>-1999-06-24  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-simple-data-wrapper.[ch]:</div><div class='del'>-	new class. Simple implementation of a data wrapper:</div><div class='del'>-	simply keeps the stream result in a byte array.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_parse_header_pair): added a warning. </div><div class='del'>-	Have to think about the correct way to store content type stuff.</div><div class='del'>-</div><div class='del'>-1999-06-24  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_one_recipient_to_stream): </div><div class='del'>-	includes gmime-utils header. </div><div class='del'>-	patch from Ulrich Drepper &lt;drepper at cygnus.com&gt;</div><div class='del'>-	set separator string in write_header_with_glist_to_stream()</div><div class='del'>-	</div><div class='del'>-	* camel/camel-log.c (camel_log): </div><div class='del'>-	patch from Ulrich Drepper &lt;drepper at cygnus.com&gt;</div><div class='del'>-	Do not use stderr in initialization of logfile descriptor.</div><div class='del'>-	</div><div class='del'>-	* camel/camel-stream-fs.c (camel_stream_fs_new_with_name): </div><div class='del'>-	patch from Ulrich Drepper &lt;drepper at cygnus.com&gt;</div><div class='del'>-	initialize mode field in open(). </div><div class='del'>-</div><div class='del'>-1999-06-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (_get_content_type): </div><div class='del'>-	moved all the content-type stuff here.</div><div class='del'>-	(camel_data_wrapper_init): initialize the instance</div><div class='del'>-	content-type field.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_parse_header_pair): </div><div class='del'>-	parse Content-Type stuff in header. </div><div class='del'>-	(_write_to_stream): write the content type stuff to </div><div class='del'>-	the stream.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c (gmime_content_field_get_mime_type): </div><div class='del'>-	new function, returns "type/subtype" mime type string.</div><div class='del'>-	(gmime_content_field_construct_from_string): </div><div class='del'>-	new function, construbt a content_field object</div><div class='del'>-	form a string. be used to set the mime_type from a</div><div class='del'>-	string.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_set_content_type): </div><div class='del'>-	(camel_mime_part_set_content_type): </div><div class='del'>-	(_get_content_type): </div><div class='del'>-	(_get_content_type): </div><div class='del'>-	new methods.</div><div class='del'>-</div><div class='del'>-1999-06-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_stream): </div><div class='del'>-	replace CR/LF+'\t' with ' ' </div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_set_recipient_list_from_string): </div><div class='del'>-	trim \t when splitting</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_file): </div><div class='del'>-	corrected bug in scanning tabulations ('t' -&gt; '\t')</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): read mail.test instead</div><div class='del'>-	of mail1.test</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_add_header): </div><div class='del'>-	added comments </div><div class='del'>-</div><div class='del'>-1999-06-03  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* devel-docs/query/virtual-folder-in-depth.sgml: </div><div class='del'>-	sgmlized Giao's doc about virtual folders.</div><div class='del'>-</div><div class='del'>-1999-05-31  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): </div><div class='del'>-	use new stream code instead of raw file * stuff.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_table_from_stream): </div><div class='del'>-	new func. Will replace get_header_table_from_file and will</div><div class='del'>-	be used to parse headers from files as well as from </div><div class='del'>-	memory buffers.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c:</div><div class='del'>-	CamelStream Subclass. File system based</div><div class='del'>-	stream.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-05-30  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>- 	* camel/camel-stream.h: new class. Represents an </div><div class='del'>-	abstract stream object.</div><div class='del'>-</div><div class='del'>-       * camel/camel-mime-message.c (_set_recipient_list_from_string): </div><div class='del'>-	remove leading and trailing spaces in recipient addresses.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (_store_header_pair_from_gstring): </div><div class='del'>-	remove leading and trailing spaces from header values.</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c (g_string_trim): new</div><div class='del'>-	func: remove leading or trailng chars from </div><div class='del'>-	a specified char set.</div><div class='del'>-	(g_string_split): allow trimming of substrings.</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): remove gtk_main call</div><div class='del'>-</div><div class='del'>-1999-05-28  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c </div><div class='del'>-	(_parse_header_pair): </div><div class='del'>-	(_init_header_name_table): </div><div class='del'>-	More header parsing code.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-1999-05-27  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test2.c (main): rewrite message obtained via</div><div class='del'>-	parsing into a file. Actually, it works pretty well :))</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_set_recipient_list_from_string): </div><div class='del'>-	create recipient list form a comma separated string.</div><div class='del'>-	(_parse_header_pair): added recipient lists parsing.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_parse_header_pair): </div><div class='del'>-	new (protected) method. Parse a head pair and</div><div class='del'>-	decides what to do with it.</div><div class='del'>-	</div><div class='del'>-	(_add_header): Call in _parse_header_pair</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_parse_header_pair): </div><div class='del'>-	overload  header parsing MimePart mthod.</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c (g_string_split): </div><div class='del'>-	new func: split a gstring into a GList of</div><div class='del'>-	substring.</div><div class='del'>-</div><div class='del'>-1999-05-26  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_lines_from_file): </div><div class='del'>-	new func. Parses message header zone and returns</div><div class='del'>-	a Glist of all header lines.</div><div class='del'>-</div><div class='del'>-	* tests/test2.c: tests message parsing</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (write_header_table_to_file): </div><div class='del'>-	new func to write a table of headers.</div><div class='del'>-</div><div class='del'>-1999-05-20  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_file): </div><div class='del'>-	recipient list printing</div><div class='del'>-	</div><div class='del'>-	* tests/test1.c (main): more tests.</div><div class='del'>-</div><div class='del'>-1999-05-19  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_write_to_file): test if content</div><div class='del'>-	exists before calling its write_to method.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_file): bugs fix.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_new_with_session): </div><div class='del'>-	new func. Creates a message with the session field set</div><div class='del'>-	up correctly.</div><div class='del'>-</div><div class='del'>-1999-05-18  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* tests/test1.c (main): tests</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (_write_to_file): </div><div class='del'>-	started write_to framework for mime_messages</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (*_message_number): </div><div class='del'>-	message number funcs.</div><div class='del'>-	</div><div class='del'>-1999-05-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (*_flag): </div><div class='del'>-	flags handling methods</div><div class='del'>-</div><div class='del'>-1999-05-14  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_class_init): </div><div class='del'>-	added recipient handling class funcs.</div><div class='del'>-</div><div class='del'>-1999-05-13  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-        </div><div class='del'>-	* camel/camel-mime-message.c (camel_mime_message_init): </div><div class='del'>-	create recipients hash table</div><div class='del'>-	(_remove_recipient): </div><div class='del'>-	(_add_recipient):</div><div class='del'>-	(_get_recipients):  new funcs.</div><div class='del'>-	Internal Recipients data structure is</div><div class='del'>-	a bit complicated though.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (camel_mime_part_init): </div><div class='del'>-	create headers hash table</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.h: </div><div class='del'>-	a bunch of get/set header field</div><div class='del'>-	method done. Does nothing yet though.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.[ch] :</div><div class='del'>-	new file. </div><div class='del'>-</div><div class='del'>-1999-05-12  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.h (struct ): </div><div class='del'>-	disposition is now a full GMimeContentField</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-content-field.c: new file</div><div class='del'>-	handle "type/subtype ;parameter=value ; parameter=value ..."</div><div class='del'>-	BNF grammar elements</div><div class='del'>-	(gmime_content_field_write_to_file): new func</div><div class='del'>-	</div><div class='del'>-	* camel/gmime-utils.c (gmime_write_header_pair_to_file): </div><div class='del'>-	namespace change</div><div class='del'>-</div><div class='del'>-1999-05-11  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_write_to_file): </div><div class='del'>-	overload wrapper class method.</div><div class='del'>-	(_write_to_file): start to write some text in </div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c: typo fix.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c: </div><div class='del'>-	* camel/camel-service.c: </div><div class='del'>-	* camel/camel-folder.c: </div><div class='del'>-	* camel/camel-data-wrapper.c: </div><div class='del'>-	* camel/camel-mime-part.c: </div><div class='del'>-	static functions naming follows gnome </div><div class='del'>-	coding style guide.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.h: implemented public interfaces</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-05-10  Bertrand Guiheneuf  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (__camel_mime_part_get_header_lines): </div><div class='del'>-	(__camel_mime_part_set_header_lines): </div><div class='del'>-	(__camel_mime_part_get_content_languages): </div><div class='del'>-	(__camel_mime_part_set_content_languages): </div><div class='del'>-	(__camel_mime_part_get_encoding): </div><div class='del'>-	(__camel_mime_part_set_encoding): </div><div class='del'>-	(__camel_mime_part_get_content_MD5): </div><div class='del'>-	(__camel_mime_part_set_content_MD5): </div><div class='del'>-	(__camel_mime_part_get_content_id): </div><div class='del'>-	(__camel_mime_part_set_content_id): </div><div class='del'>-	A bunch of new set/get func.</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c (g_string_list_free): </div><div class='del'>-	convenience function for string list </div><div class='del'>-	complete deallocation.</div><div class='del'>-</div><div class='del'>-1999-05-09  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (__camel_mime_part_add_header): </div><div class='del'>-	new method</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.h (struct CamelMimePart):</div><div class='del'>-	added core fields.</div><div class='del'>-</div><div class='del'>-1999-05-08  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.[ch]: </div><div class='del'>-	new class. models a mime mail part.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c </div><div class='del'>-	(camel_data_wrapper_write_to_buffer): method to</div><div class='del'>-	stream data content in a buffer.</div><div class='del'>-	(camel_data_wrapper_write_to_file): </div><div class='del'>-	(camel_data_wrapper_construct_from_buffer): </div><div class='del'>-	(camel_data_wrapper_construct_from_file): </div><div class='del'>-	new methods.</div><div class='del'>-	</div><div class='del'>-1999-05-07  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.[ch]:new class.</div><div class='del'>-	This should not be a class but rather an </div><div class='del'>-	interface. The day Gtk support interfaces, </div><div class='del'>-	it dataWrapper should become an interface.</div><div class='del'>-</div><div class='del'>-1999-05-04  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-service.c (camel_service_get_url): </div><div class='del'>-	new method.</div><div class='del'>-</div><div class='del'>-	* devel-docs/camel/camel-sections.txt: added </div><div class='del'>-	function doc references</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (__camel_folder_close): </div><div class='del'>-	fixed indentation.</div><div class='del'>-	(camel_folder_expunge): new method.</div><div class='del'>-	(__camel_folder_close): used expunge flag</div><div class='del'>-</div><div class='del'>-1999-05-03  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_mode): </div><div class='del'>-	typo fix</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (__camel_folder_list_subfolders): </div><div class='del'>-	new func.</div><div class='del'>-</div><div class='del'>-	* some doc stuffs</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-05-01  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c </div><div class='del'>-	(__camel_folder_get_mode): </div><div class='del'>-	(camel_folder_get_mode): </div><div class='del'>-	(camel_folder_get_parent_store): </div><div class='del'>-	(__camel_folder_get_parent_store): </div><div class='del'>-	(camel_folder_get_parent_folder): </div><div class='del'>-	(__camel_folder_get_parent_folder): </div><div class='del'>-	new methods</div><div class='del'>-</div><div class='del'>-	* camel/camel-service.c: put __ prefix before</div><div class='del'>-	private virtual funcs.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_delete): </div><div class='del'>-	(camel_folder_delete_messages): </div><div class='del'>-	new methods.</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c (g_url_new): some</div><div class='del'>-	more comments </div><div class='del'>-</div><div class='del'>-1999-04-27  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c (camel_folder_create): </div><div class='del'>-	new public function.</div><div class='del'>-</div><div class='del'>-1999-04-25  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_get_store_from_provider): </div><div class='del'>-	initialize folder object.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (init): new method.</div><div class='del'>-	called by session object at instantiation time.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.h (struct _CamelStore): </div><div class='del'>-	new fields : session and url_name</div><div class='del'>-</div><div class='del'>-1999-04-25  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_set_provider): </div><div class='del'>-	new method to set the default provider for a protocol.</div><div class='del'>-	(camel_session_get_store_from_provider): </div><div class='del'>-	new method to instantiate a folder from a provider.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.h: s/GString/gchar/g</div><div class='del'>-	+ typo fix.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.[ch]:</div><div class='del'>-	basic provider structure. Have to write the</div><div class='del'>-	code for dynamic loading.</div><div class='del'>-</div><div class='del'>-1999-04-24  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/url-util.[ch]: s/new_g_url/g_url_new</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c (new_g_url): URL </div><div class='del'>-	rewritten completely. Error handling not</div><div class='del'>-	implemented in public functions.</div><div class='del'>-	But URL scan works pretty well :)))</div><div class='del'>-</div><div class='del'>-1999-04-24 bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/url-util.[ch]: I needed the url </div><div class='del'>-	functions to use GString, and I wanted a more</div><div class='del'>-	general scheme so I finally started rewriting </div><div class='del'>-	the whole thing from scratch.</div><div class='del'>-	No more code from gzilla :(</div><div class='del'>-	</div><div class='del'>-1999-04-23  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/url-util.[ch]:</div><div class='del'>-	Utility functions to parse URLs.</div><div class='del'>-	Stolen shamelessly from gzilla (www.gzilla.com)</div><div class='del'>-	written by Raph Levien &lt;raph@acm.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/Makefile.am: added url-util.[ch]</div><div class='del'>-	compilation.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): removed devel-docs</div><div class='del'>-	until I come up with a correct Makefile.am</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.h: </div><div class='del'>-	* camel/camel-folder.h:</div><div class='del'>-	correct declarations of structs</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1999-04-22  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-store.c:</div><div class='del'>-	more test implementation.</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.c (camel_store_get_type): typo fix</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-04-21  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/MH/camel-mh-folder.c (camel_mh_folder_get_type): </div><div class='del'>-	start test provider.</div><div class='del'>-</div><div class='del'>-1999-04-20  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-	</div><div class='del'>-	* camel/camel-store.h: now CamelStore inherits from</div><div class='del'>-	CamelService.</div><div class='del'>-</div><div class='del'>-	* camel/camel-service.c (camel_service_class_init): </div><div class='del'>-	basic abstract service class.</div><div class='del'>-</div><div class='del'>-1999-04-19  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/README: added some (few) explanations.</div><div class='del'>-</div><div class='del'>-1999-04-18  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-store.[ch]: started implementation</div><div class='del'>-	* camel/camel-folder.c (camel_folder_get_type): typo</div><div class='del'>-	uncommented the store related code.</div><div class='del'>-	(camel_folder_create): enable som store relted code. </div><div class='del'>-	Not finished. Have to define public methods first.</div><div class='del'>-</div><div class='del'>-	* camel/camel-log.h: some explanation about the </div><div class='del'>-	log system</div><div class='del'>-</div><div class='del'>-1999-04-18   bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c: </div><div class='del'>-	(camel_folder_create): implemented (partially)</div><div class='del'>-	have to write CamelStore before finishing it.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.h (CamelFolder): added full_name field</div><div class='del'>-	(CamelFolderClass): added set/get_full_name methods</div><div class='del'>-</div><div class='del'>-1999-04-18  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c: some work</div><div class='del'>-	* camel/camel-log.c: log system for camel</div><div class='del'>-	* camel/gstring-util.c: some utilities for GString objects</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-1999-04-18  bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* autogen.sh (PKG_NAME): groomf -&gt; gnome-mailer</div><div class='del'>-</div><div class='head'>diff --git a/HACKING b/HACKING<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/HACKING?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 4b475c8a61..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-changelogs =			\</div><div class='del'>-	ChangeLog</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'>-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'>-	$(appicon_DATA)		\</div><div class='del'>-	$(application_DATA)</div><div class='del'>-</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'>-	executive-summary	\</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'>-	ui			\</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'>-</div><div class='head'>diff --git a/NEWS b/NEWS<br/>deleted file mode 100644<br/>index 373284bf36..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/NEWS?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>NEWS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,614 +0,0 @@</div><div class='del'>-Version 0.6</div><div class='del'>------------</div><div class='del'>-</div><div class='del'>-General:</div><div class='del'>-</div><div class='del'>-  - Split out lots of functionality to gal.  Evolution now depends on</div><div class='del'>-    gal. (Chris Lahey, Gal Team)</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Added a cute splash screen.  (Ettore, TigerT)</div><div class='del'>-</div><div class='del'>-  - Improved the way `~/evolution' is initialized the first time.</div><div class='del'>-    (Iain)</div><div class='del'>-</div><div class='del'>-  - Fixed the problem with the folder bar disappearing too son when</div><div class='del'>-    clicking on the scrollbar.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Updated to use the new toolbar and UI merging code from Bonobo.</div><div class='del'>-    (Michael Meeks, Ettore)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - Numerous i18n encoding, decoding, and display fixes. Non-ASCII</div><div class='del'>-    text should be displayed correctly in most context in the mailer</div><div class='del'>-    now. The composer no longer sends undeclared 8bit data. (Jeff)</div><div class='del'>-</div><div class='del'>-  - The IMAP provider now caches summary info between sessions, so</div><div class='del'>-    startup should be much faster for large folders. (Dan)</div><div class='del'>-</div><div class='del'>-  - Subscribe/unsubscribe UI for newsgroups. (IMAP subscriptions will</div><div class='del'>-    be supported in a later release.) NNTP authentication support.</div><div class='del'>-    Various other NNTP fixes. (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - New "full search" button to do more complicated searches. (NotZed)</div><div class='del'>-</div><div class='del'>-  - Composer attachment bar improvements. You can now drag files to</div><div class='del'>-    the composer window to attach them to the message. (Iain)</div><div class='del'>-</div><div class='del'>-  - Message list state (columns selected, sorting, etc) is now saved</div><div class='del'>-    between sessions. (NotZed)</div><div class='del'>-</div><div class='del'>-  - "Get Mail" now works for IMAP. IMAP mail no longer arrives</div><div class='del'>-    asynchronously (although if you delete mail from another client,</div><div class='del'>-    it will be deleted asynchronously). (Dan)</div><div class='del'>-</div><div class='del'>-  - Image attachments now use thumbnail images rather than a generic</div><div class='del'>-    image icon. (Iain)</div><div class='del'>-</div><div class='del'>-  - Various IMAP provider bugs (Dan, Jeff)</div><div class='del'>-</div><div class='del'>-  - Filter code cleanup/improvements. (NotZed) Filtering can read and</div><div class='del'>-    write message scores. (Jeff) On-demand filters no longer expunge</div><div class='del'>-    the source folder, and don't filter deleted messages. (Jeff)</div><div class='del'>-    Filters now log their actions. (Jeff)</div><div class='del'>-</div><div class='del'>-  - Drafts, Outbox, and Sent folders now default to showing "To"</div><div class='del'>-    instead of "From" in the header list. Messages output to the Sent</div><div class='del'>-    folder are marked as "Seen". "Send later" on a reply will mark the</div><div class='del'>-    message as having been replied to. (Jeff)</div><div class='del'>-</div><div class='del'>-  - Message list "attachment" column is now functional. The</div><div class='del'>-    read/unread state of a fake thread header now matches the state of</div><div class='del'>-    the thread. (NotZed) Message list sorting is more clever (Jeff)</div><div class='del'>-</div><div class='del'>-  - The "Print" toolbar button now opens a Print dialog rather than a</div><div class='del'>-    Print Preview window. (Miguel)</div><div class='del'>-</div><div class='del'>-  - New "Select All" command. "Mark all messages as seen" became "Mark</div><div class='del'>-    (selected) messages seen". (Jeff)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Improved todo list and calendar view gui (Damon)</div><div class='del'>-</div><div class='del'>-  - Printing works again (Federico)</div><div class='del'>-</div><div class='del'>-  - Config dialog improvement and implementation (Damon)</div><div class='del'>-</div><div class='del'>-  - Todo and calendar conduits working, except for archiving (JP)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Lots of internal refactoring of addressbook, including changes due</div><div class='del'>-    to gal. (Chris, Chris)</div><div class='del'>-</div><div class='del'>-  - Lots of bug fixes. (Chris, Chris, Matt Bissiri, Iain, Dan)</div><div class='del'>-</div><div class='del'>-  - Added a working field to save whether the contact wants</div><div class='del'>-    HTML. (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added "Stop" and "View All" toolbar buttons. (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Lots of work on modifiable LDAP. (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Recognizes a lot more Prefixes and Suffixes when parsing names. (Nat)</div><div class='del'>-</div><div class='del'>-  - The card view doesn't write out cards unless they've changed. (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - New layout of address editor dialog. (Anna, Chris Lahey)</div><div class='del'>-</div><div class='del'>-Version 0.5.1, "Salamended", 2000-09-15</div><div class='del'>----------------------------------------</div><div class='del'>-</div><div class='del'>-General:</div><div class='del'>-</div><div class='del'>-  - Fixed a font-handling problem that would cause Evolution to crash</div><div class='del'>-    at startup with certain Gtk themes. (Chris)</div><div class='del'>-</div><div class='del'>-  - Fixed some build problems. (Chris)</div><div class='del'>-</div><div class='del'>-  - We no longer ship an out-of-date Red Hat-only RPM spec file.</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - The shell now installs the `Sent' folder at startup if it doesn't</div><div class='del'>-    exist yet.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - If a component crashes unexpectedly, the shell displays a dialog</div><div class='del'>-    box informing the user of that.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed a bug in the folder selector dialog that would result in</div><div class='del'>-    crashes while trying to move messages in the mailer. (Dan)</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Fixed a bug that would cause the addressbook to crash when</div><div class='del'>-    embedded in the composer. (Dan)</div><div class='del'>-</div><div class='del'>-Mail:</div><div class='del'>-</div><div class='del'>-  - Fixed a display problem caused by expunging an IMAP folder. (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed POP mail so that "keep on server" is obeyed correctly. (Dan,</div><div class='del'>-    Jeff)</div><div class='del'>-</div><div class='del'>-  - Fixed replies so that replying to a message twice doesn't turn off</div><div class='del'>-    the "replied" flag. (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed a bug that prevented "Send later" from working. (Dan)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.5, "Salamander", 2000-09-13</div><div class='del'>--------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Switched to using ETree for the folder view.  (Chris Toshok,</div><div class='del'>-    Ettore)</div><div class='del'>-</div><div class='del'>-  - Added interfaces to change the string displayed in the tree view</div><div class='del'>-    as the name of the folder.  (Ettore)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Uses only the new iCalendar standard internally; this means future</div><div class='del'>-    interoperability with new calendaring programs.  (JP, Federico)</div><div class='del'>-</div><div class='del'>-  - New ultra-cool date range selector, aka little calendar.  (Damon)</div><div class='del'>-</div><div class='del'>-  - Plenty of internal refactoring.  (JP, Damon, Federico)</div><div class='del'>-</div><div class='del'>-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)</div><div class='del'>-    &lt;EXPERIMENTAL&gt;</div><div class='del'>-</div><div class='del'>-  - Pilot synch work, mostly on pcs infrastructure and some todo work (JP)</div><div class='del'>-    &lt;EXPERIMENTAL&gt;</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - New advanced search dialog.  (Michael Zucchi, Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added parsing of addresses.  (Jesse Pavel)</div><div class='del'>-</div><div class='del'>-  - Converted most of addressbook to UTF8.  (Lauris)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-  - Filters (but not vfolders) are now more powerful: they can check</div><div class='del'>-    any message header, and can do regexp searches on the headers and</div><div class='del'>-    body.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - A first draft of an automated mailing list recognizer</div><div class='del'>-    has been added.  (It will need more/better rules.)  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Attachments are handled differently now.  All attachments always</div><div class='del'>-    have an icon and a header, and you can right-click on the icon to</div><div class='del'>-    view/hide, save, or launch an external viewer.  (Dan)</div><div class='del'>-</div><div class='del'>-  - It is no longer necessary to quit and restart after adding a new</div><div class='del'>-    IMAP server.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Lots of i18n/charset fixing.  (Lauris)</div><div class='del'>-</div><div class='del'>-  - Shiny new toolbar icons.  (Tuomas)</div><div class='del'>-</div><div class='del'>-  - Giant menu reorganization. Most message operations are now in the</div><div class='del'>-    "Message" menu, and folder operations in the "Folder" menu.</div><div class='del'>-    (Ettore, Dan, Peter)</div><div class='del'>-</div><div class='del'>-  - "Mark as seen" timeout is now configurable. Mail view remembers</div><div class='del'>-    the location of the message list/message display split.  (Richard</div><div class='del'>-    Hult)</div><div class='del'>-</div><div class='del'>-  - New filter category: "On-demand", for filters to be applied</div><div class='del'>-    at arbitrary times rather than during mail incorporation.  (Peter)</div><div class='del'>-</div><div class='del'>-  - POP/IMAP config pages allow you to specify a port... this may</div><div class='del'>-    go away in a later release when we support ssl/ssh tunneling</div><div class='del'>-    directly.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Reply To All will now remove your own addresses from the recipient</div><div class='del'>-    lists.  (Jesse Pavel)</div><div class='del'>-</div><div class='del'>-  - Folders are synced when you switch to another folder now.  (Dan)</div><div class='del'>-</div><div class='del'>-  - An IMAP bug that caused all messages to be marked as read before</div><div class='del'>-    they were read has been fixed.  (Dan)</div><div class='del'>-</div><div class='del'>-  - The IMAP provider is now more robust about dealing with other</div><div class='del'>-    concurrent IMAP clients.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - POP and IMAP are better about when they do and don't try to</div><div class='del'>-    reconnect.  This was part of Camel operation cancellation support,</div><div class='del'>-    which unfortunately didn't make it into 0.5.  (Peter)</div><div class='del'>-</div><div class='del'>-  - Sent and Outbox folders are now functional.  You now have 2</div><div class='del'>-    options when sending a message - "Send Now" which will send the</div><div class='del'>-    message imediately and "Send Later" which will queue the message in</div><div class='del'>-    Outbox for later sending.  When a message is successfully sent, it</div><div class='del'>-    is copied to the Sent folder for your records.  (Jeff)</div><div class='del'>-</div><div class='del'>-ETable:</div><div class='del'>-</div><div class='del'>-  - ETree fixes.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Lots of small usability fixes.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Lots of grouping bug fixes.  Specifically, fixed crashes when</div><div class='del'>-    grouping in trees and made ETable not go crazy when you change</div><div class='del'>-    data and the table is grouped.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Improved table printing when grouped.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Converted most of ETable to UTF8.  (Lauris)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.4, "Alewife", 2000-08-14</div><div class='del'>-----------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Added interfaces to display messages and a progress bar when the</div><div class='del'>-    component is busy.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Changed the shell BonoboUIHandler code to allow placing menu items</div><div class='del'>-    such as "Print" in the right places.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added code to check if an existing `~/evolution' directory</div><div class='del'>-    actually has the content we expect and, if not, complain to the</div><div class='del'>-    user.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Fixed some Bonobo-related refcounting problems.  (Michael Meeks)</div><div class='del'>-</div><div class='del'>-  - Removed the GConf dependency.  (JP)</div><div class='del'>-</div><div class='del'>-  - Improved the API for the folder selection dialog.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Memory leak fixes.  (Peter)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  The calendar is in the middle of major rewrite. Evolution 0.4</div><div class='del'>-  ships with essentially the same calendar component as 0.3 did.</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - More work on the Palm Pilot conduits.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed some LDAP-related crashes.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Added support for displaying embedded vCards through a Bonobo</div><div class='del'>-    component.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added support for generic fields.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Fixed the navigation order for the Tab key in the contact editor</div><div class='del'>-    window.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Fixed some Bonobo-related bugs and crashes.  (Chris Lahey, Michael</div><div class='del'>-    Meeks)</div><div class='del'>-</div><div class='del'>-  - Only display entries that have an email address in the address</div><div class='del'>-    selector dialog.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added an utility program to import vCards from Gnomecard.  (Chris</div><div class='del'>-    Lahey)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>- Generic</div><div class='del'>-</div><div class='del'>-  - Long mailer operations (such as fetching new mail) now run</div><div class='del'>-    asynchronously rather than blocking the UI. This involved</div><div class='del'>-    a major rewrite of much of the Camel and mailer code.  (Peter)</div><div class='del'>-</div><div class='del'>-  - GPG/PGP message decryption support (Nathan Thompson-Amato, Dan)</div><div class='del'>-</div><div class='del'>-  - Unfinished messages in the composer can be saved to the "Drafts"</div><div class='del'>-    folder and finished later.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - Double-clicking on a message in the message view now opens it in a</div><div class='del'>-    separate window.  (Jeff)</div><div class='del'>-</div><div class='del'>-  - vCards attached to messages now bring up a minicard view with a</div><div class='del'>-    button to add the vCard to the addressbook (Chris Lahey, Dan)</div><div class='del'>-</div><div class='del'>-  - Inline uuencoded/binhexed "attachment" support (Dan)</div><div class='del'>-</div><div class='del'>-  - "Mark All Messages Seen" command.  (Cody Russell)</div><div class='del'>-</div><div class='del'>- Filters / VFolders</div><div class='del'>-</div><div class='del'>-  - Major filter/vfolder dialog rewrite (Michael Zucchi) VFolders can</div><div class='del'>-    now search any (searchable) folder, not just Inbox.</div><div class='del'>-</div><div class='del'>-  - Auto-filter/auto-vfolder code (right click on a message in the</div><div class='del'>-    list and pick one of the options at the bottom of the menu to</div><div class='del'>-    create a filter/vfolder rule for similar messages).  (Michael)</div><div class='del'>-</div><div class='del'>-  - You can now set the color of messages in the message list, based</div><div class='del'>-    on filter rules.  (Local stores can also now store arbitrary user</div><div class='del'>-    flags, although there is not yet UI code to set/view them.)</div><div class='del'>-    (Michael)</div><div class='del'>-</div><div class='del'>-  - Added "Save" button to the quicksearch bar to save a search as a</div><div class='del'>-    vfolder.  (Michael)</div><div class='del'>-</div><div class='del'>- Configuration</div><div class='del'>-</div><div class='del'>-  - Major mail config dialog rewrite (JP).</div><div class='del'>-</div><div class='del'>-  - The mailer now remembers your threaded/unthreaded message view</div><div class='del'>-    setting between sessions.  (Jeremy Wise).</div><div class='del'>-</div><div class='del'>-  - Support for multiple identities (JP, Jeff), sources (JP, Peter), and</div><div class='del'>-    IMAP servers (JP, Dan)</div><div class='del'>-</div><div class='del'>- Providers</div><div class='del'>-</div><div class='del'>-  - You can now leave POP mail on the server. (This will [currently]</div><div class='del'>-    only work right with POP servers that support the UIDL command.</div><div class='del'>-    On other servers, it will never download some messages unless you</div><div class='del'>-    never delete mail.)</div><div class='del'>-</div><div class='del'>-  - There is now an MH-like local store available, and code to convert</div><div class='del'>-    a folder from one type to the other.  (Michael)</div><div class='del'>-</div><div class='del'>-  - The mbox provider now writes out "From " lines that are more</div><div class='del'>-    compatible with other mailers (like Mutt) that are picky about</div><div class='del'>-    their exact format.  (Michael)</div><div class='del'>-</div><div class='del'>-  - The IMAP provider now supports searching (Jeff). Also various</div><div class='del'>-    other speed/efficiency/robustness improvements (Jeff), and support</div><div class='del'>-    for old IMAP4 servers as well as IMAP4rev1 (Jon K Hellan).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Version 0.3, "Jellyfish", 2000-07-21</div><div class='del'>-------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  - Pop-up folder selection.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added support for multiple views.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Added support for saving component-specific settings, and</div><div class='del'>-    some initial code to save the view's configuration.</div><div class='del'>-    (Ettore)</div><div class='del'>-</div><div class='del'>-  - Fixed the Bonobo menu code so that it works with all the</div><div class='del'>-    locales.  (Ettore)</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-   - Lots of IMAP fixes.  (Jeff) </div><div class='del'>-</div><div class='del'>-   - You can use an external setuid/setgid movemail program</div><div class='del'>-    (although we don't ship our own yet). If you have one</div><div class='del'>-    installed with emacs, the configure script will find</div><div class='del'>-    that. Otherwise, you can specify --with-movemail=/path.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  - You can toggle HTML/plain text for an individual message</div><div class='del'>-    in the composer now.  (Ettore)</div><div class='del'>-</div><div class='del'>-  - Bonobo embedding sort of works again, but there are</div><div class='del'>-    problems with size allocation somewhere. Attachments can now</div><div class='del'>-    also be handled by external applications.  (Dan)</div><div class='del'>-</div><div class='del'>-  - text/plain mail is now line-wrapped in the mail display,</div><div class='del'>-    to deal with people who don't put newlines in their mail.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  - Allow user to specify IMAP namespace in the mail config</div><div class='del'>-    dialog.  (Dan, Jeff)</div><div class='del'>-</div><div class='del'>-  - Quoted-printable encoder fixes.  (Michael Zucchi)</div><div class='del'>-</div><div class='del'>-  - Various NNTP fixes, include a news pane in the config</div><div class='del'>-    dialog.  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Some memory corruption fixes.  (Peter Williams)</div><div class='del'>-</div><div class='del'>-  - Fix for message not being re-drawn as deleted.  (Peter</div><div class='del'>-    Williams, Jeff)</div><div class='del'>-</div><div class='del'>-  - Moving a message to another folder copies the flags now</div><div class='del'>-    (Jeff)</div><div class='del'>-</div><div class='del'>-  - Close signature in HTML mail with &lt;/PRE&gt;, not &lt;PRE&gt;, and</div><div class='del'>-    default to ~/.signature.  (Michael Meeks)</div><div class='del'>-</div><div class='del'>-  - Fixed some confusing behavior in the message threading</div><div class='del'>-    algorithm.  (Dan)</div><div class='del'>-</div><div class='del'>-  - Improvements to the item selection code.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  - Added support for a bunch of previously unsupported iCalendar</div><div class='del'>-    properties.  (Federico)</div><div class='del'>-</div><div class='del'>-  - Conduit for synchronizing the calendar with gnome-pilot</div><div class='del'>-    (requires gnome-pilot from CVS).  (Seth)</div><div class='del'>-</div><div class='del'>-  - ETable-based to-do list view ("taskpad"), for your viewing</div><div class='del'>-    pleasure.</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  - Conduit for synchronizing the addressbook with gnome-pilot</div><div class='del'>-    (requires gnome-pilot from CVS).  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Conduit for synchronizing the addressbook with gnome-pilot</div><div class='del'>-    (requires gnome-pilot from CVS).  (Chris Toshok)</div><div class='del'>-</div><div class='del'>-  - Fixed some random crashes.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Implemented a vCard Bonobo control so that we can support</div><div class='del'>-    inline vCard viewing in the mailer.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Quick search looks at both the name and the company name now.</div><div class='del'>-    (Chris Lahey)</div><div class='del'>-</div><div class='del'>-  - Added more functionality to the contact editor's toolbar.  (Chris</div><div class='del'>-    Lahey)</div><div class='del'>-</div><div class='del'>-  - Support for printing single cards.  (Chris Lahey)</div><div class='del'>-</div><div class='del'>-Version 0.2, "Saccharomyces", 2000-07-11</div><div class='del'>-----------------------------------------</div><div class='del'>-</div><div class='del'>-Shell:</div><div class='del'>-</div><div class='del'>-  * Folder selection dialog (Ettore).</div><div class='del'>-</div><div class='del'>-  * Folder creation dialog (Ettore).</div><div class='del'>-</div><div class='del'>-Addressbook:</div><div class='del'>-</div><div class='del'>-  * LDAP server configuration dialog (Chris Toshok).</div><div class='del'>-  </div><div class='del'>-  * Integration of LDAP servers in the shell's tree view (Chris Toshok).</div><div class='del'>-  </div><div class='del'>-  * ETable-based view (Chris Lahey).</div><div class='del'>-  </div><div class='del'>-  * Printing support for the ETable-based view (Chris Lahey).</div><div class='del'>-  </div><div class='del'>-  * Address selection dialog integrated with the message composer (Chris</div><div class='del'>-    Lahey).</div><div class='del'>-  </div><div class='del'>-  * Many miscellaneous bugs fixed (everyone).</div><div class='del'>-</div><div class='del'>-Calendar:</div><div class='del'>-</div><div class='del'>-  * Printing support (Michael, Federico).</div><div class='del'>-  </div><div class='del'>-  * Many, many behavior fixes and polishing to the day/week/month view</div><div class='del'>-    widgets (Damon).</div><div class='del'>-  </div><div class='del'>-  * New glade-based event editor.  This is unfinished but usable (Seth,</div><div class='del'>-    Federico).</div><div class='del'>-  </div><div class='del'>-  * Mouse wheel scrolling support (Anders).</div><div class='del'>-  </div><div class='del'>-  * We have an awesome new engine for computing recurring events</div><div class='del'>-    (Damon).  This will be plugged in to the new iCalendar code.</div><div class='del'>-  </div><div class='del'>-  * Internal and public API fixes (Federico, Seth).</div><div class='del'>-  </div><div class='del'>-  * Shell-related changes (Ettore).</div><div class='del'>-  </div><div class='del'>-  * Data model for ETable; this is not used yet (Federico).</div><div class='del'>-  </div><div class='del'>-  * New iCalendar support; this is not used yet (Federico).</div><div class='del'>-  </div><div class='del'>-  * Pilot syncing updates; this is not used yet (Seth).</div><div class='del'>-  </div><div class='del'>-  * Many miscellaneous bugs fixed (everyone).</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Mailer:</div><div class='del'>-</div><div class='del'>-  Major features:</div><div class='del'>-</div><div class='del'>-  * Basic IMAP support (Jeff)</div><div class='del'>-</div><div class='del'>-  * Threaded message view (Michael, Chris Toshok)</div><div class='del'>-</div><div class='del'>-  * Filters now work (original work by Michael, bugfixes by Dan)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  Smaller features:</div><div class='del'>-</div><div class='del'>-  * Implemented moving messages between folders (Dan)</div><div class='del'>-</div><div class='del'>-  * Very basic printing support (Dan, but it was only like 5 lines</div><div class='del'>-    of code, because gnome-print kicks ass)</div><div class='del'>-</div><div class='del'>-  * "Delete", "Forward", and "Refile" operations now work on</div><div class='del'>-    multiple messages. (Chris Lahey, Peter Williams, Dan)</div><div class='del'>-</div><div class='del'>-  * Toggle read/unread flag when the user clicks on the envelope</div><div class='del'>-    icon (Chris Lahey, Dan).</div><div class='del'>-</div><div class='del'>-  * The "New folder" menu item now works (Ettore, Dan).</div><div class='del'>-</div><div class='del'>-  * The filter/vfolder druid now uses the new shell folder selection</div><div class='del'>-    UI (Michael)</div><div class='del'>-</div><div class='del'>-  * Added "Cc" to the set of filter/vfolderable headers and make the</div><div class='del'>-    filter/vfolder "messages to address" rule work with to or cc.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  * New key bindings: "Delete" deletes the current message and jumps</div><div class='del'>-    to the next undeleted message. "N" and "P" go to next/previous</div><div class='del'>-    unread message. (Dan)</div><div class='del'>-</div><div class='del'>-  * Keep asking for POP/IMAP password until the user gets it correct</div><div class='del'>-    or hits Cancel, and remember the result until the user exits (or</div><div class='del'>-    chooses "Forget Passwords"). (Dan, Jeff)</div><div class='del'>-</div><div class='del'>-  * Kludge Camel to output ISO-8859-1 instead of UTF-8, since</div><div class='del'>-    neither GtkHTML nor ETable supports UTF-8 still. (Dan)</div><div class='del'>-</div><div class='del'>-  * Use the gnome-vfs "sniff buffer" interface to try to identify</div><div class='del'>-    the MIME type of attachments without useful type information</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  * Allow saving drafts in the composer (Ettore)</div><div class='del'>-</div><div class='del'>-  * Added "Received date" header to the set of possible message list</div><div class='del'>-    headers. (Dan)</div><div class='del'>-</div><div class='del'>-  * Partial gladification of the config dialog (JP Rosevear)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  Bug fixes:</div><div class='del'>-</div><div class='del'>-  * Message read/unread/deleted flags should now be saved reliably</div><div class='del'>-    when you exit, and summary should not be rebuilt when a rebuild</div><div class='del'>-    isn't needed. Expunging should work reliably (Dan, Ettore,</div><div class='del'>-    Jeff).</div><div class='del'>-</div><div class='del'>-  * Fix disappearing toolbar bug (Dan).</div><div class='del'>-</div><div class='del'>-  * Fixed a bug that made downloading of very large messages over</div><div class='del'>-    POP incredibly slow, and various other smaller POP bugs. (Dan)</div><div class='del'>-</div><div class='del'>-  * Fixed bugs that made large attachments sometimes get dropped and</div><div class='del'>-    small ones sometimes get truncated. (Dan)</div><div class='del'>-</div><div class='del'>-  * Fixed filter/vfolder "messages to address" rule to correctly</div><div class='del'>-    match "to" rather than "from". (Michael)</div><div class='del'>-</div><div class='del'>-  * Fix some text/plain formatting bugs in the composer. (Dan,</div><div class='del'>-    Ettore)</div><div class='del'>-</div><div class='del'>-  * Turn off search mode when getting new mail (to avoid corrupting</div><div class='del'>-    the display). Make "get mail" always put unfiltered mail into</div><div class='del'>-    Inbox rather than the current folder. (Dan)</div><div class='del'>-</div><div class='del'>-  * Fixed a bug that caused "Re:" to be prepended even to subjects</div><div class='del'>-    that started with "Re:" when replying. Added a default subject</div><div class='del'>-    to forwarded messages. (Dan)</div><div class='del'>-</div><div class='del'>-  * Make the "Attach" dialog in the composer remember the last</div><div class='del'>-    directory it was in. (Dan)</div><div class='del'>-</div><div class='del'>-  * Code to parse invalid date formats since some mailers generate</div><div class='del'>-    them... (Jeff)</div><div class='del'>-</div><div class='del'>-  * Fixed various small SMTP bugs (Jeff, Chris Lahey)</div><div class='del'>-</div><div class='del'>-  * Fixed some memory leaks (Peter, Jeff)</div><div class='del'>-</div><div class='del'>-  * Make replies use the text/plain part of a multipart/alternative</div><div class='del'>-    if the user configured plain text rather than HTML mail sending.</div><div class='del'>-    (Dan)</div><div class='del'>-</div><div class='del'>-  * Various config dialog fixes (Jeff)</div><div class='del'>-</div><div class='del'>-  * Partial filter/vfolder GUI facelift (Jacob)</div><div class='head'>diff --git a/README b/README<br/>deleted file mode 100644<br/>index f0a7032d3b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/README?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>README</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,184 +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'>-IF IT DOESN'T WORK</div><div class='del'>-------------------</div><div class='del'>-</div><div class='del'>-Did you read the "How to build" section below? :-)</div><div class='del'>-</div><div class='del'>-If you have built Evolution and it doesn't work, or you can't get it</div><div class='del'>-or one of its dependencies to compile, try running the</div><div class='del'>-"verify-evolution-install.sh" script in the tools/ subdirectory. It</div><div class='del'>-may be able to figure out what went wrong.</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 - 1.8.7 or later in the 1.0 series, but not from the 2.0</div><div class='del'>-   series (If you get this from GNOME CVS, use the tag "LIB_XML_1_X".)</div><div class='del'>-   (*)</div><div class='del'>-</div><div class='del'>- - gnome-print - 0.20 (*). The gnome-print CVS HEAD will NOT work, nor</div><div class='del'>-   will 0.21.</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.3 or later (*)</div><div class='del'>-</div><div class='del'>- - oaf - 0.5 or later</div><div class='del'>-</div><div class='del'>-   *** If you are using oaf from CVS, you should use the flag</div><div class='del'>-   *** "--disable-more-warnings" when configure, or it may fail to</div><div class='del'>-   *** build.</div><div class='del'>-</div><div class='del'>- - gnome-vfs - 0.3 or later</div><div class='del'>-</div><div class='del'>-   *** If you are using gnome-vfs from CVS, you should use the flag</div><div class='del'>-   *** "--disable-more-warnings" when configuring, or it may fail to</div><div class='del'>-   *** build.</div><div class='del'>-</div><div class='del'>- - bonobo - 0.17 or later</div><div class='del'>-</div><div class='del'>-   *** Note that bonobo must be installed with the same --prefix as</div><div class='del'>-   *** either gnome-libs or evolution for the Makefiles to work</div><div class='del'>-   *** properly.</div><div class='del'>-</div><div class='del'>- - 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 - 0.6 or later</div><div class='del'>-</div><div class='del'>- - gal (GNOME Application Library) - from CVS</div><div class='del'>-</div><div class='del'>- - gtkhtml - 0.5 or later</div><div class='del'>-</div><div class='del'>- - libglade (*)</div><div class='del'>-</div><div class='del'>-If you want support for PalmPilot syncing (currently only supported by</div><div class='del'>-the calendar and not yet very stable/functional), you will also need</div><div class='del'>-the following packages:</div><div class='del'>-</div><div class='del'>- - pilot-link (*)</div><div class='del'>-</div><div class='del'>- - gnome-pilot - from CVS, with --enable-oaf</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 de3e404849..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/acconfig.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>acconfig.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-#undef ENABLE_NLS</div><div class='del'>-#undef HAVE_CATGETS</div><div class='del'>-#undef HAVE_GETTEXT</div><div class='del'>-#undef HAVE_LC_MESSAGES</div><div class='del'>-#undef HAVE_STPCPY</div><div class='del'>-#undef HAVE_LIBSM</div><div class='del'>-#undef PACKAGE</div><div class='del'>-#undef VERSION</div><div class='del'>-#undef ENABLE_THREADS</div><div class='del'>-#undef SENDMAIL_PATH</div><div class='del'>-#undef SYSTEM_MAIL_DIR</div><div class='del'>-#undef HAVE_LDAP</div><div class='del'>-#undef HAVE_TIMEZONE</div><div class='del'>-#undef HAVE_TM_GMTOFF</div><div class='del'>-#undef USING_OAF</div><div class='del'>-#undef HAVE_KRB4</div><div class='del'>-#undef HAVE_KRB5</div><div class='del'>-#undef MOVEMAIL_PATH</div><div class='del'>-#undef PGP_PROGRAM</div><div class='del'>-#undef GPG_PATH</div><div class='del'>-#undef PGP5_PATH</div><div class='del'>-#undef PGP_PATH</div><div class='del'>-#undef USING_GNOME_PRINT_0_20</div><div class='del'>-#undef NEED_KRB_SENDAUTH_PROTO</div><div class='del'>-#undef HAVE_ISBLANK</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='del'>-</div><div class='del'>-/* Define if ctime_r takes three arguments */</div><div class='del'>-#undef CTIME_R_THREE_ARGS</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 d18c824e5d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3005 +0,0 @@</div><div class='del'>-2000-11-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Add</div><div class='del'>-	menus items to the envelope printing stuff.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Hook up the search menu.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-search.c,</div><div class='del'>-	gui/widgets/e-addressbook-search.h: Add the search menu.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Add e-contact-print-envelope.c and</div><div class='del'>-	e-contact-print-envelope.h.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print-envelope.c,</div><div class='del'>-	printing/e-contact-print-envelope.h: Added envelope printing.</div><div class='del'>-</div><div class='del'>-2000-11-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am: Clean the idl-generated</div><div class='del'>-	files properly.</div><div class='del'>-</div><div class='del'>-2000-11-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/.cvsignore, gui/minicard/.cvsignore: Removed these</div><div class='del'>-	unnecessary .cvsignores.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Switch to using EAddressbookSearch</div><div class='del'>-	instead of custom quick search widget.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Made this do a</div><div class='del'>-	slightly better job of rendering names.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am: Added e-addressbook-search.c and</div><div class='del'>-	e-addressbook-search.h.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-search.c,</div><div class='del'>-	gui/widgets/e-addressbook-search.h: New class that puts up an</div><div class='del'>-	entry and a combo box.</div><div class='del'>-</div><div class='del'>-2000-11-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (load_ldap_data): </div><div class='del'>-	(e_ldap_storage_add_server): Add "highlighted" flag to</div><div class='del'>-	evolution_storage_new_folder</div><div class='del'>-</div><div class='del'>-2000-10-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (cursor_cb): Let the warning make sense</div><div class='del'>-	(compute_pid): remove</div><div class='del'>-	(local_record_from_ecard): Create local record from ecard - not finished</div><div class='del'>-	(local_record_from_uid): Obtain local_record from uid with the proper</div><div class='del'>-	e-book way</div><div class='del'>-	(set_status_cleared): Add empty callback</div><div class='del'>-	(add_archive_record): kill</div><div class='del'>-	(delete_archive_record): kill</div><div class='del'>-	(archive_record): Add empty callback</div><div class='del'>-	(conduit_get_gpilot_conduit): Update signal connects</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (vcard_change_type): Function to determine</div><div class='del'>-	the type of change - not finished</div><div class='del'>-	(pas_backend_file_search_changes): Create a view and callback based on </div><div class='del'>-	how the cards have changed</div><div class='del'>-	(pas_backend_file_process_get_changes): Implement the get changes operation</div><div class='del'>-	for files</div><div class='del'>-	(pas_backend_file_process_client_requests): Add GetChanges method for</div><div class='del'>-	processing</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_queue_get_changes): Add changes to</div><div class='del'>-	the list</div><div class='del'>-	(impl_Evolution_Book_get_changes): implement object method</div><div class='del'>-	(pas_book_get_epv): Add get changes to epv</div><div class='del'>-	(pas_book_respond_get_changes): Respond to the get changes operation</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: Add GetChanges PASOperation</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl: add get_changes and respond_get_changes</div><div class='del'>-	methods</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_get_changes): Client function</div><div class='del'>-	to a view of the changed objects</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.h: New prototype</div><div class='del'>-</div><div class='del'>-2000-10-30  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* backend/e-book/e-card.c: Fixed marking of strings</div><div class='del'>-	for translation. Use "_(" instead of "_ (".</div><div class='del'>-	* gui/component/addressbook-factory.c: Add missing</div><div class='del'>-	calls to bindtextdomain() and textdomain noticed by</div><div class='del'>-	Dan Winship.</div><div class='del'>-	* gui/component/addressbook.c: Marked string for translation.</div><div class='del'>-	</div><div class='del'>-2000-10-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am, gui/search/Makefile.am,</div><div class='del'>-	printing/Makefile.am: Fixed these to include EXTRA_GNOME_CFLAGS.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c: Turned off</div><div class='del'>-	newlines in header fields.</div><div class='del'>-</div><div class='del'>-2000-10-26  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c (e_contact_print_letter_tab),</div><div class='del'>-	(complete_sequence, e_contact_do_print_phone_list, lowify):</div><div class='del'>-	unsigned charness.</div><div class='del'>-</div><div class='del'>-2000-10-25  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (ldap_op_process_current): only</div><div class='del'>-	call the handler if the if we're connected, and if we fail to</div><div class='del'>-	connect finish the op and post a message.</div><div class='del'>-	(pas_backend_ldap_connect): add debug spew if DEBUG is defined.</div><div class='del'>-	(modify_card_handler): LDAP_RES_SEARCH_ENTRY =&gt; LDAP_SUCCESS.</div><div class='del'>-	(modify_card_handler): only perform the ldap_modify_s if we have a</div><div class='del'>-	list of modifications.</div><div class='del'>-	(get_cursor_handler): use ldap_error_to_response here.</div><div class='del'>-	(pas_backend_ldap_load_uri): use LDAP_PORT instead of the constant</div><div class='del'>-	389.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am (INCLUDES): </div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am (INCLUDES): </div><div class='del'>-	* backend/ebook/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.h: Use new libeconduit calls and</div><div class='del'>-	abstraction</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: ditto</div><div class='del'>-	</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (pre_sync): Use e_pilot_map_read</div><div class='del'>-	(post_sync): Use e_pilot_map_write</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Link libeconduit and not libical</div><div class='del'>-</div><div class='del'>-2000-10-20  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (tb_save_and_close_cb): </div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (toggle_view_as_cb): </div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.h: New structure of file - similar</div><div class='del'>-	to calendar/todo conduits</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit-config.h: Config stuff for conduit</div><div class='del'>-</div><div class='del'>-	* conduit/.cvsignore: Update</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am: Build fixes</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit-control-applet.desktop: Renamed</div><div class='del'>-	to e-address-conduit-control-applet.desktop</div><div class='del'>-</div><div class='del'>-	* conduit/address.conduit.in: Renamed to e-address.conduit.in</div><div class='del'>-</div><div class='del'>-2000-10-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c (SPEC): Remove Family name</div><div class='del'>-	column since it's a bit weird.  This also fixes the initial state</div><div class='del'>-	since all of the column choices were off by one.</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am (glade_DATA): Remove</div><div class='del'>-	`e-contact-print.glade.h'.</div><div class='del'>-	(EXTRA_DIST): Move here.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (glade_DATA): Remove</div><div class='del'>-	`ldap-server-dialog.glade.h'.</div><div class='del'>-	(EXTRA_DIST): Move here.</div><div class='del'>-</div><div class='del'>-2000-10-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Change how the extension field acts when</div><div class='del'>-	converting delivery addresses to labels.</div><div class='del'>-</div><div class='del'>-2000-10-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added the</div><div class='del'>-	function e_card_delivery_address_to_label.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.c: Fixed a potential</div><div class='del'>-	crash.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Made this save the changed</div><div class='del'>-	data to the string version of the address.</div><div class='del'>-</div><div class='del'>-2000-10-19  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (change_view_type): update to new</div><div class='del'>-	UI handler.</div><div class='del'>-	(update_view_type): split from (change_view_type).</div><div class='del'>-	(control_activate): add an update_view_type.</div><div class='del'>-</div><div class='del'>-2000-10-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Change NAME_OR_ORG to return the</div><div class='del'>-	email address if both name and organization are taken.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Fixed up the spec</div><div class='del'>-	strings in this class.  Removed the "cursor_mode" argument to</div><div class='del'>-	ETable since it's part of the spec now.</div><div class='del'>-</div><div class='del'>-2000-10-17  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Change the initial dialog </div><div class='del'>-	visibility to FALSE</div><div class='del'>-	so the contact editor doesn't flash when it appears.</div><div class='del'>-</div><div class='del'>-2000-10-16  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c </div><div class='del'>-	(e_select_names_manager_activate_dialog): Only allow one dialog</div><div class='del'>-	per manager.</div><div class='del'>-</div><div class='del'>-2000-10-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulladdr.glade: Fixed a typo.  Made this look a</div><div class='del'>-	bit better.</div><div class='del'>-</div><div class='del'>-2000-10-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am:</div><div class='del'>-	* gui/component/Makefile.am: Remove CPPFLAGS since they just</div><div class='del'>-	duplicate flags that were already in INCLUDES.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am (ecpsdir): </div><div class='del'>-	* gui/widgets/Makefile.am:</div><div class='del'>-	* contact-editor/Makefile.am: Move -D flags from CPPFLAGS to</div><div class='del'>-	INCLUDES so they don't override any CPPFLAGS set at configure</div><div class='del'>-	time.</div><div class='del'>-</div><div class='del'>-2000-10-14  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): if we are in</div><div class='del'>-	LDAP mode then merge in the extra few items, otherwise just merge</div><div class='del'>-	the standard thing; saves duplication.</div><div class='del'>-</div><div class='del'>-2000-10-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: Added</div><div class='del'>-	"evolution:shell-component-icon" property.</div><div class='del'>-</div><div class='del'>-2000-10-14  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c </div><div class='del'>-	(e_select_names_manager_activate_dialog): Only allow one dialog</div><div class='del'>-	per id.</div><div class='del'>-	(e_select_names_manager_destroy): Destroy the hashtable.</div><div class='del'>-	(e_select_names_manager_init): Init the hashtable.</div><div class='del'>-</div><div class='del'>-2000-10-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:</div><div class='del'>-	Rearranged these fields a bit more.</div><div class='del'>-</div><div class='del'>-2000-10-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c: Changed these for boolean</div><div class='del'>-	ascending attribute instead of int ascending attribute.  Fixed</div><div class='del'>-	e-select-names to not use a column past the end of its array.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.c,</div><div class='del'>-	contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:</div><div class='del'>-	Rearranged the address editor dialog.</div><div class='del'>-</div><div class='del'>-2000-10-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed the column</div><div class='del'>-	elements, the no-headers attribute and added a cursor-mode=line</div><div class='del'>-	attribute.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c: Fixed the column elements here.</div><div class='del'>-</div><div class='del'>-2000-10-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.c: Updated these to the new style</div><div class='del'>-	ETables.</div><div class='del'>-</div><div class='del'>-2000-10-06  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c (get_widget): Removed</div><div class='del'>-	ondemand callback nonsense from rule_context_load().</div><div class='del'>-</div><div class='del'>-2000-10-05  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (create_ui): upd.</div><div class='del'>-	(e_contact_editor_init): upd.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate_cb): upd.</div><div class='del'>-	(control_deactivate): kill.</div><div class='del'>-	(control_activate): upd.</div><div class='del'>-</div><div class='del'>-2000-09-22  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): update.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (create_ui): upd.</div><div class='del'>-</div><div class='del'>-Fri Sep 29 07:33:54 2000  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard.c, gui/widgets/e-minicard.h: Made it so</div><div class='del'>- 	that minicard doesn't write out changes to the backend unless</div><div class='del'>- 	something's actually changed.</div><div class='del'>-</div><div class='del'>-Tue Sep 26 16:28:47 2000  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Make sure that card-&gt;name and</div><div class='del'>- 	card-&gt;full_name are always valid.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Removed some unused</div><div class='del'>- 	variables.</div><div class='del'>-</div><div class='del'>-2000-09-22  Matt Bissiri  &lt;bissiri@eecs.umich.edu&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c (extract_info): If</div><div class='del'>-	(editor-&gt;name == NULL), store ptr to newly allocated ECardName in</div><div class='del'>- 	editor-&gt;name, not just in a stack variable.  This fixes a crash</div><div class='del'>- 	which happened when you click "New", then click "Full Name...",</div><div class='del'>- 	then enter name, then click "OK".</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_name_to_string): Add</div><div class='del'>- 	g_return_val_if_fail.</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am:</div><div class='del'>-	* gui/component/Makefile.am:</div><div class='del'>-	* contact-editor/Makefile.am:</div><div class='del'>-	* printing/Makefile.am: Look for ename in /e-util/ename instead of</div><div class='del'>-	/addressbook/ename</div><div class='del'>-	</div><div class='del'>-	* backend/ebook/e-card.c: Updated to include e-util/ename/*.h</div><div class='del'>-</div><div class='del'>-	* ename: Moved to /e-util so it could be shared</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): took out ename</div><div class='del'>-</div><div class='del'>-2000-09-25  Nat Friedman  &lt;nat@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western-tables.h: Added a ton of new prefixes and</div><div class='del'>-	suffixes.</div><div class='del'>-</div><div class='del'>-2000-09-22  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): update.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (create_ui): upd.</div><div class='del'>-</div><div class='del'>-2000-09-22  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: lots of changes.  flesh out the</div><div class='del'>- 	remove/modify/create functions.  add another flag for the property</div><div class='del'>- 	table, PROP_DN, which makes it easy for us to determine when we</div><div class='del'>- 	need to create a new DN for a record when we're modifying.  also</div><div class='del'>- 	add a ber_func to the table for PROP_TYPE_LIST fields, which fills</div><div class='del'>- 	in the list of bvalues that we send to the ldap server.  The</div><div class='del'>- 	add/modify/delete stuff hasn't been tested yet, and it hopelessly</div><div class='del'>- 	complex (yay ldap).</div><div class='del'>-	(ldap_search_handler): act synchronous when ldap_search responds</div><div class='del'>- 	with -1.</div><div class='del'>-	(view_destroy): use pas_book_view_notify_status_message.</div><div class='del'>-	(ldap_op_process_current): same</div><div class='del'>-	(ldap_op_process): same</div><div class='del'>-	(poll_ldap): same</div><div class='del'>-	(ldap_search_handler): same</div><div class='del'>-</div><div class='del'>-2000-09-22  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.h: add</div><div class='del'>- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME to the enum.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c (field_data): add</div><div class='del'>- 	E_CARD_SIMPLE_FIELD_FAMILY_NAME.</div><div class='del'>-	(e_card_simple_get): add getter for FAMILY_NAME.</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Made addresses be quoted printable again</div><div class='del'>- 	so that they will encode properly if they have carriage returns in</div><div class='del'>- 	them.  This is possible now because of a fix in libversit.</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c,</div><div class='del'>- 	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,</div><div class='del'>- 	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,</div><div class='del'>- 	backend/pas/pas-book-view.c, backend/pas/pas-book-view.h: Added a</div><div class='del'>- 	function to set the status message associated with a given view.</div><div class='del'>-  	This is not yet implemented in the gui.</div><div class='del'>-</div><div class='del'>-2000-09-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c, backend/ebook/e-book.h,</div><div class='del'>-	backend/idl/addressbook.idl, backend/pas/pas-backend-file.c,</div><div class='del'>-	backend/pas/pas-backend-ldap.c, backend/pas-backend.c,</div><div class='del'>-	backend/pas/pas-backend.h, backend/pas/pas-book.c,</div><div class='del'>-	backend/pas/pas-book.h: Added a function to query static</div><div class='del'>-	capabilities (capabilities that can be reported immediately) and</div><div class='del'>-	implemented them in the 2 servers.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added a View All button and a Stop</div><div class='del'>-	button.  Sorted out the new directory server stuff a bit.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-model.c,</div><div class='del'>-	gui/widgets/e-addressbook-model.h: Cleaned up a bit.  Added a stop</div><div class='del'>-	function.  Check for capabilities before deciding whether to load</div><div class='del'>-	all cards when initially viewed.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h: Added stop and view all</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.h,</div><div class='del'>-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h:</div><div class='del'>-	Added a stop function.  Check for capabilities before deciding</div><div class='del'>-	whether to load all cards when initially viewed.</div><div class='del'>-</div><div class='del'>-2000-09-21  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): remove _UIHandler</div><div class='del'>-</div><div class='del'>-2000-09-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: Added a missing include</div><div class='del'>-	of ctype.h.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed a problem where using a</div><div class='del'>-	GList was causing us to not be reentrant.  We now use an EList</div><div class='del'>-	here and so now this is reentrant.  This should fix the "wombat</div><div class='del'>-	crashes every time you run evolution" bug.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed a type mismatch.</div><div class='del'>-</div><div class='del'>-2000-09-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: Make this work when a</div><div class='del'>-	field is spread across multiple lines.</div><div class='del'>-</div><div class='del'>-2000-09-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added a</div><div class='del'>-	wants_html field to cards.  Uses "x-mozilla-html".</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added definition of</div><div class='del'>-	EVOLUTION_DATADIR.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Make Wants HTML check</div><div class='del'>-	button visible.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Make Wants HTML check button</div><div class='del'>-	active.  Fix UI stuff to use XML.  Set parent window of</div><div class='del'>-	confirm_delete dialog.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard.c: Set</div><div class='del'>-	the parent window of the confirm_delete dialog.</div><div class='del'>-	</div><div class='del'>-2000-09-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c: Fixed display of the minicards</div><div class='del'>-	when the addressbook was first loading.  (It was overwriting a</div><div class='del'>-	string with NULL during init.)</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/Makefile.am (ruledir): Use $(datadir), not</div><div class='del'>-	$(prefix)/share</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am, contact-editor/Makefile.am,</div><div class='del'>-	ename/Makefile.am, gui/component/Makefile.am,</div><div class='del'>-	gui/widgets/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and</div><div class='del'>-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/pas/pas-backend-file.c,</div><div class='del'>-	contact-editor/e-contact-editor-address.c,</div><div class='del'>-	contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	contact-editor/e-contact-editor-categories.h,</div><div class='del'>-	contact-editor/e-contact-editor-fullname.c,</div><div class='del'>-	contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-save-as.c, ename/e-address-western.c,</div><div class='del'>-	ename/test-ename-western-gtk.c,</div><div class='del'>-	gui/component/addressbook-factory.c, gui/component/addressbook.c,</div><div class='del'>-	gui/component/e-cardlist-model.h, gui/component/e-ldap-storage.c,</div><div class='del'>-	gui/component/select-names/e-select-names-bonobo.c,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h,</div><div class='del'>-	gui/search/e-addressbook-search-dialog.c,</div><div class='del'>-	gui/widgets/e-addressbook-model.h,</div><div class='del'>-	gui/widgets/e-addressbook-view.c, gui/widgets/e-minicard-label.c,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.c,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.h,</div><div class='del'>-	gui/widgets/e-minicard-view.c, gui/widgets/e-minicard-view.h,</div><div class='del'>-	gui/widgets/e-minicard-widget.h, gui/widgets/e-minicard.c,</div><div class='del'>-	gui/widgets/test-minicard-label.c, gui/widgets/test-reflow.c,</div><div class='del'>-	printing/e-contact-print.c: Fixed the #include lines to deal</div><div class='del'>-	properly with gal.</div><div class='del'>-	</div><div class='del'>-2000-09-15  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.h,</div><div class='del'>-	contact-editor/e-contact-save-as.h,</div><div class='del'>-	gui/widgets/e-addressbook-model.h,</div><div class='del'>-	gui/widgets/e-minicard-view-widget.h,</div><div class='del'>-	gui/widgets/e-minicard-view.h, gui/widgets/e-minicard.c,</div><div class='del'>-	gui/widgets/e-minicard.h: Fixed the paths of some .h #includes.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed all of the code to actually</div><div class='del'>-	create and display the correct view of the addressbook and moved</div><div class='del'>-	it to the new class gui/widgets/e-addressbook-view.c.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am: Added everything necessary for</div><div class='del'>-	e-addressbook-view.c and e-addressbook-view.h.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-addressbook-view.c,</div><div class='del'>-	gui/widgets/e-addressbook-view.h: New class to deal with actual</div><div class='del'>-	display of addresses and switching between card view and table</div><div class='del'>-	view.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view-widget.c: Made this deal more</div><div class='del'>-	gracefully with having the book set to NULL.</div><div class='del'>-</div><div class='del'>-2000-09-16  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: fix broken include.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): define datadir.</div><div class='del'>-	(evolution_addressbook_SOURCES): remove e-addressbook-model.[ch]</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): use datadir.</div><div class='del'>-</div><div class='del'>-2000-09-16  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (gladedir): Define.</div><div class='del'>-	(glade_DATA): Install `alphabet.glade'.</div><div class='del'>-	(EXTRA_DIST): Define.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (glade_DATA): Remove `alphabet.glade'.</div><div class='del'>-	(EXTRA_DIST): Remove `alphabet.glade.h'.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am (libeminicard_a_SOURCES): Add</div><div class='del'>-	`e-addressbook-model.c' and `e-addressbook-model.h'.  I hope this</div><div class='del'>-	is what Chris meant to do.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_srcdir)/addressbook/gui/widgets'.</div><div class='del'>-	(evolution_addressbook_SOURCES): Remove `e-addressbook-model.c'</div><div class='del'>-	and `e-addressbook-model.h'.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: #include</div><div class='del'>-	"e-addressbook-model.h" from "addressbook/gui/widgets" instead of</div><div class='del'>-	"addressbook/gui/component", as it has been moved there.</div><div class='del'>-</div><div class='del'>-2000-09-15  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: split all the ldap operations</div><div class='del'>-	into 2 halves, a handler, and destructor, and create a structure</div><div class='del'>-	containing two function pointers and any data they need.  this</div><div class='del'>-	allows us queue up pending operations (since the LDAP*'s are no</div><div class='del'>-	longer view specific.  there's one per backend.)  also, add</div><div class='del'>-	support for restarting async operations if the SERVER DOWN error</div><div class='del'>-	isn't communicated until sometime after the handler is called (as</div><div class='del'>-	is the case with the async search stuff.)</div><div class='del'>-</div><div class='del'>-2000-09-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Call unicode_init</div><div class='del'>-	for e-font stuff.</div><div class='del'>-</div><div class='del'>-2000-09-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am, gui/widgets/Makefile.am: Added</div><div class='del'>-	$(GNOME_PRINT_LIBS) to all of the test files in these directories.</div><div class='del'>-</div><div class='del'>-2000-09-14  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): fix path.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: update include.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: update include.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/e-minicard-view.h: update include.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: update include path.</div><div class='del'>-</div><div class='del'>-2000-09-13  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (e_contact_editor_init): hack.</div><div class='del'>-	(create_toolbar): ditto.</div><div class='del'>-</div><div class='del'>-2000-09-07  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Radicaly update UI handler code.</div><div class='del'>-</div><div class='del'>-2000-09-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/widgets/*, gui/minicard/*: Moved gui/minicard to</div><div class='del'>-	gui/widgets, except for e-reflow.c, e-reflow.h, e-reflow-sorted.c,</div><div class='del'>-	and e-reflow-sorted.h.</div><div class='del'>-</div><div class='del'>-	* gui/widgets/Makefile.am: Added e-reflow to the INCLUDES list and</div><div class='del'>-	libereflow.a to a bunch of LDADD lines.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added</div><div class='del'>-	libereflow.a here.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SUBDIRS): Replaced minicard with widgets.</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am: Add space after `-I'</div><div class='del'>-	when invoking `orbit-idl'.</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (EXTRA_DIST): Remove `ui.xml'.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed a crash error.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-09-11  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: fixed certain address parsing</div><div class='del'>-	problems.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulladdr.glade: Made this a bit better balanced.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the toolbar button for find do</div><div class='del'>-	the same thing that the menu item for search does.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: Made the top half of</div><div class='del'>-	this not expand.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Removed a bunch of redundant code.  Made it so that when you set</div><div class='del'>-	an address label, it sets the delivery address as well.  Added</div><div class='del'>-	functions to set and get the delivery address.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added code to</div><div class='del'>-	convert and address label to a delivery address.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added e-contact-editor-address.[ch],</div><div class='del'>-	fulladdr.glade, fulladdr.glade.h.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Switched from a label</div><div class='del'>-	to a button to show the parsed address.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-address.c,</div><div class='del'>-	contact-editor/e-contact-editor-address.h: New class to implement</div><div class='del'>-	the parsed address dialog.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c,</div><div class='del'>-	contact-editor/e-contact-editor-fullname.h: Added const to the</div><div class='del'>-	_new function.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Implemented clicking on the</div><div class='del'>-	address button.</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulladdr.glade, contact-editor/fulladdr.glade.h:</div><div class='del'>-	New glade files for the parsed address dialog.</div><div class='del'>-</div><div class='del'>-	* contact-editor/fullname-strings.h, fullname.glade: Changed these</div><div class='del'>-	accellabels to labels.</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am: Added e-address-western.c.</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-09-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: Added by Jesse.</div><div class='del'>-</div><div class='del'>-2000-09-08  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-label.c (e_minicard_label_construct):</div><div class='del'>-	Use canvas default font</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c (e_minicard_realize): Ditto</div><div class='del'>-	(get_left_width): Ditto</div><div class='del'>-</div><div class='del'>-2000-09-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed a few warnings.</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-2000-09-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (load_ldap_data): Updated for the</div><div class='del'>-	extra arg now needed by `evolution_storage_new_folder()'.</div><div class='del'>-	(e_ldap_storage_add_server): Likewise.</div><div class='del'>-</div><div class='del'>-2000-08-31  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am (INCLUDES): Add `BONOBO_GNOME_CFLAGS' and</div><div class='del'>-	`-I$(top_srcdir)'.</div><div class='del'>-</div><div class='del'>-2000-08-31  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Install load-gnomecard-addressbook</div><div class='del'>-	and load-pine-addressbook.</div><div class='del'>-</div><div class='del'>-2000-08-30  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c: Countless small changes for gnome-print 0.21+</div><div class='del'>-</div><div class='del'>-2000-08-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: Add a name to the minicard</div><div class='del'>-	viewer.</div><div class='del'>-</div><div class='del'>-2000-08-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: </div><div class='del'>-	* backend/ebook/test-client.c: </div><div class='del'>-	* backend/ebook/test-client-list.c: </div><div class='del'>-	* backend/ebook/load-gnomecard-addressbook.c: </div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: </div><div class='del'>-	* backend/pas/pas-book-factory.c: </div><div class='del'>-	* conduit/address-conduit.h: Remove USING_OAF checks</div><div class='del'>-</div><div class='del'>-2000-08-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Use the right argument name to turn</div><div class='del'>-	on grid lines.</div><div class='del'>-</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Comment out minicard-view-test</div><div class='del'>-	since its gnorba dependent</div><div class='del'>-	</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Remove gnorba stuff</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c (e_minicard_control_factory_init):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: ditto</div><div class='del'>-</div><div class='del'>-2000-08-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* demo/* Removed the demo directory since it's no longer used.</div><div class='del'>-</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Remove gnorba stuff</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.gnorba: Kill</div><div class='del'>-	</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.gnorba: Kill</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am:  Remove gnorba stuff</div><div class='del'>-</div><div class='del'>-2000-08-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDFLAGS): Add</div><div class='del'>-	-export-dynamic so libglade will be able to resolve custom widget</div><div class='del'>-	callbacks.</div><div class='del'>-</div><div class='del'>-2000-08-23  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (func_contains): Use e_utf8_strstrcase</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c (fill_in_field): Use e_utf8 wrapper</div><div class='del'>-	(extract_field): Same</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (full_name_clicked): Don't crash</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am: Link demo with libeutil.la</div><div class='del'>-</div><div class='del'>-	* ename/test-ename-western-gtk.c (full_changed_cb): Use e_utf8 wrapper</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (find_contact_cb): Use e_utf8 wrapper</div><div class='del'>-	(search_entry_activated): Same</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: Fix an error in the</div><div class='del'>-	arguments to rule_context_load.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Fix this to not mess up if the person</div><div class='del'>-	passes a VCard with a carriage return in the mailing address.</div><div class='del'>-</div><div class='del'>-2000-08-14  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/addresstypes.xml: Fixed fullname-&gt;full_name for</div><div class='del'>-	search field.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c (get_widget): Check we</div><div class='del'>-	actually got any parts to build the dialogue with.</div><div class='del'>-</div><div class='del'>-2000-08-13  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): Set the</div><div class='del'>-	global_shell_client nastyhack when we know it.</div><div class='del'>-	This is only required to link with the filter code ...</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Added</div><div class='del'>-	libfilter.a to the link line.</div><div class='del'>-</div><div class='del'>-	* gui/search/Makefile.am (noinst_LIBRARIES): Change library name</div><div class='del'>-	from libaddressbooksearchdialog to libaddressbooksearch, as used</div><div class='del'>-	elsewhere.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c (get_widget):</div><div class='del'>-	Implement.</div><div class='del'>-	(get_query): Likewise.</div><div class='del'>-	(e_addressbook_search_dialog_destroy): Unref filter stuff when</div><div class='del'>-	done.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_deactivate): Added chris's</div><div class='del'>-	patch to put the meny in</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Use e_utf8 wrappers everywhere</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/e-card.h: Started adding a time zone field to ECard.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Added</div><div class='del'>-	e_table_model_pre_change where appropriate.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Added a ref and unref pair.</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Linked in the search dialog again.</div><div class='del'>-	It looks like some changes in the shell made this not work.</div><div class='del'>-</div><div class='del'>-2000-08-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c, conduit/address-conduit.h: Changed</div><div class='del'>-	this to use ECardSimple.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed a memory leak.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added stuff to the right click</div><div class='del'>-	menu.  Activated the new search dialog that doesn't quite work</div><div class='del'>-	yet.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c: Fixed some run time warnings.</div><div class='del'>-</div><div class='del'>-2000-08-15  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c (e_minicard_event): use style colors</div><div class='del'>-	for the selected state.  This doesn't properly redraw the minicard</div><div class='del'>-	when there is a style_change event, that is next.</div><div class='del'>-	(e_minicard_realize): use style colors.</div><div class='del'>-</div><div class='del'>-2000-08-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Include the proper db1/db.h</div><div class='del'>-	as in RedHat 7.0 -- patch from Kenny Graunke &lt;kwg@teleport.com&gt;</div><div class='del'>-</div><div class='del'>-2000-08-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/Makefile.am (libaddress_conduit_la_SOURCES): add</div><div class='del'>-	address-conduit.h</div><div class='del'>-</div><div class='del'>-	* Makefile.am (CONDUIT_SUBDIR): only set subdir if</div><div class='del'>-	ENABLE_PILOT_CONDUITS is set.</div><div class='del'>-</div><div class='del'>-2000-08-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): add conduit subdir.</div><div class='del'>-</div><div class='del'>-2000-08-13  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (conduit_get_gpilot_conduit): add</div><div class='del'>-	special oaf initialization hack so conduit can find wombat, and</div><div class='del'>-	accept all cookies so that we can actually talk to oaf.</div><div class='del'>-</div><div class='del'>-2000-08-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed a typo that cause the</div><div class='del'>-	wrong field to be searched.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Made the select</div><div class='del'>-	names dialog only display entries with email addresses.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Fixed a typo in the name of</div><div class='del'>-	the first phone entry.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/Makefile.am,</div><div class='del'>-	gui/search/e-addressbook-search-dialog.c,</div><div class='del'>-	gui/search/e-addressbook-search-dialog.h: A few small interface</div><div class='del'>-	fixes.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Link in the addressbook search</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added the search directory.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: Fixed a potential crash.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.h: Fixed an include line.</div><div class='del'>-</div><div class='del'>-	* gui/search/.cvsignore, gui/search/Makefile.am: New files.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: Fixed compilation.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Ettore fixed compilation.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/.cvsignore: Added load-gnomecard-addressbook.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c,</div><div class='del'>-	gui/search/e-addressbook-search-dialog.h: Made this into a Gtk</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-2000-08-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-view.c: Ref our book view listener.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Updated to use new minicard view</div><div class='del'>-	widget.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Added e-minicard-view-widget.c and</div><div class='del'>-	e-minicard-view-widget.h.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view-widget.c,</div><div class='del'>-	gui/minicard/e-minicard-view-widget.h: New class that's just a</div><div class='del'>-	minicard view in an ECanvas.</div><div class='del'>-</div><div class='del'>-	* gui/search/e-addressbook-search-dialog.c: New file for</div><div class='del'>-	implementing a search dialog.</div><div class='del'>-</div><div class='del'>-2000-08-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (transmit): implement code to encode</div><div class='del'>-	the first email address and send to the pilot.</div><div class='del'>-	(get_phone_label_by_flag): rename find_phone_label_for_flags to</div><div class='del'>-	this, and implement by calling get_phone_label_by_name.</div><div class='del'>-</div><div class='del'>-2000-08-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (ecard_from_remote_record): add code</div><div class='del'>-	for handling email addresses from pilot (which stores it as a</div><div class='del'>-	phone number entry.  go figure.)</div><div class='del'>-	(check_for_slow_setting): #if 0 out, since we don't use it (yet).</div><div class='del'>-	(update_record): un #if 0 the code to handle the case where the</div><div class='del'>-	pilot info has changed for a local record.</div><div class='del'>-	(merge_ecard_with_remote_record): implement function, but for now</div><div class='del'>-	just return the existing (desktop) record - we still don't allow</div><div class='del'>-	merge from the pilot.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/addresstypes.xml: Changed a couple of input field</div><div class='del'>-	names.</div><div class='del'>-</div><div class='del'>-2000-08-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Remove prototype for</div><div class='del'>-	`setup_ldap_storage()', which shouldn't be here anyway.</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/search/, gui/search/addresstypes.xml: New search dialog for</div><div class='del'>-	addressbook.</div><div class='del'>-</div><div class='del'>-2000-08-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): Update for</div><div class='del'>-	changed prototype, pass evolution_homedir arg to</div><div class='del'>-	setup_ldap_storage.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Now takes</div><div class='del'>-	an evolution_homedir arg, uses that to generate the path to the</div><div class='del'>-	ldapservers.xml file, and stores the result in a static variable.</div><div class='del'>-	(e_ldap_storage_add_server, e_ldap_storage_remove_server): Use that</div><div class='del'>-	static variable rather than hardcoding the path to the file.</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed any search to not crash on</div><div class='del'>-	missing phone numbers or email addresses.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Added a button to save to</div><div class='del'>-	your addressbook.</div><div class='del'>-</div><div class='del'>-2000-08-09  Cody Russell  &lt;bratsche@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the toolbar honor the user's</div><div class='del'>-	gnomecc settings for detachable toolbars.</div><div class='del'>-</div><div class='del'>-2000-08-09  Nat Friedman  &lt;nat@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western-tables.h: Added some military prefixes.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Add the stock</div><div class='del'>-	print icon to the print item.</div><div class='del'>-</div><div class='del'>-2000-08-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Put the print</div><div class='del'>-	item in the right placeholder so that it gets the right position</div><div class='del'>-	in the "File" menu.</div><div class='del'>-	(control_deactivate): Updated accordingly.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c, gui/minicard/e-minicard.c: Changed</div><div class='del'>-	e_popup_menu_run call to match the new arguments.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: Fixed this file to work</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Use the correct oafinfo ID</div><div class='del'>-	here.  Also cleaned up the code a bit with the help of Michael</div><div class='del'>-	Meeks.</div><div class='del'>-</div><div class='del'>-2000-08-08  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c (e_addressbook_model_init):</div><div class='del'>-	use x-evolution-any-field.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (search_entry_activated): use</div><div class='del'>-	x-evolution-any-field.</div><div class='del'>-	(change_view_type): same.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c (e_minicard_view_init): set query</div><div class='del'>-	to x-evolution-any-field.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (func_contains): support</div><div class='del'>-	x-evolution-any-field for matching any evolution supported field.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (compare_email): switch to using</div><div class='del'>-	ECardSimple calls.</div><div class='del'>-	(compare_phone): same.</div><div class='del'>-	(compare_address): same.</div><div class='del'>-	(entry_compare): switch to using ECardSimple calls, and support a</div><div class='del'>-	'x-evolution-any-field' wildcard field.</div><div class='del'>-	(vcard_matches_search): use an ECardSimple.</div><div class='del'>-</div><div class='del'>-2000-08-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Removed the next and prev</div><div class='del'>-	toolbar buttons since they don't do anything.</div><div class='del'>-</div><div class='del'>-2000-08-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor.c: Fixed the tab order to not</div><div class='del'>-	repeat the web page address field.</div><div class='del'>-</div><div class='del'>-2000-08-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed the tab order for this</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-2000-08-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Cast to (char *) in</div><div class='del'>-	e_card_load_cards_from_file since libversit isn't const correct.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-04  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): unref.</div><div class='del'>-</div><div class='del'>-	* demo/addressbook.c (control_activate): unref.</div><div class='del'>-</div><div class='del'>-2000-08-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	gui/component/e-addressbook-model.c: Emit "model_pre_change"</div><div class='del'>-	signal as appropriate.</div><div class='del'>-</div><div class='del'>-2000-08-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Adapted this to supply the</div><div class='del'>-	new append_row API of ETableModel.</div><div class='del'>-</div><div class='del'>-2000-07-31  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Changed the default set of columns.</div><div class='del'>-</div><div class='del'>-2000-07-29  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added load-gnomecard-addressbook</div><div class='del'>-	compilation.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added</div><div class='del'>-	e_card_load_cards_from_file helper function to load multiple cards</div><div class='del'>-	from a single file.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-gnomecard-addressbook.c: New file to load</div><div class='del'>-	vcard files.  I think this is the format that gnomecard uses so if</div><div class='del'>-	you copy your gnomecard file to gnomecard.vcf and then run this</div><div class='del'>-	program in the same directory, it'll copy all your gnome contacts</div><div class='del'>-	into evolution.  It needs to be changed to take a filename as a</div><div class='del'>-	parameter.  Some fields (phone and address information, for</div><div class='del'>-	example) aren't displayed properly, but are saved.  This is new</div><div class='del'>-	code, so some other than phone and address may be lost.</div><div class='del'>-</div><div class='del'>-2000-07-28  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am: Add `pas-backend-ldap.c' and</div><div class='del'>-	`pas-backend-ldap.h' to `EXTRA_DIST' so they get distributed even</div><div class='del'>-	if the OpenLDAP support is not enabled.</div><div class='del'>-</div><div class='del'>-2000-07-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: Changed the URI to load</div><div class='del'>-	to.</div><div class='del'>-</div><div class='del'>-2000-07-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-widget-test.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-07-26  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (view_destroy): wait to free the</div><div class='del'>-	view until we've taken care of freeing its internals.  also, close</div><div class='del'>-	the ldap connection here.</div><div class='del'>-	(pas_backend_ldap_connect): rename p_b_l_ensure_connected to this,</div><div class='del'>-	since it's always called when we create a view.</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): open an ldap connection</div><div class='del'>-	in this function and close it at the end.</div><div class='del'>-	(poll_ldap): make sure to call ldap_unbind to close the view's</div><div class='del'>-	connection here.</div><div class='del'>-	(pas_backend_ldap_search): call pas_backend_ldap_connect here -</div><div class='del'>-	ldap_unbind will either be called from poll_ldap or from</div><div class='del'>-	view_destroy.</div><div class='del'>-	(pas_backend_ldap_get_vcard): the PASBackendLDAP no longer has an</div><div class='del'>-	LDAP*.</div><div class='del'>-</div><div class='del'>-2000-07-26  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): add support for user settable scope.</div><div class='del'>-	(pas_backend_ldap_search): same.</div><div class='del'>-	(pas_backend_ldap_load_uri): same.</div><div class='del'>-</div><div class='del'>-2000-07-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: lowercasify the</div><div class='del'>-	supported_mime_types</div><div class='del'>-</div><div class='del'>-2000-07-25  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h: add enum for e-card pilot status.</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: #ifdef out all the archiving code with SUPPORT_ARCHIVING.</div><div class='del'>-	(purge): implement correctly - deleting ecards whose pilot status is DELETED.</div><div class='del'>-	(set_status): implement.</div><div class='del'>-	(set_pilot_id): add gtk_main call here to change commit_card into a synchronous</div><div class='del'>-	(delete_all): implement correctly - don't delete the records, just set their status to DELETED.</div><div class='del'>-	(local_record_from_ecard): get the current status from the ecard.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vcard): add vcard support for pilot status.</div><div class='del'>-	(parse_pilot_status): new function.</div><div class='del'>-	(e_card_class_init): add pilot status object arg.</div><div class='del'>-	(e_card_set_arg): add pilot status support.</div><div class='del'>-	(e_card_get_arg): same.</div><div class='del'>-	(e_card_init): initialize pilot_status to 0.</div><div class='del'>-</div><div class='del'>-2000-07-25  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c: add comment headers to signals that</div><div class='del'>-	didn't have any.</div><div class='del'>-	</div><div class='del'>-2000-07-25  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduit/address-conduit.c (start_address_server): use the user's</div><div class='del'>-	Contact db.  not toshok's.</div><div class='del'>-</div><div class='del'>-2000-07-25  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c (book_open_cb): check we</div><div class='del'>-	opened ok.</div><div class='del'>-</div><div class='del'>-2000-07-25  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am (libename_static_la_LDFLAGS): build static</div><div class='del'>-	version of the library for address conduit to use</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: build a static version of the library</div><div class='del'>-	to link into the conduit</div><div class='del'>-</div><div class='del'>-2000-07-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Added a #define for</div><div class='del'>-	"X-EVOLUTION-PILOTID".  Added a parse_pilot_id to read pilot id's</div><div class='del'>-	in properly from VCards.  Rearranged some field orders.  Added a</div><div class='del'>-	get_arg case for ARG_PILOTID.  Initialize pilot_id field to 0.</div><div class='del'>-</div><div class='del'>-2000-07-24  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.h: add pilot_id.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vcard): add support for</div><div class='del'>-	X-EVOLUTION-PILOTD vcard field.</div><div class='del'>-	(e_card_class_init): add pilot_id arg.</div><div class='del'>-	(e_card_set_arg): handle pilot_id arg.</div><div class='del'>-</div><div class='del'>-2000-07-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c: Remove the idle handler</div><div class='del'>-	when we're destroyed.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c: Fixed the spacing on the card</div><div class='del'>-	header.</div><div class='del'>-</div><div class='del'>-2000-07-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.oafinfo: Fixed the oaf info.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/.cvsignore, gui/minicard/Makefile.am,</div><div class='del'>-	gui/minicard/e-minicard-widget-test.c: Added a test for the</div><div class='del'>-	minicard widget.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Fixed the mime type.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Fixed some crashes if your parent</div><div class='del'>-	isn't a minicard view.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.oafinfo: Removed.</div><div class='del'>-</div><div class='del'>-2000-07-20  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Update for</div><div class='del'>-	the new `evolution_shell_component_new()'.</div><div class='del'>-</div><div class='del'>-2000-07-19  Fatih Demir	&lt;kabalak@gmx.net&gt;</div><div class='del'>-	</div><div class='del'>-	* conduit/address-conduit-control-applet.desktop:</div><div class='del'>-		Added the Turkish desktop entry.</div><div class='del'>-</div><div class='del'>-2000-07-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c: Added "text/vCard" to the</div><div class='del'>-	list of mime types we support.</div><div class='del'>-</div><div class='del'>-2000-07-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Added</div><div class='del'>-	gui/minicard/e-minicard-control.c,</div><div class='del'>-	gui/minicard/e-minicard-control.h,</div><div class='del'>-	gui/minicard/e-minicard-widget.c, and</div><div class='del'>-	gui/minicard/e-minicard-widget.h.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c,</div><div class='del'>-	gui/minicard/e-minicard-control.h,</div><div class='del'>-	gui/minicard/e-minicard-widget.c,</div><div class='del'>-	gui/minicard/e-minicard-widget.h: Got these to compile.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.gnorba,</div><div class='del'>-	gui/minicard/e-minicard-control.oafinfo: Copied directly from</div><div class='del'>-	bonobo-clock-control.  These aren't done yet.</div><div class='del'>-</div><div class='del'>-2000-07-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-control.c,</div><div class='del'>-	gui/minicard/e-minicard-control.h,</div><div class='del'>-	gui/minicard/e-minicard-widget.c,</div><div class='del'>-	gui/minicard/e-minicard-widget.h: New files for using a minicard</div><div class='del'>-	as a widget or a bonobo control.</div><div class='del'>-</div><div class='del'>-2000-07-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (ldap_server_foreach): duh.</div><div class='del'>-	don't save the port in the host slot either.</div><div class='del'>-</div><div class='del'>-2000-07-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-confirm-delete.glade,</div><div class='del'>-	contact-editor/e-contact-editor-confirm-delete.glade.h: Added</div><div class='del'>-	these.</div><div class='del'>-</div><div class='del'>-2000-07-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Switched the order of compilation of printing and</div><div class='del'>-	contact-editor.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added printing libraries and a</div><div class='del'>-	confirm delete dialog glade file.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Enabled the delete and print</div><div class='del'>-	functions as well as providing a confirm delete dialog to the</div><div class='del'>-	outside world.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Made the delete button on new cards</div><div class='del'>-	active.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Added printing libraries to a number</div><div class='del'>-	of test programs.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Added print and delete to the right</div><div class='del'>-	click menu.  Made the delete button on the card editor active.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c, printing/e-contact-print.h: Added a</div><div class='del'>-	function to print a single card.</div><div class='del'>-</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (ldap_server_foreach): oops.  fix</div><div class='del'>-	typo that was saving the port in the rootdn spot.</div><div class='del'>-	(save_ldap_data): make this a bit safer - writing to a new file</div><div class='del'>-	and renaming it.</div><div class='del'>-	(load_ldap_data): make this a bit smarter - if parsing the</div><div class='del'>-	ldapservers.xml file fails and there's a .new file there,</div><div class='del'>-	rename it.</div><div class='del'>-	</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Do case insensitive compares.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c: Make quick search</div><div class='del'>-	search both name and company name.</div><div class='del'>-</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Add icons to the toolbars.</div><div class='del'>-</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added installation of arrow.png.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Use EVOLUTIONDIR #define.</div><div class='del'>-</div><div class='del'>-2000-07-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed an unused function</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am (EXTRA_DIST): add idl</div><div class='del'>-	file to EXTRA_DIST</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Remove the</div><div class='del'>-	SelectNames test.</div><div class='del'>-</div><div class='del'>-2000-07-10  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: (Clahey's fix)</div><div class='del'>-	Make multiple addresses be concatenated correctly.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Switched from ETable</div><div class='del'>-	to ETableScrolled.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/minicard/e-minicard.c: Don't display mailer or</div><div class='del'>-	"name or org" fields.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Added a field that gives the name if it exists and the company</div><div class='del'>-	name otherwise.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Formatting changes.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c: Added</div><div class='del'>-	stripping of names and display of company name if name doesn't</div><div class='del'>-	exist.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Fixed up the</div><div class='del'>-	display so that we display both name and email address.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: Fixed a small</div><div class='del'>-	off by one error that was causing an extra character to get</div><div class='del'>-	deleted sometimes.</div><div class='del'>-</div><div class='del'>-2000-07-09  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/test-reflow.c (allocate_callback): Fix off by one bug with</div><div class='del'>-	scroll region setting.</div><div class='del'>-	(resize): Likewise.</div><div class='del'>-	(main): Put the contacts list in an EScrolledFrame instead of using a</div><div class='del'>-	separate GtkScrollbar.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow.c (e_reflow_event): Don't change mouse cursor and</div><div class='del'>-	don't allow drags on dividers that aren't visible.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (allocate_callback): Fix off by one bug with</div><div class='del'>-	scroll region setting.</div><div class='del'>-	(resize): Likewise.</div><div class='del'>-	(create_minicard_view): Put the contacts list in an EScrolledFrame instead of</div><div class='del'>-	using a separate GtkScrollbar.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed unused do_nothing_cb</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.h: Made the OK</div><div class='del'>-	and Cancel buttons in the ESelectNames dialog we create work</div><div class='del'>-	properly.</div><div class='del'>-	</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h: Added</div><div class='del'>-	e_select_names_model_duplicate.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Made the</div><div class='del'>-	text be set correctly if there's already data in the source when</div><div class='del'>-	the text model is created.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Removed handling of</div><div class='del'>-	the buttons (the user of this dialog will have to handle them.)</div><div class='del'>-	Added e_select_names_get_source.  Fixed some typos.</div><div class='del'>-</div><div class='del'>-2000-07-09  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Link the toolbar print button to</div><div class='del'>-	the print callback.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c</div><div class='del'>-	(e_select_names_clicked): Hitting OK or Cancel at least closes the</div><div class='del'>-	dialog now.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_create_entry): Set the returned entry to</div><div class='del'>-	use the ellipsis.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: Include</div><div class='del'>-	e-select-names-factory.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: Handle a NULL</div><div class='del'>-	iterator properly in the replace function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c: Fill in</div><div class='del'>-	info properly in the value_at function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Don't</div><div class='del'>-	strlen a NULL text object.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Close if the person</div><div class='del'>-	hits ok or cancel (doesn't yet actually undo changes if Cancel is</div><div class='del'>-	hit.)  Handle removing addresses when they're double clicked on.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/select-names.glade,</div><div class='del'>-	gui/component/select-names/select-names.glade.h: Hid some unused</div><div class='del'>-	fields and changed the text at the top of the dialog.</div><div class='del'>-</div><div class='del'>-2000-07-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/.cvsignore: Ignore dynamically </div><div class='del'>-	created source files</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c</div><div class='del'>-	(entry_get_property_fn): New function to set the properties.</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Start up the factory</div><div class='del'>-	for `Evolution::Addressbook::SelectNames'.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/evolution-addressbook-select-names.oafinfo:</div><div class='del'>-	New.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-factory.c: New.</div><div class='del'>-	* gui/component/select-names/e-select-names-factory.h: New.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.c: New.</div><div class='del'>-	* gui/component/select-names/e-select-names-bonobo.h: New.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c (main): Call</div><div class='del'>-	`e_select_names_factory_init()'.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c</div><div class='del'>-	(e_select_names_manager_add_section): Made const-aware.</div><div class='del'>-	(e_select_names_manager_create_entry): Made const-aware.</div><div class='del'>-	(e_select_names_manager_activate_dialog): Made const-aware.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Evolution-Addressbook-SelectNames.idl:</div><div class='del'>-	New.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c,</div><div class='del'>-	gui/component/e-addressbook-model.h: Added an "editable" argument.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Set our</div><div class='del'>-	EAddressModel to not be editable.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Changed to line</div><div class='del'>-	mode.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.c: Implemented the</div><div class='del'>-	get_cards function.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Implemented adding</div><div class='del'>-	cards through the interface.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c: Make the</div><div class='del'>-	entry widgets we create editable.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c: Use</div><div class='del'>-	e_strsplit instead of g_strsplit.  Fixed an off by 1 error.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c: When</div><div class='del'>-	the model changes, send a model changed signal.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Made</div><div class='del'>-	changing this work correctly if it's empty.  Made change signals</div><div class='del'>-	propagate properly.  Is a bit better about freeing iterators when</div><div class='del'>-	done.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c: Made the finished</div><div class='del'>-	lists be in order instead of being sorted.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_server_cb): Since</div><div class='del'>-	ELDAPServer-&gt;port is a char *, allocate a string with the number</div><div class='del'>-	389 contained.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the select names test test the</div><div class='del'>-	new code instead of the old way of getting to an ESelectNames</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c: Coded</div><div class='del'>-	storing the model for each section, creating an entry and</div><div class='del'>-	returning it, and for activating the dialog.  Wrote a bit of the</div><div class='del'>-	get_cards code, but not all of it.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h: Coded all of</div><div class='del'>-	the code needed to make ESelectNamesTextModel work (it doesn't</div><div class='del'>-	yet, but all the code should be there.)  Removed</div><div class='del'>-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.c: Changed</div><div class='del'>-	these to compensate for removal of</div><div class='del'>-	E_SELECT_NAMES_MODEL_DATA_TYPE_SEPARATION_MATERIAL.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.h: Fixed some</div><div class='del'>-	silly typos.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h: Added a parameter to</div><div class='del'>-	add_section that lets you specify the source ESelectNamesModel.</div><div class='del'>-	</div><div class='del'>-2000-07-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.h: add scope to ELDAPServer, and</div><div class='del'>-	make port a string.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (load_ldap_data): don't load a</div><div class='del'>-	uri, load all the bits and pieces and build up the uri when</div><div class='del'>-	creating the folder, according to the openldap url format.</div><div class='del'>-	(ldap_server_foreach): store out each of the individual uri</div><div class='del'>-	pieces.</div><div class='del'>-	(e_ldap_storage_remove_server): free the new fields.</div><div class='del'>-	(get_string_value): if the text is empty, return the empty string</div><div class='del'>-	instead of NULL.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.c (extract_server_info): port is a string now.</div><div class='del'>-	(fill_in_server_info): port is a string now.</div><div class='del'>-</div><div class='del'>-2000-07-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Changed "FIXME: Save and</div><div class='del'>-	Close" to "Save and Close".  Removed some toolbar items that will</div><div class='del'>-	never be used.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h: Added functions</div><div class='del'>-	to allow you to modify the model (not implemented yet.)</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.h: Finished</div><div class='del'>-	this.  Doesn't support changing the model at all.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-text-model.c: Finished</div><div class='del'>-	this.  Changing the model by typing is done, but doesn't work</div><div class='del'>-	since none of the functions in the base model are implemented.</div><div class='del'>-</div><div class='del'>-2000-07-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_server_cb): call</div><div class='del'>-	e_ldap_storage_add_server call.</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-server-dialog.glade: add name row.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.h: remove the ELDAPServer type.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.c (extract_server_info): add</div><div class='del'>-	support for the name-entry.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.c (fill_in_server_info): same.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.h: add ELDAPServer type, and add</div><div class='del'>-	prototypes for e_ldap_storage_add_server and</div><div class='del'>-	e_ldap_storage_remove_server.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (e_ldap_storage_add_server): new</div><div class='del'>-	function, add it to our hash table, add a shell folder, and save</div><div class='del'>-	out the metadata.</div><div class='del'>-	(ldap_server_foreach): add the ldap server info under a</div><div class='del'>-	"contactserver" node.</div><div class='del'>-	(setup_ldap_storage): create our hashtable.</div><div class='del'>-</div><div class='del'>-2000-07-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_prop): remove hack to read</div><div class='del'>-	"uri" file from local directory.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): add</div><div class='del'>-	e-ldap-storage.{c,h}</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): call</div><div class='del'>-	setup_ldap_storage.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.c (setup_ldap_storage): Register</div><div class='del'>-	the LDAP storage and load the .xml file.</div><div class='del'>-	(load_ldap_data): function to load our xml file.</div><div class='del'>-	(save_ldap_data): function to save our xml file.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-storage.h: new file.</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names.c: Fixed more compile</div><div class='del'>-	errors.</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/Makefile.am: Fixed compile error.</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Removed e-card-iterator.c,</div><div class='del'>-	e-card-iterator.h, e-card-list-iterator.c, e-card-list-iterator.h,</div><div class='del'>-	e-card-list.c, e-card-list.h.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-iterator.c,</div><div class='del'>-	backend/ebook/e-card-iterator.h,</div><div class='del'>-	backend/ebook/e-card-list-iterator.c,</div><div class='del'>-	backend/ebook/e-card-list-iterator.h, backend/ebook/e-card-list.c,</div><div class='del'>-	backend/ebook/e-card-list.h: Removed in favor or versions without</div><div class='del'>-	the -card in the e-util directory since these classes are not</div><div class='del'>-	specific to cards at all.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,</div><div class='del'>-	backend/ebook/e-card.c, backend/ebook/e-card.h,</div><div class='del'>-	backend/ebook/load-pine-addressbook.c, backend/ebook/test-card.c,</div><div class='del'>-	backend/pas/pas-backend-file.c: Changed the references to</div><div class='del'>-	e-card-list.c and friends to e-list.c and friends.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Added #include</div><div class='del'>-	&lt;e-contact-save-as.h&gt; to fix a warning.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Moved a number of classes associated</div><div class='del'>-	with the select-names object to the new select-names directory.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Changed the reference to</div><div class='del'>-	e-select-names.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-select-names.c, gui/component/e-select-names.h,</div><div class='del'>-	gui/component/select-names.glade,</div><div class='del'>-	gui/component/select-names.glade.h: Moved these files into</div><div class='del'>-	select-names/.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/.cvsignore,</div><div class='del'>-	gui/component/select-names/Makefile.am,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.h,</div><div class='del'>-	gui/component/select-names/e-select-names-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-table-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.c,</div><div class='del'>-	gui/component/select-names/e-select-names-text-model.h,</div><div class='del'>-	gui/component/select-names/e-select-names.c,</div><div class='del'>-	gui/component/select-names/e-select-names.h,</div><div class='del'>-	gui/component/select-names/recipient.glade,</div><div class='del'>-	gui/component/select-names/select-names.glade,</div><div class='del'>-	gui/component/select-names/select-names.glade.h: New files for</div><div class='del'>-	select names dialog (e-select-names.c, e-select-names.h,</div><div class='del'>-	select-names.glade, select-names.glade.h and recipient.glade moved</div><div class='del'>-	from gui/component/.)</div><div class='del'>-</div><div class='del'>-2000-06-29  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (owner_set_cb): Get an</div><div class='del'>-	EvolutionShellClient instead of an Evolution_Shell to match the</div><div class='del'>-	changes in libeshell.</div><div class='del'>-</div><div class='del'>-2000-06-28  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names/,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.c,</div><div class='del'>-	gui/component/select-names/e-select-names-manager.h: New select</div><div class='del'>-	names manager interface (Not complete.)</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	addressbook/gui/component/e-cardlist-model.c: Added</div><div class='del'>-	value_to_string handlers.</div><div class='del'>-</div><div class='del'>-	* demo/addressbook-widget.c, demo/demo.c: Removed usage of "x" and</div><div class='del'>-	"y" arguments.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/addressbook.c: Activated Click To Add</div><div class='del'>-	and set the click to add message.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/e-addressbook-model.c: Added</div><div class='del'>-	value_to_string and append_row handlers.</div><div class='del'>-</div><div class='del'>-	* addressbook/gui/component/e-select-names.c: Added a column.</div><div class='del'>-</div><div class='del'>-2000-06-26  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (poll_ldap): remove spew.</div><div class='del'>-	(pas_backend_ldap_ensure_connected): duh, don't access a pointer</div><div class='del'>-	we know to be NULL.</div><div class='del'>-	(query_prop_to_ldap): rename map_e_card_prop_to_ldap to this.</div><div class='del'>-	easier to type.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/test-minicard-label.c,</div><div class='del'>-	gui/minicard/test-minicard.c, gui/minicard/test-reflow.c: Remove</div><div class='del'>-	usage of "x" and "y" arguments.</div><div class='del'>-</div><div class='del'>-2000-06-18    &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (INCLUDES): Use</div><div class='del'>-	`$(BONOBO_GNOME_CFLAGS)' so that we compile when Bonobo is not in</div><div class='del'>-	the default GNOME prefix.</div><div class='del'>-</div><div class='del'>-2000-06-17  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-label.c,</div><div class='del'>-	gui/minicard/e-minicard-label.h, gui/minicard/e-minicard.c: Made</div><div class='del'>-	the left column of minicards not get any wider than the widest</div><div class='del'>-	possible name.</div><div class='del'>-</div><div class='del'>-2000-06-13  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (SHELL_OBJS): Removed.</div><div class='del'>-	(evolution_addressbook_LDADD): Link with</div><div class='del'>-	`$(top_builddir)/shell/libeshell.a'.</div><div class='del'>-</div><div class='del'>-2000-06-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Removed the</div><div class='del'>-	ETableModel thaw handler.</div><div class='del'>-	* gui/component/e-cardlist-model.c: Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-select-names.c: Fixed the widget reparenting.</div><div class='del'>-</div><div class='del'>-2000-06-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added glade files.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added a test of the Select Names</div><div class='del'>-	functionality.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Made this class_init</div><div class='del'>-	function a bit cleaner.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-select-names.c: Tested this and fixed some</div><div class='del'>-	obvious errors.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names.glade: The main window shouldn't be</div><div class='del'>-	visible by default.</div><div class='del'>-</div><div class='del'>-2000-06-11  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Link</div><div class='del'>-	with libemiscwidgets.a.</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_LDADD): Likewise.</div><div class='del'>-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise.</div><div class='del'>-	(reflow_test_LDADD): Likewise.</div><div class='del'>-	(minicard_view_test_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-cardlist-model.c: Renamed a bunch of functions</div><div class='del'>-	for better readability.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-select-names.c, gui/component/e-select-names.h:</div><div class='del'>-	This should be a working dialog now.</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names.glade: Changed the name &amp; creation</div><div class='del'>-	function of the ETable here.</div><div class='del'>-</div><div class='del'>-2000-06-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/select-names.glade,</div><div class='del'>-	gui/component/select-names.glade.h: Glade files for Select Names</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-2000-06-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Do e_card_simple_sync and</div><div class='del'>-	extract_info more often.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added table printing code.</div><div class='del'>-</div><div class='del'>-2000-06-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (factory_fn): Pass NULL</div><div class='del'>-	for the new args @create_folder_fn and @remove_folder_fn.</div><div class='del'>-</div><div class='del'>-2000-06-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c (create_view): Updated for</div><div class='del'>-	the new `EvolutionShellComponentCreateViewFn'.  Return</div><div class='del'>-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if @type is not</div><div class='del'>-	"contacts".</div><div class='del'>-</div><div class='del'>-2000-06-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Bind Save As to save the</div><div class='del'>-	current view of the contact as a vcard.</div><div class='del'>-</div><div class='del'>-2000-06-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (save_card): Doh, sync the</div><div class='del'>-	card simple and extract the card info.</div><div class='del'>-</div><div class='del'>-2000-06-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.h (EContactEditor): Now this</div><div class='del'>-	derives from GtkObject.  It follows the same strategy as the</div><div class='del'>-	EventEditor in the calendar.</div><div class='del'>-	(EContactEditor): Added an is_new_card field so that we can know</div><div class='del'>-	whether to add() or commit() the card.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c (e_contact_editor_get_type):</div><div class='del'>-	Derive from GtkObject.</div><div class='del'>-	(e_contact_editor_class_init): Likewise.</div><div class='del'>-	(e_contact_editor_class_init): Added an "is_new_card" argument.</div><div class='del'>-	(e_contact_editor_set_arg): Handle ARG_IS_NEW_CARD.</div><div class='del'>-	(e_contact_editor_get_arg): Likewise.</div><div class='del'>-	(e_contact_editor_new): Take in an is_new_arg argument and set it</div><div class='del'>-	on the object.</div><div class='del'>-	(e_contact_editor_init): Load the app widget into the app field of</div><div class='del'>-	the EContactEditor structure.  Create its UIHandler as well.</div><div class='del'>-	(e_contact_editor_class_init): New "add_card", "commit_card", and</div><div class='del'>-	"editor_closed" signals.</div><div class='del'>-</div><div class='del'>-	* contact-editor/test-editor.c (main): Modified for the new API.</div><div class='del'>-	(editor_closed_cb): Tweaked for the new API.</div><div class='del'>-	Since this test program does not use Bonobo, it doesn't work,</div><div class='del'>-	though.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_cb): Use the new</div><div class='del'>-	contact editor API.</div><div class='del'>-	(table_double_click): Ditto.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c (e_minicard_view_event): Use the</div><div class='del'>-	new contact editor API.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c (e_minicard_event): Use the new</div><div class='del'>-	contact editor API.</div><div class='del'>-</div><div class='del'>-2000-06-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (contact_editor_test_LDADD): Remove</div><div class='del'>-	the `$(srcdir)/' prefix from `libecontacteditor.a' because [of</div><div class='del'>-	course] the library is built in the build directory, not in the</div><div class='del'>-	source directory.</div><div class='del'>-	* gui/minicard/Makefile.am (minicard_test_LDADD): Likewise with</div><div class='del'>-	`libeminicard.a'.</div><div class='del'>-	(minicard_label_test_LDADD): Likewise.</div><div class='del'>-	(reflow_test_LDADD): Likewise.</div><div class='del'>-	(minicard_view_test_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Bind right click on the ETable to</div><div class='del'>-	"Save to VCard."</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Made phone/email/address</div><div class='del'>-	labels change correctly again.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: Made</div><div class='del'>-	evolution-addressbook shut down when the shell is done with it.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c: Made</div><div class='del'>-	double click only work on the first button.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: return TRUE if opening a contact</div><div class='del'>-	editor so that we don't get a "new dialog" contact editor.</div><div class='del'>-</div><div class='del'>-2000-06-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (new_contact_cb): Use the stock</div><div class='del'>-	cancel button for the dialog.</div><div class='del'>-	(table_double_click): Likewise.</div><div class='del'>-	(find_contact_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-31  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade: Added accelerators for</div><div class='del'>-	the remaining items.</div><div class='del'>-</div><div class='del'>-	Add spacing, beautify the dialogs.</div><div class='del'>-</div><div class='del'>-2000-06-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Put the toolbar</div><div class='del'>-	into a frame to make it look like standard GNOME toolbars.  Also,</div><div class='del'>-	set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not do</div><div class='del'>-	evil things when its moved to the left or the right of the window.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-cardlist-model.c,</div><div class='del'>-	gui/component/e-cardlist-model.h: New files for card list.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Fixed a memory leak.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/alphabet.glade: Made the alphabet buttons not</div><div class='del'>-	focusable.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c: Made the "123" button work.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c: Made all buttons past the last</div><div class='del'>-	letter available work.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/alphabet.glade: Added a bit of space around the</div><div class='del'>-	alphabet bar.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added alphabet.glade and</div><div class='del'>-	alphabet.glade.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c, gui/component/alphabet.glade,</div><div class='del'>-	gui/component/alphabet.glade.h: Added an alphabet bar.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h,</div><div class='del'>-	gui/minicard/e-reflow-sorted.c, gui/minicard/e-reflow-sorted.h:</div><div class='del'>-	Added the ability to just to a particular spot in the reflow.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Added BONOBO_GNOME_CFLAGS to CPPFLAGS.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c: Made double clicking create a</div><div class='del'>-	new card.  Set the empty message.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Made sorting be case insensitive.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c, e-reflow.c, e-reflow.h: Added a</div><div class='del'>-	message for when the reflow is empty.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c, printing/medbook.ecps: Made the</div><div class='del'>-	default printout be full page.  Made sorting case insensitive.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.c,</div><div class='del'>-	backend/ebook/e-book-view-listener.h, backend/ebook/e-book-view.c,</div><div class='del'>-	backend/ebook/e-book-view.h, backend/idl/addressbook.idl,</div><div class='del'>-	backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c,</div><div class='del'>-	backend/pas/pas-book-factory.c, backend/pas/pas-book-view.c,</div><div class='del'>-	backend/pas/pas-book-view.h: Added "sequence_complete" signal.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c: Made printing wait for</div><div class='del'>-	"sequence_complete" signal and made it sort.</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c,</div><div class='del'>-	gui/component/e-addressbook-model.c,</div><div class='del'>-	gui/component/e-addressbook-model.h: Added double click to open</div><div class='del'>-	contact editor.</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Removed some columns.</div><div class='del'>-</div><div class='del'>-2000-05-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (addressbook_factory_new_control):</div><div class='del'>-	New function.</div><div class='del'>-	(addressbook_factory): Use it.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (evolution_addressbook_LDADD): Link with</div><div class='del'>-	`evolution-shell-component.o' from the shell directory.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-component.c: New.</div><div class='del'>-	* gui/component/addressbook-component.h: New.</div><div class='del'>-</div><div class='del'>-2000-05-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Switched printing and gui.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-view-listener.h,</div><div class='del'>-	backend/ebook/e-book-view.h, backend/ebook/e-book.h,</div><div class='del'>-	backend/ebook/e-card-cursor.h, backend/ebook/e-card-list.h,</div><div class='del'>-	backend/ebook/e-card-simple.h, backend/ebook/e-card.h: Fixed the</div><div class='del'>-	#defines to work elsewhere in evolution.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added linking to libecontactprint.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added a menu item to print the</div><div class='del'>-	current query.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Add linking to libebook and requirements.</div><div class='del'>-	Add installation of ecps files.</div><div class='del'>-</div><div class='del'>-	* printing/e-contact-print.c, printing/e-contact-print.h: Changed</div><div class='del'>-	this to use real data from an EBook.</div><div class='del'>-</div><div class='del'>-	* printing/test-print.c: Made this pass NULL, NULL to</div><div class='del'>-	e_contact_print_dialog_new so that it will compile.</div><div class='del'>-</div><div class='del'>-2000-05-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-save-as.c: Fixed some memory leaks.</div><div class='del'>-</div><div class='del'>-2000-05-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added e-contact-editor-save-as.c and</div><div class='del'>-	e-contact-editor-save-as.h.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-save-as.c,</div><div class='del'>-	contact-editor/e-contact-save-as.h: New files that display a save</div><div class='del'>-	as dialog and then save the given card to that file.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Call e_contact_save_as in a right</div><div class='del'>-	click menu.</div><div class='del'>-</div><div class='del'>-2000-05-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	gui/component/e-addressbook-model.c: Added initialize_value and</div><div class='del'>-	value_is_empty callbacks.</div><div class='del'>-</div><div class='del'>-2000-05-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed a bug that broke</div><div class='del'>-	address field support.</div><div class='del'>-</div><div class='del'>-2000-05-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Added support for arbitrary</div><div class='del'>-	fields in the contact editor.</div><div class='del'>-</div><div class='del'>-2000-05-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Fixed e_card_name_copy and</div><div class='del'>-	e_card_arbitrary_copy to deal correctly with a passed NULL.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Removed imagesdir stuff.</div><div class='del'>-</div><div class='del'>-	* contact-editor/arrow.png: Made this transparent.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Renamed some widgets</div><div class='del'>-	and added custom widgets for all of the images.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Worked on making this work</div><div class='del'>-	decently well with messed up glade files.  Cleaned up a lot of code.</div><div class='del'>-</div><div class='del'>-2000-05-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Fixed the code to write out and read in</div><div class='del'>-	arbitrary fields.</div><div class='del'>-</div><div class='del'>-2000-05-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h,</div><div class='del'>-	backend/ebook/e-card-types.h, backend/ebook/e-card.c,</div><div class='del'>-	backend/ebook/e-card.h: Implemented "MAILER" field.  Added</div><div class='del'>-	arbitrary field support.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Added E_CARD_SIMPLE_FIELD_MAILER.  Not implemented yet.</div><div class='del'>-</div><div class='del'>-2000-05-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (construct_email_list): convert to use ECardSimple.</div><div class='del'>-	(poll_ldap): same.</div><div class='del'>-</div><div class='del'>-2000-05-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.h: add typedefs for the can_write</div><div class='del'>-	functions, and add parameters to pas_book_new.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c (pas_book_construct): add can_write/can_write_card params.</div><div class='del'>-	(pas_book_new): same.</div><div class='del'>-	(impl_Evolution_Book_can_write): new function.</div><div class='del'>-	(impl_Evolution_Book_can_write_card): same.</div><div class='del'>-	(pas_book_get_epv): assign the can_write/can_write_card slots in the epv.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_can_write): new function.</div><div class='del'>-	(pas_backend_ldap_can_write_card): same.</div><div class='del'>-	(pas_backend_ldap_add_client): add can_write/can_write_card to pas_book_new call.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_can_write_card): new function, calls can_write.</div><div class='del'>-	(pas_backend_file_can_write): same.</div><div class='del'>-	(can_write): return TRUE if we can write to the addressbook file.</div><div class='del'>-	(pas_backend_file_add_client): add can_write/can_write_card to pas_book_new call.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl (Evolution): add can_write and</div><div class='del'>-	can_write_card permission requests.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (e_card_get_vcard): Fixed a large memory leak.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c (add_list_unique): Fixed another memory</div><div class='del'>-	leak.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/pas/pas-backend-file.c,</div><div class='del'>-	contact-editor/e-contact-editor.c, ename/e-name-western.c,</div><div class='del'>-	gui/component/addressbook.c, gui/minicard/e-minicard-view.c: Fixed</div><div class='del'>-	some memory leaks.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Rearranged some code.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed a reference</div><div class='del'>-	leak.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Fixed a compile</div><div class='del'>-	error.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Got rid of a</div><div class='del'>-	memory leak.  Rearranged a couple functions.</div><div class='del'>-	</div><div class='del'>-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard-view.h:</div><div class='del'>-	Added some code to stop watching the EBook when the canvas is</div><div class='del'>-	destroyed (apparently the canvas is destroyed before our widget is</div><div class='del'>-	destroyed.)</div><div class='del'>-</div><div class='del'>-2000-05-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-categories.c: Use the correct</div><div class='del'>-	policy for resize.</div><div class='del'>-</div><div class='del'>-2000-05-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added libeutil for e-card's support</div><div class='del'>-	for categories.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-list.c, backend/ebook/e-card-list.h: Added</div><div class='del'>-	a function to get the length.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added categories</div><div class='del'>-	support (accessible either as "categories" or "category_list".)</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added e-table and all of the</div><div class='del'>-	categories files.</div><div class='del'>-</div><div class='del'>-	* contact-editor/categories.glade,</div><div class='del'>-	contact-editor/categories-strings.h,</div><div class='del'>-	contact-editor/e-contact-editor-categories.c,</div><div class='del'>-	contact-editor/e-contact-editor-categories.h:</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Rearranged this dialog.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Rearranged dialog a bit.</div><div class='del'>-	Added opening of categories dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Rearranged libraries so that</div><div class='del'>-	libetable would be available for the contact editor categories</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Fix for new ETable resizing.  Make</div><div class='del'>-	contact editor dialog resizable.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am: Added libetable contact editor</div><div class='del'>-	categories dialog.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Make contact editor dialog resizable.</div><div class='del'>-</div><div class='del'>-2000-05-12  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/fulname.glade: Use accelerators here.</div><div class='del'>-</div><div class='del'>-2000-05-13  Valek Filippov  &lt;frob@df.ru&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-server-dialog.glade: save translatable strings</div><div class='del'>-	* gui/component/ldap-server-dialog.glade.h: file with strings</div><div class='del'>-	* printing/e-contact-print.glade: save translatable strings</div><div class='del'>-	* printing/e-contact-print.glade.h: file with strings</div><div class='del'>-		</div><div class='del'>-2000-05-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_activate): Now that we</div><div class='del'>-	depend on recent gnome-libs we can make the toolbar detachable</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the table view be sorted by</div><div class='del'>-	name initially.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c: Send a proper response when you</div><div class='del'>-	can't find the ldap URI.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Cleaned up the open error dialog a</div><div class='del'>-	bit.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added a dialog for when you can't</div><div class='del'>-	open an addressbook.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h,</div><div class='del'>-	e-card-types.h.</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am: Added pas-backend-ldap.h.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added a proper EXTRA_DIST section.</div><div class='del'>-	Removed some old defines.</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am: Added e-name-western-tables.h.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added e-ldap-server-dialog.h.  Added</div><div class='del'>-	a proper EXTRA_DIST section.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow.c: Added a missed cast.</div><div class='del'>-</div><div class='del'>-	* printing/Makefile.am: Added a proper EXTRA_DIST section.</div><div class='del'>-	</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Make sure that the canvas</div><div class='del'>-	doesn't intercept keyboard focus.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Use new art.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Replaced the Address</div><div class='del'>-	button with a label and rearranged the address area a bit.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Reenable editting.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c: Make reflow flow on deletion.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Destroy the view object when</div><div class='del'>-	leaving the minicard view.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c: Fixed reflow sorting to call</div><div class='del'>-	reflow_request when sorting on an item changes.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Make File As change if name or</div><div class='del'>-	company are changed pretty much anywhere.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Turned off having minicard editing</div><div class='del'>-	effect anything since it's so crashy.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c: Enabled a couple more fields</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Added a default card to all new</div><div class='del'>-	file backends.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Rearranged order of things</div><div class='del'>-	getting destroyed.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c: Rearranged order of things</div><div class='del'>-	getting destroyed.  Don't set attributes of non-null or destroyed</div><div class='del'>-	items.  Destroy parent object when destroyed.  Maintain ref_count</div><div class='del'>-	of items in list.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Don't set attributes of non-null</div><div class='del'>-	items.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow-sorted.c: Maintain ref_count of items in</div><div class='del'>-	list.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-reflow.c: Maintain ref_count of items in list.</div><div class='del'>-	Destroy parent object when destroyed.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Fixed some indentation.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Changed Email to</div><div class='del'>-	Primary Email.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Added checkmarks to indicate</div><div class='del'>-	if data exists in the pull down menus for the phone, address, and</div><div class='del'>-	email fields.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Fixed the string duplication</div><div class='del'>-	problem.  Fixed the business/home address string mix up.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Made the minicard view the default</div><div class='del'>-	view.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c: Fixed this up a bit.  Syncing</div><div class='del'>-	should work better now.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard-view.c, gui/minicard/e-minicard.c,</div><div class='del'>-	gui/minicard/e-minicard.h, gui/minicard/e-reflow-sorted.c,</div><div class='del'>-	gui/minicard/e-reflow-sorted.h: Made a minimal number of things be</div><div class='del'>-	destroyed and recreated when updating a field.</div><div class='del'>-</div><div class='del'>-2000-05-07    &lt;toshok@the-dot-in.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c (remodel): make sure to free the</div><div class='del'>-	return value of e_card_simple_get.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (teardown_table_view): destroy the</div><div class='del'>-	ECardSimple here, plug memory leak.</div><div class='del'>-	(create_table_view): use view-&gt;simple so we can destroy the</div><div class='del'>-	ECardSimple later on.</div><div class='del'>-</div><div class='del'>-2000-05-07  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_extract_middle): comment</div><div class='del'>-	function, and fix an ABR.</div><div class='del'>-</div><div class='del'>-2000-05-07  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_cleanup_string): comment</div><div class='del'>-	function, and fix an ABR.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Added saving in minicard view.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed an off by 2 error.</div><div class='del'>-</div><div class='del'>-2000-05-07  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (set_prop): don't create a new</div><div class='del'>-	ebook.  instead, unload the current uri (if there is one) and load</div><div class='del'>-	the new one.</div><div class='del'>-	(addressbook_factory): create the ebook once.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c: Replaced some model_changed</div><div class='del'>-	calls with row_inserted calls.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:</div><div class='del'>-	Removed some code that was notifying too many clients at the wrong</div><div class='del'>-	times.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Set view-&gt;book.  Unreffed</div><div class='del'>-	view-&gt;book.  Unreffed the model instead of destroying it.  Removed</div><div class='del'>-	the /tmp/test.db stuff.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Make the addressbook create the</div><div class='del'>-	correct file uri.  Added a default query.  Initialize view-&gt;model</div><div class='del'>-	and view-&gt;view to NULL.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c,</div><div class='del'>-	gui/minicard/e-minicard-view.c: Only call get_book_view if both</div><div class='del'>-	book and query and non-null.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_deactivate): remove the</div><div class='del'>-	separator and toggle view items as well.</div><div class='del'>-	(toggle_view_as_cb): callback for the "/View/Toggle View" menu</div><div class='del'>-	item.</div><div class='del'>-	(get_query): getter for the query string that takes into account</div><div class='del'>-	the two view types.</div><div class='del'>-	(set_query): setter for the query string that takes into account</div><div class='del'>-	the two view types.</div><div class='del'>-	(set_book): setter for the EBook type - not really a setter, since</div><div class='del'>-	the book is kept in the AddressbookView, but this method actually</div><div class='del'>-	sets the "book" property on the current view.</div><div class='del'>-	(find_contact_cb): make use of get/set_query</div><div class='del'>-	(search_entry_activated): make use of set_query.</div><div class='del'>-	(control_activate): add a menu separator and an item to toggle</div><div class='del'>-	between view types.</div><div class='del'>-	(book_open_cb): make use of set_book.</div><div class='del'>-	(ebook_create): no longer needs to return the EBook, since we set</div><div class='del'>-	the book field in our view.</div><div class='del'>-	(teardown_minicard_view): destructor function for the minicard</div><div class='del'>-	specific ui.</div><div class='del'>-	(create_minicard_view): constructor function for the minicard</div><div class='del'>-	specific ui.</div><div class='del'>-	(teardown_table_view): destructor function for the e-table</div><div class='del'>-	specific ui.</div><div class='del'>-	(create_table_view): constructor function for the e-table specific</div><div class='del'>-	ui.</div><div class='del'>-	(change_view_type): destroy the old and create the new view ui,</div><div class='del'>-	change the label of the Toggle View menu item, and reset the book</div><div class='del'>-	and query on the new view type.</div><div class='del'>-	(addressbook_factory): create an all-encompassing vbox that the</div><div class='del'>-	view uses to create the bonobo control, which contains 1 widget</div><div class='del'>-	per ui specific view (the e-table in the table case, and another</div><div class='del'>-	vbox in the minicard case.)  use change_view_type to create the</div><div class='del'>-	initial view.</div><div class='del'>-</div><div class='del'>-2000-05-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: Made a NULL callback just mean to not</div><div class='del'>-	call back.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Reordered fields.  Added a get_const function to get a constant</div><div class='del'>-	string that persists until the simple is destroyed.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: Added e-addressbook-model.c and</div><div class='del'>-	e-addressbook-model.h and all of the libraries and includes that</div><div class='del'>-	they are dependent on.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c: Initialize e cursors.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Added inactive code to display an</div><div class='del'>-	ETable view of the addressbook.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-addressbook-model.c,</div><div class='del'>-	gui/component/e-addressbook-model.h: New files to implement an</div><div class='del'>-	ETable model with a EBook back end.</div><div class='del'>-	</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	Mostly finished ECardSimple.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Changed this to match with</div><div class='del'>-	some of the changes to ECardSimple.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Changed this to look for</div><div class='del'>-	"addressbook.db" in the given directory if it doesn't find the</div><div class='del'>-	file "uri".</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c, gui/minicard/e-minicard.h: Changed</div><div class='del'>-	this to use ECardSimple.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* gui/component/.cvsignore: ignore evolution-addressbook.pure</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am: add support for generating </div><div class='del'>-	evolution-addressbook.pure.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_load_uri): if a</div><div class='del'>-	port isn't specified in the uri default to 389.</div><div class='del'>-</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: Made this take a uri through its</div><div class='del'>-	property bag.</div><div class='del'>-</div><div class='del'>-2000-05-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added e-card-simple.c and</div><div class='del'>-	e-card-simple.h.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-simple.c, backend/ebook/e-card-simple.h:</div><div class='del'>-	New card wrapper class to simplify things.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Changed e-contact-editor to use</div><div class='del'>-	ECardSimple a bit.</div><div class='del'>-</div><div class='del'>-2000-05-03  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_deactivate): #ifdef</div><div class='del'>-	HAVE_LDAP the ldap specific stuff.</div><div class='del'>-	(null_cb): same.</div><div class='del'>-	(control_activate): same.</div><div class='del'>-</div><div class='del'>-2000-05-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_srcdir)/addressbook/ename'.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* demo/Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-	* printing/Makefile.am: same.</div><div class='del'>-</div><div class='del'>-2000-05-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c: Add back in the</div><div class='del'>-	CORBA_Object_release.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c: Properly duplicate and release the</div><div class='del'>-	listener passed to us.</div><div class='del'>-</div><div class='del'>-2000-05-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c, backend/pas/pas-backend-ldap.c:</div><div class='del'>-	Made uri slightly better managed.</div><div class='del'>-	</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(pas_book_factory_process_request): Remove this</div><div class='del'>-	CORBA_Object_release that causes things not to work.  This is just</div><div class='del'>-	a temporary fix until we figure out what's actually wrong.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book.c: Fixed a copy and paste error in a warning.</div><div class='del'>-	</div><div class='del'>-2000-05-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Switched the subdirs order since backend depends on</div><div class='del'>-	ename.</div><div class='del'>-</div><div class='del'>-2000-05-01  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_remove_client):</div><div class='del'>-	fix a typo in the for loop.</div><div class='del'>-</div><div class='del'>-2000-05-01  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c: include gtk.</div><div class='del'>-</div><div class='del'>-2000-04-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book-types.h (EBookStatus): Added new status</div><div class='del'>-	values for the IDL stuff.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.h (PASBookFactoryClass): New</div><div class='del'>-	"last_book_gone" signal.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(pas_book_factory_launch_backend): Better error handling.</div><div class='del'>-	(pas_book_factory_process_queue): Let</div><div class='del'>-	pas_book_factory_process_request() free the request.</div><div class='del'>-	(pas_book_factory_process_request): Free the request here.</div><div class='del'>-	Perform better error handling.</div><div class='del'>-	(free_active_server_map_entry): Free an active server map entry;</div><div class='del'>-	free the URI key and unref the backend value.  This function was</div><div class='del'>-	renamed; the old one was trying to CORBA_Object_unref() a GTK+</div><div class='del'>-	object!</div><div class='del'>-	(remove_backends_entry): Free a backend table entry; free the URI</div><div class='del'>-	key.</div><div class='del'>-	(backend_last_client_gone_cb): Remove the backend from the active</div><div class='del'>-	server map and emit the "last_book_gone" signal if appropriate.</div><div class='del'>-	(pas_book_factory_get_n_backends): New function to query the</div><div class='del'>-	number of running backends in an addressbook factory.</div><div class='del'>-</div><div class='del'>-	* backend/idl/addressbook.idl (BookListener::CallStatus): Added a</div><div class='del'>-	ProtocolNotSupported code.  This is for when the addressbook</div><div class='del'>-	factory cannot find a provider for the requested URI.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.h (PASBackendClass): New</div><div class='del'>-	"last_client_gone" signal.</div><div class='del'>-	(PASBackendClass): New get_uri virtual method.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend.c (pas_backend_load_uri): Return a</div><div class='del'>-	gboolean success code.</div><div class='del'>-	(pas_backend_add_client): Return a gboolean success code.</div><div class='del'>-	(pas_backend_last_client_gone): New function used by backend</div><div class='del'>-	implementations to notify upwards when the backend's last client</div><div class='del'>-	is destroyed.</div><div class='del'>-	(pas_backend_get_uri): New function to get the URI of a backend.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c (pas_backend_file_add_client):</div><div class='del'>-	Pass the backend as the closure data to the "destroy" handler of</div><div class='del'>-	the book.  We cannot call pas_book_get_backend() in the callback</div><div class='del'>-	since the book's private data has already been destroyed when the</div><div class='del'>-	callback is invoked.  Alternatively, we could move the private</div><div class='del'>-	data destruction step to the book's ::finalize() method.</div><div class='del'>-	(pas_backend_file_book_destroy_cb): Get the backend from the</div><div class='del'>-	callback's data, not from the book.</div><div class='del'>-	(pas_backend_file_remove_client): Remove the book from the list of</div><div class='del'>-	clients.  When all clients go away, call</div><div class='del'>-	pas_backend_last_client_gone().</div><div class='del'>-	(PASBackendFilePrivate): Added an uri field.</div><div class='del'>-	(pas_backend_file_get_uri): Implement the get_uri method.</div><div class='del'>-	(pas_backend_file_load_uri): Return a gboolean success code.</div><div class='del'>-	Also, store the URI in the private structure.</div><div class='del'>-	(pas_backend_file_add_client): Return a gboolean success code.</div><div class='del'>-	Also, call pas_backend_last_client_gone() if appropriate.</div><div class='del'>-	(pas_backend_file_destroy): Free the bf-&gt;priv-&gt;uri.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c (pas_backend_ldap_add_client):</div><div class='del'>-	Pass the backend as the closure data to the "destroy" handler of</div><div class='del'>-	the book.  See above for rationale.</div><div class='del'>-	(pas_backend_ldap_book_destroy_cb): Get the backend from the</div><div class='del'>-	callback's data.</div><div class='del'>-	(pas_backend_ldap_remove_client): Remove the book from the list of</div><div class='del'>-	clients.  When all clients go away, call</div><div class='del'>-	pas_backend_last_client_gone().</div><div class='del'>-	(pas_backend_ldap_load_uri): Return a gboolean success code.</div><div class='del'>-	(pas_backend_ldap_add_client): Return a gboolean success code.</div><div class='del'>-	Also, call pas_backend_last_client_gone() if appropriate.</div><div class='del'>-	(PASBackendLDAPPrivate): New uri field.</div><div class='del'>-	(pas_backend_ldap_get_uri): Implement the get_uri method.</div><div class='del'>-	(pas_backend_ldap_load_uri): Store the uri in the private</div><div class='del'>-	structure.</div><div class='del'>-	(pas_backend_ldap_destroy): Free the bl-&gt;priv-&gt;uri.</div><div class='del'>-</div><div class='del'>-2000-04-30  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (evolution_addressbook_SOURCES): added</div><div class='del'>-	e-ldap-server-dialog.c</div><div class='del'>-	(glade_DATA): added ldap-server-dialog.glade</div><div class='del'>-</div><div class='del'>-	* gui/component/ldap-server-dialog.glade: new file.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.h: new file.</div><div class='del'>-</div><div class='del'>-	* gui/component/e-ldap-server-dialog.c: new file, contains logic</div><div class='del'>-	associated with ldap server dialog.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c (control_deactivate): remove the</div><div class='del'>-	directory server menu item.</div><div class='del'>-	(null_cb): do nothing callback for e_book_load_uri call.  should</div><div class='del'>-	change to (at the very least) pop up a dialog if there was an</div><div class='del'>-	error.</div><div class='del'>-	(new_server_cb): new function - really just switches to a</div><div class='del'>-	particular ldap server, since the information isn't saved</div><div class='del'>-	anywhere.</div><div class='del'>-	(control_activate): add directory server menu item.</div><div class='del'>-</div><div class='del'>-2000-04-30  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c (e_book_load_uri): create the book</div><div class='del'>-	listener here, since it's destroyed in unload_uri.</div><div class='del'>-	(e_book_construct): remove the book listener construction here.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/.cvsignore: Added load-pine-addressbook.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor.c, gui/minicard/e-minicard.c: Made</div><div class='del'>-	some fields invisible that were visible before.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c: Make file as not have the : after it if</div><div class='del'>-	it's empty.  If there's no name, or file_as, fill in these fields</div><div class='del'>-	with defaults based on full_name or name respectively.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/load-pine-addressbook.c: New file to do import of</div><div class='del'>-	pine .addressbook files.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Made empty fields act as the</div><div class='del'>-	empty string for searches.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Made the File As field update</div><div class='del'>-	properly as you edit the name and company fields.  Added the pull</div><div class='del'>-	down list of File As choices.  Made sure that all fields will</div><div class='del'>-	be set to NULL if they are deleted to the empty string.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/e-minicard.c: Use the File As field instead of the</div><div class='del'>-	Full Name field for the header.  Make identical compares on the</div><div class='del'>-	File As field do a compare on the uid.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c,</div><div class='del'>-	contact-editor/fullname.glade: Fixed a string mismatch.</div><div class='del'>-</div><div class='del'>-2000-04-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Added ename includes and libs.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added</div><div class='del'>-	e_card_name_from_string.  Added header for</div><div class='del'>-	e_card_delivery_address_from_string, even though it's not</div><div class='del'>-	implemented yet.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Removed the ename includes since we</div><div class='del'>-	no longer use ename directly here.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Fixed this to properly save</div><div class='del'>-	the address labels displayed.  Updated this to use the function</div><div class='del'>-	e_card_name_from_string instead of doing it by hand.</div><div class='del'>-</div><div class='del'>-	* contact-editor/fullname-strings.h,</div><div class='del'>-	contact-editor/fullname.glade: Deleted an unused field.  Changed</div><div class='del'>-	the set of prefixes and suffixes.</div><div class='del'>-</div><div class='del'>-2000-04-30  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-ldap.c</div><div class='del'>-	(pas_backend_ldap_ensure_connected): add support for a rootdn in</div><div class='del'>-	the uri.</div><div class='del'>-	(pas_backend_ldap_build_all_cards_list): make use of the rootdn in</div><div class='del'>-	the call to ldap_search_s.</div><div class='del'>-	(pas_backend_ldap_search): same.</div><div class='del'>-	(pas_backend_ldap_load_uri): get the rootdn out of the passed in uri.</div><div class='del'>-</div><div class='del'>-2000-04-29  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added</div><div class='del'>-	e_card_phone_new e_card_delivery_address_new,</div><div class='del'>-	e_card_delivery_address_to_string, e_card_name_copy,</div><div class='del'>-	e_card_name_new, e_card_name_to_string, and made e_card_name_free</div><div class='del'>-	public.  Removed some unused code.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am: Added e-contact-editor-fullname.[ch]</div><div class='del'>-	and fullname.glade.  Added e-name libs and includes.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor-fullname.c,</div><div class='del'>-	contact-editor/e-contact-editor-fullname.h,</div><div class='del'>-	contact-editor/fullname-strings.h, contact-editor/fullname.glade:</div><div class='del'>-	New dialog for editing the fields of a name separately.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Create an</div><div class='del'>-	EContactEditorFullname when you click on the Full Name button.</div><div class='del'>-	Maintain a parsed name at all times.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am, gui/minicard/Makefile.am: Added</div><div class='del'>-	e-name libs.</div><div class='del'>-</div><div class='del'>-2000-04-28  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c (register_factory): fix the</div><div class='del'>-	`USING_OAF' changes so that they work for when we are not using</div><div class='del'>-	oaf.</div><div class='del'>-</div><div class='del'>-2000-04-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am</div><div class='del'>-	(gnome_libs): Use `BONOBO_GNOME_LIBS'.</div><div class='del'>-	(INCLUDES): Add `-I$(srcdir)/..'.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-book-factory.c</div><div class='del'>-	(register_factory): New function to register the factory.</div><div class='del'>-	Implementation different according to `USING_OAF'.</div><div class='del'>-	(pas_book_factory_activate): Use `register_factory()'.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook.c: New #define `CONTROL_FACTORY_ID',</div><div class='del'>-	varying depending on whether we are `USING_OAF'.</div><div class='del'>-	(addressbook_factory_init): Use `CONTROL_FACTORY_ID'.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/test-client.c (init_corba): New function,</div><div class='del'>-	implemented differently according to the `USING_OAF' #define.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-book.c: New #define `CARDSERVER_OAF_ID'.</div><div class='del'>-	(e_book_construct): Work with OAF #if `USING_OAF'.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (gnome_libs): Removed.</div><div class='del'>-	(corbadir): Removed.</div><div class='del'>-	(ebook_libs): Removed.</div><div class='del'>-	(test_client_LDADD): Just add `libebook.la'.</div><div class='del'>-	(test_card_LDADD): Likewise.</div><div class='del'>-	(test_client_list_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/component/addressbook-factory.c</div><div class='del'>-	(init_corba): New helper function, implemented differently</div><div class='del'>-	according to `USING_OAF'.</div><div class='del'>-	(main): Call `init_corba()'.</div><div class='del'>-</div><div class='del'>-2000-04-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card.c, backend/ebook/e-card.h: Added file as,</div><div class='del'>-	office, manager, assistant, spouse, and anniversary fields.  These</div><div class='del'>-	all use "X-EVOLUTION-" fields in the VCards.</div><div class='del'>-</div><div class='del'>-	* backend/pas/pas-backend-file.c: Added all the new fields (except</div><div class='del'>-	anniversary) to the list of fields.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Fixed some misnamed</div><div class='del'>-	fields and fixed the placement of the comments field.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Made the newly added fields</div><div class='del'>-	display properly.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added ename.</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.h, ename/test-ename-western-gtk.c,</div><div class='del'>-	ename/test-ename-western.c: Fixed up some #includes.</div><div class='del'>-</div><div class='del'>-	* ename/.cvsignore: Added .cvsignore.</div><div class='del'>-</div><div class='del'>-2000-04-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,</div><div class='del'>-	backend/ebook/e-card.h: Added an address label field.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Got rid of some unused</div><div class='del'>-	fields.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Added the address label field.</div><div class='del'>-	Load only.  Editing these fields seems to mess things up.</div><div class='del'>-</div><div class='del'>-2000-04-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c: Added proper handling of the</div><div class='del'>-	email field.</div><div class='del'>-</div><div class='del'>-2000-04-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* backend/ebook/e-card-types.h, backend/ebook/e-card.c,</div><div class='del'>-	gui/minicard/e-minicard.c: Prefixed the ADDR_ flags.</div><div class='del'>-</div><div class='del'>-	* contact-editor/contact-editor.glade,</div><div class='del'>-	contact-editor/e-contact-editor-strings.h: Edited the glade file.</div><div class='del'>-	Removed all the fields that we don't use.</div><div class='del'>-</div><div class='del'>-	* contact-editor/e-contact-editor.c,</div><div class='del'>-	contact-editor/e-contact-editor.h: Made the phone fields work</div><div class='del'>-	properly.  The address and email fields are temporarily turned off</div><div class='del'>-	until they can be made to work as the phone fields do.</div><div class='del'>-</div><div class='del'>-2000-04-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am (INCLUDES): Use</div><div class='del'>-	`$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am (idl_flags): Add `-I $(datadir)/idl' to</div><div class='del'>-	pick up IDL files in the installation prefix as well.</div><div class='del'>-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am (ORBIT_IDL): Use `-I $(datadir)/idl'</div><div class='del'>-	to get the IDLs from the installation prefix as well.</div><div class='del'>-	(INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-	(test_client_LDADD): Use `$(BONOBO_GNOME_LIBS)' instead of</div><div class='del'>-	hardcoding `-lbonobo'!  Also get rid of some other useless flags,</div><div class='del'>-	as `$(BONOBO_GNOME_LIBS)' really has all what we need.</div><div class='del'>-	(test_client_list_LDADD): Likewise.</div><div class='del'>-	(test_card_LDADD): Likewise.</div><div class='del'>-</div><div class='del'>-2000-04-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log</div><div class='del'>-	domain.</div><div class='del'>-</div><div class='del'>-	* gui/component/Makefile.am (INCLUDES): Use</div><div class='del'>-	"evolution-addressbook" as the log domain.</div><div class='del'>-</div><div class='del'>-	* backend/pas/Makefile.am: Build libpas.a, not a shared library.</div><div class='del'>-	Do not install any header files.</div><div class='del'>-	(INCLUDES): Remove spurious include paths.</div><div class='del'>-</div><div class='del'>-	* backend/pas/*.[ch]: Fix includes.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/Makefile.am: Do not install the test programs.</div><div class='del'>-	Fixed some include weirdness.</div><div class='del'>-</div><div class='del'>-	* backend/ebook/*.[ch]: Fix includes.</div><div class='del'>-</div><div class='del'>-	* contact-editor/Makefile.am (INCLUDES): Set the log domain to</div><div class='del'>-	"contact-editor".</div><div class='del'>-	(INCLUDES): Fix.</div><div class='del'>-</div><div class='del'>-	* contact-editor/*.[ch]: Fix includes.</div><div class='del'>-</div><div class='del'>-	* gui/minicard/*.[ch]: Fix includes.</div><div class='del'>-</div><div class='del'>-	* ChangeLog: Started a ChangeLog here.</div><div class='head'>diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am<br/>deleted file mode 100644<br/>index cc89ee5aeb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-if ENABLE_PILOT_CONDUITS</div><div class='del'>-CONDUIT_SUBDIR=conduit</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-SUBDIRS =	\</div><div class='del'>-	backend printing contact-editor gui $(CONDUIT_SUBDIR)</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/.cvsignore b/addressbook/backend/.cvsignore<br/>deleted file mode 100644<br/>index 09980ae6ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 1abc66db18..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,16 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-addressbook-stubs.c</div><div class='del'>-addressbook-skels.c</div><div class='del'>-addressbook-common.c</div><div class='del'>-addressbook.h</div><div class='del'>-test-card</div><div class='del'>-test-client</div><div class='del'>-test-client-list</div><div class='del'>-load-pine-addressbook</div><div class='del'>-load-gnomecard-addressbook</div><div class='head'>diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am<br/>deleted file mode 100644<br/>index 7fef103315..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,124 +0,0 @@</div><div class='del'>-noinst_PROGRAMS = test-card test-client test-client-list</div><div class='del'>-</div><div class='del'>-bin_PROGRAMS = load-pine-addressbook load-gnomecard-addressbook</div><div class='del'>-</div><div class='del'>-CORBA_SOURCE =						\</div><div class='del'>-	addressbook.h					\</div><div class='del'>-	addressbook-common.c				\</div><div class='del'>-	addressbook-stubs.c				\</div><div class='del'>-	addressbook-skels.c</div><div class='del'>-</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=\""$(localedir)"\"        \</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'>-	$(EXTRA_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-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-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'>-</div><div class='del'>-#</div><div class='del'>-# make a static library for use by addressbook's conduit's shared library</div><div class='del'>-#</div><div class='del'>-noinst_LTLIBRARIES = libebook-static.la</div><div class='del'>-libebook_static_la_SOURCES = $(libebook_la_SOURCES)</div><div class='del'>-libebook_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-test_client_SOURCES =					\</div><div class='del'>-	test-client.c</div><div class='del'>-</div><div class='del'>-test_client_LDADD =					\</div><div class='del'>-	libebook.la					\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la		\</div><div class='del'>-	$(top_builddir)/e-util/ename/libename.la	\</div><div class='del'>-	$(top_builddir)/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'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/e-util/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'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/e-util/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'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/e-util/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_gnomecard_addressbook_SOURCES =			\</div><div class='del'>-	load-gnomecard-addressbook.c</div><div class='del'>-</div><div class='del'>-load_gnomecard_addressbook_LDADD =			\</div><div class='del'>-	libebook.la					\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)				\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(top_builddir)/e-util/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 cd1bdc6000..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view-listener.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-book-view-listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,408 +0,0 @@</div><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'>-	resp-&gt;message   = NULL;</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add, Remove, Modify */</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_queue_id_event (EBookViewListener          *listener,</div><div class='del'>-				     EBookViewListenerOperation  op,</div><div class='del'>-				     const char             *id)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookViewListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = op;</div><div class='del'>-	resp-&gt;id        = g_strdup (id);</div><div class='del'>-	resp-&gt;cards     = NULL;</div><div class='del'>-	resp-&gt;message   = NULL;</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add, Remove, Modify */</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_queue_sequence_event (EBookViewListener          *listener,</div><div class='del'>-					   EBookViewListenerOperation  op,</div><div class='del'>-					   const 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'>-	resp-&gt;message   = NULL;</div><div class='del'>-	</div><div class='del'>-	for ( i = 0; i &lt; cards-&gt;_length; i++ ) {</div><div class='del'>-		resp-&gt;cards = g_list_append(resp-&gt;cards, e_card_new(cards-&gt;_buffer[i]));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Status Message */</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_queue_message_event (EBookViewListener          *listener,</div><div class='del'>-					  EBookViewListenerOperation  op,</div><div class='del'>-					  const char                 *message)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	resp = g_new0 (EBookViewListenerResponse, 1);</div><div class='del'>-</div><div class='del'>-	resp-&gt;op        = op;</div><div class='del'>-	resp-&gt;id        = NULL;</div><div class='del'>-	resp-&gt;cards     = NULL;</div><div class='del'>-	resp-&gt;message   = g_strdup(message);</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_response (listener, resp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_BookViewListener_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'>-static void</div><div class='del'>-impl_BookViewListener_signal_status_message (PortableServer_Servant  servant,</div><div class='del'>-					     const char             *message,</div><div class='del'>-					     CORBA_Environment      *ev)</div><div class='del'>-{</div><div class='del'>-	EBookViewListener *listener = E_BOOK_VIEW_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-</div><div class='del'>-	e_book_view_listener_queue_message_event (listener, StatusMessageEvent, message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_listener_check_pending:</div><div class='del'>- * @listener: the #EBookViewListener </div><div class='del'>- *</div><div class='del'>- * Returns: the number of items on the response queue,</div><div class='del'>- * or -1 if the @listener is isn't an #EBookViewListener.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_book_view_listener_check_pending (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (listener != NULL,              -1);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), -1);</div><div class='del'>-</div><div class='del'>-	return g_list_length (listener-&gt;priv-&gt;response_queue);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_listener_pop_response:</div><div class='del'>- * @listener: the #EBookViewListener for which a request is to be popped</div><div class='del'>- *</div><div class='del'>- * Returns: an #EBookViewListenerResponse if there are responses on the</div><div class='del'>- * queue to be returned; %NULL if there aren't, or if the @listener</div><div class='del'>- * isn't an EBookViewListener.</div><div class='del'>- */</div><div class='del'>-EBookViewListenerResponse *</div><div class='del'>-e_book_view_listener_pop_response (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-	GList                 *popped;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (listener != NULL,              NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_BOOK_VIEW_LISTENER (listener), NULL);</div><div class='del'>-</div><div class='del'>-	if (listener-&gt;priv-&gt;response_queue == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	resp = listener-&gt;priv-&gt;response_queue-&gt;data;</div><div class='del'>-</div><div class='del'>-	popped = listener-&gt;priv-&gt;response_queue;</div><div class='del'>-	listener-&gt;priv-&gt;response_queue =</div><div class='del'>-		g_list_remove_link (listener-&gt;priv-&gt;response_queue,</div><div class='del'>-				    listener-&gt;priv-&gt;response_queue);</div><div class='del'>-	g_list_free_1 (popped);</div><div class='del'>-</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EBookViewListener *</div><div class='del'>-e_book_view_listener_construct (EBookViewListener *listener)</div><div class='del'>-{</div><div class='del'>-	POA_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'>-	if (listener-&gt;priv-&gt;idle_id)</div><div class='del'>-		g_source_remove(listener-&gt;priv-&gt;idle_id);</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'>-</div><div class='del'>-		g_free(resp-&gt;id);</div><div class='del'>-</div><div class='del'>-		g_list_foreach(resp-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-		g_list_free(resp-&gt;cards);</div><div class='del'>-</div><div class='del'>-		g_free (resp-&gt;message);</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'>-	epv-&gt;signal_status_message     = impl_BookViewListener_signal_status_message;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_book_view_listener_corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	e_book_view_listener_vepv.Bonobo_Unknown_epv          = bonobo_object_get_epv ();</div><div class='del'>-	e_book_view_listener_vepv.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 5a535a209a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view-listener.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-book-view-listener.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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'>-	StatusMessageEvent,</div><div class='del'>-} EBookViewListenerOperation;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBookViewListenerOperation  op;</div><div class='del'>-</div><div class='del'>-	/* For CardRemovedEvent */</div><div class='del'>-	char                   *id;</div><div class='del'>-</div><div class='del'>-	/* For Card[Added|Modified]Event */</div><div class='del'>-	GList                  *cards; /* Of type ECard. */</div><div class='del'>-</div><div class='del'>-	/* For StatusMessageEvent */</div><div class='del'>-	char                   *message;</div><div class='del'>-	</div><div class='del'>-} EBookViewListenerResponse;</div><div class='del'>-</div><div class='del'>-EBookViewListener         *e_book_view_listener_new            (void);</div><div class='del'>-int                        e_book_view_listener_check_pending  (EBookViewListener *listener);</div><div class='del'>-EBookViewListenerResponse *e_book_view_listener_pop_response   (EBookViewListener *listener);</div><div class='del'>-GtkType                    e_book_view_listener_get_type       (void);</div><div class='del'>-</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 6e0379f2cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-book-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,328 +0,0 @@</div><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'>-	STATUS_MESSAGE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_book_view_signals [LAST_SIGNAL];</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-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'>-static void</div><div class='del'>-e_book_view_do_status_message_event (EBookView                 *book_view,</div><div class='del'>-				     EBookViewListenerResponse *resp)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (book_view), e_book_view_signals [STATUS_MESSAGE],</div><div class='del'>-			 resp-&gt;message);</div><div class='del'>-	g_free(resp-&gt;message);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Reading notices out of the EBookViewListener's queue.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_book_view_check_listener_queue (EBookViewListener *listener, EBookView *book_view)</div><div class='del'>-{</div><div class='del'>-	EBookViewListenerResponse *resp;</div><div class='del'>-</div><div class='del'>-	resp = e_book_view_listener_pop_response (listener);</div><div class='del'>-</div><div class='del'>-	if (resp == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch (resp-&gt;op) {</div><div class='del'>-	case CardAddedEvent:</div><div class='del'>-		e_book_view_do_added_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	case CardModifiedEvent:</div><div class='del'>-		e_book_view_do_modified_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	case CardRemovedEvent:</div><div class='del'>-		e_book_view_do_removed_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	case SequenceCompleteEvent:</div><div class='del'>-		e_book_view_do_complete_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	case StatusMessageEvent:</div><div class='del'>-		e_book_view_do_status_message_event (book_view, resp);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_error ("EBookView: Unknown operation %d in listener queue!\n",</div><div class='del'>-			 resp-&gt;op);</div><div class='del'>-	}</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'>-	e_book_view_signals [STATUS_MESSAGE] =</div><div class='del'>-		gtk_signal_new ("status_message",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EBookViewClass, status_message),</div><div class='del'>-				gtk_marshal_NONE__STRING,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_STRING);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_book_view_signals,</div><div class='del'>-				      LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	klass-&gt;card_changed = NULL;</div><div class='del'>-	klass-&gt;card_added = NULL;</div><div class='del'>-	klass-&gt;card_removed = NULL;</div><div class='del'>-	klass-&gt;sequence_complete = NULL;</div><div class='del'>-	klass-&gt;status_message = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_book_view_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_book_view_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-e_book_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EBookView",</div><div class='del'>-			sizeof (EBookView),</div><div class='del'>-			sizeof (EBookViewClass),</div><div class='del'>-			(GtkClassInitFunc)  e_book_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_book_view_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/e-book-view.h b/addressbook/backend/ebook/e-book-view.h<br/>deleted file mode 100644<br/>index bd64c9dbc7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book-view.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-book-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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'>-	void (* status_message)    (EBookView *book_view, const char *message);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Creating a new addressbook. */</div><div class='del'>-EBookView         *e_book_view_new                    (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 32103fc9df..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-book.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1066 +0,0 @@</div><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'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook.h"</div><div class='del'>-#include "e-card-cursor.h"</div><div class='del'>-#include "e-book-listener.h"</div><div class='del'>-#include "e-book.h"</div><div class='del'>-</div><div class='del'>-GtkObjectClass *e_book_parent_class;</div><div class='del'>-</div><div class='del'>-#define CARDSERVER_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"</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 != URILoaded) {</div><div class='del'>-		g_warning ("e_book_unload_uri: No URI is loaded!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Release the remote 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'>-char *</div><div class='del'>-e_book_get_static_capabilities (EBook *book)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *temp;</div><div class='del'>-	char *ret_val;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (book-&gt;priv-&gt;load_state != URILoaded) {</div><div class='del'>-		g_warning ("e_book_unload_uri: No URI is loaded!\n");</div><div class='del'>-		return g_strdup("");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	temp = Evolution_Book_get_static_capabilities(book-&gt;priv-&gt;corba_book, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_get_static_capabilities: Exception "</div><div class='del'>-			   "during get_static_capabilities!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret_val = g_strdup(temp);</div><div class='del'>-	CORBA_free(temp);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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'>-	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'>-	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'>-gboolean e_book_get_changes         (EBook                 *book,</div><div class='del'>-				     gchar                 *changeid,</div><div class='del'>-				     EBookBookViewCallback  cb,</div><div class='del'>-				     gpointer               closure)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	EBookViewListener *listener;</div><div class='del'>-  </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_changes: No URI loaded!\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	listener = e_book_view_listener_new();</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	Evolution_Book_get_changes (book-&gt;priv-&gt;corba_book, bonobo_object_corba_objref(BONOBO_OBJECT(listener)), changeid, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("e_book_changes: Exception "</div><div class='del'>-			   "getting changes!\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		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 == URILoaded)</div><div class='del'>-		e_book_unload_uri (book);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	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 3c3f2bc65b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-book.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-book.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,128 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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'>-char     *e_book_get_static_capabilities  (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'>-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'>-gboolean  e_book_get_changes              (EBook                 *book,</div><div class='del'>-					   char                  *changeid,</div><div class='del'>-					   EBookBookViewCallback  cb,</div><div class='del'>-					   gpointer               closure);</div><div class='del'>-</div><div class='del'>-/* 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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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-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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 ff65ff82b0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-simple.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-card-simple.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'>- * 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'>-	E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL,</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_FAMILY_NAME,        "family_name", "Family Name",   "Family Name",  0,                               E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },</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'>-	{ E_CARD_SIMPLE_FIELD_NAME_OR_ORG,        "nameororg",   "",              "",         0,                                   E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL },</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'>-</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'>-	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'>-	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'>-		EList *address_list;</div><div class='del'>-		EList *phone_list;</div><div class='del'>-		EList *email_list;</div><div class='del'>-		EList *delivery_list;</div><div class='del'>-		const ECardPhone *phone;</div><div class='del'>-		const char *email;</div><div class='del'>-		const ECardAddrLabel *address;</div><div class='del'>-		const ECardDeliveryAddress *delivery;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "address_label", &amp;address_list,</div><div class='del'>-			       "address",       &amp;delivery_list,</div><div class='del'>-			       "phone",         &amp;phone_list,</div><div class='del'>-			       "email",         &amp;email_list,</div><div class='del'>-			       NULL);</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i++) {</div><div class='del'>-			e_card_phone_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_list_get_iterator(phone_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			phone = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {</div><div class='del'>-				if (((phone-&gt;flags &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_list_get_iterator(email_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			email = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {</div><div class='del'>-				if ((simple-&gt;email[i] == NULL)) {</div><div class='del'>-					simple-&gt;email[i] = g_strdup(email);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-			e_card_address_label_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_list_get_iterator(address_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			address = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-				if (((address-&gt;flags &amp; addr_correspondences[i]) == addr_correspondences[i]) &amp;&amp; (simple-&gt;address[i] == NULL)) {</div><div class='del'>-					simple-&gt;address[i] = e_card_address_label_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'>-		for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i++) {</div><div class='del'>-			e_card_delivery_address_free(simple-&gt;delivery[i]);</div><div class='del'>-			simple-&gt;delivery[i] = NULL;</div><div class='del'>-		}</div><div class='del'>-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			delivery = e_iterator_get(iterator);</div><div class='del'>-			for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-				if (((delivery-&gt;flags &amp; addr_correspondences[i]) == addr_correspondences[i]) &amp;&amp; (simple-&gt;delivery[i] == NULL)) {</div><div class='del'>-					simple-&gt;delivery[i] = e_card_delivery_address_copy(delivery);</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</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'>-		EList *address_list;</div><div class='del'>-		EList *phone_list;</div><div class='del'>-		EList *email_list;</div><div class='del'>-		EList *delivery_list;</div><div class='del'>-		const ECardPhone *phone;</div><div class='del'>-		const ECardAddrLabel *address;</div><div class='del'>-		const ECardDeliveryAddress *delivery;</div><div class='del'>-		const char *email;</div><div class='del'>-		int i;</div><div class='del'>-		int iterator_next = 1;</div><div class='del'>-</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "address_label", &amp;address_list,</div><div class='del'>-			       "address",       &amp;delivery_list,</div><div class='del'>-			       "phone",         &amp;phone_list,</div><div class='del'>-			       "email",         &amp;email_list,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-		for (iterator = e_list_get_iterator(phone_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {</div><div class='del'>-			int i;</div><div class='del'>-			phone = e_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_iterator_set(iterator, simple-&gt;phone[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_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_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_list_get_iterator(email_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {</div><div class='del'>-			int i;</div><div class='del'>-			email = e_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_iterator_set(iterator, simple-&gt;email[i]);</div><div class='del'>-					} else {</div><div class='del'>-						e_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_list_append(email_list, simple-&gt;email[i]);</div><div class='del'>-				g_free(simple-&gt;email[i]);</div><div class='del'>-				simple-&gt;email[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (iterator = e_list_get_iterator(address_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {</div><div class='del'>-			int i;</div><div class='del'>-			address = e_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_iterator_set(iterator, simple-&gt;address[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_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_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'>-</div><div class='del'>-		for (iterator = e_list_get_iterator(delivery_list); e_iterator_is_valid(iterator); iterator_next ? e_iterator_next(iterator) : FALSE ) {</div><div class='del'>-			int i;</div><div class='del'>-			delivery = e_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 ((delivery-&gt;flags &amp; addr_correspondences[i]) == addr_correspondences[i]) {</div><div class='del'>-					if (simple-&gt;delivery[i]) {</div><div class='del'>-						simple-&gt;delivery[i]-&gt;flags = addr_correspondences[i];</div><div class='del'>-						if (!e_card_delivery_address_is_empty(simple-&gt;delivery[i])) {</div><div class='del'>-							e_iterator_set(iterator, simple-&gt;delivery[i]);</div><div class='del'>-						} else {</div><div class='del'>-							e_iterator_delete(iterator);</div><div class='del'>-							iterator_next = 0;</div><div class='del'>-						}</div><div class='del'>-						e_card_delivery_address_free(simple-&gt;delivery[i]);</div><div class='del'>-						simple-&gt;delivery[i] = NULL;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}	</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		for (i = 0; i &lt; E_CARD_SIMPLE_ADDRESS_ID_LAST; i ++) {</div><div class='del'>-			if (simple-&gt;delivery[i]) {</div><div class='del'>-				simple-&gt;delivery[i]-&gt;flags = addr_correspondences[i];</div><div class='del'>-				e_list_append(delivery_list, simple-&gt;delivery[i]);</div><div class='del'>-				e_card_delivery_address_free(simple-&gt;delivery[i]);</div><div class='del'>-				simple-&gt;delivery[i] = NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		fill_in_info(simple);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECardPhone     *e_card_simple_get_phone   (ECardSimple          *simple,</div><div class='del'>-						 ECardSimplePhoneId    id)</div><div class='del'>-{</div><div class='del'>-	return simple-&gt;phone[id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char           *e_card_simple_get_email   (ECardSimple          *simple,</div><div class='del'>-						 ECardSimpleEmailId    id)</div><div class='del'>-{</div><div class='del'>-	return simple-&gt;email[id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECardAddrLabel *e_card_simple_get_address (ECardSimple          *simple,</div><div class='del'>-						 ECardSimpleAddressId  id)</div><div class='del'>-{</div><div class='del'>-	return simple-&gt;address[id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECardDeliveryAddress *e_card_simple_get_delivery_address (ECardSimple          *simple,</div><div class='del'>-								ECardSimpleAddressId  id)</div><div class='del'>-{</div><div class='del'>-	return simple-&gt;delivery[id];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void            e_card_simple_set_phone   (ECardSimple          *simple,</div><div class='del'>-					   ECardSimplePhoneId    id,</div><div class='del'>-					   const ECardPhone           *phone)</div><div class='del'>-{</div><div class='del'>-	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'>-	if (simple-&gt;delivery[id])</div><div class='del'>-		e_card_delivery_address_free(simple-&gt;delivery[id]);</div><div class='del'>-	simple-&gt;delivery[id] = e_card_delivery_address_from_label(simple-&gt;address[id]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void            e_card_simple_set_delivery_address (ECardSimple          *simple,</div><div class='del'>-						    ECardSimpleAddressId  id,</div><div class='del'>-						    const ECardDeliveryAddress *delivery)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;delivery[id])</div><div class='del'>-		e_card_delivery_address_free(simple-&gt;delivery[id]);</div><div class='del'>-	simple-&gt;delivery[id] = e_card_delivery_address_copy(delivery);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *e_card_simple_get_const    (ECardSimple          *simple,</div><div class='del'>-					ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	char *ret_val = e_card_simple_get(simple, field);</div><div class='del'>-	if (ret_val)</div><div class='del'>-		simple-&gt;temp_fields = g_list_prepend(simple-&gt;temp_fields, ret_val);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char     *e_card_simple_get            (ECardSimple          *simple,</div><div class='del'>-					ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	ECardSimpleInternalType type = field_data[field].type;</div><div class='del'>-	const ECardAddrLabel *addr;</div><div class='del'>-	const ECardPhone *phone;</div><div class='del'>-	const char *string;</div><div class='del'>-	ECardDate *date;</div><div class='del'>-	ECardName *name;</div><div class='del'>-	switch(type) {</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:</div><div class='del'>-		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'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:</div><div class='del'>-		switch (field) {</div><div class='del'>-		case E_CARD_SIMPLE_FIELD_NAME_OR_ORG:</div><div class='del'>-			gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-				       "full_name", &amp;string,</div><div class='del'>-				       NULL);</div><div class='del'>-			if (string &amp;&amp; *string)</div><div class='del'>-				return g_strdup(string);</div><div class='del'>-			gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-				       "org", &amp;string,</div><div class='del'>-				       NULL);</div><div class='del'>-			if (string &amp;&amp; *string)</div><div class='del'>-				return g_strdup(string);</div><div class='del'>-			string = e_card_simple_get_email(simple,</div><div class='del'>-							 E_CARD_SIMPLE_EMAIL_ID_EMAIL); </div><div class='del'>-			return g_strdup(string);</div><div class='del'>-		case E_CARD_SIMPLE_FIELD_FAMILY_NAME:</div><div class='del'>-			gtk_object_get (GTK_OBJECT(simple-&gt;card),</div><div class='del'>-					"name", &amp;name,</div><div class='del'>-					NULL);</div><div class='del'>-			return g_strdup (name-&gt;family);</div><div class='del'>-		default:</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	default:</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-name_to_style(const ECardName *name, char *company, int style)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	char *strings[4], **stringptr;</div><div class='del'>-	char *substring;</div><div class='del'>-	switch (style) {</div><div class='del'>-	case 0:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-			*(stringptr++) = name-&gt;family;</div><div class='del'>-		if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-			*(stringptr++) = name-&gt;given;</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(", ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-			*(stringptr++) = name-&gt;given;</div><div class='del'>-		if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-			*(stringptr++) = name-&gt;family;</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(" ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		string = g_strdup(company);</div><div class='del'>-		break;</div><div class='del'>-	case 3: /* Fall Through */</div><div class='del'>-	case 4:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-			*(stringptr++) = name-&gt;family;</div><div class='del'>-		if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-			*(stringptr++) = name-&gt;given;</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		substring = g_strjoinv(", ", strings);</div><div class='del'>-		if (!(company &amp;&amp; *company))</div><div class='del'>-			company = "";</div><div class='del'>-		if (style == 3)</div><div class='del'>-			string = g_strdup_printf("%s (%s)", substring, company);</div><div class='del'>-		else</div><div class='del'>-			string = g_strdup_printf("%s (%s)", company, substring);</div><div class='del'>-		g_free(substring);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		string = g_strdup("");</div><div class='del'>-	}</div><div class='del'>-	return string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-file_as_get_style (ECardSimple *simple)</div><div class='del'>-{</div><div class='del'>-	char *filestring = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FILE_AS);</div><div class='del'>-	char *trystring;</div><div class='del'>-	char *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'>-		case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-					     </div><div class='del'>-ECardSimpleType e_card_simple_type       (ECardSimple          *simple,</div><div class='del'>-					  ECardSimpleField      field)</div><div class='del'>-{</div><div class='del'>-	ECardSimpleInternalType type = field_data[field].type;</div><div class='del'>-	switch(type) {</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_STRING:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_ADDRESS:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_PHONE:</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_EMAIL:</div><div class='del'>-	default:</div><div class='del'>-		return E_CARD_SIMPLE_TYPE_STRING;</div><div class='del'>-</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_DATE:</div><div class='del'>-		return E_CARD_SIMPLE_TYPE_DATE;</div><div class='del'>-</div><div class='del'>-	case E_CARD_SIMPLE_INTERNAL_TYPE_SPECIAL:</div><div class='del'>-		return E_CARD_SIMPLE_TYPE_STRING;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char     *e_card_simple_get_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'>-		EList *list;</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-			       "arbitrary", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);</div><div class='del'>-			if (callback)</div><div class='del'>-				(*callback) (arbitrary, closure);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const ECardArbitrary *e_card_simple_get_arbitrary     (ECardSimple          *simple,</div><div class='del'>-						       const char           *key)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;card) {</div><div class='del'>-		EList *list;</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-			       "arbitrary", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);</div><div class='del'>-			if (!strcasecmp(arbitrary-&gt;key, key))</div><div class='del'>-				return arbitrary;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Any of these except key can be NULL */	      </div><div class='del'>-void                  e_card_simple_set_arbitrary     (ECardSimple          *simple,</div><div class='del'>-						       const char           *key,</div><div class='del'>-						       const char           *type,</div><div class='del'>-						       const char           *value)</div><div class='del'>-{</div><div class='del'>-	if (simple-&gt;card) {</div><div class='del'>-	ECardArbitrary *new_arb;</div><div class='del'>-		EList *list;</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-			       "arbitrary", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		for (iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);</div><div class='del'>-			if (!strcasecmp(arbitrary-&gt;key, key)) {</div><div class='del'>-				new_arb = e_card_arbitrary_new();</div><div class='del'>-				new_arb-&gt;key = g_strdup(key);</div><div class='del'>-				new_arb-&gt;type = g_strdup(type);</div><div class='del'>-				new_arb-&gt;value = g_strdup(value);</div><div class='del'>-				e_iterator_set(iterator, new_arb);</div><div class='del'>-				e_card_arbitrary_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_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 e23f5fe90c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-simple.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-card-simple.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</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;e-util/e-list.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_CARD_SIMPLE            (e_card_simple_get_type ())</div><div class='del'>-#define E_CARD_SIMPLE(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD_SIMPLE, ECardSimple))</div><div class='del'>-#define E_CARD_SIMPLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD_SIMPLE, ECardSimpleClass))</div><div class='del'>-#define E_IS_CARD_SIMPLE(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD_SIMPLE))</div><div class='del'>-#define E_IS_CARD_SIMPLE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD_SIMPLE))</div><div class='del'>-</div><div class='del'>-typedef enum _ECardSimplePhoneId ECardSimplePhoneId;</div><div class='del'>-typedef enum _ECardSimpleEmailId ECardSimpleEmailId;</div><div class='del'>-typedef enum _ECardSimpleAddressId ECardSimpleAddressId;</div><div class='del'>-typedef enum _ECardSimpleType ECardSimpleType;</div><div class='del'>-typedef enum _ECardSimpleField ECardSimpleField;</div><div class='del'>-</div><div class='del'>-enum _ECardSimplePhoneId {</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_ASSISTANT,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_BUSINESS,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_2,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_CALLBACK,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_CAR,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_COMPANY,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_HOME,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_HOME_2,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_HOME_FAX,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_ISDN,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_MOBILE,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_OTHER,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_OTHER_FAX,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_PAGER,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_PRIMARY,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_RADIO,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_TELEX,</div><div class='del'>-	E_CARD_SIMPLE_PHONE_ID_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_FAMILY_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_NAME_OR_ORG,</div><div class='del'>-        E_CARD_SIMPLE_FIELD_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct _ECardSimple ECardSimple;</div><div class='del'>-typedef struct _ECardSimpleClass ECardSimpleClass;</div><div class='del'>-</div><div class='del'>-struct _ECardSimple {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	GList *temp_fields;</div><div class='del'>-</div><div class='del'>-	ECardPhone *phone[E_CARD_SIMPLE_PHONE_ID_LAST];</div><div class='del'>-	char *email[E_CARD_SIMPLE_EMAIL_ID_LAST];</div><div class='del'>-	ECardAddrLabel *address[E_CARD_SIMPLE_ADDRESS_ID_LAST];</div><div class='del'>-	ECardDeliveryAddress *delivery[E_CARD_SIMPLE_ADDRESS_ID_LAST];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardSimpleClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef void (*ECardSimpleArbitraryCallback) (const ECardArbitrary *arbitrary, gpointer closure);</div><div class='del'>-ECardSimple                *e_card_simple_new                   (ECard                        *card);</div><div class='del'>-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'>-ECardSimple                *e_card_simple_duplicate             (ECardSimple                  *simple);</div><div class='del'>-char                       *e_card_simple_get                   (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleField              field);</div><div class='del'>-const char                 *e_card_simple_get_const             (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleField              field);</div><div class='del'>-void                        e_card_simple_set                   (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleField              field,</div><div class='del'>-								 const char                   *data);</div><div class='del'>-ECardSimpleType             e_card_simple_type                  (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleField              field);</div><div class='del'>-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'>-const ECardDeliveryAddress *e_card_simple_get_delivery_address  (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleAddressId          id);</div><div class='del'>-void                        e_card_simple_set_phone             (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimplePhoneId            id,</div><div class='del'>-								 const ECardPhone             *phone);</div><div class='del'>-void                        e_card_simple_set_email             (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleEmailId            id,</div><div class='del'>-								 const char                   *email);</div><div class='del'>-void                        e_card_simple_set_address           (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleAddressId          id,</div><div class='del'>-								 const ECardAddrLabel         *address);</div><div class='del'>-void                        e_card_simple_set_delivery_address  (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleAddressId          id,</div><div class='del'>-								 const ECardDeliveryAddress   *delivery);</div><div class='del'>-void                        e_card_simple_arbitrary_foreach     (ECardSimple                  *simple,</div><div class='del'>-								 ECardSimpleArbitraryCallback *callback,</div><div class='del'>-								 gpointer                      closure);</div><div class='del'>-const ECardArbitrary       *e_card_simple_get_arbitrary         (ECardSimple                  *simple,</div><div class='del'>-								 const char                   *key);</div><div class='del'>-/* Any of these except key can be NULL */	      </div><div class='del'>-void                        e_card_simple_set_arbitrary         (ECardSimple                  *simple,</div><div class='del'>-								 const char                   *key,</div><div class='del'>-								 const char                   *type,</div><div class='del'>-								 const char                   *value);</div><div class='del'>-void                        e_card_simple_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='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/ebook/e-card-types.h b/addressbook/backend/ebook/e-card-types.h<br/>deleted file mode 100644<br/>index a2563d4bf6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card-types.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-card-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,97 +0,0 @@</div><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'>-/* PILOT SYNC STATUS */</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	E_CARD_PILOT_STATUS_NONE,</div><div class='del'>-	E_CARD_PILOT_STATUS_MOD,</div><div class='del'>-	E_CARD_PILOT_STATUS_DEL</div><div class='del'>-};</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 37a35b05e2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-card.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3383 +0,0 @@</div><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 &lt;e-util/ename/e-name-western.h&gt;</div><div class='del'>-#include &lt;e-util/ename/e-address-western.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#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_PILOT_ID "X-EVOLUTION-PILOTID"</div><div class='del'>-#define XEV_PILOT_STATUS "X-EVOLUTION-PILOTSTATUS"</div><div class='del'>-#define XEV_WANTS_HTML "X-MOZILLA-HTML"</div><div class='del'>-#define XEV_ARBITRARY "X-EVOLUTION-ARBITRARY"</div><div class='del'>-</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_WANTS_HTML,</div><div class='del'>-	ARG_WANTS_HTML_SET,</div><div class='del'>-	ARG_PILOTID,</div><div class='del'>-	ARG_PILOTSTATUS,</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_wants_html(ECard *card, VObject *object);</div><div class='del'>-static void parse_pilot_id(ECard *card, VObject *object);</div><div class='del'>-static void parse_pilot_status(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_WANTS_HTML,            parse_wants_html },</div><div class='del'>-	{ XEV_PILOT_ID,              parse_pilot_id },</div><div class='del'>-	{ XEV_PILOT_STATUS,          parse_pilot_status },</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'>-		EIterator *iterator = e_list_get_iterator(card-&gt;address);</div><div class='del'>-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {</div><div class='del'>-			VObject *addressprop;</div><div class='del'>-			ECardDeliveryAddress *address = (ECardDeliveryAddress *) e_iterator_get(iterator);</div><div class='del'>-			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'>-			addProp(addressprop, 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;address_label ) {</div><div class='del'>-		EIterator *iterator = e_list_get_iterator(card-&gt;address_label);</div><div class='del'>-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {</div><div class='del'>-			VObject *labelprop;</div><div class='del'>-			ECardAddrLabel *address_label = (ECardAddrLabel *) e_iterator_get(iterator);</div><div class='del'>-			if (address_label-&gt;data)</div><div class='del'>-				labelprop = 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'>-		EIterator *iterator = e_list_get_iterator(card-&gt;phone);</div><div class='del'>-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {</div><div class='del'>-			VObject *phoneprop;</div><div class='del'>-			ECardPhone *phone = (ECardPhone *) e_iterator_get(iterator);</div><div class='del'>-			phoneprop = 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'>-		EIterator *iterator = e_list_get_iterator(card-&gt;email);</div><div class='del'>-		for ( ; e_iterator_is_valid(iterator) ;e_iterator_next(iterator) ) {</div><div class='del'>-			VObject *emailprop;</div><div class='del'>-			emailprop = addPropValue(vobj, VCEmailAddressProp, (char *) e_iterator_get(iterator));</div><div class='del'>-			addProp (emailprop, VCInternetProp);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( card-&gt;bday ) {</div><div class='del'>-		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'>-		EIterator *iterator;</div><div class='del'>-		int length = 0;</div><div class='del'>-		char *string;</div><div class='del'>-		char *stringptr;</div><div class='del'>-		for (iterator = e_list_get_iterator(card-&gt;categories); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			length += strlen(e_iterator_get(iterator)) + 1;</div><div class='del'>-		}</div><div class='del'>-		string = g_new(char, length + 1);</div><div class='del'>-		stringptr = string;</div><div class='del'>-		*stringptr = 0;</div><div class='del'>-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			strcpy(stringptr, e_iterator_get(iterator));</div><div class='del'>-			stringptr += strlen(stringptr);</div><div class='del'>-			*stringptr = ',';</div><div class='del'>-			stringptr++;</div><div class='del'>-			*stringptr = 0;</div><div class='del'>-		}</div><div class='del'>-		if (stringptr &gt; string) {</div><div class='del'>-			stringptr --;</div><div class='del'>-			*stringptr = 0;</div><div class='del'>-		}</div><div class='del'>-		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;wants_html_set) {</div><div class='del'>-		addPropValue (vobj, XEV_WANTS_HTML, card-&gt;wants_html ? "TRUE" : "FALSE");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;pilot_id) {</div><div class='del'>-		gchar *pilotid_str;</div><div class='del'>-		pilotid_str = g_strdup_printf ("%d", card-&gt;pilot_id);</div><div class='del'>-		addPropValue (vobj, XEV_PILOT_ID, pilotid_str);</div><div class='del'>-		g_free (pilotid_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;pilot_status) {</div><div class='del'>-		gchar *pilotstatus_str;</div><div class='del'>-		pilotstatus_str = g_strdup_printf ("%d", card-&gt;pilot_status);</div><div class='del'>-		addPropValue (vobj, XEV_PILOT_STATUS, pilotstatus_str);</div><div class='del'>-		g_free (pilotstatus_str);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (card-&gt;arbitrary) {</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-		for (iterator = e_list_get_iterator(card-&gt;arbitrary); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ECardArbitrary *arbitrary = e_iterator_get(iterator);</div><div class='del'>-			VObject *arb_object;</div><div class='del'>-			if (arbitrary-&gt;value) {</div><div class='del'>-				arb_object = 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'>-#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'>-	EList *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_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'>-	EList *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_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'>-	EList *list;</div><div class='del'>-</div><div class='del'>-	next_addr-&gt;flags   = get_address_flags (vobj);</div><div class='del'>-	next_addr-&gt;po      = e_v_object_get_child_value (vobj, VCPostalBoxProp);</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_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'>-	EList *list;</div><div class='del'>-</div><div class='del'>-	next_addr-&gt;flags   = get_address_flags (vobj);</div><div class='del'>-	assign_string(vobj, &amp;next_addr-&gt;data);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "address_label", &amp;list,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_list_append(list, next_addr);</div><div class='del'>-	e_card_address_label_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, EList *list, char *string)</div><div class='del'>-{</div><div class='del'>-	char *temp = e_strdup_strip(string);</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-</div><div class='del'>-	if (!*temp) {</div><div class='del'>-		g_free(temp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	for ( iterator = e_list_get_iterator(list); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		if (!strcmp(e_iterator_get(iterator), temp)) {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!e_iterator_is_valid(iterator)) {</div><div class='del'>-		e_list_append(list, temp);</div><div class='del'>-	}</div><div class='del'>-	g_free(temp);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_parse_categories(ECard *card, char *str)</div><div class='del'>-{</div><div class='del'>-	int length = strlen(str);</div><div class='del'>-	char *copy = g_new(char, length + 1);</div><div class='del'>-	int i, j;</div><div class='del'>-	EList *list;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       "category_list", &amp;list,</div><div class='del'>-		       NULL);</div><div class='del'>-	for (i = 0, j = 0; str[i]; i++, j++) {</div><div class='del'>-		switch (str[i]) {</div><div class='del'>-		case '\\':</div><div class='del'>-			i++;</div><div class='del'>-			if (str[i]) {</div><div class='del'>-				copy[j] = str[i];</div><div class='del'>-			} else</div><div class='del'>-				i--;</div><div class='del'>-			break;</div><div class='del'>-		case ',':</div><div class='del'>-			copy[j] = 0;</div><div class='del'>-			add_list_unique(card, list, copy);</div><div class='del'>-			j = -1;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			copy[j] = str[i];</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	copy[j] = 0;</div><div class='del'>-	add_list_unique(card, list, copy);</div><div class='del'>-	g_free(copy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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'>-static void</div><div class='del'>-parse_wants_html(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 (!strcasecmp(str, "true")) {</div><div class='del'>-			card-&gt;wants_html = TRUE;</div><div class='del'>-			card-&gt;wants_html_set = TRUE;</div><div class='del'>-		}</div><div class='del'>-		if (!strcasecmp(str, "false")) {</div><div class='del'>-			card-&gt;wants_html = FALSE;</div><div class='del'>-			card-&gt;wants_html_set = TRUE;</div><div class='del'>-		}</div><div class='del'>-		free(str);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_pilot_id(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'>-		card-&gt;pilot_id = atoi(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_pilot_status(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'>-		card-&gt;pilot_status = atoi(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'>-	EList *list;</div><div class='del'>-	for ( initPropIterator (&amp;iterator, vobj); moreIteration(&amp;iterator); ) {</div><div class='del'>-		VObject *temp = nextVObject(&amp;iterator);</div><div class='del'>-		const char *name = vObjectName(temp);</div><div class='del'>-		if (name &amp;&amp; !strcmp(name, "TYPE")) {</div><div class='del'>-			g_free(arbitrary-&gt;type);</div><div class='del'>-			assign_string(temp, &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_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;fname) {</div><div class='del'>-		card-&gt;fname = g_strdup("");</div><div class='del'>-	}</div><div class='del'>-	if (!card-&gt;name) {</div><div class='del'>-		card-&gt;name = e_card_name_from_string(card-&gt;fname);</div><div class='del'>-	}</div><div class='del'>-	if (!card-&gt;file_as) {</div><div class='del'>-		ECardName *name = card-&gt;name;</div><div class='del'>-		char *strings[3], **stringptr;</div><div class='del'>-		char *string;</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-			*(stringptr++) = name-&gt;family;</div><div class='del'>-		if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-			*(stringptr++) = name-&gt;given;</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(", ", strings);</div><div class='del'>-		card-&gt;file_as = string;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_card_class_init (ECardClass *klass)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	klass-&gt;attribute_jump_table = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	for ( i = 0; i &lt; sizeof(attribute_jump_array) / sizeof(attribute_jump_array[0]); i++ ) {</div><div class='del'>-		g_hash_table_insert(klass-&gt;attribute_jump_table, attribute_jump_array[i].key, attribute_jump_array[i].function);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ECard::file_as",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FILE_AS);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::full_name",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_FULL_NAME);  </div><div class='del'>-	gtk_object_add_arg_type ("ECard::name",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_NAME);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::address",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::address_label",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_ADDRESS_LABEL);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::phone",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_PHONE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::email",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READABLE, ARG_EMAIL);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::birth_date",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_BIRTH_DATE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::url",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_URL);  </div><div class='del'>-	gtk_object_add_arg_type ("ECard::org",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::org_unit",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ORG_UNIT);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::office",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_OFFICE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::title",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_TITLE);  </div><div class='del'>-	gtk_object_add_arg_type ("ECard::role",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ROLE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::manager",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MANAGER);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::assistant",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_ASSISTANT);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::nickname",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_NICKNAME);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::spouse",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_SPOUSE);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::anniversary",</div><div class='del'>-				 GTK_TYPE_POINTER, GTK_ARG_READWRITE, ARG_ANNIVERSARY);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::mailer",</div><div class='del'>-				 GTK_TYPE_STRING, GTK_ARG_READWRITE, ARG_MAILER);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::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::wants_html",</div><div class='del'>-				 GTK_TYPE_BOOL, GTK_ARG_READWRITE, ARG_WANTS_HTML);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::wants_html_set",</div><div class='del'>-				 GTK_TYPE_BOOL, GTK_ARG_READABLE, ARG_WANTS_HTML);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::pilot_id",</div><div class='del'>-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTID);</div><div class='del'>-	gtk_object_add_arg_type ("ECard::pilot_status",</div><div class='del'>-				 GTK_TYPE_INT, GTK_ARG_READWRITE, ARG_PILOTSTATUS);</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'>-gboolean</div><div class='del'>-e_card_delivery_address_is_empty (const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	return (((addr-&gt;po      == NULL) || (*addr-&gt;po      == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;ext     == NULL) || (*addr-&gt;ext     == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;street  == NULL) || (*addr-&gt;street  == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;city    == NULL) || (*addr-&gt;city    == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;region  == NULL) || (*addr-&gt;region  == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;code    == NULL) || (*addr-&gt;code    == 0)) &amp;&amp;</div><div class='del'>-		((addr-&gt;country == NULL) || (*addr-&gt;country == 0)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardDeliveryAddress *</div><div class='del'>-e_card_delivery_address_from_label(const ECardAddrLabel *label)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *addr = g_new(ECardDeliveryAddress, 1);</div><div class='del'>-	EAddressWestern *western = e_address_western_parse (label-&gt;data);</div><div class='del'>-	</div><div class='del'>-	addr-&gt;po      = g_strdup (western-&gt;po_box     );</div><div class='del'>-	addr-&gt;ext     = g_strdup (western-&gt;extended   );</div><div class='del'>-	addr-&gt;street  = g_strdup (western-&gt;street     );</div><div class='del'>-	addr-&gt;city    = g_strdup (western-&gt;locality   );</div><div class='del'>-	addr-&gt;region  = g_strdup (western-&gt;region     );</div><div class='del'>-	addr-&gt;code    = g_strdup (western-&gt;postal_code);</div><div class='del'>-	addr-&gt;country = g_strdup (western-&gt;country    );</div><div class='del'>-	addr-&gt;flags   = label-&gt;flags;</div><div class='del'>-	</div><div class='del'>-	e_address_western_free(western);</div><div class='del'>-	</div><div class='del'>-	return addr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_card_delivery_address_to_string(const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	char *strings[5], **stringptr = strings;</div><div class='del'>-	char *line1, *line22, *line2;</div><div class='del'>-	char *final;</div><div class='del'>-	if (addr-&gt;po &amp;&amp; *addr-&gt;po)</div><div class='del'>-		*(stringptr++) = addr-&gt;po;</div><div class='del'>-	if (addr-&gt;street &amp;&amp; *addr-&gt;street)</div><div class='del'>-		*(stringptr++) = addr-&gt;street;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	line1 = g_strjoinv(" ", strings);</div><div class='del'>-	stringptr = strings;</div><div class='del'>-	if (addr-&gt;region &amp;&amp; *addr-&gt;region)</div><div class='del'>-		*(stringptr++) = addr-&gt;region;</div><div class='del'>-	if (addr-&gt;code &amp;&amp; *addr-&gt;code)</div><div class='del'>-		*(stringptr++) = addr-&gt;code;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	line22 = g_strjoinv(" ", strings);</div><div class='del'>-	stringptr = strings;</div><div class='del'>-	if (addr-&gt;city &amp;&amp; *addr-&gt;city)</div><div class='del'>-		*(stringptr++) = addr-&gt;city;</div><div class='del'>-	if (line22 &amp;&amp; *line22)</div><div class='del'>-		*(stringptr++) = line22;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	line2 = g_strjoinv(", ", strings);</div><div class='del'>-	stringptr = strings;</div><div class='del'>-	if (line1 &amp;&amp; *line1)</div><div class='del'>-		*(stringptr++) = line1;</div><div class='del'>-	if (addr-&gt;ext &amp;&amp; *addr-&gt;ext)</div><div class='del'>-		*(stringptr++) = addr-&gt;ext;</div><div class='del'>-	if (line2 &amp;&amp; *line2)</div><div class='del'>-		*(stringptr++) = line2;</div><div class='del'>-	if (addr-&gt;country &amp;&amp; *addr-&gt;country)</div><div class='del'>-		*(stringptr++) = addr-&gt;country;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	final = g_strjoinv("\n", strings);</div><div class='del'>-	g_free(line1);</div><div class='del'>-	g_free(line22);</div><div class='del'>-	g_free(line2);</div><div class='del'>-	return final;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardAddrLabel *</div><div class='del'>-e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr)</div><div class='del'>-{</div><div class='del'>-	ECardAddrLabel *label;</div><div class='del'>-	label = e_card_address_label_new();</div><div class='del'>-	label-&gt;flags = addr-&gt;flags;</div><div class='del'>-	label-&gt;data = e_card_delivery_address_to_string(addr);</div><div class='del'>-</div><div class='del'>-	return label;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardAddrLabel *</div><div class='del'>-e_card_address_label_new (void)</div><div class='del'>-{</div><div class='del'>-	ECardAddrLabel *newaddr = g_new(ECardAddrLabel, 1);</div><div class='del'>-</div><div class='del'>-	newaddr-&gt;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'>-</div><div class='del'>-	g_return_val_if_fail (name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (name-&gt;prefix &amp;&amp; *name-&gt;prefix)</div><div class='del'>-		*(stringptr++) = name-&gt;prefix;</div><div class='del'>-	if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-		*(stringptr++) = name-&gt;given;</div><div class='del'>-	if (name-&gt;additional &amp;&amp; *name-&gt;additional)</div><div class='del'>-		*(stringptr++) = name-&gt;additional;</div><div class='del'>-	if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-		*(stringptr++) = name-&gt;family;</div><div class='del'>-	if (name-&gt;suffix &amp;&amp; *name-&gt;suffix)</div><div class='del'>-		*(stringptr++) = name-&gt;suffix;</div><div class='del'>-	*stringptr = NULL;</div><div class='del'>-	return g_strjoinv(" ", strings);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECardName *</div><div class='del'>-e_card_name_from_string(const char *full_name)</div><div class='del'>-{</div><div class='del'>-	ECardName *name = 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_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_WANTS_HTML:</div><div class='del'>-		card-&gt;wants_html = GTK_VALUE_BOOL(*arg);</div><div class='del'>-		card-&gt;wants_html_set = TRUE;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_PILOTID:</div><div class='del'>-		card-&gt;pilot_id = GTK_VALUE_INT(*arg);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_PILOTSTATUS:</div><div class='del'>-		card-&gt;pilot_status = GTK_VALUE_INT(*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_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_list_new((EListCopyFunc) e_card_delivery_address_copy, </div><div class='del'>-							(EListFreeFunc) 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_list_new((EListCopyFunc) e_card_address_label_copy, </div><div class='del'>-							      (EListFreeFunc) 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_list_new((EListCopyFunc) e_card_phone_copy, </div><div class='del'>-						      (EListFreeFunc) 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_list_new((EListCopyFunc) g_strdup, </div><div class='del'>-						      (EListFreeFunc) g_free,</div><div class='del'>-						      NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card-&gt;email);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CATEGORIES:</div><div class='del'>-		{</div><div class='del'>-			int i;</div><div class='del'>-			char ** strs;</div><div class='del'>-			int length;</div><div class='del'>-			EIterator *iterator;</div><div class='del'>-			if (!card-&gt;categories)</div><div class='del'>-				card-&gt;categories = e_list_new((EListCopyFunc) g_strdup, </div><div class='del'>-								   (EListFreeFunc) g_free,</div><div class='del'>-								   NULL);</div><div class='del'>-			length = e_list_length(card-&gt;categories);</div><div class='del'>-			strs = g_new(char *, length + 1);</div><div class='del'>-			for (iterator = e_list_get_iterator(card-&gt;categories), i = 0; e_iterator_is_valid(iterator); e_iterator_next(iterator), i++) {</div><div class='del'>-				strs[i] = (char *)e_iterator_get(iterator);</div><div class='del'>-			}</div><div class='del'>-			strs[i] = 0;</div><div class='del'>-			GTK_VALUE_STRING(*arg) = g_strjoinv(", ", strs);</div><div class='del'>-			g_free(strs);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ARG_CATEGORY_LIST:</div><div class='del'>-		if (!card-&gt;categories)</div><div class='del'>-			card-&gt;categories = e_list_new((EListCopyFunc) g_strdup, </div><div class='del'>-							   (EListFreeFunc) g_free,</div><div class='del'>-							   NULL);</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(card-&gt;categories);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_BIRTH_DATE:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = card-&gt;bday;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_URL:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;url;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;org;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ORG_UNIT:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;org_unit;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_OFFICE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;office;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TITLE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;title;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ROLE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;role;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MANAGER:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;manager;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ASSISTANT:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;assistant;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_NICKNAME:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;nickname;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_SPOUSE:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;spouse;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ANNIVERSARY:</div><div class='del'>-		GTK_VALUE_POINTER(*arg) = card-&gt;anniversary;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_MAILER:</div><div class='del'>-		GTK_VALUE_STRING(*arg) = card-&gt;mailer;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_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_WANTS_HTML:</div><div class='del'>-		GTK_VALUE_BOOL(*arg) = card-&gt;wants_html;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_WANTS_HTML_SET:</div><div class='del'>-		GTK_VALUE_BOOL(*arg) = card-&gt;wants_html_set;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_PILOTID:</div><div class='del'>-		GTK_VALUE_INT(*arg) = card-&gt;pilot_id;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_PILOTSTATUS:</div><div class='del'>-		GTK_VALUE_INT(*arg) = card-&gt;pilot_status;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_ARBITRARY:</div><div class='del'>-		if (!card-&gt;arbitrary)</div><div class='del'>-			card-&gt;arbitrary = e_list_new((EListCopyFunc) e_card_arbitrary_copy,</div><div class='del'>-							  (EListFreeFunc) 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;wants_html = FALSE;</div><div class='del'>-	card-&gt;wants_html_set = FALSE;</div><div class='del'>-	card-&gt;pilot_id = 0;</div><div class='del'>-	card-&gt;pilot_status = 0;</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'>-GList *</div><div class='del'>-e_card_load_cards_from_file(const char *filename)</div><div class='del'>-{</div><div class='del'>-	VObject *vobj = Parse_MIME_FromFileName((char *) filename);</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-	while(vobj) {</div><div class='del'>-		VObject *next;</div><div class='del'>-		ECard *card = E_CARD(gtk_type_new(e_card_get_type()));</div><div class='del'>-		parse(card, vobj);</div><div class='del'>-		next = nextVObjectInList(vobj);</div><div class='del'>-		cleanVObject(vobj);</div><div class='del'>-		vobj = next;</div><div class='del'>-		list = g_list_prepend(list, card);</div><div class='del'>-	}</div><div class='del'>-	list = g_list_reverse(list);</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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'>-#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 bad7b3068b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/e-card.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/e-card.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +0,0 @@</div><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;e-util/e-list.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_CARD            (e_card_get_type ())</div><div class='del'>-#define E_CARD(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))</div><div class='del'>-#define E_CARD_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_CARD, ECardClass))</div><div class='del'>-#define E_IS_CARD(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_CARD))</div><div class='del'>-#define E_IS_CARD_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_CARD))</div><div class='del'>-</div><div class='del'>-typedef struct _ECard ECard;</div><div class='del'>-typedef struct _ECardClass ECardClass;</div><div class='del'>-</div><div class='del'>-struct _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'>-	EList       *address;  	/* Delivery addresses (ECardDeliveryAddress *) */</div><div class='del'>-	EList       *address_label; /* Delivery address labels</div><div class='del'>-					 * (ECardAddrLabel *)               */</div><div class='del'>-</div><div class='del'>-	EList       *phone;         /* Phone numbers (ECardPhone *)     */</div><div class='del'>-	EList       *email;         /* Email addresses (char *)         */</div><div class='del'>-	char            *url;	        /* The person's web page.           */</div><div class='del'>-</div><div class='del'>-	ECardDate       *bday;	        /* The person's birthday.           */</div><div class='del'>-</div><div class='del'>-	char            *note;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	char            *org;           /* The person's organization.       */</div><div class='del'>-	char            *org_unit;      /* The person's organization unit.  */</div><div class='del'>-	char            *office;        /* The person's office.             */</div><div class='del'>-	char            *role;          /* The person's role w/in his org   */</div><div class='del'>-	char            *title;	        /* The person's title w/in his org  */</div><div class='del'>-</div><div class='del'>-	char            *manager;</div><div class='del'>-	char            *assistant;</div><div class='del'>-</div><div class='del'>-	char            *nickname;      /* The person's nickname            */</div><div class='del'>-	</div><div class='del'>-	char            *spouse;        /* The person's spouse.             */</div><div class='del'>-	ECardDate       *anniversary;   /* The person's anniversary.        */</div><div class='del'>-</div><div class='del'>-	char            *mailer;        /* Mailer                           */</div><div class='del'>-</div><div class='del'>-	char            *fburl;         /* Free Busy URL                    */</div><div class='del'>-</div><div class='del'>-	gint             timezone;      /* number of minutes from UTC as an int */</div><div class='del'>-</div><div class='del'>-	EList       *categories;    /* Categories.                      */</div><div class='del'>-</div><div class='del'>-	EList       *arbitrary;     /* Arbitrary fields.                */</div><div class='del'>-</div><div class='del'>-	guint32         wants_html : 1; /* Wants html mail. */</div><div class='del'>-	guint32         wants_html_set : 1; /* Wants html mail. */</div><div class='del'>-</div><div class='del'>-	guint32         pilot_id;       /* id of the corresponding pilot */</div><div class='del'>-	guint32         pilot_status;   /* status information */</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'>-	EList        xtension;</div><div class='del'>-#endif</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECardClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-	GHashTable    *attribute_jump_table;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-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'>-gboolean              e_card_delivery_address_is_empty    (const ECardDeliveryAddress *addr);</div><div class='del'>-char                 *e_card_delivery_address_to_string   (const ECardDeliveryAddress *addr);</div><div class='del'>-ECardDeliveryAddress *e_card_delivery_address_from_label  (const ECardAddrLabel *label);</div><div class='del'>-ECardAddrLabel       *e_card_delivery_address_to_label    (const ECardDeliveryAddress *addr);</div><div class='del'>-</div><div class='del'>-ECardAddrLabel *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'>-GList *e_card_load_cards_from_file(const char *filename);</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-gnomecard-addressbook.c b/addressbook/backend/ebook/load-gnomecard-addressbook.c<br/>deleted file mode 100644<br/>index 3295854b0a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/load-gnomecard-addressbook.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/load-gnomecard-addressbook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,86 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.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'>-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'>-	GList *list = e_card_load_cards_from_file("gnomecard.vcf");</div><div class='del'>-	GList *iterator;</div><div class='del'>-	for (iterator = list; iterator; iterator = g_list_next(iterator)) {</div><div class='del'>-		ECard *card = iterator-&gt;data;</div><div class='del'>-		e_book_add_card(book, card, add_card_cb, card);</div><div class='del'>-	}</div><div class='del'>-	g_list_free(list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-ebook_create (void)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	gchar *path, *uri;</div><div class='del'>-	</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (!book) {</div><div class='del'>-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",</div><div class='del'>-			__FILE__,</div><div class='del'>-			__FUNCTION__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-				      "evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-	g_free(uri);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	gtk_idle_add ((GtkFunction) ebook_create, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/load-pine-addressbook.c b/addressbook/backend/ebook/load-pine-addressbook.c<br/>deleted file mode 100644<br/>index 30fda41be4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/load-pine-addressbook.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/load-pine-addressbook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,167 +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;liboaf/liboaf.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'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-static CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EBook *book, EBookStatus status, const gchar *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECard *card = E_CARD(closure);</div><div class='del'>-	char *vcard = e_card_get_vcard(card);</div><div class='del'>-	g_print ("Saved card: %s\n", vcard);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_line (EBook *book, char *line)</div><div class='del'>-{</div><div class='del'>-	char **strings;</div><div class='del'>-	ECardName *name;</div><div class='del'>-	ECard *card;</div><div class='del'>-	EList *list;</div><div class='del'>-</div><div class='del'>-	card = e_card_new("");</div><div class='del'>-	strings = g_strsplit(line, "\t", 3);</div><div class='del'>-	if (strings[0] &amp;&amp; strings[1] &amp;&amp; strings[2]) {</div><div class='del'>-		name = e_card_name_from_string(strings[1]);</div><div class='del'>-		gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-			       "nickname", strings[0],</div><div class='del'>-			       "full_name", strings[1],</div><div class='del'>-			       "name", name,</div><div class='del'>-			       NULL);</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "email", &amp;list,</div><div class='del'>-			       NULL);</div><div class='del'>-		e_list_append(list, strings[2]);</div><div class='del'>-		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 void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	FILE *fp = fopen (".addressbook", "r");</div><div class='del'>-	char line[2 * 1024];</div><div class='del'>-	int which = 0;</div><div class='del'>-	char *lastline = NULL;</div><div class='del'>-</div><div class='del'>-	if (!fp) {</div><div class='del'>-		g_warning ("Can't find .addressbook");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while(fgets(line + which * 1024, 1024, fp)) {</div><div class='del'>-		int length;</div><div class='del'>-		char *thisline = line + which * 1024;</div><div class='del'>-		length = strlen(thisline);</div><div class='del'>-		if (thisline[length - 1] == '\n')</div><div class='del'>-			line[--length] = 0;</div><div class='del'>-		if (lastline &amp;&amp; *thisline &amp;&amp; isspace(*thisline)) {</div><div class='del'>-			char *temp;</div><div class='del'>-			while(*thisline &amp;&amp; isspace(*thisline))</div><div class='del'>-				thisline ++;</div><div class='del'>-			temp = lastline;</div><div class='del'>-			lastline = g_strdup_printf("%s%s", lastline, thisline);</div><div class='del'>-			g_free(temp);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		if (lastline) {</div><div class='del'>-			parse_line (book, lastline);</div><div class='del'>-			g_free(lastline);</div><div class='del'>-		}</div><div class='del'>-		lastline = g_strdup(thisline);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (lastline) {</div><div class='del'>-		parse_line (book, lastline);</div><div class='del'>-		g_free(lastline);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-ebook_create (void)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	gchar *path, *uri;</div><div class='del'>-	</div><div class='del'>-	book = e_book_new ();</div><div class='del'>-</div><div class='del'>-	if (!book) {</div><div class='del'>-		printf ("%s: %s(): Couldn't create EBook, bailing.\n",</div><div class='del'>-			__FILE__,</div><div class='del'>-			__FUNCTION__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-				      "evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	if (! e_book_load_uri (book, uri, book_open_cb, NULL)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-	g_free(uri);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static char *</div><div class='del'>-read_file (char *name)</div><div class='del'>-{</div><div class='del'>-	int  len;</div><div class='del'>-	char buff[65536];</div><div class='del'>-	char line[1024];</div><div class='del'>-	FILE *f;</div><div class='del'>-</div><div class='del'>-	f = fopen (name, "r");</div><div class='del'>-	if (f == NULL)</div><div class='del'>-		g_error ("Unable to open %s!\n", name);</div><div class='del'>-</div><div class='del'>-	len  = 0;</div><div class='del'>-	while (fgets (line, sizeof (line), f) != NULL) {</div><div class='del'>-		strcpy (buff + len, line);</div><div class='del'>-		len += strlen (line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (f);</div><div class='del'>-</div><div class='del'>-	return g_strdup (buff);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	gnome_init_with_popt_table("blah", "0.0", argc, argv, NULL, 0, NULL);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	gtk_idle_add ((GtkFunction) ebook_create, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/ebook/test-card.c b/addressbook/backend/ebook/test-card.c<br/>deleted file mode 100644<br/>index a727dae7a3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-card.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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'>-	EList *address;</div><div class='del'>-	EList *phone;</div><div class='del'>-	EList *email;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	ECardDate *bday;</div><div class='del'>-</div><div class='del'>-	gnome_init ("TestCard", "0.0", argc, argv);</div><div class='del'>-</div><div class='del'>-	cardstr = NULL;</div><div class='del'>-	if (argc == 2)</div><div class='del'>-		cardstr = read_file (argv [1]);</div><div class='del'>-</div><div class='del'>-	if (cardstr == NULL)</div><div class='del'>-		cardstr = TEST_VCARD;</div><div class='del'>-#if 0</div><div class='del'>-	{</div><div class='del'>-	  int i;</div><div class='del'>-	  for ( i = 0; i &lt; 100000; i++ ) {</div><div class='del'>-	    card = e_card_new (cardstr);</div><div class='del'>-	  </div><div class='del'>-	    gtk_object_unref (GTK_OBJECT (card));</div><div class='del'>-	  }</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	card = e_card_new (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_list_get_iterator(address);</div><div class='del'>-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-	    printf("Email : %s\n", (char *) e_iterator_get(iterator));</div><div class='del'>-	  }</div><div class='del'>-	  gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	if ( phone ) {</div><div class='del'>-	  iterator = e_list_get_iterator(address);</div><div class='del'>-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-	    ECardPhone *e_card_phone = (ECardPhone *) e_iterator_get(iterator);</div><div class='del'>-	    printf("Phone ; %d : %s\n", e_card_phone-&gt;flags, e_card_phone-&gt;number);</div><div class='del'>-	  }</div><div class='del'>-	  gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	if ( address ) {</div><div class='del'>-	  iterator = e_list_get_iterator(address);</div><div class='del'>-	  for (; e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-	    ECardDeliveryAddress *del_address = (ECardDeliveryAddress *) e_iterator_get(iterator);</div><div class='del'>-	    printf("Address ; %d:\n", del_address-&gt;flags);</div><div class='del'>-	    if ( del_address-&gt;po )</div><div class='del'>-	      printf("  Po      : %s\n", del_address-&gt;po);</div><div class='del'>-	    if ( del_address-&gt;ext )</div><div class='del'>-	      printf("  Ext     : %s\n", del_address-&gt;ext);</div><div class='del'>-	    if ( del_address-&gt;street )</div><div class='del'>-	      printf("  Street  : %s\n", del_address-&gt;street);</div><div class='del'>-	    if ( del_address-&gt;city )</div><div class='del'>-	      printf("  City    : %s\n", del_address-&gt;city);</div><div class='del'>-	    if ( del_address-&gt;region )</div><div class='del'>-	      printf("  Region  : %s\n", del_address-&gt;region);</div><div class='del'>-	    if ( del_address-&gt;code )</div><div class='del'>-	      printf("  Code    : %s\n", del_address-&gt;code);</div><div class='del'>-	    if ( del_address-&gt;country )</div><div class='del'>-	      printf("  Country : %s\n", del_address-&gt;country);</div><div class='del'>-	  }</div><div class='del'>-	  gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	printf("%s", e_card_get_vcard(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 69422ba20e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-client-list.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/test-client-list.c</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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-book.h"</div><div class='del'>-</div><div class='del'>-CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	gnome_init ("blah", "0.0", argc, argv);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	long length = e_card_cursor_get_length(cursor);</div><div class='del'>-	long i;</div><div class='del'>-	</div><div class='del'>-	printf ("Length: %d\n", (int) length);</div><div class='del'>-	for ( i = 0; i &lt; length; i++ ) {</div><div class='del'>-		ECard *card = e_card_cursor_get_nth(cursor, i);</div><div class='del'>-		char *vcard = e_card_get_vcard(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 acbeedac41..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/ebook/test-client.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/ebook/test-client.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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.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'>-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'>-	gnome_init_with_popt_table ("blah", "0.0", argc, argv, NULL, 0, NULL);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-	init_bonobo (argc, argv);</div><div class='del'>-</div><div class='del'>-	cardstr = NULL;</div><div class='del'>-	if (argc == 2)</div><div class='del'>-		cardstr = read_file (argv [1]);</div><div class='del'>-</div><div class='del'>-	if (cardstr == NULL)</div><div class='del'>-		cardstr = TEST_VCARD;</div><div class='del'>-</div><div class='del'>-	gtk_idle_add ((GtkFunction) ebook_create, NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/idl/.cvsignore b/addressbook/backend/idl/.cvsignore<br/>deleted file mode 100644<br/>index 09980ae6ba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/idl/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 2c5a54487e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/idl/addressbook.idl?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/idl/addressbook.idl</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'>- *</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'>-		void signal_status_message (in string message);</div><div class='del'>-	};</div><div class='del'>-	</div><div class='del'>-	interface BookView : Bonobo::Unknown {</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	interface Book : Bonobo::Unknown {</div><div class='del'>-		/*</div><div class='del'>-		 * Fetching cards in the addresbook.</div><div class='del'>-		 */</div><div class='del'>-		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 get_changes(in BookViewListener listener, in string changeid);</div><div class='del'>-</div><div class='del'>-		void check_connection ();</div><div class='del'>-</div><div class='del'>-		string get_static_capabilities ();</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'>-		void respond_get_changes (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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 819f99e57d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +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=\""$(localedir)"\"		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"wombat-pas\"			\</div><div class='del'>-	-I$(top_srcdir) 				\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-        $(BONOBO_GNOME_CFLAGS)				\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-LDAP_BACKEND_SOURCES = pas-backend-ldap.c pas-backend-ldap.h</div><div class='del'>-</div><div class='del'>-if ENABLE_LDAP</div><div class='del'>-LDAP_BACKEND = $(LDAP_BACKEND_SOURCES)</div><div class='del'>-else</div><div class='del'>-LDAP_BACKEND = </div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES = libpas.a</div><div class='del'>-</div><div class='del'>-libpas_a_SOURCES =					\</div><div class='del'>-	$(CORBA_SOURCE)					\</div><div class='del'>-	pas-book-factory.c				\</div><div class='del'>-	pas-book-factory.h				\</div><div class='del'>-	pas-book-view.c					\</div><div class='del'>-	pas-book-view.h					\</div><div class='del'>-	pas-book.c					\</div><div class='del'>-	pas-book.h					\</div><div class='del'>-	pas-backend-file.c				\</div><div class='del'>-	pas-backend-file.h				\</div><div class='del'>-	$(LDAP_BACKEND)					\</div><div class='del'>-	pas-backend.c					\</div><div class='del'>-	pas-backend.h					\</div><div class='del'>-	pas-card-cursor.c				\</div><div class='del'>-	pas-card-cursor.h</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(CORBA_SOURCE)</div><div class='del'>-CLEANFILES   += $(BUILT_SOURCES)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(LDAP_BACKEND_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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 84a21d4c6f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-file.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-backend-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1443 +0,0 @@</div><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'>-#ifdef HAVE_DB1_DB_H</div><div class='del'>-#include &lt;db1/db.h&gt;</div><div class='del'>-#else</div><div class='del'>-#include &lt;db.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#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-simple.h&gt;</div><div class='del'>-#include &lt;e-util/e-sexp.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#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'>-	EList    *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'>-	ECardSimple *card;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static PASBackendFileBookView *</div><div class='del'>-pas_backend_file_book_view_copy(const PASBackendFileBookView *book_view, void *closure)</div><div class='del'>-{</div><div class='del'>-	PASBackendFileBookView *new_book_view;</div><div class='del'>-	new_book_view = g_new(PASBackendFileBookView, 1);</div><div class='del'>-	new_book_view-&gt;book_view = book_view-&gt;book_view;</div><div class='del'>-	new_book_view-&gt;search = g_strdup(book_view-&gt;search);</div><div class='del'>-	new_book_view-&gt;search_sexp = book_view-&gt;search_sexp;</div><div class='del'>-	if (new_book_view-&gt;search_sexp)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(new_book_view-&gt;search_sexp));</div><div class='del'>-	new_book_view-&gt;search_context = g_new(PASBackendFileSearchContext, 1);</div><div class='del'>-	new_book_view-&gt;search_context-&gt;card = book_view-&gt;search_context-&gt;card;</div><div class='del'>-	return new_book_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_book_view_free(PASBackendFileBookView *book_view, void *closure)</div><div class='del'>-{</div><div class='del'>-	g_free(book_view-&gt;search);</div><div class='del'>-	if (book_view-&gt;search_sexp)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(book_view-&gt;search_sexp));</div><div class='del'>-	g_free(book_view-&gt;search_context);</div><div class='del'>-	g_free(book_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-get_length(PASCardCursor *cursor, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;</div><div class='del'>-</div><div class='del'>-	return cursor_data-&gt;num_elements;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_nth(PASCardCursor *cursor, long n, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendFileCursorPrivate *cursor_data = (PASBackendFileCursorPrivate *) data;</div><div class='del'>-	GList *nth_item = g_list_nth(cursor_data-&gt;elements, n);</div><div class='del'>-</div><div class='del'>-	return g_strdup((char*)nth_item-&gt;data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cursor_destroy(GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	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'>-	EIterator         *iterator;</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE(pas_book_get_backend(book));</div><div class='del'>-	for (iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		const PASBackendFileBookView *view = e_iterator_get(iterator);</div><div class='del'>-		if (view-&gt;book_view == PAS_BOOK_VIEW(object)) {</div><div class='del'>-			e_iterator_delete(iterator);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-	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 (ECardSimple *card, const char *str,</div><div class='del'>-	       char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = E_CARD_SIMPLE_EMAIL_ID_EMAIL; i &lt; E_CARD_SIMPLE_EMAIL_ID_LAST; i ++) {</div><div class='del'>-		const char *email = e_card_simple_get_email (card, i);</div><div class='del'>-</div><div class='del'>-		if (email &amp;&amp; compare(email, str))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_phone (ECardSimple *card, const char *str,</div><div class='del'>-	       char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = E_CARD_SIMPLE_PHONE_ID_ASSISTANT; i &lt; E_CARD_SIMPLE_PHONE_ID_LAST; i ++) {</div><div class='del'>-		const ECardPhone *phone = e_card_simple_get_phone (card, i);</div><div class='del'>-</div><div class='del'>-		if (phone &amp;&amp; compare(phone-&gt;number, str))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-compare_address (ECardSimple *card, const char *str,</div><div class='del'>-		 char *(*compare)(const char*, const char*))</div><div class='del'>-{</div><div class='del'>-	g_warning("address searching not implemented\n");</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct prop_info {</div><div class='del'>-	ECardSimpleField field_id;</div><div class='del'>-	const char *query_prop;</div><div class='del'>-	const char *ecard_prop;</div><div class='del'>-#define PROP_TYPE_NORMAL   0x01</div><div class='del'>-#define PROP_TYPE_LIST     0x02</div><div class='del'>-#define PROP_TYPE_LISTITEM 0x03</div><div class='del'>-	int prop_type;</div><div class='del'>-	gboolean (*list_compare)(ECardSimple *ecard, const char *str,</div><div class='del'>-				 char *(*compare)(const char*, const char*));</div><div class='del'>-</div><div class='del'>-} prop_info_table[] = {</div><div class='del'>-#define NORMAL_PROP(f,q,e) {f, q, e, PROP_TYPE_NORMAL, NULL}</div><div class='del'>-#define LIST_PROP(q,e,c) {0, q, e, PROP_TYPE_LIST, c}</div><div class='del'>-</div><div class='del'>-	/* query prop,  ecard prop,   type,              list compare function */</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FILE_AS, "file_as", "file_as" ),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name",  "full_name" ),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_URL, "url", "url" ),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MAILER, "mailer", "mailer"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG, "org", "org"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ORG_UNIT, "org_unit", "org_unit"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_OFFICE, "office", "office"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_TITLE, "title", "title"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ROLE, "role", "role"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_MANAGER, "manager", "manager"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_ASSISTANT, "assistant", "assistant"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NICKNAME, "nickname", "nickname"),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_SPOUSE, "spouse", "spouse" ),</div><div class='del'>-	NORMAL_PROP ( E_CARD_SIMPLE_FIELD_NOTE, "note", "note"),</div><div class='del'>-	LIST_PROP ( "email", "email", compare_email ),</div><div class='del'>-	LIST_PROP ( "phone", "phone", compare_phone ),</div><div class='del'>-	LIST_PROP ( "address", "address", compare_address ),</div><div class='del'>-};</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'>-		gboolean any_field;</div><div class='del'>-</div><div class='del'>-		propname = argv[0]-&gt;value.string;</div><div class='del'>-</div><div class='del'>-		any_field = !strcmp(propname, "x-evolution-any-field");</div><div class='del'>-		for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-			if (any_field</div><div class='del'>-			    || !strcmp (prop_info_table[i].query_prop, propname)) {</div><div class='del'>-				info = &amp;prop_info_table[i];</div><div class='del'>-				</div><div class='del'>-				if (info-&gt;prop_type == PROP_TYPE_NORMAL) {</div><div class='del'>-					char *prop = NULL;</div><div class='del'>-					/* searches where the query's property</div><div class='del'>-					   maps directly to an ecard property */</div><div class='del'>-					</div><div class='del'>-					prop = e_card_simple_get (ctx-&gt;card, info-&gt;field_id);</div><div class='del'>-</div><div class='del'>-					if (prop &amp;&amp; compare(prop, argv[1]-&gt;value.string)) {</div><div class='del'>-						truth = TRUE;</div><div class='del'>-					}</div><div class='del'>-					if ((!prop) &amp;&amp; compare("", argv[1]-&gt;value.string)) {</div><div class='del'>-						truth = TRUE;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				else if (info-&gt;prop_type == PROP_TYPE_LIST) {</div><div class='del'>-				/* the special searches that match any of the list elements */</div><div class='del'>-					truth = info-&gt;list_compare (ctx-&gt;card, argv[1]-&gt;value.string, compare);</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				/* if we're looking at all fields and find a match,</div><div class='del'>-				   or if we're just looking at this one field,</div><div class='del'>-				   break. */</div><div class='del'>-				if ((any_field &amp;&amp; truth)</div><div class='del'>-				    || !any_field)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-	r = e_sexp_result_new(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, (char *(*)(const char*, const char*)) e_utf8_strstrcase);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-is_helper (const char *s1, const char *s2)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp(s1, s2))</div><div class='del'>-		return (char*)s1;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_is(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	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 (const 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'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	card = e_card_new (vcard_string);</div><div class='del'>-	view-&gt;search_context-&gt;card = e_card_simple_new (card);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-</div><div class='del'>-	/* if it's not a valid vcard why is it in our db? :) */</div><div class='del'>-	if (!view-&gt;search_context-&gt;card)</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'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view-&gt;search_context-&gt;card));</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'>-			 const PASBackendFileBookView *cnstview)</div><div class='del'>-{</div><div class='del'>-	int     db_error = 0;</div><div class='del'>-	GList   *cards = NULL;</div><div class='del'>-	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'>-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;</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'>-	if (view-&gt;search_sexp)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;search_sexp));</div><div class='del'>-	view-&gt;search_sexp = e_sexp_new();</div><div class='del'>-</div><div class='del'>-	for(i=0;i&lt;sizeof(symbols)/sizeof(symbols[0]);i++) {</div><div class='del'>-		if (symbols[i].type == 1) {</div><div class='del'>-			e_sexp_add_ifunction(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'>-typedef enum {</div><div class='del'>-	VCardChangeNone,</div><div class='del'>-	VCardChangeAdded,</div><div class='del'>-	VCardChangeModified,</div><div class='del'>-	VCardChangeDeleted</div><div class='del'>-} VCardChangeType;</div><div class='del'>-</div><div class='del'>-static VCardChangeType</div><div class='del'>-vcard_change_type (const PASBackendFileBookView *view, char *vcard_string)</div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-</div><div class='del'>-	card = e_card_new (vcard_string);</div><div class='del'>-	view-&gt;search_context-&gt;card = e_card_simple_new (card);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-</div><div class='del'>-	/* if it's not a valid vcard why is it in our db? :) */</div><div class='del'>-	if (!view-&gt;search_context-&gt;card)</div><div class='del'>-		return VCardChangeNone;</div><div class='del'>-</div><div class='del'>-	/* FIX ME, actually need to implement this */</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(view-&gt;search_context-&gt;card));</div><div class='del'>-</div><div class='del'>-	return VCardChangeNone;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_search_changes (PASBackendFile  	      *bf,</div><div class='del'>-				 PASBook         	      *book,</div><div class='del'>-				 const PASBackendFileBookView *cnstview)</div><div class='del'>-{</div><div class='del'>-	int     db_error = 0;</div><div class='del'>-	GList   *add_cards = NULL;</div><div class='del'>-	GList   *mod_cards = NULL;</div><div class='del'>-	GList   *del_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'>-	PASBackendFileBookView *view = (PASBackendFileBookView *)cnstview;</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'>-	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 what type of change has occurred, if any */</div><div class='del'>-			switch (vcard_change_type (view, vcard_string)) {</div><div class='del'>-			case VCardChangeNone:</div><div class='del'>-				break;</div><div class='del'>-			case VCardChangeAdded:</div><div class='del'>-				add_cards = g_list_append (add_cards, strdup(vcard_string));</div><div class='del'>-				break;</div><div class='del'>-			case VCardChangeModified:</div><div class='del'>-				mod_cards = g_list_append (mod_cards, strdup(vcard_string));</div><div class='del'>-				break;</div><div class='del'>-			case VCardChangeDeleted:</div><div class='del'>-				del_cards = g_list_append (del_cards, strdup(vcard_string));</div><div class='del'>-				break;</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_changes: error building list\n");</div><div class='del'>-	} else {</div><div class='del'>-		GList *l;</div><div class='del'>-		</div><div class='del'>-		pas_book_view_notify_add (view-&gt;book_view, add_cards);</div><div class='del'>-		pas_book_view_notify_change (view-&gt;book_view, mod_cards);</div><div class='del'>-</div><div class='del'>-		for (l = del_cards; l != NULL; l = l-&gt;next){</div><div class='del'>-			char *card = l-&gt;data;</div><div class='del'>-			pas_book_view_notify_remove (view-&gt;book_view, card);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</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 (add_cards, (GFunc)g_free, NULL);</div><div class='del'>-	g_list_foreach (mod_cards, (GFunc)g_free, NULL);</div><div class='del'>-	g_list_foreach (del_cards, (GFunc)g_free, NULL);</div><div class='del'>-	g_list_free (add_cards);</div><div class='del'>-	g_list_free (mod_cards);</div><div class='del'>-	g_list_free (del_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'>-	EIterator *iterator;</div><div class='del'>-	PASBackendFile *bf = PAS_BACKEND_FILE (backend);</div><div class='del'>-</div><div class='del'>-	id = do_create(backend, req-&gt;vcard, &amp;vcard);</div><div class='del'>-	if (id) {</div><div class='del'>-		for (iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const PASBackendFileBookView *view = e_iterator_get(iterator);</div><div class='del'>-			if (vcard_matches_search (view, vcard)) {</div><div class='del'>-				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'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		</div><div class='del'>-		pas_book_respond_create (</div><div class='del'>-			book,</div><div class='del'>-			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'>-	EIterator     *iterator;</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 (iterator = e_list_get_iterator (bf-&gt;priv-&gt;book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		const PASBackendFileBookView *view = e_iterator_get(iterator);</div><div class='del'>-		if (vcard_matches_search (view, vcard_string)) {</div><div class='del'>-			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'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-	</div><div class='del'>-	pas_book_respond_remove (</div><div class='del'>-				 book,</div><div class='del'>-				 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'>-	EIterator     *iterator;</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 (iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			CORBA_Environment ev;</div><div class='del'>-			const PASBackendFileBookView *view = e_iterator_get(iterator);</div><div class='del'>-			gboolean old_match, new_match;</div><div class='del'>-</div><div class='del'>-			CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-			bonobo_object_dup_ref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-</div><div class='del'>-			old_match = vcard_matches_search (view, old_vcard_string);</div><div class='del'>-			new_match = vcard_matches_search (view, req-&gt;vcard);</div><div class='del'>-			if (old_match &amp;&amp; new_match)</div><div class='del'>-				pas_book_view_notify_change_1 (view-&gt;book_view, req-&gt;vcard);</div><div class='del'>-			else if (new_match)</div><div class='del'>-				pas_book_view_notify_add_1 (view-&gt;book_view, req-&gt;vcard);</div><div class='del'>-			else /* if (old_match) */</div><div class='del'>-				pas_book_view_notify_remove (view-&gt;book_view, id);</div><div class='del'>-			pas_book_view_notify_complete (view-&gt;book_view);</div><div class='del'>-</div><div class='del'>-			bonobo_object_release_unref(bonobo_object_corba_objref(BONOBO_OBJECT(view-&gt;book_view)), &amp;ev);</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-		pas_book_respond_modify (</div><div class='del'>-				 book,</div><div class='del'>-				 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'>-	PASBackendFileSearchContext ctx;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (req-&gt;listener != NULL);</div><div class='del'>-</div><div class='del'>-	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.book_view = book_view;</div><div class='del'>-	view.search = req-&gt;search;</div><div class='del'>-	view.search_sexp = NULL;</div><div class='del'>-	view.search_context = &amp;ctx;</div><div class='del'>-	ctx.card = NULL;</div><div class='del'>-</div><div class='del'>-	e_list_append(bf-&gt;priv-&gt;book_views, &amp;view);</div><div class='del'>-</div><div class='del'>-	iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views);</div><div class='del'>-	e_iterator_last(iterator);</div><div class='del'>-	pas_backend_file_search (bf, book, e_iterator_get(iterator));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-	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_get_changes (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'>-	PASBackendFileSearchContext ctx;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (req-&gt;listener != NULL);</div><div class='del'>-</div><div class='del'>-	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_changes (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.book_view = book_view;</div><div class='del'>-	view.search = req-&gt;search;</div><div class='del'>-	view.search_sexp = NULL;</div><div class='del'>-	view.search_context = &amp;ctx;</div><div class='del'>-	ctx.card = NULL;</div><div class='del'>-</div><div class='del'>-	e_list_append(bf-&gt;priv-&gt;book_views, &amp;view);</div><div class='del'>-</div><div class='del'>-	iterator = e_list_get_iterator(bf-&gt;priv-&gt;book_views);</div><div class='del'>-	e_iterator_last(iterator);</div><div class='del'>-	pas_backend_file_search_changes (bf, book, e_iterator_get(iterator));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-	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'>-	case GetChanges:</div><div class='del'>-		pas_backend_file_process_get_changes (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 char *</div><div class='del'>-pas_backend_file_get_static_capabilities (PASBackend             *backend)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("local");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_file_construct (PASBackendFile *backend)</div><div class='del'>-{</div><div class='del'>-	g_assert (backend != NULL);</div><div class='del'>-	g_assert (PAS_IS_BACKEND_FILE (backend));</div><div class='del'>-</div><div class='del'>-	if (! pas_backend_construct (PAS_BACKEND (backend)))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_file_new:</div><div class='del'>- */</div><div class='del'>-PASBackend *</div><div class='del'>-pas_backend_file_new (void)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *backend;</div><div class='del'>-</div><div class='del'>-	backend = gtk_type_new (pas_backend_file_get_type ());</div><div class='del'>-</div><div class='del'>-	if (! pas_backend_file_construct (backend)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return PAS_BACKEND (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	PASBackendFile *bf;</div><div class='del'>-</div><div class='del'>-	bf = PAS_BACKEND_FILE (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(bf-&gt;priv-&gt;book_views));</div><div class='del'>-	g_free (bf-&gt;priv-&gt;uri);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (pas_backend_file_parent_class)-&gt;destroy (object);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_class_init (PASBackendFileClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass  *object_class = (GtkObjectClass *) klass;</div><div class='del'>-	PASBackendClass *parent_class;</div><div class='del'>-</div><div class='del'>-	pas_backend_file_parent_class = gtk_type_class (pas_backend_get_type ());</div><div class='del'>-</div><div class='del'>-	parent_class = PAS_BACKEND_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	/* Set the virtual methods. */</div><div class='del'>-	parent_class-&gt;load_uri                = pas_backend_file_load_uri;</div><div class='del'>-	parent_class-&gt;get_uri                 = pas_backend_file_get_uri;</div><div class='del'>-	parent_class-&gt;add_client              = pas_backend_file_add_client;</div><div class='del'>-	parent_class-&gt;remove_client           = pas_backend_file_remove_client;</div><div class='del'>-	parent_class-&gt;get_static_capabilities = pas_backend_file_get_static_capabilities;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = pas_backend_file_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_file_init (PASBackendFile *backend)</div><div class='del'>-{</div><div class='del'>-	PASBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv             = g_new0 (PASBackendFilePrivate, 1);</div><div class='del'>-	priv-&gt;loaded     = FALSE;</div><div class='del'>-	priv-&gt;clients    = NULL;</div><div class='del'>-	priv-&gt;book_views = e_list_new((EListCopyFunc) pas_backend_file_book_view_copy, (EListFreeFunc) pas_backend_file_book_view_free, NULL);</div><div class='del'>-	priv-&gt;uri        = NULL;</div><div class='del'>-</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 f9842d2406..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend-ldap.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-backend-ldap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1846 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *   Chris Toshok (toshok@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'>-/*#define DEBUG*/</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'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#define LDAP_DEBUG</div><div class='del'>-#endif</div><div class='del'>-#include &lt;ldap.h&gt;</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-#undef LDAP_DEBUG</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#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 100</div><div class='del'>-</div><div class='del'>-/* this really needs addressing */</div><div class='del'>-#define OBJECT_CLASS "person"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gchar *query_prop_to_ldap(gchar *query_prop);</div><div class='del'>-</div><div class='del'>-static PASBackendClass *pas_backend_ldap_parent_class;</div><div class='del'>-typedef struct _PASBackendLDAPCursorPrivate PASBackendLDAPCursorPrivate;</div><div class='del'>-typedef struct _PASBackendLDAPBookView PASBackendLDAPBookView;</div><div class='del'>-typedef struct LDAPOp LDAPOp;</div><div class='del'>-</div><div class='del'>-struct _PASBackendLDAPPrivate {</div><div class='del'>-	char     *uri;</div><div class='del'>-	gboolean connected;</div><div class='del'>-	GList    *clients;</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'>-	int      ldap_scope;</div><div class='del'>-	GList    *book_views;</div><div class='del'>-</div><div class='del'>-	LDAP     *ldap;</div><div class='del'>-</div><div class='del'>-	/* whether or not there's a request in process on our LDAP* */</div><div class='del'>-	LDAPOp *current_op;</div><div class='del'>-	GList *pending_ops;</div><div class='del'>-	int op_idle;</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'>-	LDAPOp                *search_op;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef gboolean (*LDAPOpHandler)(PASBackend *backend, LDAPOp *op);</div><div class='del'>-typedef void (*LDAPOpDtor)(PASBackend *backend, LDAPOp *op);</div><div class='del'>-</div><div class='del'>-struct LDAPOp {</div><div class='del'>-	LDAPOpHandler handler;</div><div class='del'>-	LDAPOpDtor    dtor;</div><div class='del'>-	PASBackend    *backend;</div><div class='del'>-	PASBook       *book;</div><div class='del'>-	PASBookView   *view;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void     ldap_op_init (LDAPOp *op, PASBackend *backend, PASBook *book, PASBookView *view, LDAPOpHandler handler, LDAPOpDtor dtor);</div><div class='del'>-static void     ldap_op_process_current (PASBackend *backend);</div><div class='del'>-static void     ldap_op_process (LDAPOp *op);</div><div class='del'>-static void     ldap_op_restart (LDAPOp *op);</div><div class='del'>-static gboolean ldap_op_process_on_idle (PASBackend *backend);</div><div class='del'>-static void     ldap_op_finished (LDAPOp *op);</div><div class='del'>-</div><div class='del'>-static ECardSimple *build_card_from_entry (LDAP *ldap, LDAPMessage *e);</div><div class='del'>-</div><div class='del'>-static void email_populate_func(ECardSimple *card, char **values);</div><div class='del'>-struct berval** email_ber_func(ECardSimple *card);</div><div class='del'>-gboolean email_compare_func (ECardSimple *ecard1, ECardSimple *ecard2);</div><div class='del'>-</div><div class='del'>-struct prop_info {</div><div class='del'>-	ECardSimpleField field_id;</div><div class='del'>-	char *query_prop;</div><div class='del'>-	char *ldap_attr;</div><div class='del'>-#define PROP_TYPE_NORMAL   0x01</div><div class='del'>-#define PROP_TYPE_LIST     0x02</div><div class='del'>-#define PROP_DN            0x04</div><div class='del'>-	int prop_type;</div><div class='del'>-</div><div class='del'>-	/* the remaining items are only used for the TYPE_LIST props */</div><div class='del'>-</div><div class='del'>-	/* used when reading from the ldap server populates ECard with the values in **values. */</div><div class='del'>-	void (*populate_ecard_func)(ECardSimple *card, char **values);</div><div class='del'>-	/* used when writing to an ldap server.  returns a NULL terminated array of berval*'s */</div><div class='del'>-	struct berval** (*ber_func)(ECardSimple *card);</div><div class='del'>-	/* used to compare list attributes */</div><div class='del'>-	gboolean (*compare_func)(ECardSimple *card1, ECardSimple *card2);</div><div class='del'>-</div><div class='del'>-} prop_info[] = {</div><div class='del'>-</div><div class='del'>-#define DN_NORMAL_PROP(fid,q,a) {fid, q, a, PROP_TYPE_NORMAL | PROP_DN, NULL}</div><div class='del'>-#define DN_LIST_PROP(fid,q,a,ctor,ber,cmp) {fid, q, a, PROP_TYPE_LIST | PROP_DN, ctor, ber, cmp}</div><div class='del'>-#define NORMAL_PROP(fid,q,a) {fid, q, a, PROP_TYPE_NORMAL, NULL}</div><div class='del'>-</div><div class='del'>-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_FULL_NAME, "full_name", "cn" ),</div><div class='del'>-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_FAMILY_NAME, "family_name", "sn" ),</div><div class='del'>-	NORMAL_PROP    (E_CARD_SIMPLE_FIELD_TITLE,     "title", "title"),</div><div class='del'>-	DN_NORMAL_PROP (E_CARD_SIMPLE_FIELD_ORG,       "org", "o"),</div><div class='del'>-	NORMAL_PROP    (E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, "phone", "telephonenumber"),</div><div class='del'>-	DN_LIST_PROP   (E_CARD_SIMPLE_FIELD_EMAIL, "email", "mail", email_populate_func, email_ber_func, email_compare_func)</div><div class='del'>-</div><div class='del'>-#undef DN_NORMAL_PROP</div><div class='del'>-#undef DN_LIST_PROP</div><div class='del'>-#undef NORMAL_PROP</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static int num_prop_infos = sizeof(prop_info) / sizeof(prop_info[0]);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-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'>-			if (view-&gt;search_idle != 0) {</div><div class='del'>-				/* we have a search running on the</div><div class='del'>-				   ldap connection.  remove the idle</div><div class='del'>-				   handler and anbandon the msg id */</div><div class='del'>-				g_source_remove(view-&gt;search_idle);</div><div class='del'>-				pas_book_view_notify_status_message (view-&gt;book_view, "Abandoning pending search");</div><div class='del'>-				if (view-&gt;search_msgid != -1)</div><div class='del'>-					ldap_abandon (bl-&gt;priv-&gt;ldap, view-&gt;search_msgid);</div><div class='del'>-</div><div class='del'>-				/* if the search op is the current op,</div><div class='del'>-				   finish it. else, remove it from the</div><div class='del'>-				   list and nuke it ourselves. */</div><div class='del'>-				if (view-&gt;search_op == bl-&gt;priv-&gt;current_op)</div><div class='del'>-					ldap_op_finished (view-&gt;search_op);</div><div class='del'>-				else {</div><div class='del'>-					bl-&gt;priv-&gt;pending_ops = g_list_remove (bl-&gt;priv-&gt;pending_ops,</div><div class='del'>-									       view-&gt;search_op);</div><div class='del'>-					view-&gt;search_op-&gt;dtor (view-&gt;search_op-&gt;backend,</div><div class='del'>-							       view-&gt;search_op);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_free (view-&gt;search);</div><div class='del'>-			g_free (view);</div><div class='del'>-			bl-&gt;priv-&gt;book_views = g_list_remove_link(bl-&gt;priv-&gt;book_views, list);</div><div class='del'>-			g_list_free_1(list);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corba_book = bonobo_object_corba_objref(BONOBO_OBJECT(book));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init(&amp;ev);</div><div class='del'>-</div><div class='del'>-	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_connect (PASBackendLDAP *bl)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPPrivate *blpriv = bl-&gt;priv;</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG</div><div class='del'>-	{</div><div class='del'>-		extern int ldap_debug;</div><div class='del'>-		ldap_debug = LDAP_DEBUG_ANY;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* close connection first if it's open first */</div><div class='del'>-	if (blpriv-&gt;ldap)</div><div class='del'>-		ldap_unbind (blpriv-&gt;ldap);</div><div class='del'>-</div><div class='del'>-	blpriv-&gt;ldap = ldap_open (blpriv-&gt;ldap_host, blpriv-&gt;ldap_port);</div><div class='del'>-	if (NULL != blpriv-&gt;ldap) {</div><div class='del'>-		ldap_simple_bind_s(blpriv-&gt;ldap,</div><div class='del'>-				   NULL /*binddn*/, NULL /*passwd*/);</div><div class='del'>-		blpriv-&gt;connected = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("pas_backend_ldap_connect failed for "</div><div class='del'>-			   "'ldap://%s:%d/%s'\n",</div><div class='del'>-			   blpriv-&gt;ldap_host,</div><div class='del'>-			   blpriv-&gt;ldap_port,</div><div class='del'>-			   blpriv-&gt;ldap_rootdn ? blpriv-&gt;ldap_rootdn : "");</div><div class='del'>-		blpriv-&gt;connected = FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_op_init (LDAPOp *op, PASBackend *backend,</div><div class='del'>-	      PASBook *book, PASBookView *view,</div><div class='del'>-	      LDAPOpHandler handler, LDAPOpDtor dtor)</div><div class='del'>-{</div><div class='del'>-	op-&gt;backend = backend;</div><div class='del'>-	op-&gt;book = book;</div><div class='del'>-	op-&gt;view = view;</div><div class='del'>-	op-&gt;handler = handler;</div><div class='del'>-	op-&gt;dtor = dtor;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_op_process_current (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	LDAPOp *op = bl-&gt;priv-&gt;current_op;</div><div class='del'>-</div><div class='del'>-	if (!bl-&gt;priv-&gt;connected) {</div><div class='del'>-		if (op-&gt;view)</div><div class='del'>-			pas_book_view_notify_status_message (op-&gt;view, "Connecting to LDAP server");</div><div class='del'>-		pas_backend_ldap_connect(bl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;connected) {</div><div class='del'>-		if (op-&gt;handler (backend, op))</div><div class='del'>-			ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (op-&gt;view)</div><div class='del'>-			pas_book_view_notify_status_message (op-&gt;view, "Unable to connect to LDAP server");</div><div class='del'>-</div><div class='del'>-		ldap_op_finished (op);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_op_process (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (op-&gt;backend);</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;current_op) {</div><div class='del'>-		/* operation in progress.  queue this op for later and return. */</div><div class='del'>-		if (op-&gt;view)</div><div class='del'>-			pas_book_view_notify_status_message (op-&gt;view, "Waiting for connection to ldap server...");</div><div class='del'>-		bl-&gt;priv-&gt;pending_ops = g_list_append (bl-&gt;priv-&gt;pending_ops, op);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* nothing going on, do this op now */</div><div class='del'>-		bl-&gt;priv-&gt;current_op = op;</div><div class='del'>-		ldap_op_process_current (op-&gt;backend);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-ldap_op_process_on_idle (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;op_idle = 0;</div><div class='del'>-</div><div class='del'>-	ldap_op_process_current (backend);</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'>-ldap_op_restart (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	PASBackend *backend = op-&gt;backend;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (op == bl-&gt;priv-&gt;current_op);</div><div class='del'>-</div><div class='del'>-	bl-&gt;priv-&gt;op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ldap_op_finished (LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	PASBackend *backend = op-&gt;backend;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (op == bl-&gt;priv-&gt;current_op);</div><div class='del'>-</div><div class='del'>-	op-&gt;dtor (backend, op);</div><div class='del'>-</div><div class='del'>-	if (bl-&gt;priv-&gt;pending_ops) {</div><div class='del'>-		bl-&gt;priv-&gt;current_op = bl-&gt;priv-&gt;pending_ops-&gt;data;</div><div class='del'>-		bl-&gt;priv-&gt;pending_ops = g_list_remove_link (bl-&gt;priv-&gt;pending_ops, bl-&gt;priv-&gt;pending_ops);</div><div class='del'>-</div><div class='del'>-		bl-&gt;priv-&gt;op_idle = g_idle_add((GSourceFunc)ldap_op_process_on_idle, backend);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		bl-&gt;priv-&gt;current_op = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-ldap_error_to_response (int ldap_error)</div><div class='del'>-{</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS)</div><div class='del'>-		return Evolution_BookListener_Success;</div><div class='del'>-	else if (NAME_ERROR (ldap_error))</div><div class='del'>-		return Evolution_BookListener_CardNotFound;</div><div class='del'>-	else if (ldap_error == LDAP_INSUFFICIENT_ACCESS)</div><div class='del'>-		return Evolution_BookListener_PermissionDenied;</div><div class='del'>-	else if (ldap_error == LDAP_SERVER_DOWN)</div><div class='del'>-		return Evolution_BookListener_RepositoryOffline;</div><div class='del'>-	else</div><div class='del'>-		return Evolution_BookListener_OtherError;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-create_dn_from_ecard (ECardSimple *card)</div><div class='del'>-{</div><div class='del'>-	char *o, *o_part = NULL;</div><div class='del'>-	const char *mail;</div><div class='del'>-	char *mail_part = NULL;</div><div class='del'>-	char *cn, *cn_part = NULL;</div><div class='del'>-	char *dn;</div><div class='del'>-	gboolean need_comma = FALSE;</div><div class='del'>-</div><div class='del'>-	o = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_ORG);</div><div class='del'>-	if (o) {</div><div class='del'>-		o_part = g_strdup_printf ("o=%s", o);</div><div class='del'>-		need_comma = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		o_part = g_strdup ("");</div><div class='del'>-		need_comma = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mail = e_card_simple_get_email (card, E_CARD_SIMPLE_EMAIL_ID_EMAIL);</div><div class='del'>-	if (mail) {</div><div class='del'>-		mail_part = g_strdup_printf ("mail=%s%s", mail, need_comma ? "," : "");</div><div class='del'>-		need_comma = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		mail_part = g_strdup ("");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cn = e_card_simple_get (card, E_CARD_SIMPLE_FIELD_FULL_NAME);</div><div class='del'>-	if (cn) {</div><div class='del'>-		cn_part = g_strdup_printf ("cn=\"%s\"%s", cn, need_comma ? "," : "");</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		cn_part = g_strdup ("");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dn = g_strdup_printf ("%s%s%s", cn_part, mail_part, o_part);</div><div class='del'>-</div><div class='del'>-	g_free (cn_part);</div><div class='del'>-	g_free (mail_part);</div><div class='del'>-	g_free (o_part);</div><div class='del'>-</div><div class='del'>-	g_print ("generated dn: %s\n", dn);</div><div class='del'>-</div><div class='del'>-	return dn;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray*</div><div class='del'>-build_mods_from_ecards (ECardSimple *current, ECardSimple *new, gboolean *new_dn_needed)</div><div class='del'>-{</div><div class='del'>-	gboolean adding = (current == NULL);</div><div class='del'>-	GPtrArray *result = g_ptr_array_new();</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (new_dn_needed)</div><div class='del'>-		*new_dn_needed = FALSE;</div><div class='del'>-</div><div class='del'>-	/* we walk down the list of properties we can deal with (that</div><div class='del'>-	 big table at the top of the file) */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-		char *new_prop = NULL;</div><div class='del'>-		char *current_prop = NULL;</div><div class='del'>-		gboolean include;</div><div class='del'>-</div><div class='del'>-		/* get the value for the new card, and compare it to</div><div class='del'>-                   the value in the current card to see if we should</div><div class='del'>-                   update it -- if adding is TRUE, short circuit the</div><div class='del'>-                   check. */</div><div class='del'>-		new_prop = e_card_simple_get (new, prop_info[i].field_id);</div><div class='del'>-</div><div class='del'>-		/* need to set INCLUDE to true if the field needs to</div><div class='del'>-                   show up in the ldap modify request */</div><div class='del'>-		if (adding) {</div><div class='del'>-			/* if we're creating a new card, include it if the</div><div class='del'>-                           field is there at all */</div><div class='del'>-			include = (new_prop != NULL);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			/* if we're modifying an existing card,</div><div class='del'>-                           include it if the current field value is</div><div class='del'>-                           different than the new one, if it didn't</div><div class='del'>-                           exist previously, or if it's been</div><div class='del'>-                           removed. */</div><div class='del'>-			current_prop = e_card_simple_get (current, prop_info[i].field_id);</div><div class='del'>-</div><div class='del'>-			if (new_prop &amp;&amp; current_prop)</div><div class='del'>-				include = strcmp (new_prop, current_prop);</div><div class='del'>-			else</div><div class='del'>-				include = (!!new_prop != !!current_prop);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (include) {</div><div class='del'>-			LDAPMod *mod = g_new (LDAPMod, 1);</div><div class='del'>-</div><div class='del'>-			/* the included attribute has changed - we</div><div class='del'>-                           need to update the dn if it's one of the</div><div class='del'>-                           attributes we compute the dn from. */</div><div class='del'>-			if (new_dn_needed)</div><div class='del'>-				*new_dn_needed |= prop_info[i].prop_type &amp; PROP_DN;</div><div class='del'>-</div><div class='del'>-			if (adding) {</div><div class='del'>-				mod-&gt;mod_op = LDAP_MOD_ADD;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				if (!new_prop)</div><div class='del'>-					mod-&gt;mod_op = LDAP_MOD_DELETE;</div><div class='del'>-				else if (!current_prop)</div><div class='del'>-					mod-&gt;mod_op = LDAP_MOD_ADD;</div><div class='del'>-				else</div><div class='del'>-					mod-&gt;mod_op = LDAP_MOD_REPLACE;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			mod-&gt;mod_type = g_strdup (prop_info[i].ldap_attr);</div><div class='del'>-</div><div class='del'>-			if (prop_info[i].prop_type &amp; PROP_TYPE_NORMAL) {</div><div class='del'>-				mod-&gt;mod_values = g_new (char*, 2);</div><div class='del'>-				mod-&gt;mod_values[0] = e_card_simple_get (new, prop_info[i].field_id);</div><div class='del'>-				mod-&gt;mod_values[1] = NULL;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				mod-&gt;mod_bvalues = prop_info[i].ber_func (new);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			g_ptr_array_add (result, mod);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* NULL terminate the list of modifications */</div><div class='del'>-	g_ptr_array_add (result, NULL);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_mods (GPtrArray *mods)</div><div class='del'>-{</div><div class='del'>-	int i = 0;</div><div class='del'>-	LDAPMod *mod;</div><div class='del'>-</div><div class='del'>-	while ((mod = g_ptr_array_index (mods, i++))) {</div><div class='del'>-		g_free (mod-&gt;mod_type);</div><div class='del'>-</div><div class='del'>-		/* XXX we leak the values */</div><div class='del'>-		g_free (mod);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (mods, TRUE /* XXX ? */);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	char *vcard;</div><div class='del'>-} LDAPCreateOp;</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-create_card_handler (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	ECard *new_ecard;</div><div class='del'>-	ECardSimple *new_card;</div><div class='del'>-	char *dn;</div><div class='del'>-	int response;</div><div class='del'>-	int            ldap_error;</div><div class='del'>-	GPtrArray *mod_array;</div><div class='del'>-	LDAPMod **ldap_mods;</div><div class='del'>-	LDAPMod *objectclass_mod;</div><div class='del'>-	LDAP *ldap;</div><div class='del'>-</div><div class='del'>-	new_ecard = e_card_new (create_op-&gt;vcard);</div><div class='del'>-	new_card = e_card_simple_new (new_ecard);</div><div class='del'>-</div><div class='del'>-	dn = create_dn_from_ecard (new_card);</div><div class='del'>-</div><div class='del'>-	ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-	/* build our mods */</div><div class='del'>-	mod_array = build_mods_from_ecards (NULL, new_card, NULL);</div><div class='del'>-	objectclass_mod = g_new (LDAPMod, 1);</div><div class='del'>-</div><div class='del'>-	objectclass_mod-&gt;mod_op = LDAP_MOD_ADD;</div><div class='del'>-	objectclass_mod-&gt;mod_type = g_strdup ("objectclass");</div><div class='del'>-	objectclass_mod-&gt;mod_values = g_new (char*, 1);</div><div class='del'>-	objectclass_mod-&gt;mod_values[0] = g_strdup (OBJECT_CLASS);</div><div class='del'>-	objectclass_mod-&gt;mod_values[1] = NULL;</div><div class='del'>-</div><div class='del'>-	g_ptr_array_add (mod_array, objectclass_mod);</div><div class='del'>-</div><div class='del'>-	ldap_mods = (LDAPMod**)mod_array-&gt;pdata;</div><div class='del'>-</div><div class='del'>-	/* actually perform the ldap add */</div><div class='del'>-	ldap_error = ldap_add_s (ldap, dn, ldap_mods);</div><div class='del'>-</div><div class='del'>-	g_print ("ldap_add_s returned 0x%x (%s) status\n", ldap_error, ldap_err2string(ldap_error));</div><div class='del'>-</div><div class='del'>-	/* and clean up */</div><div class='del'>-	free_mods (mod_array);</div><div class='del'>-	g_free (dn);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT(new_card));</div><div class='del'>-</div><div class='del'>-	/* and lastly respond */</div><div class='del'>-	response = ldap_error_to_response (ldap_error);</div><div class='del'>-	pas_book_respond_create (create_op-&gt;op.book,</div><div class='del'>-				 response,</div><div class='del'>-				 dn);</div><div class='del'>-</div><div class='del'>-	/* we're synchronous */</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_card_dtor (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPCreateOp *create_op = (LDAPCreateOp*)op;</div><div class='del'>-</div><div class='del'>-	g_free (create_op-&gt;vcard);</div><div class='del'>-	g_free (create_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_create_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	LDAPCreateOp *create_op = g_new (LDAPCreateOp, 1);</div><div class='del'>-</div><div class='del'>-	ldap_op_init ((LDAPOp*)create_op, backend, book, NULL, create_card_handler, create_card_dtor);</div><div class='del'>-</div><div class='del'>-	create_op-&gt;vcard = req-&gt;vcard;</div><div class='del'>-</div><div class='del'>-	ldap_op_process ((LDAPOp*)create_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	char *id;</div><div class='del'>-} LDAPRemoveOp;</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-remove_card_handler (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	int response;</div><div class='del'>-	int ldap_error;</div><div class='del'>-</div><div class='del'>-	ldap_error = ldap_delete_s (bl-&gt;priv-&gt;ldap, remove_op-&gt;id);</div><div class='del'>-</div><div class='del'>-	response = ldap_error_to_response (ldap_error);</div><div class='del'>-</div><div class='del'>-	pas_book_respond_remove (remove_op-&gt;op.book,</div><div class='del'>-				 response);</div><div class='del'>-</div><div class='del'>-	/* we're synchronous */</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_card_dtor (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPRemoveOp *remove_op = (LDAPRemoveOp*)op;</div><div class='del'>-</div><div class='del'>-	g_free (remove_op-&gt;id);</div><div class='del'>-	g_free (remove_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_remove_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	LDAPRemoveOp *remove_op = g_new (LDAPRemoveOp, 1);</div><div class='del'>-</div><div class='del'>-	ldap_op_init ((LDAPOp*)remove_op, backend, book, NULL, remove_card_handler, remove_card_dtor);</div><div class='del'>-</div><div class='del'>-	remove_op-&gt;id = req-&gt;id;</div><div class='del'>-</div><div class='del'>-	ldap_op_process ((LDAPOp*)remove_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	char *vcard;</div><div class='del'>-} LDAPModifyOp;</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-modify_card_handler (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;</div><div class='del'>-	PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-	ECard *new_ecard;</div><div class='del'>-	char *id;</div><div class='del'>-	int response;</div><div class='del'>-	int            ldap_error;</div><div class='del'>-	LDAPMessage    *res, *e;</div><div class='del'>-	char *query;</div><div class='del'>-	GPtrArray *mod_array;</div><div class='del'>-	LDAPMod **ldap_mods;</div><div class='del'>-	LDAP *ldap;</div><div class='del'>-</div><div class='del'>-	new_ecard = e_card_new (modify_op-&gt;vcard);</div><div class='del'>-	id = e_card_get_id(new_ecard);</div><div class='del'>-</div><div class='del'>-	ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</div><div class='del'>-	/* we don't get sent the original vcard along with the new one</div><div class='del'>-           in this call, so we have to query the ldap server for the</div><div class='del'>-           original record so we can compute our delta. */</div><div class='del'>-	query = g_strdup_printf ("(dn=%s)", id);</div><div class='del'>-	ldap_error = ldap_search_s (ldap,</div><div class='del'>-				    bl-&gt;priv-&gt;ldap_rootdn,</div><div class='del'>-				    bl-&gt;priv-&gt;ldap_scope,</div><div class='del'>-				    query, NULL, 0, &amp;res);</div><div class='del'>-</div><div class='del'>-	if (ldap_error == LDAP_SUCCESS) {</div><div class='del'>-		/* get the single card from the list (we're guaranteed</div><div class='del'>-                   either 1 or 0 since we looked up by dn, which is</div><div class='del'>-                   unique) */</div><div class='del'>-		e = ldap_first_entry (ldap, res);</div><div class='del'>-		if (e)	{</div><div class='del'>-			ECardSimple *new_card = e_card_simple_new (new_ecard);</div><div class='del'>-			ECardSimple *current_card = build_card_from_entry (ldap, e);</div><div class='del'>-			gboolean need_new_dn;</div><div class='del'>-</div><div class='del'>-			/* build our mods */</div><div class='del'>-			mod_array = build_mods_from_ecards (current_card, new_card, &amp;need_new_dn);</div><div class='del'>-			if (mod_array-&gt;len &gt; 0) {</div><div class='del'>-				ldap_mods = (LDAPMod**)mod_array-&gt;pdata;</div><div class='del'>-</div><div class='del'>-				/* actually perform the ldap modify */</div><div class='del'>-				ldap_error = ldap_modify_s (ldap, id, ldap_mods);</div><div class='del'>-				g_print ("ldap_modify_s returned 0x%x (%s) status\n", ldap_error, ldap_err2string(ldap_error));</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				g_print ("modify list empty.  on modification sent\n");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* and clean up */</div><div class='del'>-			free_mods (mod_array);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT(new_card));</div><div class='del'>-			gtk_object_unref (GTK_OBJECT(current_card));</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			g_print ("didn't find original card\n");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ldap_msgfree(res);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_print ("ldap_search_s returned 0x%x (%s) status\n", ldap_error, ldap_err2string(ldap_error));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	response = ldap_error_to_response (ldap_error);</div><div class='del'>-	pas_book_respond_modify (modify_op-&gt;op.book,</div><div class='del'>-				 response);</div><div class='del'>-</div><div class='del'>-	/* we're synchronous */</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-modify_card_dtor (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPModifyOp *modify_op = (LDAPModifyOp*)op;</div><div class='del'>-</div><div class='del'>-	g_free (modify_op-&gt;vcard);</div><div class='del'>-	g_free (modify_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_modify_card (PASBackend *backend,</div><div class='del'>-				      PASBook    *book,</div><div class='del'>-				      PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	LDAPModifyOp *modify_op = g_new (LDAPModifyOp, 1);</div><div class='del'>-</div><div class='del'>-	ldap_op_init ((LDAPOp*)modify_op, backend, book, NULL, modify_card_handler, modify_card_dtor);</div><div class='del'>-</div><div class='del'>-	modify_op-&gt;vcard = req-&gt;vcard;</div><div class='del'>-</div><div class='del'>-	ldap_op_process ((LDAPOp*)modify_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	PASBook *book;</div><div class='del'>-} LDAPGetCursorOp;</div><div class='del'>-</div><div class='del'>-static long</div><div class='del'>-get_length(PASCardCursor *cursor, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;</div><div class='del'>-</div><div class='del'>-	return cursor_data-&gt;num_elements;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_nth(PASCardCursor *cursor, long n, gpointer data)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPCursorPrivate *cursor_data = (PASBackendLDAPCursorPrivate *) data;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (n &lt; cursor_data-&gt;num_elements, NULL);</div><div class='del'>-</div><div class='del'>-	return (char*)g_list_nth (cursor_data-&gt;elements, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cursor_destroy(GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	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'>-	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'>-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 = bl-&gt;priv-&gt;ldap;</div><div class='del'>-	int            ldap_error;</div><div class='del'>-	LDAPMessage    *res, *e;</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'>-					 bl-&gt;priv-&gt;ldap_scope,</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 gboolean</div><div class='del'>-get_cursor_handler (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPGetCursorOp *cursor_op = (LDAPGetCursorOp*)op;</div><div class='del'>-	CORBA_Environment ev;</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'>-	PASBackendLDAPCursorPrivate *cursor_data;</div><div class='del'>-	PASBook *book = cursor_op-&gt;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 (book,</div><div class='del'>-				     ldap_error_to_response (ldap_error),</div><div class='del'>-				     cursor);</div><div class='del'>-</div><div class='del'>-	/* we're synchronous */</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_cursor_dtor (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	g_free (op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_process_get_cursor (PASBackend *backend,</div><div class='del'>-				     PASBook    *book,</div><div class='del'>-				     PASRequest *req)</div><div class='del'>-{</div><div class='del'>-	LDAPGetCursorOp *op = g_new (LDAPGetCursorOp, 1);</div><div class='del'>-</div><div class='del'>-	ldap_op_init ((LDAPOp*)op, backend, book, NULL, get_cursor_handler, get_cursor_dtor);</div><div class='del'>-</div><div class='del'>-	ldap_op_process ((LDAPOp*)op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-email_populate_func(ECardSimple *card, char **values)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; values[i] &amp;&amp; i &lt; 3; i ++) {</div><div class='del'>-		e_card_simple_set_email (card, i, values[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct berval**</div><div class='del'>-email_ber_func(ECardSimple *card)</div><div class='del'>-{</div><div class='del'>-	struct berval** result;</div><div class='del'>-	const char *emails[3];</div><div class='del'>-	int i, j, num;</div><div class='del'>-</div><div class='del'>-	num = 0;</div><div class='del'>-	for (i = 0; i &lt; 3; i ++) {</div><div class='del'>-		emails[i] = e_card_simple_get_email (card, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);</div><div class='del'>-		if (emails[i])</div><div class='del'>-			num++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result = g_new (struct berval*, num + 1);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num; i ++)</div><div class='del'>-		result[i] = g_new (struct berval, 1);</div><div class='del'>-</div><div class='del'>-	j = 0;</div><div class='del'>-	for (i = 0; i &lt; 3; i ++) {</div><div class='del'>-		if (emails[i])</div><div class='del'>-			result[j++]-&gt;bv_val = g_strdup (emails[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	result[num] = NULL;</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-email_compare_func (ECardSimple *ecard1, ECardSimple *ecard2)</div><div class='del'>-{</div><div class='del'>-	const char *email1, *email2;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 3; i ++) {</div><div class='del'>-		gboolean equal;</div><div class='del'>-		email1 = e_card_simple_get_email (ecard1, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);</div><div class='del'>-		email2 = e_card_simple_get_email (ecard2, E_CARD_SIMPLE_EMAIL_ID_EMAIL + i);</div><div class='del'>-</div><div class='del'>-		if (email1 &amp;&amp; email2)</div><div class='del'>-			equal = !strcmp (email1, email2);</div><div class='del'>-		else</div><div class='del'>-			equal = (!!email1 == !!email2);</div><div class='del'>-</div><div class='del'>-		if (!equal)</div><div class='del'>-			return equal;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;;</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'>-		gboolean one_star = FALSE;</div><div class='del'>-</div><div class='del'>-		if (strlen(str) == 0)</div><div class='del'>-			one_star = TRUE;</div><div class='del'>-</div><div class='del'>-		if (!strcmp (propname, "x-evolution-any-field")) {</div><div class='del'>-			int i;</div><div class='del'>-			int query_length;</div><div class='del'>-			char *big_query;</div><div class='del'>-			char *header, *footer;</div><div class='del'>-			char *match_str;</div><div class='del'>-</div><div class='del'>-			header = g_malloc0((num_prop_infos - 1) * 2 + 1);</div><div class='del'>-			footer = g_malloc0(num_prop_infos + 1);</div><div class='del'>-			for (i = 0; i &lt; num_prop_infos - 1; i ++) {</div><div class='del'>-				strcat (header, "(|");</div><div class='del'>-				strcat (footer, ")");</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			match_str = g_strdup_printf("=*%s%s)",</div><div class='del'>-						    str, one_star ? "" : "*");</div><div class='del'>-</div><div class='del'>-			query_length = strlen (header);</div><div class='del'>-</div><div class='del'>-			for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-				query_length += 1 + strlen(prop_info[i].ldap_attr) + strlen (match_str);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			big_query = g_malloc0(query_length + 1);</div><div class='del'>-			strcat (big_query, header);</div><div class='del'>-			for (i = 0; i &lt; num_prop_infos; i ++) {</div><div class='del'>-				strcat (big_query, "(");</div><div class='del'>-				strcat (big_query, prop_info[i].ldap_attr);</div><div class='del'>-				strcat (big_query, match_str);</div><div class='del'>-			}</div><div class='del'>-			strcat (big_query, footer);</div><div class='del'>-</div><div class='del'>-			*list = g_list_prepend(*list, big_query);</div><div class='del'>-</div><div class='del'>-			g_free (match_str);</div><div class='del'>-			g_free (header);</div><div class='del'>-			g_free (footer);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			char *ldap_attr = query_prop_to_ldap(propname);</div><div class='del'>-</div><div class='del'>-			if (ldap_attr)</div><div class='del'>-				*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'>-</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 = query_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 = query_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 = query_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 gchar *</div><div class='del'>-query_prop_to_ldap(gchar *query_prop)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; num_prop_infos; i ++)</div><div class='del'>-		if (!strcmp (query_prop, prop_info[i].query_prop))</div><div class='del'>-			return prop_info[i].ldap_attr;</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	LDAPOp op;</div><div class='del'>-	char *ldap_query;</div><div class='del'>-	PASBackendLDAP *bl;</div><div class='del'>-	PASBackendLDAPBookView *view;</div><div class='del'>-} LDAPSearchOp;</div><div class='del'>-</div><div class='del'>-static ECardSimple *</div><div class='del'>-build_card_from_entry (LDAP *ldap, LDAPMessage *e)</div><div class='del'>-{</div><div class='del'>-	ECard *ecard = E_CARD(gtk_type_new(e_card_get_type()));</div><div class='del'>-	ECardSimple *card = e_card_simple_new (ecard);</div><div class='del'>-	char *dn = 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'>-	g_print ("build_card_from_entry, dn = %s\n", dn);</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[i].ldap_attr))</div><div class='del'>-				info = &amp;prop_info[i];</div><div class='del'>-</div><div class='del'>-		if (info) {</div><div class='del'>-			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 &amp; 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 &amp; PROP_TYPE_LIST) {</div><div class='del'>-				/* if it's a list call the ecard-populate function,</div><div class='del'>-				   which calls gtk_object_set to set the property */</div><div class='del'>-				info-&gt;populate_ecard_func(card,</div><div class='del'>-							  values);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			ldap_value_free (values);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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'>-</div><div class='del'>-	return card;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-poll_ldap (LDAPSearchOp *op)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAPBookView *view = op-&gt;view;</div><div class='del'>-	PASBackendLDAP *bl = op-&gt;bl;</div><div class='del'>-	LDAP           *ldap = bl-&gt;priv-&gt;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'>-	static int received = 0;</div><div class='del'>-</div><div class='del'>-	pas_book_view_notify_status_message (view-&gt;book_view, "Polling for LDAP search result");</div><div class='del'>-</div><div class='del'>-	rc = ldap_result (ldap, view-&gt;search_msgid, 0, NULL, &amp;res);</div><div class='del'>-	</div><div class='del'>-	if (rc == -1 &amp;&amp; received == 0) {</div><div class='del'>-		pas_book_view_notify_status_message (view-&gt;book_view, "Restarting search");</div><div class='del'>-		/* connection went down and we never got any. */</div><div class='del'>-		bl-&gt;priv-&gt;connected = FALSE;</div><div class='del'>-</div><div class='del'>-		/* this will reopen the connection */</div><div class='del'>-		ldap_op_restart ((LDAPOp*)op);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (rc != 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'>-		ldap_op_finished ((LDAPOp*)op);</div><div class='del'>-		received = 0;</div><div class='del'>-		pas_book_view_notify_status_message (view-&gt;book_view, "Search complete");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	received = 1;</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'>-		ECardSimple *card = build_card_from_entry (ldap, e);</div><div class='del'>-</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 gboolean</div><div class='del'>-ldap_search_handler (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;</div><div class='del'>-</div><div class='del'>-	if (op-&gt;view)</div><div class='del'>-		pas_book_view_notify_status_message (op-&gt;view, "Searching...");</div><div class='del'>-</div><div class='del'>-	/* it might not be NULL if we've been restarted */</div><div class='del'>-	if (search_op-&gt;ldap_query == NULL)</div><div class='del'>-		search_op-&gt;ldap_query = pas_backend_ldap_build_query(search_op-&gt;view-&gt;search);</div><div class='del'>-</div><div class='del'>-	if (search_op-&gt;ldap_query != NULL) {</div><div class='del'>-		PASBackendLDAP *bl = PAS_BACKEND_LDAP (backend);</div><div class='del'>-		PASBackendLDAPBookView *view = search_op-&gt;view;</div><div class='del'>-		LDAP *ldap = bl-&gt;priv-&gt;ldap;</div><div class='del'>-</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'>-						       bl-&gt;priv-&gt;ldap_scope,</div><div class='del'>-						       search_op-&gt;ldap_query,</div><div class='del'>-						       NULL, 0)) == -1) {</div><div class='del'>-			pas_book_view_notify_status_message (view-&gt;book_view, ldap_err2string(ldap-&gt;ld_errno));</div><div class='del'>-			return TRUE; /* act synchronous in this case */</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			view-&gt;search_idle = g_idle_add((GSourceFunc)poll_ldap, search_op);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* we're async */</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* error doing the conversion to an ldap query, let's</div><div class='del'>-                   end this now by acting like we're synchronous. */</div><div class='del'>-		g_warning ("LDAP problem converting search query %s\n", search_op-&gt;view-&gt;search);</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'>-ldap_search_dtor (PASBackend *backend, LDAPOp *op)</div><div class='del'>-{</div><div class='del'>-	LDAPSearchOp *search_op = (LDAPSearchOp*) op;</div><div class='del'>-</div><div class='del'>-	g_free (search_op-&gt;ldap_query);</div><div class='del'>-	g_free (search_op);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_ldap_search (PASBackendLDAP  	*bl,</div><div class='del'>-			 PASBook         	*book,</div><div class='del'>-			 PASBackendLDAPBookView *view)</div><div class='del'>-{</div><div class='del'>-	LDAPSearchOp *op = g_new (LDAPSearchOp, 1);</div><div class='del'>-</div><div class='del'>-	ldap_op_init ((LDAPOp*)op, PAS_BACKEND(bl), book, view-&gt;book_view, ldap_search_handler, ldap_search_dtor);</div><div class='del'>-</div><div class='del'>-	op-&gt;ldap_query = NULL;</div><div class='del'>-	op-&gt;view = view;</div><div class='del'>-	op-&gt;bl = bl;</div><div class='del'>-</div><div class='del'>-	/* keep track of the search op so we can delete it from the</div><div class='del'>-           list if the view is destroyed */</div><div class='del'>-	view-&gt;search_op = (LDAPOp*)op;</div><div class='del'>-</div><div class='del'>-	ldap_op_process ((LDAPOp*)op);</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_new0(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 TRUE; /* 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 TRUE; /* 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'>-	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'>-</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 LDAP_PORT */</div><div class='del'>-		if (bl-&gt;priv-&gt;ldap_port == 0)</div><div class='del'>-			bl-&gt;priv-&gt;ldap_port = LDAP_PORT;</div><div class='del'>-		bl-&gt;priv-&gt;ldap_rootdn = g_strdup(lud-&gt;lud_dn);</div><div class='del'>-		bl-&gt;priv-&gt;ldap_scope = lud-&gt;lud_scope;</div><div class='del'>-</div><div class='del'>-		ldap_free_urldesc(lud);</div><div class='del'>-</div><div class='del'>-		pas_backend_ldap_connect (bl);</div><div class='del'>-		if (bl-&gt;priv-&gt;ldap == NULL)</div><div class='del'>-			return FALSE;</div><div class='del'>-		else</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 char *</div><div class='del'>-pas_backend_ldap_get_static_capabilites (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("net");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pas_backend_ldap_construct (PASBackendLDAP *backend)</div><div class='del'>-{</div><div class='del'>-	g_assert (backend != NULL);</div><div class='del'>-	g_assert (PAS_IS_BACKEND_LDAP (backend));</div><div class='del'>-</div><div class='del'>-	if (! pas_backend_construct (PAS_BACKEND (backend)))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_ldap_new:</div><div class='del'>- */</div><div class='del'>-PASBackend *</div><div class='del'>-pas_backend_ldap_new (void)</div><div class='del'>-{</div><div class='del'>-	PASBackendLDAP *backend;</div><div class='del'>-</div><div class='del'>-	backend = gtk_type_new (pas_backend_ldap_get_type ());</div><div class='del'>-</div><div class='del'>-	if (! pas_backend_ldap_construct (backend)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (backend));</div><div class='del'>-</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return PAS_BACKEND (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-call_dtor (LDAPOp *op, gpointer data)</div><div class='del'>-{</div><div class='del'>-	op-&gt;dtor (op-&gt;backend, op);</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_list_foreach (bl-&gt;priv-&gt;pending_ops, (GFunc)call_dtor, NULL);</div><div class='del'>-	g_list_free (bl-&gt;priv-&gt;pending_ops);</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'>-	parent_class-&gt;get_static_capabilities = pas_backend_ldap_get_static_capabilites;</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 1568918560..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-backend.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *   Nat Friedman (nat@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'>-char *</div><div class='del'>-pas_backend_get_static_capabilities (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (PAS_IS_BACKEND (backend), NULL);</div><div class='del'>-	</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_static_capabilities != NULL);</div><div class='del'>-</div><div class='del'>-	return CLASS (backend)-&gt;get_static_capabilities (backend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_last_client_gone:</div><div class='del'>- * @backend: An addressbook backend.</div><div class='del'>- * </div><div class='del'>- * Emits the "last_client_gone" signal for the specified backend.  Should</div><div class='del'>- * only be called from backend implementations if the backend really does</div><div class='del'>- * not have any more clients.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-pas_backend_last_client_gone (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (PAS_IS_BACKEND (backend));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (backend), pas_backend_signals[LAST_CLIENT_GONE]);	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_init (PASBackend *backend)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_backend_class_init (PASBackendClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) klass;</div><div class='del'>-</div><div class='del'>-	pas_backend_signals[LAST_CLIENT_GONE] =</div><div class='del'>-		gtk_signal_new ("last_client_gone",</div><div class='del'>-				GTK_RUN_FIRST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (PASBackendClass, last_client_gone),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, pas_backend_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	klass-&gt;add_client = NULL;</div><div class='del'>-	klass-&gt;remove_client = NULL;</div><div class='del'>-	klass-&gt;get_static_capabilities = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_backend_get_type:</div><div class='del'>- */</div><div class='del'>-GtkType</div><div class='del'>-pas_backend_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (! type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"PASBackend",</div><div class='del'>-			sizeof (PASBackend),</div><div class='del'>-			sizeof (PASBackendClass),</div><div class='del'>-			(GtkClassInitFunc)  pas_backend_class_init,</div><div class='del'>-			(GtkObjectInitFunc) pas_backend_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h<br/>deleted file mode 100644<br/>index 4045074284..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-backend.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-backend.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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'>-        char *(*get_static_capabilities) (PASBackend *backend);</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-	void (* last_client_gone) (PASBackend *backend);</div><div class='del'>-} PASBackendClass;</div><div class='del'>-</div><div class='del'>-typedef PASBackend * (*PASBackendFactoryFn) (void);</div><div class='del'>-</div><div class='del'>-gboolean    pas_backend_construct                (PASBackend             *backend);</div><div class='del'>-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'>-</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'>-char       *pas_backend_get_static_capabilities  (PASBackend             *backend);</div><div class='del'>-</div><div class='del'>-void        pas_backend_last_client_gone         (PASBackend             *backend);</div><div class='del'>-</div><div class='del'>-GtkType     pas_backend_get_type                 (void);</div><div class='del'>-</div><div class='del'>-#define PAS_BACKEND_TYPE        (pas_backend_get_type ())</div><div class='del'>-#define PAS_BACKEND(o)          (GTK_CHECK_CAST ((o), PAS_BACKEND_TYPE, PASBackend))</div><div class='del'>-#define PAS_BACKEND_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BACKEND_TYPE, PASBackendClass))</div><div class='del'>-#define PAS_IS_BACKEND(o)       (GTK_CHECK_TYPE ((o), PAS_BACKEND_TYPE))</div><div class='del'>-#define PAS_IS_BACKEND_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BACKEND_TYPE))</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_BACKEND_H__ */</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c<br/>deleted file mode 100644<br/>index 02dedbabe5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-factory.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-book-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,595 +0,0 @@</div><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'>-#include &lt;liboaf/liboaf.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'>-#define PAS_BOOK_FACTORY_OAF_ID "OAFIID:evolution:addressbook-server:0fbc844d-c721-4615-98d0-d67eacf42d80"</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'>-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'>-/**</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 94babf6280..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-view.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-book-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,334 +0,0 @@</div><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'>-void</div><div class='del'>-pas_book_view_notify_status_message (PASBookView *book_view,</div><div class='del'>-				     const char  *message)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	Evolution_BookViewListener_signal_status_message (</div><div class='del'>-		book_view-&gt;priv-&gt;listener, message, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_view_notify_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_Object_duplicate (listener, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("Unable to duplicate listener object in pas-book-view.c\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	Evolution_BookViewListener_ref (listener, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("Unable to ref listener object in pas-book-view.c\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	obj = bonobo_object_activate_servant (BONOBO_OBJECT (book_view), servant);</div><div class='del'>-	if (obj == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (book_view), obj);</div><div class='del'>-</div><div class='del'>-	book_view-&gt;priv-&gt;listener  = listener;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_view_new:</div><div class='del'>- */</div><div class='del'>-PASBookView *</div><div class='del'>-pas_book_view_new (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'>-	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_unref (book_view-&gt;priv-&gt;listener, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("Unable to unref listener object in pas-book-view.c\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_Object_release (book_view-&gt;priv-&gt;listener, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning("Unable to release listener object in pas-book-view.c\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	g_free (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 df6aed5bbb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book-view.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-book-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,55 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * A wrapper object which exports the 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'>-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'>-void         pas_book_view_notify_status_message  (PASBookView                *book_view,</div><div class='del'>-						   const char                 *message);</div><div class='del'>-</div><div class='del'>-GtkType      pas_book_view_get_type               (void);</div><div class='del'>-</div><div class='del'>-#define PAS_BOOK_VIEW_TYPE        (pas_book_view_get_type ())</div><div class='del'>-#define PAS_BOOK_VIEW(o)          (GTK_CHECK_CAST ((o), PAS_BOOK_VIEW_TYPE, PASBookView))</div><div class='del'>-#define PAS_BOOK_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), PAS_BOOK_VIEW_FACTORY_TYPE, PASBookViewClass))</div><div class='del'>-#define PAS_IS_BOOK_VIEW(o)       (GTK_CHECK_TYPE ((o), PAS_BOOK_VIEW_TYPE))</div><div class='del'>-#define PAS_IS_BOOK_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), PAS_BOOK_VIEW_TYPE))</div><div class='del'>-</div><div class='del'>-#endif /* ! __PAS_BOOK_VIEW_H__ */</div><div class='head'>diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c<br/>deleted file mode 100644<br/>index 6a8c17a584..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-book.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,754 +0,0 @@</div><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_get_changes (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       = GetChanges;</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_changes: Exception "</div><div class='del'>-			   "duplicating BookViewListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pas_book_queue_check_connection (PASBook *book)</div><div class='del'>-{</div><div class='del'>-	PASRequest *req;</div><div class='del'>-</div><div class='del'>-	req        = g_new0 (PASRequest, 1);</div><div class='del'>-	req-&gt;op    = CheckConnection;</div><div class='del'>-</div><div class='del'>-	pas_book_queue_request (book, req);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static 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_get_changes (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_changes (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'>-static char *</div><div class='del'>-impl_Evolution_Book_get_static_capabilities (PortableServer_Servant servant,</div><div class='del'>-					     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	PASBook *book = PAS_BOOK (bonobo_object_from_servant (servant));</div><div class='del'>-	char *temp;</div><div class='del'>-	char *ret_val;</div><div class='del'>-</div><div class='del'>-	temp = pas_backend_get_static_capabilities (book-&gt;priv-&gt;backend);</div><div class='del'>-	ret_val = CORBA_string_dup(temp);</div><div class='del'>-	g_free(temp);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</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_book_view:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_get_book_view (PASBook                           *book,</div><div class='del'>-				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_respond_get_changes:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_respond_get_changes (PASBook                           *book,</div><div class='del'>-			      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_changes (</div><div class='del'>-		book-&gt;priv-&gt;listener, status, object, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("pas_book_respond_get_changes: Exception "</div><div class='del'>-			   "responding to BookListener!\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * pas_book_report_connection:</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-pas_book_report_connection (PASBook  *book,</div><div class='del'>-			    gboolean  connected)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	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_static_capabilities = impl_Evolution_Book_get_static_capabilities;</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'>-	epv-&gt;get_changes             = impl_Evolution_Book_get_changes;</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 ab59d7bb3e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/backend/pas/pas-book.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/backend/pas/pas-book.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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'>-	GetChanges,</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'>-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_respond_get_changes    (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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/conduit/.cvsignore b/addressbook/conduit/.cvsignore<br/>deleted file mode 100644<br/>index 67db02346b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/conduit/.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'>-*.lo</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-libeaddress_conduit.la</div><div class='del'>-e-address-conduit-control-applet</div><div class='del'>-e-address.conduit
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/conduit/Makefile.am b/addressbook/conduit/Makefile.am<br/>deleted file mode 100644<br/>index 368a50e477..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/conduit/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-INCLUDES = 					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/addressbook		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend	\</div><div class='del'>-	-I$(top_builddir)/e-util		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)		\</div><div class='del'>-	$(GNOME_PILOT_CFLAGS)</div><div class='del'>-</div><div class='del'>-# Address Capplet</div><div class='del'>-bin_PROGRAMS = e-address-conduit-control-applet</div><div class='del'>-</div><div class='del'>-e_address_conduit_control_applet_SOURCES = address-conduit-control-applet.c</div><div class='del'>-</div><div class='del'>-e_address_conduit_control_applet_LDADD = \</div><div class='del'>-		$(CAPPLET_LIBS)  \</div><div class='del'>-		$(GNOME_LIBDIR) \</div><div class='del'>-		$(GNOME_PILOT_LIBS) \</div><div class='del'>-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \</div><div class='del'>-		$(GNOME_CAPPLET_LIBS) \</div><div class='del'>-		$(BONOBO_VFS_GNOME_LIBS) \</div><div class='del'>-		$(GNOME_XML_LIB) \</div><div class='del'>-	        $(GNOMEUI_LIBS) \</div><div class='del'>-                $(INTLLIBS)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-# Address Conduit</div><div class='del'>-e_address_conduitsdir=$(libdir)/gnome-pilot/conduits</div><div class='del'>-e_address_conduits_LTLIBRARIES = libeaddress_conduit.la</div><div class='del'>-</div><div class='del'>-libeaddress_conduit_la_SOURCES = \</div><div class='del'>-	address-conduit.c \</div><div class='del'>-	address-conduit.h \</div><div class='del'>-	address-conduit-config.h</div><div class='del'>-</div><div class='del'>-libeaddress_conduit_la_LIBADD = 					\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook-static.la	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil-static.la			\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la				\</div><div class='del'>-	$(top_builddir)/e-util/libeconduit-static.la	 		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)					\</div><div class='del'>-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\</div><div class='del'>-	$(GNOME_LIBDIR) 						\</div><div class='del'>-	$(GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-e-address.conduit: e-address.conduit.in Makefile</div><div class='del'>-	sed -e 's^\@prefix\@^$(prefix)^g' &lt; $(srcdir)/e-address.conduit.in &gt; e-address.conduit.tmp \</div><div class='del'>-	&amp;&amp; mv e-address.conduit.tmp e-address.conduit</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ccenterdir = $(datadir)/control-center</div><div class='del'>-ccenterPalmPilotdir = $(ccenterdir)/Peripherals</div><div class='del'>-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits</div><div class='del'>-ccenterConduits_DATA = e-address-conduit-control-applet.desktop </div><div class='del'>-</div><div class='del'>-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits</div><div class='del'>-panelConduits_DATA = $(ccenterConduits_DATA)</div><div class='del'>-</div><div class='del'>-Conduitdir = $(datadir)/gnome-pilot/conduits/</div><div class='del'>-Conduit_DATA = e-address.conduit</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	e-address.conduit.in \</div><div class='del'>-        $(ccenterConduits_DATA)</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(ccenterConduitsdir)</div><div class='del'>-	$(mkinstalldirs) $(Conduitdir)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/conduit/address-conduit-config.h b/addressbook/conduit/address-conduit-config.h<br/>deleted file mode 100644<br/>index 1afa8cef4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/address-conduit-config.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/conduit/address-conduit-config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,120 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - ToDo Conduit Configuration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</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'>- *          JP Rosevear &lt;jpr@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 __ADDR_CONDUIT_CONFIG_H__</div><div class='del'>-#define __ADDR_CONDUIT_CONFIG_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-management.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-config.h&gt;</div><div class='del'>-</div><div class='del'>-/* Configuration info */</div><div class='del'>-typedef struct _EAddrConduitCfg EAddrConduitCfg;</div><div class='del'>-struct _EAddrConduitCfg {</div><div class='del'>-	gboolean open_secret;</div><div class='del'>-	guint32 pilot_id;</div><div class='del'>-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef ADDR_CONFIG_LOAD</div><div class='del'>-/* Loads the configuration data */</div><div class='del'>-static void </div><div class='del'>-addrconduit_load_configuration (EAddrConduitCfg **c, guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",</div><div class='del'>-		    pilot_id);</div><div class='del'>-	</div><div class='del'>-	*c = g_new0 (EAddrConduitCfg,1);</div><div class='del'>-	g_assert (*c != NULL);</div><div class='del'>-</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'>-</div><div class='del'>-        /* set in capplets main */</div><div class='del'>-	(*c)-&gt;sync_type = GnomePilotConduitSyncTypeCustom; </div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-	</div><div class='del'>-	(*c)-&gt;pilot_id = pilot_id;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef ADDR_CONFIG_SAVE</div><div class='del'>-/* Saves the configuration data. */</div><div class='del'>-static void</div><div class='del'>-addrconduit_save_configuration (EAddrConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",</div><div class='del'>-		    c-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	gnome_config_set_bool ("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'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef ADDR_CONFIG_DUPE</div><div class='del'>-/* Creates a duplicate of the configuration data */</div><div class='del'>-static EAddrConduitCfg*</div><div class='del'>-addrconduit_dupe_configuration (EAddrConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	EAddrConduitCfg *retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (c != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	retval = g_new0 (EAddrConduitCfg, 1);</div><div class='del'>-	retval-&gt;sync_type = c-&gt;sync_type;</div><div class='del'>-	retval-&gt;open_secret = c-&gt;open_secret;</div><div class='del'>-	retval-&gt;pilot_id = c-&gt;pilot_id;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef ADDR_CONFIG_DESTROY</div><div class='del'>-/* Destroy a configuration */</div><div class='del'>-static void </div><div class='del'>-addrconduit_destroy_configuration (EAddrConduitCfg **c) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (c != NULL);</div><div class='del'>-	g_return_if_fail (*c != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (*c);</div><div class='del'>-	*c = NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif __ADDR_CONDUIT_CONFIG_H__ </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/conduit/address-conduit-control-applet.c b/addressbook/conduit/address-conduit-control-applet.c<br/>deleted file mode 100644<br/>index 3cbdbf8976..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/address-conduit-control-applet.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/conduit/address-conduit-control-applet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,341 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution addressbook -  Address Conduit Capplet</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</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'>- *          JP Rosevear &lt;jpr@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;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/gnome-pilot-client.h&gt;</div><div class='del'>-</div><div class='del'>-#define ADDR_CONFIG_LOAD 1</div><div class='del'>-#define ADDR_CONFIG_SAVE 1</div><div class='del'>-#define ADDR_CONFIG_DUPE 1</div><div class='del'>-#define ADDR_CONFIG_DESTROY 1</div><div class='del'>-#include &lt;address-conduit-config.h&gt;</div><div class='del'>-#undef ADDR_CONFIG_LOAD</div><div class='del'>-#undef ADDR_CONFIG_SAVE</div><div class='del'>-#undef ADDR_CONFIG_DUPE</div><div class='del'>-#undef ADDR_CONFIG_DESTROY</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'>-GnomePilotConduitManagement *conduit;</div><div class='del'>-GnomePilotConduitConfig *conduit_config;</div><div class='del'>-EAddrConduitCfg *origState = NULL;</div><div class='del'>-EAddrConduitCfg *curState = NULL;</div><div class='del'>-</div><div class='del'>-static void doTrySettings(GtkWidget *widget, EAddrConduitCfg *c);</div><div class='del'>-static void doRevertSettings(GtkWidget *widget, EAddrConduitCfg *c);</div><div class='del'>-static void doSaveSettings(GtkWidget *widget, EAddrConduitCfg *c);</div><div class='del'>-</div><div class='del'>-static void setStateCfg (GtkWidget *w, EAddrConduitCfg *c);</div><div class='del'>-</div><div class='del'>-gint pilotId;</div><div class='del'>-static GnomePilotClient *gpc;</div><div class='del'>-</div><div class='del'>-</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'>-doTrySettings (GtkWidget *widget, EAddrConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;sync_type != GnomePilotConduitSyncTypeCustom)</div><div class='del'>-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,</div><div class='del'>-								   c-&gt;sync_type,</div><div class='del'>-								   c-&gt;sync_type,</div><div class='del'>-								   TRUE);</div><div class='del'>-	else</div><div class='del'>-		gnome_pilot_conduit_config_disable (conduit_config);</div><div class='del'>-</div><div class='del'>-	addrconduit_save_configuration (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doRevertSettings (GtkWidget *widget, EAddrConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	activated = org_activation_state;</div><div class='del'>-	*c = *origState;</div><div class='del'>-	setStateCfg (cfgStateWindow, c);</div><div class='del'>-	doTrySettings (widget, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doSaveSettings (GtkWidget *widget, EAddrConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	*origState = *c;</div><div class='del'>-	doTrySettings (widget, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-doHelp (GtkWidget *widget, gpointer data) </div><div class='del'>-{</div><div class='del'>-	GtkWidget *about;</div><div class='del'>-	const gchar *authors[] = {</div><div class='del'>-		_("JP Rosevear &lt;jpr@helixcode.com&gt;"),</div><div class='del'>-		"", _("Original Author:"), </div><div class='del'>-		_("Eskil Heyn Olsen &lt;deity@eskil.dk&gt;"), </div><div class='del'>-		NULL};</div><div class='del'>-  </div><div class='del'>-	about = gnome_about_new (</div><div class='del'>-		_("Evolution Addressbook Conduit"), VERSION,</div><div class='del'>-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),</div><div class='del'>-		authors,</div><div class='del'>-		_("Configuration utility for the evolution addressbook 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'>-</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'>-</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_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'>-</div><div class='del'>-static void</div><div class='del'>-setStateCfg (GtkWidget *w, EAddrConduitCfg *c)</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(w), "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'>-	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) c-&gt;sync_type);</div><div class='del'>-	ignore_changes = FALSE;</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), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "help",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doHelp), 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'>-</div><div class='del'>-static void </div><div class='del'>-run_error_dialog(gchar *mesg,...) </div><div class='del'>-{</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'>-</div><div class='del'>-static gint </div><div class='del'>-get_pilot_id_from_gpilotd() </div><div class='del'>-{</div><div class='del'>-	GList *pilots=NULL;</div><div class='del'>-	gint pilot;</div><div class='del'>-	int i,err;</div><div class='del'>-  </div><div class='del'>-	i=0;</div><div class='del'>-	/* we don't worry about leaking here, so pilots isn't freed */</div><div class='del'>-	switch(err = gnome_pilot_client_get_pilots(gpc,&amp;pilots)) {</div><div class='del'>-	case GPILOTD_OK: {</div><div class='del'>-		if(pilots) {</div><div class='del'>-			for(i=0;i&lt;g_list_length(pilots);i++) {</div><div class='del'>-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)-&gt;data); </div><div class='del'>-			}</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'>-				gnome_pilot_client_get_pilot_id_by_name(gpc,</div><div class='del'>-									pilots-&gt;data,  /* this is the first pilot */</div><div class='del'>-									&amp;pilot);</div><div class='del'>-				if(i&gt;1) {</div><div class='del'>-					g_message("too many pilots...");</div><div class='del'>-					/* need a choose here */</div><div class='del'>-				}</div><div class='del'>-				return pilot;</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'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case GPILOTD_ERR_NOT_CONNECTED:</div><div class='del'>-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));</div><div class='del'>-		return -1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);</div><div class='del'>-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));</div><div class='del'>-		return -1;</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'>-int</div><div class='del'>-main (int argc, char *argv[])</div><div class='del'>-{</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'>-	/* Init capplet */</div><div class='del'>-	gnome_capplet_init ("Evolution Address conduit control applet", </div><div class='del'>-			    NULL, argc, argv, </div><div class='del'>-			    NULL, 0, NULL);</div><div class='del'>-   </div><div class='del'>-	/* Setup Client */</div><div class='del'>-	gpc = gnome_pilot_client_new ();</div><div class='del'>-	gnome_pilot_client_connect_to_daemon (gpc);</div><div class='del'>-	pilotId = get_pilot_id_from_gpilotd ();</div><div class='del'>-	if (!pilotId) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	/* Put all code to set things up in here */</div><div class='del'>-	conduit = gnome_pilot_conduit_management_new ("e_address_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);</div><div class='del'>-	if (conduit == NULL) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	addrconduit_load_configuration (&amp;origState, pilotId);</div><div class='del'>-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);</div><div class='del'>-	org_activation_state = activated =</div><div class='del'>-		gnome_pilot_conduit_config_is_enabled (conduit_config,</div><div class='del'>-						       &amp;origState-&gt;sync_type);</div><div class='del'>-</div><div class='del'>-	curState = addrconduit_dupe_configuration (origState);</div><div class='del'>-    </div><div class='del'>-	pilot_capplet_setup ();</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'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-	gnome_pilot_conduit_management_destroy (conduit);</div><div class='del'>-	addrconduit_destroy_configuration (&amp;origState);</div><div class='del'>-	addrconduit_destroy_configuration (&amp;curState);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}    </div><div class='head'>diff --git a/addressbook/conduit/address-conduit.c b/addressbook/conduit/address-conduit.c<br/>deleted file mode 100644<br/>index 048422cb7b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/address-conduit.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/conduit/address-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,959 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution addressbook - Address Conduit</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Eskil Heyn Olsen &lt;deity@eskil.dk&gt; </div><div class='del'>- *          JP Rosevear &lt;jpr@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;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'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;pi-source.h&gt;</div><div class='del'>-#include &lt;pi-socket.h&gt;</div><div class='del'>-#include &lt;pi-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'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-cursor.h&gt;</div><div class='del'>-#include &lt;ebook/e-card.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-simple.h&gt;</div><div class='del'>-</div><div class='del'>-#define ADDR_CONFIG_LOAD 1</div><div class='del'>-#define ADDR_CONFIG_DESTROY 1</div><div class='del'>-#include &lt;address-conduit-config.h&gt;</div><div class='del'>-#undef ADDR_CONFIG_LOAD</div><div class='del'>-#undef ADDR_CONFIG_DESTROY</div><div class='del'>-</div><div class='del'>-#include &lt;address-conduit.h&gt;</div><div class='del'>-</div><div class='del'>-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);</div><div class='del'>-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);</div><div class='del'>-</div><div class='del'>-#define CONDUIT_VERSION "0.1.0"</div><div class='del'>-#ifdef G_LOG_DOMAIN</div><div class='del'>-#undef G_LOG_DOMAIN</div><div class='del'>-#endif</div><div class='del'>-#define G_LOG_DOMAIN "eaddrconduit"</div><div class='del'>-</div><div class='del'>-#define DEBUG_CONDUIT 1</div><div class='del'>-/* #undef DEBUG_CONDUIT */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_CONDUIT</div><div class='del'>-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-#else</div><div class='del'>-#define LOG(e...)</div><div class='del'>-#endif </div><div class='del'>-</div><div class='del'>-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)</div><div class='del'>-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBookStatus status;</div><div class='del'>-	char *id;</div><div class='del'>-} add_card_cons;</div><div class='del'>-</div><div class='del'>-/* debug spew DELETE ME */</div><div class='del'>-static char *</div><div class='del'>-print_local (EAddrLocalRecord *local)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-</div><div class='del'>-	if (local == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-/*  	if (local-&gt;addr &amp;&amp; local-&gt;addr-&gt;description) { */</div><div class='del'>-/*  		sprintf (buff, "[%d %ld %d %d '%s' '%s']", */</div><div class='del'>-/*  			 local-&gt;todo-&gt;indefinite, */</div><div class='del'>-/*  			 mktime (&amp; local-&gt;todo-&gt;due), */</div><div class='del'>-/*  			 local-&gt;todo-&gt;priority, */</div><div class='del'>-/*  			 local-&gt;todo-&gt;complete, */</div><div class='del'>-/*  			 local-&gt;todo-&gt;description, */</div><div class='del'>-/*  			 local-&gt;todo-&gt;note); */</div><div class='del'>-/*  		return buff; */</div><div class='del'>-/*  	} */</div><div class='del'>-</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* debug spew DELETE ME */</div><div class='del'>-static char *print_remote (GnomePilotRecord *remote)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-	struct Address addr;</div><div class='del'>-</div><div class='del'>-	if (remote == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset (&amp;addr, 0, sizeof (struct Address));</div><div class='del'>-	unpack_Address (&amp;addr, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	sprintf (buff, "Hi");</div><div class='del'>-/*  	sprintf (buff, "[%d %ld %d %d '%s' '%s']", */</div><div class='del'>-/*  		 todo.indefinite, */</div><div class='del'>-/*  		 mktime (&amp; todo.due), */</div><div class='del'>-/*  		 todo.priority, */</div><div class='del'>-/*  		 todo.complete, */</div><div class='del'>-/*  		 todo.description, */</div><div class='del'>-/*  		 todo.note); */</div><div class='del'>-</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Context Routines */</div><div class='del'>-static void</div><div class='del'>-e_addr_context_new (EAddrConduitContext **ctxt, guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	*ctxt = g_new0 (EAddrConduitContext,1);</div><div class='del'>-	g_assert (ctxt!=NULL);</div><div class='del'>-</div><div class='del'>-	addrconduit_load_configuration (&amp;(*ctxt)-&gt;cfg, pilot_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addr_context_destroy (EAddrConduitContext **ctxt)</div><div class='del'>-{</div><div class='del'>-	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'>-		addrconduit_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'>-</div><div class='del'>-/* Addressbok Server routines */</div><div class='del'>-static void</div><div class='del'>-add_card_cb (EBook *ebook, EBookStatus status, const char *id, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	add_card_cons *cons = (add_card_cons*)closure;</div><div class='del'>-</div><div class='del'>-	cons-&gt;status = status;</div><div class='del'>-	cons-&gt;id = g_strdup (id);</div><div class='del'>-</div><div class='del'>-	gtk_main_quit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-status_cb (EBook *ebook, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	(*(EBookStatus*)closure) = status;</div><div class='del'>-	gtk_main_quit();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cursor_cb (EBook *book, EBookStatus status, ECardCursor *cursor, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		long length;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		ctxt-&gt;address_load_success = TRUE;</div><div class='del'>-</div><div class='del'>-		length = e_card_cursor_get_length (cursor);</div><div class='del'>-		ctxt-&gt;cards = NULL;</div><div class='del'>-		for (i = 0; i &lt; length; i ++)</div><div class='del'>-			ctxt-&gt;cards = g_list_append (ctxt-&gt;cards, e_card_cursor_get_nth (cursor, i));</div><div class='del'>-</div><div class='del'>-		gtk_main_quit(); /* end the sub event loop */</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		WARN (_("Cursor could not be loaded\n"));</div><div class='del'>-		gtk_main_quit(); /* end the sub event loop */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddrConduitContext *ctxt = (EAddrConduitContext*)closure;</div><div class='del'>-</div><div class='del'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		e_book_get_cursor (book, "(contains \"full_name\" \"\")", cursor_cb, ctxt);</div><div class='del'>-	} else {</div><div class='del'>-		WARN (_("EBook not loaded\n"));</div><div class='del'>-		gtk_main_quit(); /* end the sub event loop */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-start_addressbook_server (EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gchar *uri, *path;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(ctxt!=NULL,-2);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;ebook = e_book_new ();</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-				      "evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	e_book_load_uri (ctxt-&gt;ebook, uri, book_open_cb, ctxt);</div><div class='del'>-</div><div class='del'>-	/* run a sub event loop to turn ebook's async loading into a</div><div class='del'>-           synchronous call */</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	g_free (uri);</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;address_load_success)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Utility routines */</div><div class='del'>-static char *</div><div class='del'>-map_name (EAddrConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *filename = NULL;</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/evolution/local/Contacts/pilot-map-%d.xml", g_get_home_dir (), ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-compute_status (EAddrConduitContext *ctxt, EAddrLocalRecord *local, const char *uid)</div><div class='del'>-{</div><div class='del'>-	local-&gt;local.archived = FALSE;</div><div class='del'>-	local-&gt;local.secret = FALSE;</div><div class='del'>-	local-&gt;local.attr = GnomePilotRecordNothing;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomePilotRecord *</div><div class='del'>-local_record_to_pilot_record (EAddrLocalRecord *local,</div><div class='del'>-			      EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotRecord *p = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, NULL);</div><div class='del'>-	g_assert (local-&gt;addr != NULL );</div><div class='del'>-	</div><div class='del'>-	LOG ("local_record_to_remote_record\n");</div><div class='del'>-</div><div class='del'>-	p = g_new0 (GnomePilotRecord, 1);</div><div class='del'>-</div><div class='del'>-	p-&gt;ID = local-&gt;local.ID;</div><div class='del'>-	p-&gt;category = 0;</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'>-	/* Generate pilot record structure */</div><div class='del'>-	p-&gt;record = g_new0 (char,0xffff);</div><div class='del'>-	p-&gt;length = pack_Address (local-&gt;addr, p-&gt;record, 0xffff);</div><div class='del'>-</div><div class='del'>-	return p;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-local_record_from_ecard (EAddrLocalRecord *local, ECard *ecard, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	const ECardDeliveryAddress *delivery;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (local != NULL);</div><div class='del'>-	g_return_if_fail (ecard != NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;ecard = ecard;</div><div class='del'>-	simple = e_card_simple_new (ecard);</div><div class='del'>-	</div><div class='del'>-	local-&gt;local.ID = e_pilot_map_lookup_pid (ctxt-&gt;map, ecard-&gt;id);</div><div class='del'>-</div><div class='del'>-	compute_status (ctxt, local, ecard-&gt;id);</div><div class='del'>-</div><div class='del'>-	local-&gt;addr = g_new0 (struct Address, 1);</div><div class='del'>-</div><div class='del'>-	local-&gt;addr-&gt;entry[entryFirstname] = strdup (ecard-&gt;name-&gt;given);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryLastname] = strdup (ecard-&gt;name-&gt;family);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryCompany] = strdup (ecard-&gt;org);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryTitle] = strdup (ecard-&gt;title);</div><div class='del'>-</div><div class='del'>-	delivery = e_card_simple_get_delivery_address (simple, E_CARD_SIMPLE_ADDRESS_ID_HOME);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryAddress] = strdup (delivery-&gt;street);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryCity] = strdup (delivery-&gt;city);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryState] = strdup (delivery-&gt;region);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryZip] = strdup (delivery-&gt;code);</div><div class='del'>-	local-&gt;addr-&gt;entry[entryCountry] = strdup (delivery-&gt;country);</div><div class='del'>-</div><div class='del'>-	/* FIX ME Phone numbers */</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-local_record_from_uid (EAddrLocalRecord *local,</div><div class='del'>-		       char *uid,</div><div class='del'>-		       EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECard *ecard;</div><div class='del'>-</div><div class='del'>-	g_assert(local!=NULL);</div><div class='del'>-</div><div class='del'>-	ecard = e_book_get_card (ctxt-&gt;ebook, uid);</div><div class='del'>-</div><div class='del'>-	if (ecard != NULL) {</div><div class='del'>-		local_record_from_ecard (local, ecard, ctxt);</div><div class='del'>-	} else {</div><div class='del'>-		ecard = e_card_new (NULL);</div><div class='del'>-		local_record_from_ecard (local, ecard, ctxt);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ECard *</div><div class='del'>-ecard_from_remote_record(EAddrConduitContext *ctxt,</div><div class='del'>-			 GnomePilotRecord *remote,</div><div class='del'>-			 ECard *in_card)</div><div class='del'>-{</div><div class='del'>-	struct Address address;</div><div class='del'>-	ECard *ecard;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	int i;</div><div class='del'>-	char *string;</div><div class='del'>-	char *stringparts[4];</div><div class='del'>-	char *commaparts[3];</div><div class='del'>-	char *spaceparts[3];</div><div class='del'>-	char *commastring, *spacestring;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(remote!=NULL,NULL);</div><div class='del'>-	memset (&amp;address, 0, sizeof (struct Address));</div><div class='del'>-	unpack_Address (&amp;address, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	if (in_card == NULL) {</div><div class='del'>-		ecard = e_card_new("");</div><div class='del'>-	} else {</div><div class='del'>-		ecard = e_card_duplicate (in_card);</div><div class='del'>-	}</div><div class='del'>-	simple = e_card_simple_new (ecard);</div><div class='del'>-</div><div class='del'>-#define get(pilotprop) \</div><div class='del'>-        (address.entry [(pilotprop)])</div><div class='del'>-#define check(pilotprop) \</div><div class='del'>-        (address.entry [(pilotprop)] &amp;&amp; *address.entry [(pilotprop)])</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	if (check(entryFirstname))</div><div class='del'>-		stringparts[i++] = get(entryFirstname);</div><div class='del'>-	if (check(entryLastname))</div><div class='del'>-		stringparts[i++] = get(entryLastname);</div><div class='del'>-	stringparts[i] = NULL;</div><div class='del'>-	string = g_strjoinv(" ", stringparts);</div><div class='del'>-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_FULL_NAME, string);</div><div class='del'>-	g_free(string);</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	if (check (entryAddress))</div><div class='del'>-		spaceparts[i++] = get (entryAddress);</div><div class='del'>-	if (check (entryZip))</div><div class='del'>-		spaceparts[i++] = get (entryZip);</div><div class='del'>-	spaceparts[i] = 0;</div><div class='del'>-	spacestring = g_strjoinv(" ", spaceparts);</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	if (check (entryCity))</div><div class='del'>-		commaparts[i++] = get (entryCity);</div><div class='del'>-	if (spacestring &amp;&amp; *spacestring)</div><div class='del'>-		commaparts[i++] = spacestring;</div><div class='del'>-	commaparts[i] = 0;</div><div class='del'>-	commastring = g_strjoinv(", ", commaparts);</div><div class='del'>-</div><div class='del'>-	i = 0;</div><div class='del'>-	if (check (entryAddress))</div><div class='del'>-		stringparts[i++] = get (entryAddress);</div><div class='del'>-	if (commastring &amp;&amp; *commastring)</div><div class='del'>-		stringparts[i++] = commastring;</div><div class='del'>-	if (check (entryCountry))</div><div class='del'>-		stringparts[i++] = get (entryCountry);</div><div class='del'>-	stringparts[i] = NULL;</div><div class='del'>-	string = g_strjoinv("\n", stringparts);</div><div class='del'>-	e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ADDRESS_HOME, string);</div><div class='del'>-</div><div class='del'>-	g_free(spacestring);</div><div class='del'>-	g_free(commastring);</div><div class='del'>-	g_free(string);</div><div class='del'>-</div><div class='del'>-	if (check (entryTitle))</div><div class='del'>-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_TITLE, get (entryTitle));</div><div class='del'>-</div><div class='del'>-	if (check (entryCompany))</div><div class='del'>-		e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_ORG, get (entryCompany));</div><div class='del'>-</div><div class='del'>-	for (i = entryPhone1; i &lt;= entryPhone5; i ++) {</div><div class='del'>-		if (address.entry [i] &amp;&amp; *(address.entry [i])) {</div><div class='del'>-			char *phonelabel = ctxt-&gt;ai.phoneLabels[address.phoneLabel[i - entryPhone1]];</div><div class='del'>-			if (!strcmp (phonelabel, "E-mail"))</div><div class='del'>-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_EMAIL, address.entry[i]);</div><div class='del'>-			else if (!strcmp (phonelabel, "Home"))</div><div class='del'>-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_HOME, address.entry[i]);</div><div class='del'>-			else if (!strcmp (phonelabel, "Work"))</div><div class='del'>-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS, address.entry[i]);</div><div class='del'>-			else if (!strcmp (phonelabel, "Fax"))</div><div class='del'>-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_FAX, address.entry[i]);</div><div class='del'>-			else if (!strcmp (phonelabel, "Other"))</div><div class='del'>-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_OTHER, address.entry[i]);</div><div class='del'>-			else if (!strcmp (phonelabel, "Main"))</div><div class='del'>-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PRIMARY, address.entry[i]);</div><div class='del'>-			else if (!strcmp (phonelabel, "Pager"))</div><div class='del'>-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_PAGER, address.entry[i]);</div><div class='del'>-			else if (!strcmp (phonelabel, "Mobile"))</div><div class='del'>-				e_card_simple_set(simple, E_CARD_SIMPLE_FIELD_PHONE_MOBILE, address.entry[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#undef get</div><div class='del'>-#undef set</div><div class='del'>-</div><div class='del'>-	free_Address(&amp;address);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-</div><div class='del'>-	return ecard;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-check_for_slow_setting (GnomePilotConduit *c, EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	int count, map_count;</div><div class='del'>-</div><div class='del'>-  	count = g_list_length (ctxt-&gt;cards);</div><div class='del'>-	count = 0;</div><div class='del'>-</div><div class='del'>-	map_count = g_hash_table_size (ctxt-&gt;map-&gt;pid_map);</div><div class='del'>-	</div><div class='del'>-  	/* If there are no objects or objects but no log */</div><div class='del'>-	if ((count == 0) || (count &gt; 0 &amp;&amp; map_count == 0)) {</div><div class='del'>-		GnomePilotConduitStandard *conduit;</div><div class='del'>-		LOG ("    doing slow sync\n");</div><div class='del'>-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit);</div><div class='del'>-	} else {</div><div class='del'>-		LOG ("    doing fast sync\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot syncing callbacks */</div><div class='del'>-static gint</div><div class='del'>-pre_sync (GnomePilotConduit *conduit,</div><div class='del'>-	  GnomePilotDBInfo *dbi,</div><div class='del'>-	  EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitSyncAbs *abs_conduit;</div><div class='del'>-/*    	GList *l; */</div><div class='del'>-	int len;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-	char *filename;</div><div class='del'>-/*  	gint num_records; */</div><div class='del'>-</div><div class='del'>-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);</div><div class='del'>-</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-	LOG ("pre_sync: Addressbook Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-	g_message ("Addressbook Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;ebook = NULL;</div><div class='del'>-	</div><div class='del'>-	if (start_addressbook_server (ctxt) != 0) {</div><div class='del'>-		WARN(_("Could not start wombat server"));</div><div class='del'>-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Load the uid &lt;--&gt; pilot id mappings */</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_read (filename, &amp;ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* Set the count information */</div><div class='del'>-/*  	num_records = cal_client_get_n_objects (ctxt-&gt;client, CALOBJ_TYPE_TODO); */</div><div class='del'>-/*  	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records); */</div><div class='del'>-/*  	num_records = g_hash_table_size (ctxt-&gt;added); */</div><div class='del'>-/*  	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, num_records); */</div><div class='del'>-/*  	num_records = g_hash_table_size (ctxt-&gt;modified); */</div><div class='del'>-/*  	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, num_records); */</div><div class='del'>-/*  	num_records = g_hash_table_size (ctxt-&gt;deleted); */</div><div class='del'>-/*  	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, num_records); */</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);</div><div class='del'>-</div><div class='del'>-	buf = (unsigned char*)g_malloc (0xffff);</div><div class='del'>-	len = dlp_ReadAppBlock (dbi-&gt;pilot_socket, dbi-&gt;db_handle, 0,</div><div class='del'>-			      (unsigned char *)buf, 0xffff);</div><div class='del'>-	</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		WARN (_("Could not read pilot's Address application block"));</div><div class='del'>-		WARN ("dlp_ReadAppBlock(...) = %d", len);</div><div class='del'>-		gnome_pilot_conduit_error (conduit,</div><div class='del'>-					   _("Could not read pilot's Address application block"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	unpack_AddressAppInfo (&amp;(ctxt-&gt;ai), buf, len);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-  	check_for_slow_setting (conduit, ctxt);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-post_sync (GnomePilotConduit *conduit,</div><div class='del'>-	   GnomePilotDBInfo *dbi,</div><div class='del'>-	   EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gchar *filename;</div><div class='del'>-	</div><div class='del'>-	LOG ("post_sync: Address Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_write (filename, ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_pilot_id (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      EAddrLocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("set_pilot_id: setting to %d\n", ID);</div><div class='del'>-	</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, ID, local-&gt;ecard-&gt;id, FALSE);</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_status_cleared (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		    EAddrLocalRecord *local,</div><div class='del'>-		    EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("set_status_cleared: clearing status\n");</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	  EAddrLocalRecord **local,</div><div class='del'>-	  EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-  	static GList *cards, *iterator;</div><div class='del'>-  	static int count;</div><div class='del'>-</div><div class='del'>-  	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("beginning for_each");</div><div class='del'>-</div><div class='del'>-		cards = ctxt-&gt;cards;</div><div class='del'>-		count = 0;</div><div class='del'>-		</div><div class='del'>-		if (cards != NULL) {</div><div class='del'>-			LOG ("iterating over %d records", g_list_length (cards));</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EAddrLocalRecord, 1);</div><div class='del'>-/*  			local_record_from_uid (*local, uids-&gt;data, ctxt) */;</div><div class='del'>-</div><div class='del'>-			iterator = cards;</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		if (g_list_next (iterator)) {</div><div class='del'>-			iterator = g_list_next (iterator);</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EAddrLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, iterator-&gt;data, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each ending");</div><div class='del'>-</div><div class='del'>-  			/* Tell the pilot the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each_modified (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		   EAddrLocalRecord **local,</div><div class='del'>-		   EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-/*  	static GList *changes, *iterator; */</div><div class='del'>-/*  	static int count; */</div><div class='del'>-</div><div class='del'>-/*  	g_return_val_if_fail (local != NULL, 0); */</div><div class='del'>-</div><div class='del'>-/*  	if (*local == NULL) { */</div><div class='del'>-/*  		LOG ("beginning for_each_modified: beginning\n"); */</div><div class='del'>-		</div><div class='del'>-/*  		changes = ctxt-&gt;changed; */</div><div class='del'>-		</div><div class='del'>-/*  		count = 0; */</div><div class='del'>-		</div><div class='del'>-/*  		if (changes != NULL) { */</div><div class='del'>-/*  			CalObjChange *coc = changes-&gt;data; */</div><div class='del'>-			</div><div class='del'>-/*  			LOG ("iterating over %d records", g_list_length (changes)); */</div><div class='del'>-			 </div><div class='del'>-/*  			*local = g_new0 (EAddrLocalRecord, 1); */</div><div class='del'>-/*  			local_record_from_uid (*local, coc-&gt;uid, ctxt); */</div><div class='del'>-</div><div class='del'>-/*  			iterator = changes; */</div><div class='del'>-/*  		} else { */</div><div class='del'>-/*  			LOG ("no events"); */</div><div class='del'>-/*  			(*local) = NULL; */</div><div class='del'>-/*  			return 0; */</div><div class='del'>-/*  		} */</div><div class='del'>-/*  	} else { */</div><div class='del'>-/*  		count++; */</div><div class='del'>-/*  		if (g_list_next (iterator)) { */</div><div class='del'>-/*  			CalObjChange *coc; */</div><div class='del'>-</div><div class='del'>-/*  			iterator = g_list_next (iterator); */</div><div class='del'>-/*  			coc = iterator-&gt;data; */</div><div class='del'>-</div><div class='del'>-/*  			*local = g_new0 (EAddrLocalRecord, 1); */</div><div class='del'>-/*  			local_record_from_uid (*local, coc-&gt;uid, ctxt); */</div><div class='del'>-/*  		} else { */</div><div class='del'>-/*  			LOG ("for_each_modified ending"); */</div><div class='del'>-</div><div class='del'>-    			/* Tell the pilot the iteration is over */</div><div class='del'>-/*  			(*local) = NULL; */</div><div class='del'>-</div><div class='del'>-/*  			return 0; */</div><div class='del'>-/*  		} */</div><div class='del'>-/*  	} */</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 EAddrLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	/* used by the quick compare */</div><div class='del'>-	GnomePilotRecord *local_pilot = NULL;</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	LOG ("compare: local=%s remote=%s...\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local!=NULL,-1);</div><div class='del'>-	g_return_val_if_fail (remote!=NULL,-1);</div><div class='del'>-</div><div class='del'>-/*  	local_pilot = local_record_to_pilot_record (local, ctxt); */</div><div class='del'>-	if (!local_pilot) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;length != local_pilot-&gt;length</div><div class='del'>-	    || memcmp (local_pilot-&gt;record, remote-&gt;record, remote-&gt;length))</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		LOG ("    equal");</div><div class='del'>-	else</div><div class='del'>-		LOG ("    not equal");</div><div class='del'>-	</div><div class='del'>-	g_free (local_pilot);</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-add_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    GnomePilotRecord *remote,</div><div class='del'>-	    EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECard *ecard;</div><div class='del'>-	add_card_cons cons;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));</div><div class='del'>-</div><div class='del'>-	ecard = ecard_from_remote_record (ctxt, remote, NULL);</div><div class='del'>-</div><div class='del'>-	/* add the ecard to the server */</div><div class='del'>-	e_book_add_card (ctxt-&gt;ebook, ecard, add_card_cb, &amp;cons);</div><div class='del'>-</div><div class='del'>-	gtk_main(); /* enter sub mainloop */</div><div class='del'>-	</div><div class='del'>-	if (cons.status != E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		WARN ("add_record: failed to add card to ebook\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;cards = g_list_append (ctxt-&gt;cards,</div><div class='del'>-				     e_book_get_card (ctxt-&gt;ebook, cons.id));</div><div class='del'>-	g_free (cons.id);</div><div class='del'>-</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, remote-&gt;ID, ecard-&gt;id, FALSE);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-replace_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		EAddrLocalRecord *local,</div><div class='del'>-		GnomePilotRecord *remote,</div><div class='del'>-		EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECard *new_ecard;</div><div class='del'>-	EBookStatus commit_status;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("replace_record: replace %s with %s\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	new_ecard = ecard_from_remote_record (ctxt, remote, local-&gt;ecard);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;ecard));</div><div class='del'>-	local-&gt;ecard = new_ecard;</div><div class='del'>-</div><div class='del'>-	e_book_commit_card (ctxt-&gt;ebook, local-&gt;ecard, status_cb, &amp;commit_status);</div><div class='del'>-	</div><div class='del'>-	gtk_main (); /* enter sub mainloop */</div><div class='del'>-	</div><div class='del'>-	if (commit_status != E_BOOK_STATUS_SUCCESS)</div><div class='del'>-		WARN ("replace_record: failed to update card in ebook\n");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (new_ecard));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	       EAddrLocalRecord *local,</div><div class='del'>-	       EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-/*  	const char *uid; */</div><div class='del'>-</div><div class='del'>-/*  	g_return_val_if_fail (local != NULL, -1); */</div><div class='del'>-/*  	g_assert (local-&gt;comp != NULL); */</div><div class='del'>-</div><div class='del'>-/*  	cal_component_get_uid (local-&gt;comp, &amp;uid); */</div><div class='del'>-</div><div class='del'>-/*  	LOG ("delete_record: deleting %s\n", uid); */</div><div class='del'>-</div><div class='del'>-/*  	cal_client_remove_object (ctxt-&gt;client, uid); */</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-archive_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		EAddrLocalRecord *local,</div><div class='del'>-		gboolean archive,</div><div class='del'>-		EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("archive_record: %s\n", archive ? "yes" : "no");</div><div class='del'>-	</div><div class='del'>-        return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-       GnomePilotRecord *remote,</div><div class='del'>-       EAddrLocalRecord **local,</div><div class='del'>-       EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-/*  	char *uid; */</div><div class='del'>-	</div><div class='del'>-	LOG ("match: looking for local copy of %s\n",</div><div class='del'>-	     print_remote (remote));	</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-/*  	*local = NULL; */</div><div class='del'>-/*  	uid = g_hash_table_lookup (ctxt-&gt;map-&gt;pid_map, &amp;remote-&gt;ID); */</div><div class='del'>-	</div><div class='del'>-/*  	if (!uid) */</div><div class='del'>-/*  		return 0; */</div><div class='del'>-</div><div class='del'>-/*  	LOG ("  matched\n"); */</div><div class='del'>-	</div><div class='del'>-/*  	*local = g_new0 (EAddrLocalRecord, 1); */</div><div class='del'>-/*  	local_record_from_uid (*local, uid, ctxt); */</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-free_match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    EAddrLocalRecord *local,</div><div class='del'>-	    EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_match: freeing\n");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-/*  	gtk_object_unref (GTK_OBJECT (local-&gt;comp)); */</div><div class='del'>-	g_free (local);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 EAddrLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord **remote,</div><div class='del'>-	 EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("prepare: encoding local %s\n", print_local (local));</div><div class='del'>-</div><div class='del'>-/*  	*remote = local_record_to_pilot_record (local, ctxt); */</div><div class='del'>-</div><div class='del'>-/*  	if (!*remote) */</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'>-free_prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      EAddrLocalRecord *local,</div><div class='del'>-	      GnomePilotRecord **remote,</div><div class='del'>-	      EAddrConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_prepare: freeing\n");</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'>-	g_free (*remote);</div><div class='del'>-	*remote = NULL;</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ORBit_MessageValidationResult</div><div class='del'>-accept_all_cookies (CORBA_unsigned_long request_id,</div><div class='del'>-		    CORBA_Principal *principal,</div><div class='del'>-		    CORBA_char *operation)</div><div class='del'>-{</div><div class='del'>-	/* allow ALL cookies */</div><div class='del'>-	return ORBIT_MESSAGE_ALLOW_ALL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilot_id)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	EAddrConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	LOG ("in address's conduit_get_gpilot_conduit\n");</div><div class='del'>-</div><div class='del'>-	/* we need to find wombat with oaf, so make sure oaf</div><div class='del'>-	   is initialized here.  once the desktop is converted</div><div class='del'>-	   to oaf and gpilotd is built with oaf, this can go away */</div><div class='del'>-	if (!oaf_is_initialized ()) {</div><div class='del'>-		char *argv[ 1 ] = {"hi"};</div><div class='del'>-		oaf_init (1, argv);</div><div class='del'>-</div><div class='del'>-		if (bonobo_init (CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-			g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-		ORBit_set_request_validation_handler (accept_all_cookies);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = gnome_pilot_conduit_sync_abs_new ("AddressDB", 0x61646472);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-</div><div class='del'>-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),</div><div class='del'>-				       "e_addr_conduit");</div><div class='del'>-</div><div class='del'>-	e_addr_context_new (&amp;ctxt, pilot_id);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (retval), "addrconduit_context", ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, ctxt);</div><div class='del'>-</div><div class='del'>-	return GNOME_PILOT_CONDUIT (retval);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-conduit_destroy_gpilot_conduit (GnomePilotConduit *conduit)</div><div class='del'>-{ </div><div class='del'>-	EAddrConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), </div><div class='del'>-				    "addrconduit_context");</div><div class='del'>-</div><div class='del'>-	e_addr_context_destroy (&amp;ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (conduit));</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/conduit/address-conduit.h b/addressbook/conduit/address-conduit.h<br/>deleted file mode 100644<br/>index 141ec1b53c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/address-conduit.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/conduit/address-conduit.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'>-/* Evolution calendar - ToDo Conduit Capplet</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</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'>- *          JP Rosevear &lt;jpr@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 __ADDR_CONDUIT_H__</div><div class='del'>-#define __ADDR_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-address.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-sync-abs.h&gt;</div><div class='del'>-#include &lt;e-pilot-map.h&gt;</div><div class='del'>-</div><div class='del'>-/* This is the local record structure for the Evolution ToDo conduit. */</div><div class='del'>-typedef struct _EAddrLocalRecord EAddrLocalRecord;</div><div class='del'>-struct _EAddrLocalRecord {</div><div class='del'>-	/* The stuff from gnome-pilot-conduit-standard-abs.h</div><div class='del'>-	   Must be first in the structure, or instances of this</div><div class='del'>-	   structure cannot be used by gnome-pilot-conduit-standard-abs.</div><div class='del'>-	*/</div><div class='del'>-	GnomePilotDesktopRecord local;</div><div class='del'>-</div><div class='del'>-	/* The corresponding ECard object */</div><div class='del'>-	ECard *ecard;</div><div class='del'>-</div><div class='del'>-        /* pilot-link todo structure, used for implementing Transmit. */</div><div class='del'>-	struct Address *addr;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is the context for all the GnomeCal conduit methods. */</div><div class='del'>-typedef struct _EAddrConduitContext EAddrConduitContext;</div><div class='del'>-struct _EAddrConduitContext {</div><div class='del'>-	EAddrConduitCfg *cfg;</div><div class='del'>-</div><div class='del'>-	struct AddressAppInfo ai;</div><div class='del'>-</div><div class='del'>-	EBook *ebook;</div><div class='del'>-	GList *cards;</div><div class='del'>-	</div><div class='del'>-	gboolean address_load_tried;</div><div class='del'>-	gboolean address_load_success;</div><div class='del'>-</div><div class='del'>-	EPilotMap *map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif __ADDR_CONDUIT_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='head'>diff --git a/addressbook/conduit/e-address-conduit-control-applet.desktop b/addressbook/conduit/e-address-conduit-control-applet.desktop<br/>deleted file mode 100644<br/>index 25b4c591f6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/e-address-conduit-control-applet.desktop?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/conduit/e-address-conduit-control-applet.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Evolution Address conduit </div><div class='del'>-Name[da]=Udstående</div><div class='del'>-Name[es]=Enlace del libro de direcciones de Evolution</div><div class='del'>-Name[fr]=Conduit Adresses</div><div class='del'>-Name[no]=Oppgaver</div><div class='del'>-Name[sv]=Adresser</div><div class='del'>-Name[tr]=Adres parçasý</div><div class='del'>-Comment=Configure the address conduit</div><div class='del'>-Comment[da]=Konfigurér Udstående</div><div class='del'>-Comment[es]=Configura el enlace del libro de direcciones</div><div class='del'>-Comment[fr]=Configuration du conduit Adresses</div><div class='del'>-Comment[no]=Konfigurér oppgavelisten</div><div class='del'>-Comment[sv]=Konfigurera adresskanalen</div><div class='del'>-Comment[tr]=Adres parçasýnýn ayarlarý</div><div class='del'>-Exec=e-address-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/addressbook/conduit/e-address.conduit.in b/addressbook/conduit/e-address.conduit.in<br/>deleted file mode 100644<br/>index 1aa78a180e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/conduit/e-address.conduit.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/conduit/e-address.conduit.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-&lt;gnome-pilot-conduit version="1.0"&gt;</div><div class='del'>-&lt;conduit id="e_address_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libeaddress_conduit.so"/&gt;</div><div class='del'>-&lt;name value="EAddress"/&gt;</div><div class='del'>-&lt;conduit-attribute name="description" value="Synchronizes Addressbook with Evolution"/&gt;</div><div class='del'>-&lt;conduit-attribute name="default-synctype" value="synchronize"/&gt;</div><div class='del'>-&lt;conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/&gt;</div><div class='del'>-&lt;conduit-attribute name="settings" value="TRUE"/&gt;</div><div class='del'>-&lt;/gnome-pilot-conduit&gt;</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 1016d38301..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	$(BONOBO_GNOME_CFLAGS)			\</div><div class='del'>-	$(EXTRA_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'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\</div><div class='del'>-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"contact-editor\"</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libecontacteditor.a</div><div class='del'>-</div><div class='del'>-libecontacteditor_a_SOURCES = 			\</div><div class='del'>-	e-contact-editor-address.c		\</div><div class='del'>-	e-contact-editor-address.h		\</div><div class='del'>-	e-contact-editor-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/printing/libecontactprint.a	\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\</div><div class='del'>-	$(top_builddir)/e-util/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/misc/libemiscwidgets.a \</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la			\</div><div class='del'>-	$(GNOME_PRINT_LIBS)					\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-evolutiondir = $(datadir)/evolution</div><div class='del'>-</div><div class='del'>-evolution_DATA = arrow.png</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA = 				\</div><div class='del'>-	contact-editor.glade		\</div><div class='del'>-	fulladdr.glade			\</div><div class='del'>-	fullname.glade			\</div><div class='del'>-	categories.glade		\</div><div class='del'>-	e-contact-editor-confirm-delete.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(evolution_DATA)		\</div><div class='del'>-	$(glade_DATA)			\</div><div class='del'>-	e-contact-editor-strings.h	\</div><div class='del'>-	fulladdr.glade.h		\</div><div class='del'>-	fullname-strings.h		\</div><div class='del'>-	categories-strings.h		\</div><div class='del'>-	e-contact-editor-confirm-delete.glade.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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 5d49fd06ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/contact-editor.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/contact-editor.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2455 +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;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-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;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;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;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;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;table2&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;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;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;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;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;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;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;_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;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;_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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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'>-</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;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;button28&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;button29&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_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;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;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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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'>-</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;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;button43&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;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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;show_tabs&gt;True&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;True&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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;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;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;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;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;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;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&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;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;_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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-email1&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone4&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone2&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone1&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone3&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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;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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-address&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox1&lt;/name&gt;</div><div class='del'>-	  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;/widget&gt;</div><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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;11&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;12&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment-contacts&lt;/name&gt;</div><div class='del'>-	  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button-fulladdr&lt;/name&gt;</div><div class='del'>-	  &lt;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;_Address...&lt;/label&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'>-      &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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	&lt;label&gt;General&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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;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;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;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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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-address.c b/addressbook/contact-editor/e-contact-editor-address.c<br/>deleted file mode 100644<br/>index 7df9cb8cb4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-address.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/e-contact-editor-address.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'>- * e-contact-editor-address.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;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-contact-editor-address.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);</div><div class='del'>-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);</div><div class='del'>-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_address_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void fill_in_info(EContactEditorAddress *editor);</div><div class='del'>-static void extract_info(EContactEditorAddress *editor);</div><div class='del'>-</div><div class='del'>-static GnomeDialogClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_ADDRESS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_editor_address_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType contact_editor_address_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!contact_editor_address_type)</div><div class='del'>-		{</div><div class='del'>-			static const GtkTypeInfo contact_editor_address_info =</div><div class='del'>-			{</div><div class='del'>-				"EContactEditorAddress",</div><div class='del'>-				sizeof (EContactEditorAddress),</div><div class='del'>-				sizeof (EContactEditorAddressClass),</div><div class='del'>-				(GtkClassInitFunc) e_contact_editor_address_class_init,</div><div class='del'>-				(GtkObjectInitFunc) e_contact_editor_address_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-				(GtkClassInitFunc) NULL,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &amp;contact_editor_address_info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return contact_editor_address_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GnomeDialogClass *dialog_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	dialog_class = (GnomeDialogClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_dialog_get_type ());</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_ADDRESS);</div><div class='del'>- </div><div class='del'>-	object_class-&gt;set_arg = e_contact_editor_address_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_contact_editor_address_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_contact_editor_address_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),</div><div class='del'>-				     GNOME_STOCK_BUTTON_OK);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),</div><div class='del'>-				     GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address-&gt;address = NULL;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);</div><div class='del'>-	e_contact_editor_address-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(gui, "table-checkaddress");</div><div class='del'>-	gtk_widget_ref(widget);</div><div class='del'>-	gtk_container_remove(GTK_CONTAINER(widget-&gt;parent), widget);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)-&gt;vbox), widget, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_unref(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_editor_address_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor_address-&gt;gui)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address-&gt;gui));</div><div class='del'>-	e_card_delivery_address_free(e_contact_editor_address-&gt;address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_contact_editor_address_new (const ECardDeliveryAddress *address)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));</div><div class='del'>-	gtk_object_set (GTK_OBJECT(widget),</div><div class='del'>-			"address", address,</div><div class='del'>-			NULL);</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_ADDRESS:</div><div class='del'>-		if (e_contact_editor_address-&gt;address)</div><div class='del'>-			e_card_delivery_address_free(e_contact_editor_address-&gt;address);</div><div class='del'>-		e_contact_editor_address-&gt;address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));</div><div class='del'>-		fill_in_info(e_contact_editor_address);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_ADDRESS:</div><div class='del'>-		extract_info(e_contact_editor_address);</div><div class='del'>-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address-&gt;address);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_field(EContactEditorAddress *editor, char *field, char *string)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (editable) {</div><div class='del'>-		e_utf8_gtk_editable_set_text(editable, string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(EContactEditorAddress *editor)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *address = editor-&gt;address;</div><div class='del'>-	if (address) {</div><div class='del'>-		fill_in_field(editor, "entry-street" , address-&gt;street );</div><div class='del'>-		fill_in_field(editor, "entry-po"     , address-&gt;po     );</div><div class='del'>-		fill_in_field(editor, "entry-ext"    , address-&gt;ext    );</div><div class='del'>-		fill_in_field(editor, "entry-city"   , address-&gt;city   );</div><div class='del'>-		fill_in_field(editor, "entry-region" , address-&gt;region );</div><div class='del'>-		fill_in_field(editor, "entry-code"   , address-&gt;code   );</div><div class='del'>-		fill_in_field(editor, "entry-country", address-&gt;country);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-extract_field(EContactEditorAddress *editor, char *field)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (editable)</div><div class='del'>-		return e_utf8_gtk_editable_get_text(editable);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditorAddress *editor)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *address = editor-&gt;address;</div><div class='del'>-	if (!address) {</div><div class='del'>-		address = e_card_delivery_address_new();</div><div class='del'>-		editor-&gt;address = address;</div><div class='del'>-	}</div><div class='del'>-	address-&gt;street  = extract_field(editor, "entry-street" );</div><div class='del'>-	address-&gt;po      = extract_field(editor, "entry-po"     );</div><div class='del'>-	address-&gt;ext     = extract_field(editor, "entry-ext"    );</div><div class='del'>-	address-&gt;city    = extract_field(editor, "entry-city"   );</div><div class='del'>-	address-&gt;region  = extract_field(editor, "entry-region" );</div><div class='del'>-	address-&gt;code    = extract_field(editor, "entry-code"   );</div><div class='del'>-	address-&gt;country = extract_field(editor, "entry-country");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor-address.h b/addressbook/contact-editor/e-contact-editor-address.h<br/>deleted file mode 100644<br/>index a74e1bd967..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-address.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/e-contact-editor-address.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-address.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_ADDRESS_H__</div><div class='del'>-#define __E_CONTACT_EDITOR_ADDRESS_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'>-/* EContactEditorAddress - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * name         ECardName *     RW              The card currently being edited. Returns a copy.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS_TYPE			(e_contact_editor_address_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress))</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditorAddress       EContactEditorAddress;</div><div class='del'>-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditorAddress</div><div class='del'>-{</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECardDeliveryAddress *address;</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactEditorAddressClass</div><div class='del'>-{</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);</div><div class='del'>-GtkType    e_contact_editor_address_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor-categories.c b/addressbook/contact-editor/e-contact-editor-categories.c<br/>deleted file mode 100644<br/>index 045f128b48..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-categories.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/e-contact-editor-categories.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,452 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</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;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-simple.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.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'>-static char * e_contact_editor_categories_value_to_string (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'>-	e_table_model_pre_change(categories-&gt;model);</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 = e_utf8_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'>-#define INITIAL_SPEC "&lt;ETableSpecification no-headers=\"true\" draw-grid=\"true\" cursor-mode=\"line\"&gt;\</div><div class='del'>-  &lt;ETableColumn model_col=\"0\" _title=\" \" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\"       compare=\"integer\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"1\" _title=\"Category\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-        &lt;ETableState&gt; \</div><div class='del'>-		&lt;column source=\"0\"/&gt;						\</div><div class='del'>-		&lt;column source=\"1\"/&gt;						\</div><div class='del'>-        	&lt;grouping&gt; &lt;leaf column=\"1\" ascending=\"true\"/&gt; &lt;/grouping&gt;	\</div><div class='del'>-        &lt;/ETableState&gt; \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-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'>-	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'>-					       e_contact_editor_categories_value_to_string,</div><div class='del'>-					       categories);</div><div class='del'>-</div><div class='del'>-	e_table = e_table_scrolled_new (categories-&gt;model, NULL, INITIAL_SPEC, NULL);</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'>-		e_utf8_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'>-		e_utf8_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='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_contact_editor_categories_value_to_string (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 g_strdup_printf("%d", (int) value);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup(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 3edff76b4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-categories.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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;gal/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-confirm-delete.glade b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade<br/>deleted file mode 100644<br/>index 7f52321021..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-confirm-delete.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/e-contact-editor-confirm-delete.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-contact-editor-confirm-delete&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-contact-editor-confirm-delete&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;gnome_help_support&gt;True&lt;/gnome_help_support&gt;</div><div class='del'>-  &lt;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;e-contact-editor-confirm-delete.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;GnomeMessageBox&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;confirm-dialog&lt;/name&gt;</div><div class='del'>-  &lt;message_box_type&gt;GNOME_MESSAGE_BOX_QUESTION&lt;/message_box_type&gt;</div><div class='del'>-  &lt;message&gt;Are you sure you want</div><div class='del'>-to delete this contact?&lt;/message&gt;</div><div class='del'>-  &lt;title&gt;Delete Contact?&lt;/title&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;True&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h b/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h<br/>deleted file mode 100644<br/>index 7168db0a5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-confirm-delete.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/e-contact-editor-confirm-delete.glade.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_("Are you sure you want\n"</div><div class='del'>-              "to delete this contact?");</div><div class='del'>-gchar *s = N_("Delete Contact?");</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 05e8d45702..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-fullname.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/e-contact-editor-fullname.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,218 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * 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;gal/widgets/e-unicode.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 (const ECardName *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));</div><div class='del'>-	gtk_object_set (GTK_OBJECT(widget),</div><div class='del'>-			"name", name,</div><div class='del'>-			NULL);</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorFullname *e_contact_editor_fullname;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		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'>-			e_utf8_gtk_entry_set_text(entry, string);</div><div class='del'>-		else</div><div class='del'>-			gtk_entry_set_text(entry, "");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(EContactEditorFullname *editor)</div><div class='del'>-{</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	if (name) {</div><div class='del'>-		fill_in_field(editor, "entry-title",  name-&gt;prefix);</div><div class='del'>-		fill_in_field(editor, "entry-first",  name-&gt;given);</div><div class='del'>-		fill_in_field(editor, "entry-middle", name-&gt;additional);</div><div class='del'>-		fill_in_field(editor, "entry-last",   name-&gt;family);</div><div class='del'>-		fill_in_field(editor, "entry-suffix", name-&gt;suffix);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-extract_field(EContactEditorFullname *editor, char *field)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (entry)</div><div class='del'>-		return e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditorFullname *editor)</div><div class='del'>-{</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	if (!name) {</div><div class='del'>-		name = e_card_name_new();</div><div class='del'>-		editor-&gt;name = name;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	name-&gt;prefix     = extract_field(editor, "entry-title" );</div><div class='del'>-	name-&gt;given      = extract_field(editor, "entry-first" );</div><div class='del'>-	name-&gt;additional = extract_field(editor, "entry-middle");</div><div class='del'>-	name-&gt;family     = extract_field(editor, "entry-last"  );</div><div class='del'>-	name-&gt;suffix     = extract_field(editor, "entry-suffix");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor-fullname.h b/addressbook/contact-editor/e-contact-editor-fullname.h<br/>deleted file mode 100644<br/>index bde6733976..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-fullname.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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(const ECardName *name);</div><div class='del'>-GtkType    e_contact_editor_fullname_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-editor-strings.h b/addressbook/contact-editor/e-contact-editor-strings.h<br/>deleted file mode 100644<br/>index bb9c0b5b30..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor-strings.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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_("_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_("_Address...");</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 c4e8ed8640..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/e-contact-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1748 +0,0 @@</div><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-address.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 "e-util/e-gui-utils.h"</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-contact-save-as.h&gt;</div><div class='del'>-#include "addressbook/printing/e-contact-print.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print-envelope.h"</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	ADD_CARD,</div><div class='del'>-	COMMIT_CARD,</div><div class='del'>-	DELETE_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[DELETE_CARD] =</div><div class='del'>-	  gtk_signal_new ("delete_card",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, delete_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", EVOLUTIONDIR, image);</div><div class='del'>-		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);</div><div class='del'>-		gtk_container_add(GTK_CONTAINER(button),</div><div class='del'>-				  pixmap);</div><div class='del'>-		g_free(image_temp);</div><div class='del'>-		gtk_widget_show(pixmap);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_replace_buttons(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	_replace_button(editor, "button-phone1", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone2", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone3", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone4", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-address", "arrow.png", _address_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-email1", "arrow.png", _email_arrow_pressed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-wants_html_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	gboolean wants_html;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(widget),</div><div class='del'>-		       "active", &amp;wants_html,</div><div class='del'>-		       NULL);</div><div class='del'>-	gtk_object_set(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-		       "wants_html", wants_html,</div><div class='del'>-		       NULL);</div><div class='del'>-}</div><div class='del'>-</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 = e_utf8_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'>-#if 0</div><div class='del'>-	phone-&gt;number = NULL;</div><div class='del'>-#endif</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 = e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-</div><div class='del'>-	e_card_simple_set_email(editor-&gt;simple, editor-&gt;email_choice, string);</div><div class='del'>-</div><div class='del'>-	g_free (string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-address_text_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-	ECardAddrLabel *address;</div><div class='del'>-</div><div class='del'>-	if (editor-&gt;address_choice == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	address = e_card_address_label_new();</div><div class='del'>-</div><div class='del'>-	address-&gt;data = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-	e_card_simple_set_address(editor-&gt;simple, editor-&gt;address_choice, address);</div><div class='del'>-	e_card_address_label_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 &amp;&amp; ((name-&gt;given &amp;&amp; *name-&gt;given) || (name-&gt;family &amp;&amp; *name-&gt;family)))</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-name_to_style(const ECardName *name, char *company, int style)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	char *strings[4], **stringptr;</div><div class='del'>-	char *substring;</div><div class='del'>-	switch (style) {</div><div class='del'>-	case 0:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(", ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(" ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		string = g_strdup(company);</div><div class='del'>-		break;</div><div class='del'>-	case 3: /* Fall Through */</div><div class='del'>-	case 4:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		substring = g_strjoinv(", ", strings);</div><div class='del'>-		if (!(company &amp;&amp; *company))</div><div class='del'>-			company = "";</div><div class='del'>-		if (style == 3)</div><div class='del'>-			string = g_strdup_printf("%s (%s)", substring, company);</div><div class='del'>-		else</div><div class='del'>-			string = g_strdup_printf("%s (%s)", company, substring);</div><div class='del'>-		g_free(substring);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		string = g_strdup("");</div><div class='del'>-	}</div><div class='del'>-	return string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-file_as_get_style (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, "entry-file-as"));</div><div class='del'>-	char *filestring;</div><div class='del'>-	char *trystring;</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	int i;</div><div class='del'>-	int style;</div><div class='del'>-</div><div class='del'>-	filestring = e_utf8_gtk_entry_get_text(file_as);</div><div class='del'>-</div><div class='del'>-	style = -1;</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		trystring = name_to_style(name, editor-&gt;company, i);</div><div class='del'>-		if (!strcmp(trystring, filestring)) {</div><div class='del'>-			g_free(trystring);</div><div class='del'>-			g_free(filestring);</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-		g_free(trystring);</div><div class='del'>-	}</div><div class='del'>-	g_free (filestring);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_as_set_style(EContactEditor *editor, int style)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	int i;</div><div class='del'>-	GList *strings = NULL;</div><div class='del'>-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, "entry-file-as"));</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-		</div><div class='del'>-</div><div class='del'>-	if (style == -1) {</div><div class='del'>-		string = e_utf8_gtk_entry_get_text(file_as);</div><div class='del'>-		strings = g_list_append(strings, string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "combo-file-as");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		if (style_makes_sense(editor-&gt;name, editor-&gt;company, i)) {</div><div class='del'>-			char *u;</div><div class='del'>-			u = name_to_style(editor-&gt;name, editor-&gt;company, i);</div><div class='del'>-			string = e_utf8_to_gtk_string (widget, u);</div><div class='del'>-			g_free (u);</div><div class='del'>-			if (string) strings = g_list_append(strings, string);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_COMBO(widget)) {</div><div class='del'>-		GtkCombo *combo = GTK_COMBO(widget);</div><div class='del'>-		gtk_combo_set_popdown_strings(combo, strings);</div><div class='del'>-		g_list_foreach(strings, (GFunc) g_free, NULL);</div><div class='del'>-		g_list_free(strings);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (style != -1) {</div><div class='del'>-		string = name_to_style(editor-&gt;name, editor-&gt;company, style);</div><div class='del'>-		e_utf8_gtk_entry_set_text(file_as, string);</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-name_entry_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *file_as;</div><div class='del'>-	int style = 0;</div><div class='del'>-	char *string;</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'>-</div><div class='del'>-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));</div><div class='del'>-	editor-&gt;name = e_card_name_from_string(string);</div><div class='del'>-	g_free (string);</div><div class='del'>-	</div><div class='del'>-	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 = e_utf8_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 (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'>-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);</div><div class='del'>-			g_free(full_name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-full_addr_clicked(GtkWidget *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog;</div><div class='del'>-	int result;</div><div class='del'>-	const ECardDeliveryAddress *address;</div><div class='del'>-</div><div class='del'>-	address = e_card_simple_get_delivery_address(editor-&gt;simple, editor-&gt;address_choice);</div><div class='del'>-</div><div class='del'>-	dialog = GNOME_DIALOG(e_contact_editor_address_new(address));</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-</div><div class='del'>-	result = gnome_dialog_run (dialog);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		ECardDeliveryAddress *new_address;</div><div class='del'>-		GtkWidget *address_widget;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(dialog),</div><div class='del'>-			       "address", &amp;new_address,</div><div class='del'>-			       NULL);</div><div class='del'>-		e_card_simple_set_delivery_address(editor-&gt;simple, editor-&gt;address_choice, new_address);</div><div class='del'>-</div><div class='del'>-		address_widget = glade_xml_get_widget(editor-&gt;gui, "text-address");</div><div class='del'>-		if (address_widget &amp;&amp; GTK_IS_EDITABLE(address_widget)) {</div><div class='del'>-			char *string = e_card_delivery_address_to_string(new_address);</div><div class='del'>-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);</div><div class='del'>-			g_free(string);</div><div class='del'>-		} else {</div><div class='del'>-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);</div><div class='del'>-			e_card_simple_set_address(editor-&gt;simple, editor-&gt;address_choice, address);</div><div class='del'>-			e_card_address_label_free(address);</div><div class='del'>-		}</div><div class='del'>-		e_card_delivery_address_free(new_address);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-categories_clicked(GtkWidget *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	char *categories;</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 = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));</div><div class='del'>-	else if (editor-&gt;card)</div><div class='del'>-		gtk_object_get(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-			       "categories", &amp;categories,</div><div class='del'>-			       NULL);</div><div class='del'>-	dialog = GNOME_DIALOG(e_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'>-	g_free (categories);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		gtk_object_get(GTK_OBJECT(dialog),</div><div class='del'>-			       "categories", &amp;categories,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);</div><div class='del'>-		else</div><div class='del'>-			gtk_object_set(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-				       "categories", categories,</div><div class='del'>-				       NULL);</div><div class='del'>-		g_free(categories);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_destroy(GTK_OBJECT(dialog));</div><div class='del'>-#if 0</div><div class='del'>-	if (!entry)</div><div class='del'>-		g_free(categories);</div><div class='del'>-#endif</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'>-gboolean</div><div class='del'>-e_contact_editor_confirm_delete(GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog;</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-editor-confirm-delete.glade", NULL);</div><div class='del'>-</div><div class='del'>-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "confirm-dialog"));</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_parent(dialog, parent);</div><div class='del'>-	</div><div class='del'>-	result = gnome_dialog_run_and_close(dialog);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(gui));</div><div class='del'>-</div><div class='del'>-	return !result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce-&gt;app))) {</div><div class='del'>-</div><div class='del'>-		extract_info (ce);</div><div class='del'>-		e_card_simple_sync_card (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[DELETE_CARD],</div><div class='del'>-					 ce-&gt;card);</div><div class='del'>-		</div><div class='del'>-		file_close_cb(widget, data);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the signal to request printing a card */</div><div class='del'>-static void</div><div class='del'>-print_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(e_contact_print_card_dialog_new(ce-&gt;card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the signal to request printing a card */</div><div class='del'>-static void</div><div class='del'>-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce-&gt;card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Toolbar/Save and Close callback */</div><div class='del'>-static void</div><div class='del'>-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-	save_card (ce);</div><div class='del'>-	close_dialog (ce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),</div><div class='del'>-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_ui (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (</div><div class='del'>-		ce-&gt;uic, verbs, ce);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (ce-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-contact-editor.xml",</div><div class='del'>-			       "evolution-contact-editor");</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 GList *</div><div class='del'>-add_to_tab_order(GList *list, GladeXML *gui, char *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(gui, name);</div><div class='del'>-	return g_list_prepend(list, widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_tab_order(GladeXML *gui)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *container;</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-</div><div class='del'>-	container = glade_xml_get_widget(gui, "table-contact-editor-general");</div><div class='del'>-</div><div class='del'>-	if (container) {</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-fullname");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-jobtitle");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-company");</div><div class='del'>-		list = add_to_tab_order(list, gui, "combo-file-as");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone1");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone2");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone3");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone4");</div><div class='del'>-		list = g_list_reverse(list);</div><div class='del'>-		e_container_change_tab_order(GTK_CONTAINER(container), list);</div><div class='del'>-		g_list_free(list);</div><div class='del'>-</div><div class='del'>-		list = NULL;</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-email1");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-web");</div><div class='del'>-		list = add_to_tab_order(list, gui, "text-address");</div><div class='del'>-		list = add_to_tab_order(list, gui, "alignment-contacts");</div><div class='del'>-		list = g_list_reverse(list);</div><div class='del'>-		e_container_change_tab_order(GTK_CONTAINER(container), list);</div><div class='del'>-		g_list_free(list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_init (EContactEditor *e_contact_editor)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GtkWidget *bonobo_win;</div><div class='del'>-	GtkWidget *wants_html;</div><div class='del'>-	BonoboUIContainer *container;</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;email_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;email_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;email_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;name = e_card_name_new();</div><div class='del'>-	e_contact_editor-&gt;company = g_strdup("");</div><div class='del'>-	</div><div class='del'>-	e_contact_editor-&gt;email_choice = 0;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;</div><div class='del'>-	e_contact_editor-&gt;address_choice = 0;</div><div class='del'>-</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'>-	setup_tab_order(gui);</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;app = glade_xml_get_widget (gui, "contact editor");</div><div class='del'>-</div><div class='del'>-	e_container_foreach_leaf (GTK_CONTAINER (e_contact_editor-&gt;app),</div><div class='del'>-				  (GtkCallback) add_field_callback,</div><div class='del'>-				  e_contact_editor);</div><div class='del'>-</div><div class='del'>-	_replace_buttons(e_contact_editor);</div><div class='del'>-	set_entry_changed_signals(e_contact_editor);</div><div class='del'>-</div><div class='del'>-	wants_html = glade_xml_get_widget(e_contact_editor-&gt;gui, "checkbutton-htmlmail");</div><div class='del'>-	if (wants_html &amp;&amp; GTK_IS_TOGGLE_BUTTON(wants_html))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(wants_html), "toggled",</div><div class='del'>-				   wants_html_changed, e_contact_editor);</div><div class='del'>-	</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-fullname");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   full_name_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-fulladdr");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   full_addr_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-categories");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   categories_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Construct the app */</div><div class='del'>-	bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor");</div><div class='del'>-</div><div class='del'>-	/* FIXME: The sucking bit */</div><div class='del'>-	{</div><div class='del'>-		GtkWidget *contents;</div><div class='del'>-</div><div class='del'>-		contents = gnome_dock_get_client_area (</div><div class='del'>-			GNOME_DOCK (GNOME_APP (e_contact_editor-&gt;app)-&gt;dock));</div><div class='del'>-		if (!contents) {</div><div class='del'>-			g_message ("contact_editor_construct(): Could not get contents");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		gtk_widget_ref (contents);</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (contents-&gt;parent), contents);</div><div class='del'>-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);</div><div class='del'>-		gtk_widget_destroy (e_contact_editor-&gt;app);</div><div class='del'>-		e_contact_editor-&gt;app = bonobo_win;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Build the menu and toolbar */</div><div class='del'>-</div><div class='del'>-	container = bonobo_ui_container_new ();</div><div class='del'>-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor-&gt;app));</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;uic = bonobo_ui_component_new_default ();</div><div class='del'>-	if (!e_contact_editor-&gt;uic) {</div><div class='del'>-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	bonobo_ui_component_set_container (e_contact_editor-&gt;uic,</div><div class='del'>-					   bonobo_object_corba_objref (</div><div class='del'>-						   BONOBO_OBJECT (container)));</div><div class='del'>-</div><div class='del'>-	create_ui (e_contact_editor);</div><div class='del'>-</div><div class='del'>-	/* 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'>-	if (e_contact_editor-&gt;name)</div><div class='del'>-		e_card_name_free(e_contact_editor-&gt;name);</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, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry)));</div><div class='del'>-			g_free(*info);</div><div class='del'>-			*info = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_dialog_destroy(EContactEditor *editor, GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog_entry = gtk_entry_new();</div><div class='del'>-	GtkWidget *entry = glade_xml_get_widget(editor-&gt;gui, entry_id);</div><div class='del'>-	GtkWidget *label = glade_xml_get_widget(editor-&gt;gui, label_id);</div><div class='del'>-	</div><div class='del'>-	GtkWidget *dialog = gnome_dialog_new(title,</div><div class='del'>-					     NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(GNOME_DIALOG(dialog)-&gt;vbox),</div><div class='del'>-			  gtk_widget_new (gtk_frame_get_type(),</div><div class='del'>-					  "border_width", 4,</div><div class='del'>-					  "label", title,</div><div class='del'>-					  "child", gtk_widget_new(gtk_alignment_get_type(),</div><div class='del'>-								  "child", dialog_entry,</div><div class='del'>-								  "xalign", .5,</div><div class='del'>-								  "yalign", .5,</div><div class='del'>-								  "xscale", 1.0,</div><div class='del'>-								  "yscale", 1.0,</div><div class='del'>-								  "border_width", 9,</div><div class='del'>-								  NULL),</div><div class='del'>-					  NULL));</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button_with_pixmap(GNOME_DIALOG(dialog),</div><div class='del'>-					       "Add",</div><div class='del'>-					       GNOME_STOCK_PIXMAP_ADD);</div><div class='del'>-	gnome_dialog_append_button(GNOME_DIALOG(dialog), GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-	gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",</div><div class='del'>-			   _dialog_clicked, editor);</div><div class='del'>-	gtk_signal_connect_while_alive(GTK_OBJECT(editor), "destroy",</div><div class='del'>-				       _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog));</div><div class='del'>-	</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_entry", entry);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_label", label);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_dialog_entry", dialog_entry);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_list", list);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_info", info);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all(dialog);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int which;</div><div class='del'>-	int i;</div><div class='del'>-	gchar *label;</div><div class='del'>-	gchar *entry;</div><div class='del'>-	int result;</div><div class='del'>-	if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone1") ) {</div><div class='del'>-		which = 1;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone2") ) {</div><div class='del'>-		which = 2;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone3") ) {</div><div class='del'>-		which = 3;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone4") ) {</div><div class='del'>-		which = 4;</div><div class='del'>-	} else</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	label = g_strdup_printf("label-phone%d", which);</div><div class='del'>-	entry = g_strdup_printf("entry-phone%d", which);</div><div class='del'>-</div><div class='del'>-	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 = e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-	if (!string)</div><div class='del'>-		string = "";</div><div class='del'>-	if (strcmp(string, oldstring))</div><div class='del'>-		e_utf8_gtk_entry_set_text(entry, string);</div><div class='del'>-	g_free (oldstring);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_phone_field(GtkWidget *entry, const ECardPhone *phone)</div><div class='del'>-{</div><div class='del'>-	set_field(GTK_ENTRY(entry), phone ? phone-&gt;number : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_fields(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-</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'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address-&gt;data);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		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'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       key, &amp;string,</div><div class='del'>-		       NULL);</div><div class='del'>-	fill_in_field(editor, id, string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_single_field(EContactEditor *editor, char *name)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple = editor-&gt;simple;</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, name);</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-		int position = 0;</div><div class='del'>-		GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-		const ECardArbitrary *arbitrary;</div><div class='del'>-</div><div class='del'>-		gtk_editable_delete_text(editable, 0, -1);</div><div class='del'>-		arbitrary = e_card_simple_get_arbitrary(simple,</div><div class='del'>-							name);</div><div class='del'>-		if (arbitrary &amp;&amp; arbitrary-&gt;value) {</div><div class='del'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary-&gt;value);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-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'>-		gboolean wants_html, wants_html_set;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "file_as",       &amp;file_as,</div><div class='del'>-			       "name",          &amp;name,</div><div class='del'>-			       "anniversary",   &amp;anniversary,</div><div class='del'>-			       "birth_date",    &amp;bday,</div><div class='del'>-			       "wants_html_set",&amp;wants_html_set,</div><div class='del'>-			       "wants_html",    &amp;wants_html,</div><div class='del'>-			       NULL);</div><div class='del'>-	</div><div class='del'>-		for (i = 0; i &lt; sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {</div><div class='del'>-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (list = editor-&gt;arbitrary_fields; list; list = list-&gt;next) {</div><div class='del'>-			fill_in_single_field(editor, list-&gt;data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (wants_html_set) {</div><div class='del'>-			GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, "checkbutton-htmlmail");</div><div class='del'>-			if (widget &amp;&amp; GTK_IS_CHECK_BUTTON(widget)) {</div><div class='del'>-				gtk_object_set(GTK_OBJECT(widget),</div><div class='del'>-					       "active", wants_html,</div><div class='del'>-					       NULL);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* File as has to come after company and name or else it'll get messed up when setting them. */</div><div class='del'>-		fill_in_field(editor, "entry-file-as", file_as);</div><div class='del'>-		</div><div class='del'>-		e_card_name_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 = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; *string)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       key, string,</div><div class='del'>-				       NULL);</div><div class='del'>-		else</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       key, NULL,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		if (string) g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_single_field(EContactEditor *editor, char *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, name);</div><div class='del'>-	ECardSimple *simple = editor-&gt;simple;</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-		GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; *string)</div><div class='del'>-			e_card_simple_set_arbitrary(simple,</div><div class='del'>-						    name,</div><div class='del'>-						    NULL,</div><div class='del'>-						    string);</div><div class='del'>-		else</div><div class='del'>-			e_card_simple_set_arbitrary(simple,</div><div class='del'>-						    name,</div><div class='del'>-						    NULL,</div><div class='del'>-						    NULL);</div><div class='del'>-		if (string) g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	ECard *card = editor-&gt;card;</div><div class='del'>-	if (card) {</div><div class='del'>-		ECardDate *anniversary;</div><div class='del'>-		ECardDate *bday;</div><div class='del'>-		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 = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-			if (string &amp;&amp; *string)</div><div class='del'>-				gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-					       "file_as", string,</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			if (string) g_free(string);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {</div><div class='del'>-			extract_field(editor, card, field_mapping[i].id, field_mapping[i].key);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (list = editor-&gt;arbitrary_fields; list; list = list-&gt;next) {</div><div class='del'>-			extract_single_field(editor, list-&gt;data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (editor-&gt;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 fae6939595..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-editor.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/e-contact-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,114 +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 "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EContactEditor - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * card         ECard *         RW              The card currently being edited</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))</div><div class='del'>-#define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditor       EContactEditor;</div><div class='del'>-typedef struct _EContactEditorClass  EContactEditorClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditor</div><div class='del'>-{</div><div class='del'>-	GtkObject object;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	/* UI handler */</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *app;</div><div class='del'>-	GnomeUIInfo *email_info;</div><div class='del'>-	GnomeUIInfo *phone_info;</div><div class='del'>-	GnomeUIInfo *address_info;</div><div class='del'>-	GtkWidget *email_popup;</div><div class='del'>-	GtkWidget *phone_popup;</div><div class='del'>-	GtkWidget *address_popup;</div><div class='del'>-	GList *email_list;</div><div class='del'>-	GList *phone_list;</div><div class='del'>-	GList *address_list;</div><div class='del'>-</div><div class='del'>-	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 (* delete_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'>-</div><div class='del'>-gboolean e_contact_editor_confirm_delete(GtkWindow *parent);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_H__ */</div><div class='head'>diff --git a/addressbook/contact-editor/e-contact-save-as.c b/addressbook/contact-editor/e-contact-save-as.c<br/>deleted file mode 100644<br/>index 7209c5e8f8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-save-as.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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;gal/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 d1c84dc596..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/e-contact-save-as.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_save_as(gchar *title, ECard *card);</div><div class='del'>-</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/email.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/contact-editor/fulladdr.glade b/addressbook/contact-editor/fulladdr.glade<br/>deleted file mode 100644<br/>index e46064bb92..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/fulladdr.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/fulladdr.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,477 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;fulladdr&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;fulladdr&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;fulladdr.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-checkaddress&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Check Address&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;True&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;vbox-container&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-checkaddress&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;4&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;4&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;6&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Address:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-street&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_City:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-city&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-city&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-ext&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_PO Box:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-po&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Address _2:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-ext&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-po&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-street&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_State/Province:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-region&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-region&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-country&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;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;USA</div><div class='del'>-Canada</div><div class='del'>-Finland</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-country&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-code&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_ZIP Code:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-code&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Countr_y:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-country&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/contact-editor/fulladdr.glade.h b/addressbook/contact-editor/fulladdr.glade.h<br/>deleted file mode 100644<br/>index 7db13fcf4d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/fulladdr.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/fulladdr.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +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 Address");</div><div class='del'>-gchar *s = N_("_Address:");</div><div class='del'>-gchar *s = N_("_City:");</div><div class='del'>-gchar *s = N_("_PO Box:");</div><div class='del'>-gchar *s = N_("Address _2:");</div><div class='del'>-gchar *s = N_("_State/Province:");</div><div class='del'>-gchar *s = N_("USA");</div><div class='del'>-gchar *s = N_("Canada");</div><div class='del'>-gchar *s = N_("Finland");</div><div class='del'>-gchar *s = N_("_ZIP Code:");</div><div class='del'>-gchar *s = N_("Countr_y:");</div><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 4d4303270a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/fullname-strings.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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_("\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='del'>-gchar *s = N_("_First:");</div><div class='del'>-gchar *s = N_("_Title:");</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='head'>diff --git a/addressbook/contact-editor/fullname.glade b/addressbook/contact-editor/fullname.glade<br/>deleted file mode 100644<br/>index f2dfa23834..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/contact-editor/fullname.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/fullname.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,389 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;fullname&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;fullname&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;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;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-checkfullname&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;5&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;21&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-title&lt;/name&gt;</div><div class='del'>-	&lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	&lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	&lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	&lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	&lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	&lt;items&gt;</div><div class='del'>-Mr.</div><div class='del'>-Mrs.</div><div class='del'>-Dr.</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-title&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-suffix&lt;/name&gt;</div><div class='del'>-	&lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	&lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	&lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	&lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	&lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	&lt;items&gt;</div><div class='del'>-Sr.</div><div class='del'>-Jr.</div><div class='del'>-I</div><div class='del'>-II</div><div class='del'>-III</div><div class='del'>-Esq.</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-suffix&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-first&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-middle&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-last&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_First:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-first&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Title:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-title&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Middle:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-middle&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Last:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-last&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Suffix:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-suffix&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/contact-editor/web.png</a><br/>+++ /dev/null</div>Binary files differ<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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 cd8fe38705..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = widgets search component</div><div class='head'>diff --git a/addressbook/gui/component/.cvsignore b/addressbook/gui/component/.cvsignore<br/>deleted file mode 100644<br/>index a8ecb5d170..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 a41848b25b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +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:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"</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 Addressbook Minicard control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/vcard"/&gt;</div><div class='del'>-		&lt;item value="text/x-vcard"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       value="Evolution Addressbook minicard viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-	               value="Factory for the Evolution addressbook minicard control."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID: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_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-contacts.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo b/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo<br/>deleted file mode 100644<br/>index a41848b25b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/GNOME_Evolution_Addressbook.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +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:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"</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 Addressbook Minicard control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/vcard"/&gt;</div><div class='del'>-		&lt;item value="text/x-vcard"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       value="Evolution Addressbook minicard viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-	               value="Factory for the Evolution addressbook minicard control."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID: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_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-contacts.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am<br/>deleted file mode 100644<br/>index ca8e333739..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-SUBDIRS	= select-names</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\</div><div class='del'>-	$(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/misc			\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/minicard	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/gui/widgets		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/contact-editor	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-	$(BONOBO_HTML_GNOME_CFLAGS)			\</div><div class='del'>-	-DEVOLUTION_VERSION=\""$(VERSION)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\"		\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"	\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"</div><div class='del'>-</div><div class='del'>-bin_PROGRAMS =	\</div><div class='del'>-	evolution-addressbook</div><div class='del'>-</div><div class='del'>-evolution_addressbook_SOURCES = 	\</div><div class='del'>-	addressbook-component.c		\</div><div class='del'>-	addressbook-component.h		\</div><div class='del'>-	addressbook-factory.c		\</div><div class='del'>-	addressbook.c			\</div><div class='del'>-	addressbook.h			\</div><div class='del'>-	e-cardlist-model.c		\</div><div class='del'>-	e-cardlist-model.h		\</div><div class='del'>-	e-ldap-server-dialog.c          \</div><div class='del'>-	e-ldap-server-dialog.h		\</div><div class='del'>-	e-ldap-storage.c		\</div><div class='del'>-	e-ldap-storage.h</div><div class='del'>-</div><div class='del'>-evolution_addressbook_LDADD =						\</div><div class='del'>-	select-names/libeselectnames.la					\</div><div class='del'>-	$(top_builddir)/shell/libeshell.a				\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(BONOBO_HTML_GNOME_LIBS)					\</div><div class='del'>-	$(top_builddir)/addressbook/gui/widgets/libeminicard.a		\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la		\</div><div class='del'>-	$(top_builddir)/e-util/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/misc/libemiscwidgets.a 			\</div><div class='del'>-	$(top_builddir)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-	$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a	\</div><div class='del'>-	$(top_builddir)/filter/libfilter.la				\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_DATA = addressbook.oafinfo</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = ldap-server-dialog.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 			\</div><div class='del'>-	$(glade_DATA)		\</div><div class='del'>-	$(oaf_DATA)		\</div><div class='del'>-	ldap-server-dialog.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 5b52b8337b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-component.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/addressbook-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +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'>-#include "e-ldap-storage.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:addressbook:dbf3bba0-4b0a-4f07-899b-1ec56fdf38a0"</div><div class='del'>-</div><div class='del'>-/* Nasty hack for filters to be able to find folders */</div><div class='del'>-/* Not even used with addressbook??? */</div><div class='del'>-EvolutionShellClient *global_shell_client;</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'>-	      EvolutionShellClient *shell_client,</div><div class='del'>-	      const char *evolution_homedir,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	owner_count ++;</div><div class='del'>-</div><div class='del'>-	if (global_shell_client == NULL)</div><div class='del'>-		global_shell_client = shell_client;</div><div class='del'>-	</div><div class='del'>-	setup_ldap_storage (shell_component, evolution_homedir);</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, 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='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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 623e0385de..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook-factory.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/addressbook-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +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;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-cursors.h&gt;</div><div class='del'>-#include &lt;unicode.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'>-#include "addressbook/gui/widgets/e-minicard-control.h"</div><div class='del'>-#include "select-names/e-select-names-factory.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_corba (int *argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	gnome_init_with_popt_table ("evolution-addressbook", "0.0",</div><div class='del'>-				    *argc, argv, oaf_popt_options, 0, NULL);</div><div class='del'>-</div><div class='del'>-	oaf_init (*argc, argv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_bonobo (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	if (bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-		g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-	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'>-	#ifdef ENABLE_NLS</div><div class='del'>-	bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-	textdomain (PACKAGE);</div><div class='del'>-	#endif</div><div class='del'>-	</div><div class='del'>-	init_corba (&amp;argc, argv);</div><div class='del'>-</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_select_names_factory_init ();</div><div class='del'>-	</div><div class='del'>-	e_minicard_control_factory_init ();</div><div class='del'>-</div><div class='del'>-	e_cursors_init();</div><div class='del'>-</div><div class='del'>-	unicode_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 1645dd849b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/addressbook.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,629 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "addressbook/gui/search/e-addressbook-search-dialog.h"</div><div class='del'>-</div><div class='del'>-#include "addressbook/gui/widgets/e-addressbook-view.h"</div><div class='del'>-#include "addressbook/gui/widgets/e-addressbook-search.h"</div><div class='del'>-</div><div class='del'>-#include &lt;select-names/e-select-names.h&gt;</div><div class='del'>-#include &lt;select-names/e-select-names-manager.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include "e-contact-save-as.h"</div><div class='del'>-#include "e-ldap-server-dialog.h"</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'>-#define CONTROL_FACTORY_ID "OAFIID:control-factory:addressbook:3e10597b-0591-4d45-b082-d781b7aa6e17"</div><div class='del'>-</div><div class='del'>-#define PROPERTY_FOLDER_URI          "folder_uri"</div><div class='del'>-</div><div class='del'>-#define PROPERTY_FOLDER_URI_IDX      1</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EAddressbookView *view;</div><div class='del'>-	EAddressbookSearch *search;</div><div class='del'>-	GtkWidget *vbox;</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</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 for the delete_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-delete_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_remove_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 (BonoboUIComponent *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'>-</div><div class='del'>-	card = e_card_new("");</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-		       "book", &amp;book,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-	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), "delete_card",</div><div class='del'>-			    GTK_SIGNAL_FUNC (delete_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'>-#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 (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	ELDAPServer *server = g_new (ELDAPServer, 1);</div><div class='del'>-	EBook *book;</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-</div><div class='del'>-	/* fill in the defaults */</div><div class='del'>-	server-&gt;name = g_strdup("");</div><div class='del'>-	server-&gt;host = g_strdup("");</div><div class='del'>-	server-&gt;port = g_strdup_printf("%d", 389);</div><div class='del'>-	server-&gt;description = g_strdup("");</div><div class='del'>-	server-&gt;rootdn = g_strdup("");</div><div class='del'>-	server-&gt;uri = g_strdup_printf ("ldap://%s:%s/%s", server-&gt;host, server-&gt;port, server-&gt;rootdn);</div><div class='del'>-	e_ldap_server_editor_show (server);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-		       "book", &amp;book,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (E_IS_BOOK (book));</div><div class='del'>-	</div><div class='del'>-	/* write out the new server info */</div><div class='del'>-	e_ldap_storage_add_server (server);</div><div class='del'>-</div><div class='del'>-	/* now update the view */</div><div class='del'>-	e_book_unload_uri (book);</div><div class='del'>-	if (! e_book_load_uri (book, server-&gt;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 void</div><div class='del'>-search_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(view-&gt;view),</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'>-	gtk_widget_show(e_addressbook_search_dialog_new(book));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-find_contact_cb (BonoboUIComponent *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'>-	gtk_object_get (view-&gt;view,</div><div class='del'>-			"query", &amp;search_text,</div><div class='del'>-			NULL);</div><div class='del'>-	e_utf8_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 = e_utf8_gtk_entry_get_text(GTK_ENTRY(search_entry));</div><div class='del'>-		gtk_object_set (view-&gt;view, </div><div class='del'>-				"query", query, </div><div class='del'>-				NULL);</div><div class='del'>-		g_free (search_text);</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'>-delete_contact_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	e_addressbook_view_delete_selection(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	e_addressbook_view_print(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_all_contacts_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	e_addressbook_view_show_all(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-stop_loading_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = (AddressbookView *) user_data;</div><div class='del'>-	e_addressbook_view_stop(view-&gt;view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_view_type (AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	BonoboUIComponent *uic = bonobo_control_get_ui_component (view-&gt;control);</div><div class='del'>-	EAddressbookViewType view_type;</div><div class='del'>-</div><div class='del'>-	if (!uic || bonobo_ui_component_get_container (uic) == CORBA_OBJECT_NIL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (view-&gt;view), "type", &amp;view_type, NULL);</div><div class='del'>-</div><div class='del'>-	switch (view_type) {</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_TABLE:</div><div class='del'>-		if (uic)</div><div class='del'>-			bonobo_ui_component_set_prop (uic, "/menu/View/AsTable",</div><div class='del'>-						      "label", _("As _Minicards"), NULL);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_MINICARD:</div><div class='del'>-		if (uic)</div><div class='del'>-			bonobo_ui_component_set_prop (uic, "/menu/View/AsTable",</div><div class='del'>-						      "label", _("As _Table"), NULL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("view_type must be either TABLE or MINICARD\n");</div><div class='del'>-		return;</div><div class='del'>-	}	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_view_type (AddressbookView *view, EAddressbookViewType view_type)</div><div class='del'>-{</div><div class='del'>-	gtk_object_set (GTK_OBJECT (view-&gt;view), "type", view_type, NULL);</div><div class='del'>-</div><div class='del'>-	update_view_type (view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-toggle_view_as_cb (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	AddressbookView *view = user_data;</div><div class='del'>-	EAddressbookViewType view_type;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (view-&gt;view), "type", &amp;view_type, NULL);</div><div class='del'>-</div><div class='del'>-	if (view_type == E_ADDRESSBOOK_VIEW_TABLE)</div><div class='del'>-		change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);</div><div class='del'>-	else</div><div class='del'>-		change_view_type (view, E_ADDRESSBOOK_VIEW_TABLE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactsPrint", print_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ViewAsTable", toggle_view_as_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ViewNewContact", new_contact_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ToolSearch", search_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactNew", new_contact_cb),</div><div class='del'>-/*	BONOBO_UI_UNSAFE_VERB ("ContactFind", find_contact_cb),*/</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactDelete", delete_contact_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactViewAll", show_all_contacts_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactStop", stop_loading_cb),</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactNewServer", new_server_cb),</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate (BonoboControl     *control,</div><div class='del'>-		  BonoboUIComponent *uic,</div><div class='del'>-		  AddressbookView   *view)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIContainer remote_ui_container;</div><div class='del'>-</div><div class='del'>-	remote_ui_container = bonobo_control_get_remote_ui_container (control);</div><div class='del'>-	bonobo_ui_component_set_container (uic, remote_ui_container);</div><div class='del'>-	bonobo_object_release_unref (remote_ui_container, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (</div><div class='del'>-		uic, verbs, view);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_freeze (uic, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-addressbook.xml",</div><div class='del'>-			       "evolution-addressbook");</div><div class='del'>-#ifdef HAVE_LDAP</div><div class='del'>-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-addressbook-ldap.xml",</div><div class='del'>-			       "evolution-addressbook");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	update_view_type (view);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_thaw (uic, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate_cb (BonoboControl *control, </div><div class='del'>-		     gboolean activate, </div><div class='del'>-		     AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-	</div><div class='del'>-	if (activate)</div><div class='del'>-		control_activate (control, uic, view);</div><div class='del'>-	else</div><div class='del'>-		bonobo_ui_component_unset_container (uic);</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'>-	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'>-	if (status == E_BOOK_STATUS_SUCCESS) {</div><div class='del'>-		AddressbookView *view = closure;</div><div class='del'>-</div><div class='del'>-		gtk_object_set(GTK_OBJECT(view-&gt;view),</div><div class='del'>-			       "book", book,</div><div class='del'>-			       NULL);</div><div class='del'>-	} else {</div><div class='del'>-		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</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_data;</div><div class='del'>-	EBook *book;</div><div class='del'>-	</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROPERTY_FOLDER_URI_IDX:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-			       "book", &amp;book,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (view-&gt;uri) {</div><div class='del'>-			/* we've already had a uri set on this view, so unload it */</div><div class='del'>-			e_book_unload_uri (book);</div><div class='del'>-			g_free (view-&gt;uri);</div><div class='del'>-		} else {</div><div class='del'>-			book = e_book_new ();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		view-&gt;uri = g_strdup(BONOBO_ARG_GET_STRING (arg));</div><div class='del'>-		</div><div class='del'>-		if (!strncmp (view-&gt;uri, "file:", 5)) {</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'>-		else {</div><div class='del'>-			uri_data = g_strdup (view-&gt;uri);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (! e_book_load_uri (book, uri_data, book_open_cb, view))</div><div class='del'>-			printf ("error calling load_uri!\n");</div><div class='del'>-</div><div class='del'>-		g_free(uri_data);</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d\n", arg_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_query_changed (EAddressbookSearch *eas, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	char *search_word, *search_query;</div><div class='del'>-	int search_type;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(eas),</div><div class='del'>-		       "text", &amp;search_word,</div><div class='del'>-		       "option_choice", &amp;search_type,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	if (search_word &amp;&amp; strlen (search_word)) {</div><div class='del'>-		switch (search_type) {</div><div class='del'>-		case 0:</div><div class='del'>-			search_query = g_strdup_printf ("(contains \"x-evolution-any-field\" \"%s\")",</div><div class='del'>-							search_word);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			search_query = g_strdup_printf ("(contains \"full_name\" \"%s\")",</div><div class='del'>-							search_word);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			search_query = g_strdup_printf ("(contains \"email\" \"%s\")",</div><div class='del'>-							search_word);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			search_query = g_strdup ("(contains \"full_name\" \"\")");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		search_query = g_strdup ("(contains \"full_name\" \"\")");</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT(view-&gt;view),</div><div class='del'>-			"query", search_query,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	g_free (search_query);</div><div class='del'>-	g_free (search_word);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_menu_activated (EAddressbookSearch *eas, int id, AddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	switch (id) {</div><div class='del'>-	case 0:</div><div class='del'>-		e_addressbook_view_show_all(view-&gt;view);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;view),</div><div class='del'>-			       "book", &amp;book,</div><div class='del'>-			       NULL);</div><div class='del'>-		g_assert (E_IS_BOOK (book));</div><div class='del'>-</div><div class='del'>-		gtk_widget_show(e_addressbook_search_dialog_new(book));</div><div class='del'>-		break;</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, GNOME_PAD);</div><div class='del'>-</div><div class='del'>-	gtk_container_set_border_width(GTK_CONTAINER(view-&gt;vbox), GNOME_PAD_SMALL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect( GTK_OBJECT( view-&gt;vbox ), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-			    ( gpointer ) view );</div><div class='del'>-</div><div class='del'>-	/* Create the control. */</div><div class='del'>-	view-&gt;control = bonobo_control_new(view-&gt;vbox);</div><div class='del'>-</div><div class='del'>-	view-&gt;search = E_ADDRESSBOOK_SEARCH(e_addressbook_search_new());</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (view-&gt;vbox), GTK_WIDGET (view-&gt;search),</div><div class='del'>-			    FALSE, FALSE, 0);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;search), "query_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (addressbook_query_changed), view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view-&gt;search), "menu_activated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (addressbook_menu_activated), view);</div><div class='del'>-</div><div class='del'>-	view-&gt;view = E_ADDRESSBOOK_VIEW(e_addressbook_view_new());</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(view-&gt;vbox), GTK_WIDGET(view-&gt;view),</div><div class='del'>-			   TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	/* create the initial view */</div><div class='del'>-	change_view_type (view, E_ADDRESSBOOK_VIEW_MINICARD);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show( view-&gt;vbox );</div><div class='del'>-	gtk_widget_show( GTK_WIDGET(view-&gt;view) );</div><div class='del'>-	gtk_widget_show( GTK_WIDGET(view-&gt;search) );</div><div class='del'>-</div><div class='del'>-	view-&gt;properties = bonobo_property_bag_new (get_prop, set_prop, view);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (</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_properties (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.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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 a41848b25b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/addressbook.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/addressbook.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +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:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"</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 Addressbook Minicard control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/vcard"/&gt;</div><div class='del'>-		&lt;item value="text/x-vcard"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       value="Evolution Addressbook minicard viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-	               value="Factory for the Evolution addressbook minicard control."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID: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_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-contacts.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/addressbook/gui/component/e-cardlist-model.c b/addressbook/gui/component/e-cardlist-model.c<br/>deleted file mode 100644<br/>index 23b61d58be..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-cardlist-model.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/e-cardlist-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,226 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *</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'>-static char *</div><div class='del'>-e_cardlist_model_value_to_string (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_cardlist_model_add(ECardlistModel *model,</div><div class='del'>-		     ECard **cards,</div><div class='del'>-		     int count)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	model-&gt;data = g_realloc(model-&gt;data, model-&gt;data_count + count * sizeof(ECard *));</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		gboolean found = FALSE;</div><div class='del'>-		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'>-	model_class-&gt;value_to_string = e_cardlist_model_value_to_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_cardlist_model_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECardlistModel *model = E_CARDLIST_MODEL(object);</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_cardlist_model_get(ECardlistModel *model,</div><div class='del'>-		     int                row)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;data &amp;&amp; row &lt; model-&gt;data_count) {</div><div class='del'>-		ECard *card;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(model-&gt;data[row]),</div><div class='del'>-			       "card", &amp;card,</div><div class='del'>-			       NULL);</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(card));</div><div class='del'>-		return card;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_cardlist_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"ECardlistModel",</div><div class='del'>-			sizeof (ECardlistModel),</div><div class='del'>-			sizeof (ECardlistModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_cardlist_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_cardlist_model_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETableModel *</div><div class='del'>-e_cardlist_model_new (void)</div><div class='del'>-{</div><div class='del'>-	ECardlistModel *et;</div><div class='del'>-</div><div class='del'>-	et = gtk_type_new (e_cardlist_model_get_type ());</div><div class='del'>-	</div><div class='del'>-	return E_TABLE_MODEL(et);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/e-cardlist-model.h b/addressbook/gui/component/e-cardlist-model.h<br/>deleted file mode 100644<br/>index 0b9a7a2265..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-cardlist-model.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/e-cardlist-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-#ifndef _E_CARDLIST_MODEL_H_</div><div class='del'>-#define _E_CARDLIST_MODEL_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-#include &lt;ebook/e-book-view.h&gt;</div><div class='del'>-#include &lt;ebook/e-card-simple.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_CARDLIST_MODEL_TYPE        (e_cardlist_model_get_type ())</div><div class='del'>-#define E_CARDLIST_MODEL(o)          (GTK_CHECK_CAST ((o), E_CARDLIST_MODEL_TYPE, ECardlistModel))</div><div class='del'>-#define E_CARDLIST_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CARDLIST_MODEL_TYPE, ECardlistModelClass))</div><div class='del'>-#define E_IS_CARDLIST_MODEL(o)       (GTK_CHECK_TYPE ((o), E_CARDLIST_MODEL_TYPE))</div><div class='del'>-#define E_IS_CARDLIST_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_CARDLIST_MODEL_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ETableModel parent;</div><div class='del'>-</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECardSimple **data;</div><div class='del'>-	int data_count;</div><div class='del'>-} ECardlistModel;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-} ECardlistModelClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_cardlist_model_get_type (void);</div><div class='del'>-ETableModel *e_cardlist_model_new (void);</div><div class='del'>-</div><div class='del'>-/* Returns object with an extra ref count. */</div><div class='del'>-ECard *e_cardlist_model_get  (ECardlistModel  *model,</div><div class='del'>-			      int              row);</div><div class='del'>-void e_cardlist_model_add    (ECardlistModel  *model,</div><div class='del'>-			      ECard          **card,</div><div class='del'>-			      int              count);</div><div class='del'>-void e_cardlist_model_remove (ECardlistModel  *model,</div><div class='del'>-			      const char      *id);</div><div class='del'>-</div><div class='del'>-#endif /* _E_CARDLIST_MODEL_H_ */</div><div class='head'>diff --git a/addressbook/gui/component/e-ldap-server-dialog.c b/addressbook/gui/component/e-ldap-server-dialog.c<br/>deleted file mode 100644<br/>index 172f43280b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-ldap-server-dialog.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/e-ldap-server-dialog.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'>- * 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'>-</div><div class='del'>-	/* the name */</div><div class='del'>-	position = 0;</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "name-entry"));</div><div class='del'>-	gtk_editable_delete_text (editable, 0, -1);</div><div class='del'>-	gtk_editable_insert_text (editable, ldap_server-&gt;name, strlen (ldap_server-&gt;name), &amp;position);</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'>-	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, ldap_server-&gt;port, strlen (ldap_server-&gt;port), &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, *name;</div><div class='del'>-</div><div class='del'>-	/* the server name */</div><div class='del'>-	editable = GTK_EDITABLE(glade_xml_get_widget(dialog-&gt;gui, "name-entry"));</div><div class='del'>-	name = gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-	if (name &amp;&amp; *name) {</div><div class='del'>-		if (ldap_server-&gt;name)</div><div class='del'>-			g_free(ldap_server-&gt;name);</div><div class='del'>-		ldap_server-&gt;name = name;</div><div class='del'>-	}</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'>-		if (ldap_server-&gt;port)</div><div class='del'>-			g_free (ldap_server-&gt;port);</div><div class='del'>-		ldap_server-&gt;port = port;</div><div class='del'>-	}</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 e5ae169f5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-ldap-server-dialog.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/e-ldap-server-dialog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +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'>-#include "e-ldap-storage.h"</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-ldap-storage.c b/addressbook/gui/component/e-ldap-storage.c<br/>deleted file mode 100644<br/>index 518de69e0d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-ldap-storage.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/e-ldap-storage.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,317 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-ldap-storage.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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: Chris Toshok</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The ldap server file goes like this:</div><div class='del'>-</div><div class='del'>-   &lt;?xml version="1.0"?&gt;</div><div class='del'>-   &lt;contactservers&gt;</div><div class='del'>-     &lt;contactserver&gt;</div><div class='del'>-           &lt;name&gt;LDAP Server&lt;/name&gt;</div><div class='del'>-	   &lt;description&gt;This is my company address book.&lt;/description&gt;</div><div class='del'>-	   &lt;host&gt;ldap.server.com&lt;/host&gt;</div><div class='del'>-	   &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-	   &lt;rootdn&gt;&lt;/rootdn&gt;</div><div class='del'>-     &lt;/contactserver&gt;</div><div class='del'>-   &lt;/contactservers&gt;</div><div class='del'>-</div><div class='del'>-   FIXME: Do we want to use a namespace for this?</div><div class='del'>-   FIXME: Do we want to have an internationalized description?</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 &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-ldap-storage.h"</div><div class='del'>-#include "e-ldap-server-dialog.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/util/e-xml-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/fcntl.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#define LDAPSERVER_XML "ldapservers.xml"</div><div class='del'>-</div><div class='del'>-static gboolean load_ldap_data (EvolutionStorage *storage, const char *file_path);</div><div class='del'>-static gboolean save_ldap_data (const char *file_path);</div><div class='del'>-</div><div class='del'>-GHashTable *servers;</div><div class='del'>-EvolutionStorage *storage;</div><div class='del'>-static char *ldapservers;</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-setup_ldap_storage (EvolutionShellComponent *shell_component,</div><div class='del'>-		    const char *evolution_homedir)</div><div class='del'>-{</div><div class='del'>-	EvolutionShellClient *shell_client;</div><div class='del'>-	Evolution_Shell corba_shell;</div><div class='del'>-</div><div class='del'>-	shell_client = evolution_shell_component_get_owner (shell_component);</div><div class='del'>-	if (shell_client == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("We have no shell!?");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));</div><div class='del'>-</div><div class='del'>-	storage = evolution_storage_new (_("External Directories"));</div><div class='del'>-	if (evolution_storage_register_on_shell (storage, corba_shell) != EVOLUTION_STORAGE_OK) {</div><div class='del'>-		g_warning ("Cannot register storage");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* save the storage for later */</div><div class='del'>-	servers = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (shell_component), "e-storage", storage);</div><div class='del'>-</div><div class='del'>-	if (ldapservers)</div><div class='del'>-		g_free (ldapservers);</div><div class='del'>-	ldapservers = g_strdup_printf ("%s/" LDAPSERVER_XML, evolution_homedir);</div><div class='del'>-	load_ldap_data (storage, ldapservers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_string_value (xmlNode *node,</div><div class='del'>-		  const char *name)</div><div class='del'>-{</div><div class='del'>-	xmlNode *p;</div><div class='del'>-	xmlChar *xml_string;</div><div class='del'>-	char *retval;</div><div class='del'>-</div><div class='del'>-	p = e_xml_get_child_by_name (node, (xmlChar *) name);</div><div class='del'>-	if (p == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	p = e_xml_get_child_by_name (p, (xmlChar *) "text");</div><div class='del'>-	if (p == NULL) /* there's no text between the tags, return the empty string */</div><div class='del'>-		return g_strdup("");</div><div class='del'>-</div><div class='del'>-	xml_string = xmlNodeListGetString (node-&gt;doc, p, 1);</div><div class='del'>-	retval = g_strdup ((char *) xml_string);</div><div class='del'>-	xmlFree (xml_string);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-load_ldap_data (EvolutionStorage *storage,</div><div class='del'>-		const char *file_path)</div><div class='del'>-{</div><div class='del'>-	xmlDoc *doc;</div><div class='del'>-	xmlNode *root;</div><div class='del'>-	xmlNode *child;</div><div class='del'>-</div><div class='del'>- tryagain:</div><div class='del'>-	doc = xmlParseFile (file_path);</div><div class='del'>-	if (doc == NULL) {</div><div class='del'>-		/* check to see if a ldapserver.xml.new file is</div><div class='del'>-                   there.  if it is, rename it and run with it */</div><div class='del'>-		char *new_path = g_strdup_printf ("%s.new", file_path);</div><div class='del'>-		struct stat sb;</div><div class='del'>-</div><div class='del'>-		if (stat (new_path, &amp;sb) == 0) {</div><div class='del'>-			int rv;</div><div class='del'>-</div><div class='del'>-			rv = rename (new_path, file_path);</div><div class='del'>-			g_free (new_path);</div><div class='del'>-</div><div class='del'>-			if (0 &gt; rv) {</div><div class='del'>-				g_error ("Failed to rename ldapserver.xml: %s\n", strerror(errno));</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				goto tryagain;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (new_path);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	root = xmlDocGetRootElement (doc);</div><div class='del'>-	if (root == NULL || strcmp (root-&gt;name, "contactservers") != 0) {</div><div class='del'>-		xmlFreeDoc (doc);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (child = root-&gt;childs; child; child = child-&gt;next) {</div><div class='del'>-		char *path;</div><div class='del'>-		ELDAPServer *server;</div><div class='del'>-</div><div class='del'>-		if (strcmp (child-&gt;name, "contactserver")) {</div><div class='del'>-			g_warning ("unknown node '%s' in %s", child-&gt;name, file_path);</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		server = g_new (ELDAPServer, 1);</div><div class='del'>-</div><div class='del'>-		server-&gt;name = get_string_value (child, "name");</div><div class='del'>-		server-&gt;description = get_string_value (child, "description");</div><div class='del'>-		server-&gt;port = get_string_value (child, "port");</div><div class='del'>-		server-&gt;host = get_string_value (child, "host");</div><div class='del'>-		server-&gt;rootdn = get_string_value (child, "rootdn");</div><div class='del'>-		server-&gt;scope = get_string_value (child, "scope");</div><div class='del'>-		server-&gt;uri = g_strdup_printf ("ldap://%s:%s/%s??%s", server-&gt;host, server-&gt;port, server-&gt;rootdn, server-&gt;scope);</div><div class='del'>-</div><div class='del'>-		path = g_strdup_printf ("/%s", server-&gt;name);</div><div class='del'>-		evolution_storage_new_folder (storage, path, server-&gt;name,</div><div class='del'>-					      "contacts", server-&gt;uri,</div><div class='del'>-					      server-&gt;description, FALSE);</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert (servers, server-&gt;name, server);</div><div class='del'>-</div><div class='del'>-		g_free (path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	xmlFreeDoc (doc);</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'>-ldap_server_foreach(gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ELDAPServer *server = (ELDAPServer*)value;</div><div class='del'>-	xmlNode *root = (xmlNode*)user_data;</div><div class='del'>-	xmlNode *server_root = xmlNewNode (NULL,</div><div class='del'>-					   (xmlChar *) "contactserver");</div><div class='del'>-</div><div class='del'>-	xmlAddChild (root, server_root);</div><div class='del'>-</div><div class='del'>-	xmlNewChild (server_root, NULL, (xmlChar *) "name",</div><div class='del'>-		     (xmlChar *) server-&gt;name);</div><div class='del'>-	xmlNewChild (server_root, NULL, (xmlChar *) "description",</div><div class='del'>-		     (xmlChar *) server-&gt;description);</div><div class='del'>-</div><div class='del'>-	xmlNewChild (server_root, NULL, (xmlChar *) "port",</div><div class='del'>-		     (xmlChar *) server-&gt;port);</div><div class='del'>-	xmlNewChild (server_root, NULL, (xmlChar *) "host",</div><div class='del'>-		     (xmlChar *) server-&gt;host);</div><div class='del'>-	xmlNewChild (server_root, NULL, (xmlChar *) "rootdn",</div><div class='del'>-		     (xmlChar *) server-&gt;rootdn);</div><div class='del'>-	xmlNewChild (server_root, NULL, (xmlChar *) "scope",</div><div class='del'>-		     (xmlChar *) server-&gt;scope);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-save_ldap_data (const char *file_path)</div><div class='del'>-{</div><div class='del'>-	xmlDoc *doc;</div><div class='del'>-	xmlNode *root;</div><div class='del'>-	int fd, rv;</div><div class='del'>-	xmlChar *buf;</div><div class='del'>-	int buf_size;</div><div class='del'>-	char *new_path = g_strdup_printf ("%s.new", file_path);</div><div class='del'>-</div><div class='del'>-	doc = xmlNewDoc ((xmlChar *) "1.0");</div><div class='del'>-	root = xmlNewDocNode (doc, NULL, (xmlChar *) "contactservers", NULL);</div><div class='del'>-	xmlDocSetRootElement (doc, root);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (servers, ldap_server_foreach, root);</div><div class='del'>-</div><div class='del'>-	fd = open (new_path, O_CREAT | O_TRUNC | O_WRONLY, 0600);</div><div class='del'>-	fchmod (fd, 0600);</div><div class='del'>-</div><div class='del'>-	xmlDocDumpMemory (doc, &amp;buf, &amp;buf_size);</div><div class='del'>-</div><div class='del'>-	if (buf == NULL) {</div><div class='del'>-		g_error ("Failed to write ldapserver.xml: xmlBufferCreate() == NULL");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	rv = write (fd, buf, buf_size);</div><div class='del'>-	xmlFree (buf);</div><div class='del'>-	close (fd);</div><div class='del'>-</div><div class='del'>-	if (0 &gt; rv) {</div><div class='del'>-		g_error ("Failed to write new ldapserver.xml: %s\n", strerror(errno));</div><div class='del'>-		unlink (new_path);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (0 &gt; rename (new_path, file_path)) {</div><div class='del'>-			g_error ("Failed to rename ldapserver.xml: %s\n", strerror(errno));</div><div class='del'>-			unlink (new_path);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_ldap_storage_add_server (ELDAPServer *server)</div><div class='del'>-{</div><div class='del'>-	char *path;</div><div class='del'>-	/* add it to our hashtable */</div><div class='del'>-	g_hash_table_insert (servers, server-&gt;name, server);</div><div class='del'>-</div><div class='del'>-	/* and then to the ui */</div><div class='del'>-	path = g_strdup_printf ("/%s", server-&gt;name);</div><div class='del'>-	evolution_storage_new_folder (storage, path, server-&gt;name, "contacts",</div><div class='del'>-				      server-&gt;uri, server-&gt;description, FALSE);</div><div class='del'>-</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	save_ldap_data (ldapservers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_ldap_storage_remove_server (char *name)</div><div class='del'>-{</div><div class='del'>-	char *path;</div><div class='del'>-	ELDAPServer *server;</div><div class='del'>-</div><div class='del'>-	/* remove it from our hashtable */</div><div class='del'>-	server = (ELDAPServer*)g_hash_table_lookup (servers, name);</div><div class='del'>-	g_hash_table_remove (servers, name);</div><div class='del'>-</div><div class='del'>-	g_free (server-&gt;name);</div><div class='del'>-	g_free (server-&gt;description);</div><div class='del'>-	g_free (server-&gt;host);</div><div class='del'>-	g_free (server-&gt;port);</div><div class='del'>-	g_free (server-&gt;rootdn);</div><div class='del'>-	g_free (server-&gt;scope);</div><div class='del'>-	g_free (server-&gt;uri);</div><div class='del'>-</div><div class='del'>-	g_free (server);</div><div class='del'>-</div><div class='del'>-	/* and then from the ui */</div><div class='del'>-	path = g_strdup_printf ("/%s", name);</div><div class='del'>-	evolution_storage_removed_folder (storage, path);</div><div class='del'>-</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	save_ldap_data (ldapservers);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/e-ldap-storage.h b/addressbook/gui/component/e-ldap-storage.h<br/>deleted file mode 100644<br/>index 9d3e35b4db..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/e-ldap-storage.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/e-ldap-storage.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-ldap-storage.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: Chris Toshok</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_LDAP_STORAGE_H__</div><div class='del'>-#define __E_LDAP_STORAGE_H__</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name;</div><div class='del'>-	char *description;</div><div class='del'>-	char *host;</div><div class='del'>-	char *port;</div><div class='del'>-	char *rootdn;</div><div class='del'>-	char *scope;</div><div class='del'>-	char *uri; /* filled in from the above */</div><div class='del'>-} ELDAPServer;</div><div class='del'>-</div><div class='del'>-void setup_ldap_storage (EvolutionShellComponent *shell_component,</div><div class='del'>-			 const char *evolution_homedir);</div><div class='del'>-void e_ldap_storage_add_server (ELDAPServer *server);</div><div class='del'>-void e_ldap_storage_remove_server (char *name);</div><div class='del'>-</div><div class='del'>-#endif /* __E_LDAP_STORAGE_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 a4dad9c2c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/ldap-server-dialog.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/ldap-server-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,400 +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;output_main_file&gt;False&lt;/output_main_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;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;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;5&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;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;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;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;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;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;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;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;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;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;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;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;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;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;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;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;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'>-</div><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'>-</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;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;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;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;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/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;label5&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&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='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;/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 c99dfa3cb5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/ldap-server-dialog.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/ldap-server-dialog.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +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='del'>-gchar *s = N_("Name:");</div><div class='head'>diff --git a/addressbook/gui/component/select-names/.cvsignore b/addressbook/gui/component/select-names/.cvsignore<br/>deleted file mode 100644<br/>index 1d8db60890..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-Evolution-Addressbook-SelectNames-skels.c</div><div class='del'>-Evolution-Addressbook-SelectNames-common.c</div><div class='del'>-Evolution-Addressbook-SelectNames.h</div><div class='head'>diff --git a/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl b/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl<br/>deleted file mode 100644<br/>index 2bc8154daf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/Evolution-Addressbook-SelectNames.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * CORBA interface for the SelectNames dialog.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Ettore Perazzoli &lt;ettore@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'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module Evolution {</div><div class='del'>-module Addressbook {</div><div class='del'>-</div><div class='del'>-	interface SelectNames : Bonobo::Unknown {</div><div class='del'>-		struct Section {</div><div class='del'>-			string id;</div><div class='del'>-			string title;</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		typedef sequence&lt;Section&gt; SectionList;</div><div class='del'>-</div><div class='del'>-		exception DuplicateID {};</div><div class='del'>-		exception SectionNotFound {};</div><div class='del'>-</div><div class='del'>-		void add_section (in string id, in string title)</div><div class='del'>-			raises (DuplicateID);</div><div class='del'>-</div><div class='del'>-		Bonobo::Control get_entry_for_section (in string section_id)</div><div class='del'>-			raises (SectionNotFound);</div><div class='del'>-</div><div class='del'>-		void activate_dialog (in string section_id);</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-};</div><div class='head'>diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in<br/>deleted file mode 100644<br/>index e66c3aa38a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"</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 Addressbook's name selection interface"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"&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/Addressbook/SelectNames"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       value="Evolution's addressbook name selection interface."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo b/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo<br/>deleted file mode 100644<br/>index e66c3aa38a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.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:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"</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 Addressbook's name selection interface"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"&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/Addressbook/SelectNames"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       value="Evolution's addressbook name selection interface."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am<br/>deleted file mode 100644<br/>index 7c5d2672b0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-# CORBA stuff</div><div class='del'>-</div><div class='del'>-IDLS = \</div><div class='del'>-	Evolution-Addressbook-SelectNames.idl</div><div class='del'>-</div><div class='del'>-IDL_GENERATED = \</div><div class='del'>-	Evolution-Addressbook-SelectNames.h		\</div><div class='del'>-	Evolution-Addressbook-SelectNames-common.c	\</div><div class='del'>-	Evolution-Addressbook-SelectNames-skels.c	\</div><div class='del'>-	Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-</div><div class='del'>-Evolution-Addressbook-SelectNames-impl.o: Evolution-Addressbook-SelectNames.h</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS)</div><div class='del'>-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\</div><div class='del'>-		-I $(srcdir) $(srcdir)/Evolution-Addressbook-SelectNames.idl</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_DATA = evolution-addressbook-select-names.oafinfo</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-addressbook\"	\</div><div class='del'>-	$(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/gui/widgets		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/contact-editor	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-	$(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=\""$(localedir)"\"	\</div><div class='del'>-	-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libeselectnames.la</div><div class='del'>-</div><div class='del'>-libeselectnames_la_SOURCES = 		\</div><div class='del'>-	$(IDL_GENERATED)		\</div><div class='del'>-	e-select-names-bonobo.c		\</div><div class='del'>-	e-select-names-bonobo.h		\</div><div class='del'>-	e-select-names-factory.c	\</div><div class='del'>-	e-select-names-factory.h	\</div><div class='del'>-	e-select-names-manager.c	\</div><div class='del'>-	e-select-names-manager.h	\</div><div class='del'>-	e-select-names-model.c		\</div><div class='del'>-	e-select-names-model.h		\</div><div class='del'>-	e-select-names-table-model.c	\</div><div class='del'>-	e-select-names-table-model.h	\</div><div class='del'>-	e-select-names-text-model.c	\</div><div class='del'>-	e-select-names-text-model.h	\</div><div class='del'>-	e-select-names.c		\</div><div class='del'>-	e-select-names.h</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = select-names.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 			\</div><div class='del'>-	$(glade_DATA)		\</div><div class='del'>-	select-names.glade.h	\</div><div class='del'>-	$(oaf_DATA)		\</div><div class='del'>-	$(IDLS)</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED)</div><div class='del'>-CLEANFILES   += $(BUILT_SOURCES)</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.c b/addressbook/gui/component/select-names/e-select-names-bonobo.c<br/>deleted file mode 100644<br/>index d4e2d32cfc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-bonobo.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-bonobo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,294 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-select-names-bonobo.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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'>-</div><div class='del'>-#include &lt;bonobo/bonobo-property-bag.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include "e-select-names-manager.h"</div><div class='del'>-</div><div class='del'>-#include "e-select-names-bonobo.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE bonobo_object_get_type ()</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesBonoboPrivate {</div><div class='del'>-	ESelectNamesManager *manager;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _EntryPropertyID {</div><div class='del'>-	ENTRY_PROPERTY_ID_TEXT</div><div class='del'>-};</div><div class='del'>-typedef enum _EntryPropertyID EntryPropertyID;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* PropertyBag implementation for the entry widgets.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_get_property_fn (BonoboPropertyBag *bag,</div><div class='del'>-		       BonoboArg *arg,</div><div class='del'>-		       unsigned int arg_id,</div><div class='del'>-		       void *user_data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	char *text;</div><div class='del'>-</div><div class='del'>-	widget = GTK_WIDGET (user_data);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ENTRY_PROPERTY_ID_TEXT:</div><div class='del'>-		gtk_object_get (GTK_OBJECT (widget), "text", &amp;text, NULL);</div><div class='del'>-		BONOBO_ARG_SET_STRING (arg, text);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_set_property_fn (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'>-	GtkWidget *widget;</div><div class='del'>-	const char *text;</div><div class='del'>-</div><div class='del'>-	widget = GTK_WIDGET (user_data);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ENTRY_PROPERTY_ID_TEXT:</div><div class='del'>-		text = BONOBO_ARG_GET_STRING (arg);</div><div class='del'>-		gtk_object_set (GTK_OBJECT (widget), "text", text, NULL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* CORBA interface implementation.  */</div><div class='del'>-</div><div class='del'>-static POA_Evolution_Addressbook_SelectNames__vepv SelectNames_vepv;</div><div class='del'>-</div><div class='del'>-static POA_Evolution_Addressbook_SelectNames *</div><div class='del'>-create_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Addressbook_SelectNames *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_Evolution_Addressbook_SelectNames *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;SelectNames_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_Evolution_Addressbook_SelectNames__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_SelectNames_add_section (PortableServer_Servant servant,</div><div class='del'>-			      const CORBA_char *id,</div><div class='del'>-			      const CORBA_char *title,</div><div class='del'>-			      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_add_section (priv-&gt;manager, id, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Control</div><div class='del'>-impl_SelectNames_get_entry_for_section (PortableServer_Servant servant,</div><div class='del'>-					const CORBA_char *section_id,</div><div class='del'>-					CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-	GtkWidget *entry_widget;</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	BonoboPropertyBag *property_bag;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	entry_widget = e_select_names_manager_create_entry (priv-&gt;manager, section_id);</div><div class='del'>-	gtk_widget_show (entry_widget);</div><div class='del'>-</div><div class='del'>-	if (entry_widget == NULL) {</div><div class='del'>-		CORBA_exception_set (ev,</div><div class='del'>-				     CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Addressbook_SelectNames_SectionNotFound,</div><div class='del'>-				     NULL);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (entry_widget);</div><div class='del'>-</div><div class='del'>-	property_bag = bonobo_property_bag_new (entry_get_property_fn, entry_set_property_fn, entry_widget);</div><div class='del'>-	bonobo_property_bag_add (property_bag, "text", ENTRY_PROPERTY_ID_TEXT,</div><div class='del'>-				 BONOBO_ARG_STRING, NULL, NULL,</div><div class='del'>-				 BONOBO_PROPERTY_READABLE | BONOBO_PROPERTY_WRITEABLE);</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (control, property_bag);</div><div class='del'>-</div><div class='del'>-	return bonobo_object_corba_objref (BONOBO_OBJECT (control));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_SelectNames_activate_dialog (PortableServer_Servant servant,</div><div class='del'>-				  const CORBA_char *section_id,</div><div class='del'>-				  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (bonobo_object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_select_names_manager_activate_dialog (priv-&gt;manager, section_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	select_names = E_SELECT_NAMES_BONOBO (object);</div><div class='del'>-	priv = select_names-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;manager));</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-corba_class_init ()</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Addressbook_SelectNames__vepv *vepv;</div><div class='del'>-	POA_Evolution_Addressbook_SelectNames__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-</div><div class='del'>-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private    = NULL;</div><div class='del'>-	base_epv-&gt;finalize    = NULL;</div><div class='del'>-	base_epv-&gt;default_POA = NULL;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_Addressbook_SelectNames__epv, 1);</div><div class='del'>-	epv-&gt;add_section           = impl_SelectNames_add_section;</div><div class='del'>-	epv-&gt;get_entry_for_section = impl_SelectNames_get_entry_for_section;</div><div class='del'>-	epv-&gt;activate_dialog       = impl_SelectNames_activate_dialog;</div><div class='del'>-</div><div class='del'>-	vepv = &amp;SelectNames_vepv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv                    = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;Evolution_Addressbook_SelectNames_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (ESelectNamesBonoboClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = impl_destroy;</div><div class='del'>-</div><div class='del'>-	corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (ESelectNamesBonobo *select_names)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ESelectNamesBonoboPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;manager = e_select_names_manager_new ();</div><div class='del'>-</div><div class='del'>-	select_names-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_bonobo_construct (ESelectNamesBonobo *select_names,</div><div class='del'>-				 Evolution_Addressbook_SelectNames corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (select_names != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_SELECT_NAMES_BONOBO (select_names));</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (select_names), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESelectNamesBonobo *</div><div class='del'>-e_select_names_bonobo_new (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Addressbook_SelectNames *servant;</div><div class='del'>-	Evolution_Addressbook_SelectNames corba_object;</div><div class='del'>-	ESelectNamesBonobo *select_names;</div><div class='del'>-</div><div class='del'>-	servant = create_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	select_names = gtk_type_new (e_select_names_bonobo_get_type ());</div><div class='del'>-</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (select_names), servant);</div><div class='del'>-	e_select_names_bonobo_construct (select_names, corba_object);</div><div class='del'>-</div><div class='del'>-	return select_names;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_select_names_bonobo, "ESelectNamesBonobo", ESelectNamesBonobo, class_init, init, PARENT_TYPE)</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-bonobo.h b/addressbook/gui/component/select-names/e-select-names-bonobo.h<br/>deleted file mode 100644<br/>index 4531c1e024..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-bonobo.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-bonobo.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,71 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-select-names-bonobo.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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_SELECT_NAMES_BONOBO_H__</div><div class='del'>-#define __E_SELECT_NAMES_BONOBO_H__</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Evolution-Addressbook-SelectNames.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_BONOBO			(e_select_names_bonobo_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonobo))</div><div class='del'>-#define E_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_BONOBO, ESelectNamesBonoboClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_BONOBO(obj)			(GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))</div><div class='del'>-#define E_IS_SELECT_NAMES_BONOBO_CLASS(klass)		(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_SELECT_NAMES_BONOBO))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesBonobo        ESelectNamesBonobo;</div><div class='del'>-typedef struct _ESelectNamesBonoboPrivate ESelectNamesBonoboPrivate;</div><div class='del'>-typedef struct _ESelectNamesBonoboClass   ESelectNamesBonoboClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesBonobo {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-</div><div class='del'>-	ESelectNamesBonoboPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesBonoboClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType             e_select_names_bonobo_get_type   (void);</div><div class='del'>-void                e_select_names_bonobo_construct  (ESelectNamesBonobo *select_names,</div><div class='del'>-						      Evolution_Addressbook_SelectNames corba_object);</div><div class='del'>-ESelectNamesBonobo *e_select_names_bonobo_new        (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_SELECT_NAMES_BONOBO_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-factory.c b/addressbook/gui/component/select-names/e-select-names-factory.c<br/>deleted file mode 100644<br/>index 9a45692071..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-factory.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-select-names-factory.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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 "e-select-names-bonobo.h"</div><div class='del'>-</div><div class='del'>-#include "e-select-names-factory.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_ID "OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *factory,</div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	return BONOBO_OBJECT (e_select_names_bonobo_new ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_select_names_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (COMPONENT_FACTORY_ID, factory_fn, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-factory.h b/addressbook/gui/component/select-names/e-select-names-factory.h<br/>deleted file mode 100644<br/>index f65d5aaa9e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-factory.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-select-names-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 _E_SECELT_NAMES_FACTORY_H</div><div class='del'>-#define _E_SECELT_NAMES_FACTORY_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-gboolean e_select_names_factory_init (void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-manager.c b/addressbook/gui/component/select-names/e-select-names-manager.c<br/>deleted file mode 100644<br/>index f93d94b276..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-manager.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-manager.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,361 +0,0 @@</div><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'>- */</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 "e-select-names-manager.h"</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-#include "e-select-names-text-model.h"</div><div class='del'>-#include "e-select-names.h"</div><div class='del'>-#include &lt;gal/e-text/e-entry.h&gt;</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_CARD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *id;</div><div class='del'>-	char *title;</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-} ESelectNamesManagerSection;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *id;</div><div class='del'>-	EEntry *entry;</div><div class='del'>-} ESelectNamesManagerEntry;</div><div class='del'>-</div><div class='del'>-static void e_select_names_manager_init (ESelectNamesManager *manager);</div><div class='del'>-static void e_select_names_manager_class_init (ESelectNamesManagerClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_select_names_manager_destroy (GtkObject *object);</div><div class='del'>-static void e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_manager_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ESelectNamesManager class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;ESelectNamesManager class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_manager_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType manager_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!manager_type) {</div><div class='del'>-		GtkTypeInfo manager_info = {</div><div class='del'>-			"ESelectNamesManager",</div><div class='del'>-			sizeof (ESelectNamesManager),</div><div class='del'>-			sizeof (ESelectNamesManagerClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_manager_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_manager_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		manager_type = gtk_type_unique (gtk_object_get_type (), &amp;manager_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return manager_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_manager_new:</div><div class='del'>- * @VCard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ESelectNamesManager that wraps the @VCard.</div><div class='del'>- */</div><div class='del'>-ESelectNamesManager *</div><div class='del'>-e_select_names_manager_new (void)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManager *manager = E_SELECT_NAMES_MANAGER(gtk_type_new(e_select_names_manager_get_type()));</div><div class='del'>-	return manager;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_class_init (ESelectNamesManagerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ESelectNamesManager::card",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_manager_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_manager_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_select_names_manager_set_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ESelectNamesManager lifecycle management and vcard loading/saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManager *manager;</div><div class='del'>-	</div><div class='del'>-	manager = E_SELECT_NAMES_MANAGER (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(manager-&gt;sections));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(manager-&gt;entries));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the manager */</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManager *manager;</div><div class='del'>-	</div><div class='del'>-	manager = E_SELECT_NAMES_MANAGER (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the manager */</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManager *manager;</div><div class='del'>-</div><div class='del'>-	manager = E_SELECT_NAMES_MANAGER (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-section_copy(const void *sec, void *data)</div><div class='del'>-{</div><div class='del'>-	const ESelectNamesManagerSection *section = sec;</div><div class='del'>-	ESelectNamesManagerSection *newsec;</div><div class='del'>-	</div><div class='del'>-	newsec = g_new(ESelectNamesManagerSection, 1);</div><div class='del'>-	newsec-&gt;id = g_strdup(section-&gt;id);</div><div class='del'>-	newsec-&gt;title = g_strdup(section-&gt;title);</div><div class='del'>-	newsec-&gt;model = section-&gt;model;</div><div class='del'>-	if (newsec-&gt;model)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(newsec-&gt;model));</div><div class='del'>-	return newsec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-section_free(void *sec, void *data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerSection *section = sec;</div><div class='del'>-	g_free(section-&gt;id);</div><div class='del'>-	g_free(section-&gt;title);</div><div class='del'>-	if (section-&gt;model)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(section-&gt;model));</div><div class='del'>-	g_free(section);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-entry_copy(const void *ent, void *data)</div><div class='del'>-{</div><div class='del'>-	const ESelectNamesManagerEntry *entry = ent;</div><div class='del'>-	ESelectNamesManagerEntry *newent;</div><div class='del'>-	</div><div class='del'>-	newent = g_new(ESelectNamesManagerEntry, 1);</div><div class='del'>-	newent-&gt;id = g_strdup(entry-&gt;id);</div><div class='del'>-	newent-&gt;entry = entry-&gt;entry;</div><div class='del'>-	if (newent-&gt;entry)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(newent-&gt;entry));</div><div class='del'>-	return newent;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_free(void *ent, void *data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerEntry *entry = ent;</div><div class='del'>-	g_free(entry-&gt;id);</div><div class='del'>-	if (entry-&gt;entry)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(entry-&gt;entry));</div><div class='del'>-	g_free(entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_manager_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_select_names_manager_init (ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	manager-&gt;sections = e_list_new(section_copy, section_free, manager);</div><div class='del'>-	manager-&gt;entries  = e_list_new(entry_copy, entry_free, manager);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void                          e_select_names_manager_add_section               (ESelectNamesManager *manager,</div><div class='del'>-										const char *id,</div><div class='del'>-										const char *title)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesManagerSection *section;</div><div class='del'>-	</div><div class='del'>-	section = g_new(ESelectNamesManagerSection, 1);</div><div class='del'>-	section-&gt;id = g_strdup(id);</div><div class='del'>-	section-&gt;title = g_strdup(title);</div><div class='del'>-	section-&gt;model = e_select_names_model_new();</div><div class='del'>-	e_list_append(manager-&gt;sections, section);</div><div class='del'>-	section_free(section, manager);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-entry_destroyed(EEntry *entry, ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	if(!GTK_OBJECT_DESTROYED(manager)) {</div><div class='del'>-		EIterator *iterator = e_list_get_iterator(manager-&gt;entries);</div><div class='del'>-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ESelectNamesManagerEntry *this_entry = e_iterator_get(iterator);</div><div class='del'>-			if(entry == this_entry-&gt;entry) {</div><div class='del'>-				e_iterator_delete(iterator);</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(manager));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget                    *e_select_names_manager_create_entry              (ESelectNamesManager *manager,</div><div class='del'>-										const char *id)</div><div class='del'>-{</div><div class='del'>-	ETextModel *model;</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	iterator = e_list_get_iterator(manager-&gt;sections);</div><div class='del'>-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);</div><div class='del'>-		if (!strcmp(section-&gt;id, id)) {</div><div class='del'>-			ESelectNamesManagerEntry *entry;</div><div class='del'>-			EEntry *eentry;</div><div class='del'>-			eentry = E_ENTRY(e_entry_new());</div><div class='del'>-</div><div class='del'>-			entry = g_new(ESelectNamesManagerEntry, 1);</div><div class='del'>-			entry-&gt;entry = eentry;</div><div class='del'>-			entry-&gt;id = (char *)id;</div><div class='del'>-			model = e_select_names_text_model_new(section-&gt;model);</div><div class='del'>-			e_list_append(manager-&gt;entries, entry);</div><div class='del'>-			g_free(entry);</div><div class='del'>-</div><div class='del'>-			gtk_object_set(GTK_OBJECT(eentry),</div><div class='del'>-				       "model", model,</div><div class='del'>-				       "editable", TRUE,</div><div class='del'>-				       "use_ellipsis", TRUE,</div><div class='del'>-				       "allow_newlines", FALSE,</div><div class='del'>-				       NULL);</div><div class='del'>-			gtk_signal_connect(GTK_OBJECT(eentry), "destroy",</div><div class='del'>-					   GTK_SIGNAL_FUNC(entry_destroyed), manager);</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(manager));</div><div class='del'>-			return GTK_WIDGET(eentry);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_clicked(ESelectNames *dialog, gint button, ESelectNamesManager *manager)</div><div class='del'>-{</div><div class='del'>-	switch(button) {</div><div class='del'>-	case 0: {</div><div class='del'>-		EList *list = manager-&gt;sections;</div><div class='del'>-		EIterator *iterator = e_list_get_iterator(list);</div><div class='del'>-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			ESelectNamesManagerSection *section = (void *) e_iterator_get(iterator);</div><div class='del'>-			ESelectNamesModel *source = e_select_names_get_source(dialog, section-&gt;id);</div><div class='del'>-			if (section-&gt;model)</div><div class='del'>-				gtk_object_unref(GTK_OBJECT(section-&gt;model));</div><div class='del'>-			section-&gt;model = source;</div><div class='del'>-			/* Don't ref because get_source returns a conceptual ref_count of 1. */</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-</div><div class='del'>-		list = manager-&gt;entries;</div><div class='del'>-		iterator = e_list_get_iterator(list);</div><div class='del'>-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			ESelectNamesManagerEntry *entry = (void *) e_iterator_get(iterator);</div><div class='del'>-			ESelectNamesModel *source = e_select_names_get_source(dialog, entry-&gt;id);</div><div class='del'>-			if (source) {</div><div class='del'>-				ETextModel *model = e_select_names_text_model_new(source);</div><div class='del'>-				if (model) {</div><div class='del'>-					gtk_object_set(GTK_OBJECT(entry-&gt;entry),</div><div class='del'>-						       "model", model,</div><div class='del'>-						       NULL);</div><div class='del'>-					gtk_object_unref(GTK_OBJECT(source));</div><div class='del'>-				}</div><div class='del'>-				gtk_object_unref(GTK_OBJECT(model));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	}</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void                          e_select_names_manager_activate_dialog           (ESelectNamesManager *manager,</div><div class='del'>-										const char *id)</div><div class='del'>-{</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	</div><div class='del'>-	if (manager-&gt;names) {</div><div class='del'>-		g_assert (GTK_WIDGET_REALIZED (GTK_WIDGET (manager-&gt;names)));</div><div class='del'>-		gdk_window_show (GTK_WIDGET (manager-&gt;names)-&gt;window);</div><div class='del'>-		gdk_window_raise (GTK_WIDGET (manager-&gt;names)-&gt;window);</div><div class='del'>-	} else {</div><div class='del'>-		manager-&gt;names = E_SELECT_NAMES (e_select_names_new ());</div><div class='del'>-</div><div class='del'>-		iterator = e_list_get_iterator(manager-&gt;sections);</div><div class='del'>-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ESelectNamesManagerSection *section = e_iterator_get(iterator);</div><div class='del'>-			ESelectNamesModel *newmodel = e_select_names_model_duplicate(section-&gt;model);</div><div class='del'>-			e_select_names_add_section(manager-&gt;names, section-&gt;id, section-&gt;title, newmodel);</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(newmodel));</div><div class='del'>-		}</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(manager-&gt;names), "clicked",</div><div class='del'>-				   GTK_SIGNAL_FUNC(e_select_names_clicked), manager);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(manager-&gt;names), "destroy",</div><div class='del'>-				   GTK_SIGNAL_FUNC(gtk_widget_destroyed), </div><div class='del'>-				   &amp;manager-&gt;names);</div><div class='del'>-		gtk_widget_show(GTK_WIDGET(manager-&gt;names));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Of type ECard */</div><div class='del'>-EList                    *e_select_names_manager_get_cards                 (ESelectNamesManager *manager,</div><div class='del'>-									    const char *id)</div><div class='del'>-{</div><div class='del'>-	EIterator *iterator;</div><div class='del'>-	iterator = e_list_get_iterator(manager-&gt;sections);</div><div class='del'>-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		const ESelectNamesManagerSection *section = e_iterator_get(iterator);</div><div class='del'>-		if (!strcmp(section-&gt;id, id)) {</div><div class='del'>-			return e_select_names_model_get_cards(section-&gt;model);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-manager.h b/addressbook/gui/component/select-names/e-select-names-manager.h<br/>deleted file mode 100644<br/>index 13cddaac7d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-manager.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-manager.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,56 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</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'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_MANAGER_H__</div><div class='del'>-#define __E_SELECT_NAMES_MANAGER_H__</div><div class='del'>-</div><div class='del'>-#include &lt;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;e-util/e-list.h&gt;</div><div class='del'>-#include "e-select-names.h"</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_MANAGER            (e_select_names_manager_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_MANAGER(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManager))</div><div class='del'>-#define E_SELECT_NAMES_MANAGER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MANAGER, ESelectNamesManagerClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_MANAGER(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MANAGER))</div><div class='del'>-#define E_IS_SELECT_NAMES_MANAGER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MANAGER))</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesManager ESelectNamesManager;</div><div class='del'>-typedef struct _ESelectNamesManagerClass ESelectNamesManagerClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesManager {</div><div class='del'>-	GtkObject object;</div><div class='del'>-	</div><div class='del'>-	EList *sections;</div><div class='del'>-	EList *entries;</div><div class='del'>-</div><div class='del'>-	ESelectNames *names;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesManagerClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ESelectNamesManager *e_select_names_manager_new               (void);</div><div class='del'>-void                 e_select_names_manager_add_section       (ESelectNamesManager *manager,</div><div class='del'>-							       const char *id,</div><div class='del'>-							       const char *title);</div><div class='del'>-GtkWidget           *e_select_names_manager_create_entry      (ESelectNamesManager *manager,</div><div class='del'>-							       const char *id);</div><div class='del'>-void                 e_select_names_manager_activate_dialog   (ESelectNamesManager *manager,</div><div class='del'>-							       const char *id);</div><div class='del'>-</div><div class='del'>-/* Of type ECard */</div><div class='del'>-EList               *e_select_names_manager_get_cards         (ESelectNamesManager *manager,</div><div class='del'>-							       const char *id);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */			      </div><div class='del'>-GtkType              e_select_names_manager_get_type          (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_SELECT_NAMES_MANAGER_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-model.c b/addressbook/gui/component/select-names/e-select-names-model.c<br/>deleted file mode 100644<br/>index 0bbbe588a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-model.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,441 +0,0 @@</div><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'>- */</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 "e-select-names-model.h"</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	E_SELECT_NAMES_MODEL_CHANGED,</div><div class='del'>-	E_SELECT_NAMES_MODEL_LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_select_names_model_signals[E_SELECT_NAMES_MODEL_LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_CARD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_select_names_model_init (ESelectNamesModel *model);</div><div class='del'>-static void e_select_names_model_class_init (ESelectNamesModelClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_select_names_model_destroy (GtkObject *object);</div><div class='del'>-static void e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_model_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ESelectNamesModel 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;ESelectNamesModel class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType model_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!model_type) {</div><div class='del'>-		GtkTypeInfo model_info = {</div><div class='del'>-			"ESelectNamesModel",</div><div class='del'>-			sizeof (ESelectNamesModel),</div><div class='del'>-			sizeof (ESelectNamesModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_model_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		model_type = gtk_type_unique (gtk_object_get_type (), &amp;model_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return model_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_model_new:</div><div class='del'>- * @VCard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ESelectNamesModel that wraps the @VCard.</div><div class='del'>- */</div><div class='del'>-ESelectNamesModel *</div><div class='del'>-e_select_names_model_new (void)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_model_new:</div><div class='del'>- * @VCard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ESelectNamesModel that wraps the @VCard.</div><div class='del'>- */</div><div class='del'>-ESelectNamesModel *</div><div class='del'>-e_select_names_model_duplicate (ESelectNamesModel *old)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model = E_SELECT_NAMES_MODEL(gtk_type_new(e_select_names_model_get_type()));</div><div class='del'>-	model-&gt;data = e_list_duplicate(old-&gt;data);</div><div class='del'>-	model-&gt;id = g_strdup(old-&gt;id);</div><div class='del'>-	model-&gt;title = g_strdup(old-&gt;title);</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_class_init (ESelectNamesModelClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ESelectNamesModelClass, changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_select_names_model_signals, E_SELECT_NAMES_MODEL_LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ESelectNamesModel::card",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-</div><div class='del'>-	klass-&gt;changed = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_model_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_model_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_select_names_model_set_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ESelectNamesModel lifecycle management and vcard loading/saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_MODEL (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(model-&gt;data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *model;</div><div class='del'>-</div><div class='del'>-	model = E_SELECT_NAMES_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-data_copy(const void *sec, void *data)</div><div class='del'>-{</div><div class='del'>-	const ESelectNamesModelData *section = sec;</div><div class='del'>-	ESelectNamesModelData *newsec;</div><div class='del'>-	</div><div class='del'>-	newsec = g_new(ESelectNamesModelData, 1);</div><div class='del'>-	newsec-&gt;type = section-&gt;type;</div><div class='del'>-	newsec-&gt;card = section-&gt;card;</div><div class='del'>-	if (newsec-&gt;card)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(newsec-&gt;card));</div><div class='del'>-	newsec-&gt;string = g_strdup(section-&gt;string);</div><div class='del'>-	return newsec;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-data_free(void *sec, void *data)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModelData *section = sec;</div><div class='del'>-	if (section-&gt;card)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(section-&gt;card));</div><div class='del'>-	g_free(section-&gt;string);</div><div class='del'>-	g_free(section);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_model_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_init (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	model-&gt;data = e_list_new(data_copy, data_free, model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-copy_func(const void *data, void *user_data)</div><div class='del'>-{</div><div class='del'>-	GtkObject *object = (void *) data;</div><div class='del'>-	if (object)</div><div class='del'>-		gtk_object_ref(object);</div><div class='del'>-	return object;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_func(void *data, void *user_data)</div><div class='del'>-{</div><div class='del'>-	GtkObject *object = data;</div><div class='del'>-	if (object)</div><div class='del'>-		gtk_object_unref(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Of type ECard */</div><div class='del'>-EList                    *e_select_names_model_get_cards                 (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	EList *list = e_list_new(copy_func, free_func, NULL);</div><div class='del'>-	EIterator *iterator = e_list_get_iterator(model-&gt;data);</div><div class='del'>-	EIterator *new_iterator = e_list_get_iterator(list);</div><div class='del'>-</div><div class='del'>-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);</div><div class='del'>-		ECard *card;</div><div class='del'>-		ECardSimple *simple;</div><div class='del'>-		if (node-&gt;card) {</div><div class='del'>-			card = node-&gt;card;</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(card));</div><div class='del'>-		} else {</div><div class='del'>-			card = e_card_new("");</div><div class='del'>-		}</div><div class='del'>-		simple = e_card_simple_new(card);</div><div class='del'>-		e_card_simple_set_arbitrary(simple, "text_version", "string", node-&gt;string);</div><div class='del'>-		e_iterator_insert(new_iterator, card, FALSE);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-	}</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EList                    *e_select_names_model_get_data                 (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	return model-&gt;data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_model_changed           (ESelectNamesModel *model)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit(GTK_OBJECT(model),</div><div class='del'>-			e_select_names_model_signals[E_SELECT_NAMES_MODEL_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_insert            (ESelectNamesModel *model,</div><div class='del'>-					EIterator *iterator, /* Must be one of the iterators in the model, or NULL if the list is empty. */</div><div class='del'>-					int index,</div><div class='del'>-					char *data)</div><div class='del'>-{</div><div class='del'>-	gchar **strings = e_strsplit(data, ",", -1);</div><div class='del'>-	int i;</div><div class='del'>-	if (iterator == NULL) {</div><div class='del'>-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS, NULL, ""};</div><div class='del'>-</div><div class='del'>-		e_list_append(model-&gt;data, &amp;new);</div><div class='del'>-		iterator = e_list_get_iterator(model-&gt;data);</div><div class='del'>-</div><div class='del'>-		index = 0;</div><div class='del'>-	} else {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	if (strings[0]) {</div><div class='del'>-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);</div><div class='del'>-		gchar *temp = g_strdup_printf("%.*s%s%s", index, node-&gt;string, strings[0], node-&gt;string + index);</div><div class='del'>-		g_free(node-&gt;string);</div><div class='del'>-		node-&gt;string = temp;</div><div class='del'>-		index += strlen(strings[0]);</div><div class='del'>-</div><div class='del'>-		for (i = 1; strings[i]; i++) {</div><div class='del'>-			ESelectNamesModelData *node = (void *) e_iterator_get(iterator);</div><div class='del'>-			gchar *temp = g_strdup_printf("%.*s", index, node-&gt;string);</div><div class='del'>-			gchar *temp2 = g_strdup_printf("%s%s", strings[i], node-&gt;string + index);</div><div class='del'>-</div><div class='del'>-			g_free(node-&gt;string);</div><div class='del'>-			node-&gt;type = E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS;</div><div class='del'>-			node-&gt;string = temp;</div><div class='del'>-			if (node-&gt;card)</div><div class='del'>-				gtk_object_unref(GTK_OBJECT(node-&gt;card));</div><div class='del'>-			node-&gt;card = NULL;</div><div class='del'>-</div><div class='del'>-			node = g_new(ESelectNamesModelData, 1);</div><div class='del'>-			node-&gt;type = E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS;</div><div class='del'>-			node-&gt;card = NULL;</div><div class='del'>-			node-&gt;string = temp2;</div><div class='del'>-			e_iterator_insert(iterator, node, 0);</div><div class='del'>-			index = strlen(strings[i]);</div><div class='del'>-			g_free(node-&gt;string);</div><div class='del'>-			g_free(node);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	e_select_names_model_changed(model);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_insert_length     (ESelectNamesModel *model,</div><div class='del'>-					EIterator *iterator, /* Must be one of the iterators in the model. */</div><div class='del'>-					int index,</div><div class='del'>-					char *data,</div><div class='del'>-					int length)</div><div class='del'>-{</div><div class='del'>-	gchar *string = g_new(char, length + 1);</div><div class='del'>-	strncpy(string, data, length);</div><div class='del'>-	string[length] = 0;</div><div class='del'>-	e_select_names_model_insert(model, iterator, index, string);</div><div class='del'>-	g_free(string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_delete            (ESelectNamesModel *model,</div><div class='del'>-					EIterator *iterator, /* Must be one of the iterators in the model. */</div><div class='del'>-					int index,</div><div class='del'>-					int length)</div><div class='del'>-{</div><div class='del'>-	while (length &gt; 0 &amp;&amp; e_iterator_is_valid(iterator)) {</div><div class='del'>-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);</div><div class='del'>-		int this_length = strlen(node-&gt;string);</div><div class='del'>-		if (this_length &lt;= index + length) {</div><div class='del'>-			gchar *temp = g_strdup_printf("%.*s", index, node-&gt;string);</div><div class='del'>-			g_free(node-&gt;string);</div><div class='del'>-			node-&gt;string = temp;</div><div class='del'>-			length -= this_length - index;</div><div class='del'>-		} else {</div><div class='del'>-			gchar *temp = g_strdup_printf("%.*s%s", index, node-&gt;string, node-&gt;string + index + length);</div><div class='del'>-			g_free(node-&gt;string);</div><div class='del'>-			node-&gt;string = temp;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (length &gt; 0) {</div><div class='del'>-			e_iterator_next(iterator);</div><div class='del'>-			if (e_iterator_is_valid(iterator)) {</div><div class='del'>-				ESelectNamesModelData *node2 = (void *) e_iterator_get(iterator);</div><div class='del'>-				gchar *temp = g_strdup_printf("%s%s", node-&gt;string, node2-&gt;string);</div><div class='del'>-				g_free(node2-&gt;string);</div><div class='del'>-				node2-&gt;string = temp;</div><div class='del'>-				e_iterator_prev(iterator);</div><div class='del'>-				e_iterator_delete(iterator);</div><div class='del'>-				length --;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	e_select_names_model_changed(model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_replace           (ESelectNamesModel *model,</div><div class='del'>-					EIterator *iterator, /* Must be one of the iterators in the model. */</div><div class='del'>-					int index,</div><div class='del'>-					int length,</div><div class='del'>-					char *data)</div><div class='del'>-{</div><div class='del'>-	if (iterator == NULL) {</div><div class='del'>-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS, NULL, ""};</div><div class='del'>-</div><div class='del'>-		e_list_append(model-&gt;data, &amp;new);</div><div class='del'>-		iterator = e_list_get_iterator(model-&gt;data);</div><div class='del'>-</div><div class='del'>-		index = 0;</div><div class='del'>-	} else {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(iterator));</div><div class='del'>-	}</div><div class='del'>-	while (length &gt; 0 &amp;&amp; e_iterator_is_valid(iterator)) {</div><div class='del'>-		ESelectNamesModelData *node = (void *) e_iterator_get(iterator);</div><div class='del'>-		int this_length = strlen(node-&gt;string);</div><div class='del'>-		if (this_length &lt;= index + length) {</div><div class='del'>-			gchar *temp = g_strdup_printf("%.*s", index, node-&gt;string);</div><div class='del'>-			g_free(node-&gt;string);</div><div class='del'>-			node-&gt;string = temp;</div><div class='del'>-			length -= this_length - index;</div><div class='del'>-		} else {</div><div class='del'>-			gchar *temp = g_strdup_printf("%.*s%s", index, node-&gt;string, node-&gt;string + index + length);</div><div class='del'>-			g_free(node-&gt;string);</div><div class='del'>-			node-&gt;string = temp;</div><div class='del'>-			length = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (length &gt; 0) {</div><div class='del'>-			e_iterator_next(iterator);</div><div class='del'>-			if (e_iterator_is_valid(iterator)) {</div><div class='del'>-				ESelectNamesModelData *node2 = (void *) e_iterator_get(iterator);</div><div class='del'>-				gchar *temp = g_strdup_printf("%s%s", node-&gt;string, node2-&gt;string);</div><div class='del'>-				g_free(node2-&gt;string);</div><div class='del'>-				node2-&gt;string = temp;</div><div class='del'>-				e_iterator_prev(iterator);</div><div class='del'>-				e_iterator_delete(iterator);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!e_iterator_is_valid(iterator)) {</div><div class='del'>-		ESelectNamesModelData *node;</div><div class='del'>-		e_iterator_last(iterator);</div><div class='del'>-		if (e_iterator_is_valid(iterator)) {</div><div class='del'>-			node = (void *) e_iterator_get(iterator);</div><div class='del'>-			index = strlen(node-&gt;string);</div><div class='del'>-		} else</div><div class='del'>-			index = 0;</div><div class='del'>-	}</div><div class='del'>-	e_select_names_model_insert (model, iterator, index, data);</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_select_names_model_add_item          (ESelectNamesModel *model,</div><div class='del'>-					EIterator *iterator, /* NULL for at the beginning. */</div><div class='del'>-					ESelectNamesModelData *data)</div><div class='del'>-{</div><div class='del'>-	e_iterator_insert(iterator, data, FALSE);</div><div class='del'>-	e_select_names_model_changed(model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_model_remove_item       (ESelectNamesModel *model,</div><div class='del'>-					EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	e_iterator_delete(iterator);</div><div class='del'>-	e_select_names_model_changed(model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-model.h b/addressbook/gui/component/select-names/e-select-names-model.h<br/>deleted file mode 100644<br/>index 4ea1bdc8db..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-model.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,93 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</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'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_MODEL_H__</div><div class='del'>-#define __E_SELECT_NAMES_MODEL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;e-util/e-list.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_MODEL            (e_select_names_model_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModel))</div><div class='del'>-#define E_SELECT_NAMES_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_MODEL, ESelectNamesModelClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_MODEL))</div><div class='del'>-#define E_IS_SELECT_NAMES_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_MODEL))</div><div class='del'>-</div><div class='del'>-typedef enum   _ESelectNamesModelDataType ESelectNamesModelDataType;</div><div class='del'>-typedef struct _ESelectNamesModelData ESelectNamesModelData;</div><div class='del'>-typedef struct _ESelectNamesModel ESelectNamesModel;</div><div class='del'>-typedef struct _ESelectNamesModelClass ESelectNamesModelClass;</div><div class='del'>-</div><div class='del'>-enum _ESelectNamesModelDataType {</div><div class='del'>-	E_SELECT_NAMES_MODEL_DATA_TYPE_CARD,</div><div class='del'>-	E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesModelData {</div><div class='del'>-	ESelectNamesModelDataType type;</div><div class='del'>-	ECard *card;</div><div class='del'>-	char *string;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesModel {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	char *id;</div><div class='del'>-	char *title;</div><div class='del'>-	</div><div class='del'>-	EList *data; /* Of type ESelectNamesModelData. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesModelClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*changed) (ESelectNamesModel *model);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ESelectNamesModel *e_select_names_model_new               (void);</div><div class='del'>-ESelectNamesModel *e_select_names_model_duplicate         (ESelectNamesModel *old);</div><div class='del'>-</div><div class='del'>-/* These lengths are allowed to go over objects and act just like the text model does. */</div><div class='del'>-void               e_select_names_model_insert            (ESelectNamesModel *model,</div><div class='del'>-							   EIterator *iterator, /* Must be one of the iterators in the model. */</div><div class='del'>-							   int index,</div><div class='del'>-							   char *data);</div><div class='del'>-void               e_select_names_model_insert_length     (ESelectNamesModel *model,</div><div class='del'>-							   EIterator *iterator, /* Must be one of the iterators in the model. */</div><div class='del'>-							   int index,</div><div class='del'>-							   char *data,</div><div class='del'>-							   int length);</div><div class='del'>-void               e_select_names_model_delete            (ESelectNamesModel *model,</div><div class='del'>-							   EIterator *iterator, /* Must be one of the iterators in the model. */</div><div class='del'>-							   int index,</div><div class='del'>-							   int length);</div><div class='del'>-void               e_select_names_model_replace           (ESelectNamesModel *model,</div><div class='del'>-							   EIterator *iterator, /* Must be one of the iterators in the model. */</div><div class='del'>-							   int index,</div><div class='del'>-							   int replacement_length,</div><div class='del'>-							   char *data);</div><div class='del'>-</div><div class='del'>-void               e_select_names_model_add_item          (ESelectNamesModel *model,</div><div class='del'>-							   EIterator *iterator, /* NULL for at the beginning. */</div><div class='del'>-							   ESelectNamesModelData *data);</div><div class='del'>-void               e_select_names_model_remove_item       (ESelectNamesModel *model,</div><div class='del'>-							   EIterator *iterator);</div><div class='del'>-</div><div class='del'>-/* Of type ECard */</div><div class='del'>-EList             *e_select_names_model_get_cards         (ESelectNamesModel *model);</div><div class='del'>-</div><div class='del'>-/* Of type ESelectNamesModelData */</div><div class='del'>-EList             *e_select_names_model_get_data          (ESelectNamesModel *model);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */			      </div><div class='del'>-GtkType            e_select_names_model_get_type          (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_SELECT_NAMES_MODEL_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c<br/>deleted file mode 100644<br/>index 37abcddc70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-table-model.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-table-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,353 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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'>- */</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;gal/util/e-util.h&gt;</div><div class='del'>-#include "e-select-names-table-model.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_SOURCE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_select_names_table_model_init       (ESelectNamesTableModel *model);</div><div class='del'>-static void e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_select_names_table_model_destroy    (GtkObject *object);</div><div class='del'>-static void e_select_names_table_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_table_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-static void e_select_names_table_model_model_changed (ESelectNamesModel *source,</div><div class='del'>-						      ESelectNamesTableModel *model);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_add_source (ESelectNamesTableModel *model,</div><div class='del'>-				       ESelectNamesModel     *source)</div><div class='del'>-{</div><div class='del'>-	model-&gt;source = source;</div><div class='del'>-	if (model-&gt;source)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(model-&gt;source));</div><div class='del'>-	model-&gt;source_changed_id = gtk_signal_connect(GTK_OBJECT(model-&gt;source), "changed",</div><div class='del'>-						      GTK_SIGNAL_FUNC(e_select_names_table_model_model_changed),</div><div class='del'>-						      model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_drop_source (ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;source_changed_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT(model-&gt;source), model-&gt;source_changed_id);</div><div class='del'>-	if (model-&gt;source)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;source));</div><div class='del'>-	model-&gt;source = NULL;</div><div class='del'>-	model-&gt;source_changed_id = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_table_model_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ESelectNamesTableModel class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;ESelectNamesTableModel class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_table_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType model_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!model_type) {</div><div class='del'>-		GtkTypeInfo model_info = {</div><div class='del'>-			"ESelectNamesTableModel",</div><div class='del'>-			sizeof (ESelectNamesTableModel),</div><div class='del'>-			sizeof (ESelectNamesTableModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_table_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_table_model_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		model_type = gtk_type_unique (e_table_model_get_type (), &amp;model_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return model_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_table_model_new:</div><div class='del'>- * @VCard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ESelectNamesTableModel that wraps the @VCard.</div><div class='del'>- */</div><div class='del'>-ETableModel *</div><div class='del'>-e_select_names_table_model_new (ESelectNamesModel *source)</div><div class='del'>-{</div><div class='del'>-	ETableModel *model = E_TABLE_MODEL(gtk_type_new(e_select_names_table_model_get_type()));</div><div class='del'>-	gtk_object_set(GTK_OBJECT(model),</div><div class='del'>-		       "source", source,</div><div class='del'>-		       NULL);</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info (ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;source) {</div><div class='del'>-		EList *list = e_select_names_model_get_data(model-&gt;source);</div><div class='del'>-		EIterator *iterator = e_list_get_iterator(list);</div><div class='del'>-		int count = 0;</div><div class='del'>-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			count ++;</div><div class='del'>-		}</div><div class='del'>-		model-&gt;count = count;</div><div class='del'>-		model-&gt;data = g_new(ESelectNamesTableModelData, count);</div><div class='del'>-		count = 0;</div><div class='del'>-		for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-			const ESelectNamesModelData *data = e_iterator_get(iterator);</div><div class='del'>-			switch (data-&gt;type) {</div><div class='del'>-			case E_SELECT_NAMES_MODEL_DATA_TYPE_CARD: {</div><div class='del'>-				ECardSimple *simple = e_card_simple_new(data-&gt;card);</div><div class='del'>-				model-&gt;data[count].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);</div><div class='del'>-				if ((model-&gt;data[count].name == 0) || *model-&gt;data[count].name == 0) {</div><div class='del'>-					model-&gt;data[count].name =  e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_ORG);</div><div class='del'>-				}</div><div class='del'>-				if (model-&gt;data[count].name == 0)</div><div class='del'>-					model-&gt;data[count].name = g_strdup("");</div><div class='del'>-				model-&gt;data[count].email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);</div><div class='del'>-				if (model-&gt;data[count].email == 0)</div><div class='del'>-					model-&gt;data[count].email = g_strdup("");</div><div class='del'>-				gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-				count ++;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			case E_SELECT_NAMES_MODEL_DATA_TYPE_STRING_ADDRESS:</div><div class='del'>-				model-&gt;data[count].name =  e_strdup_strip(data-&gt;string);</div><div class='del'>-				model-&gt;data[count].email = e_strdup_strip(data-&gt;string);</div><div class='del'>-				count ++;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		model-&gt;count = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-clear_info (ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; i &lt; model-&gt;count; i++) {</div><div class='del'>-		g_free(model-&gt;data[i].name);</div><div class='del'>-		g_free(model-&gt;data[i].email);</div><div class='del'>-	}</div><div class='del'>-	g_free(model-&gt;data);</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;count = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ESelectNamesTableModel lifecycle management and vcard loading/saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_TABLE_MODEL (object);</div><div class='del'>-</div><div class='del'>-	e_select_names_table_model_drop_source (model);</div><div class='del'>-	clear_info(model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of columns in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-e_select_names_table_model_col_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	return 2;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the number of rows in our ETableModel. */</div><div class='del'>-static int</div><div class='del'>-e_select_names_table_model_row_count (ETableModel *etc)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);</div><div class='del'>-	if (e_select_names_table_model-&gt;count == -1) {</div><div class='del'>-		if (e_select_names_table_model-&gt;source) {</div><div class='del'>-			fill_in_info(e_select_names_table_model);</div><div class='del'>-		} else {</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return e_select_names_table_model-&gt;count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns the value at a particular point in our ETableModel. */</div><div class='del'>-static void *</div><div class='del'>-e_select_names_table_model_value_at (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *e_select_names_table_model = E_SELECT_NAMES_TABLE_MODEL(etc);</div><div class='del'>-	if (e_select_names_table_model-&gt;data == NULL) {</div><div class='del'>-		fill_in_info(e_select_names_table_model);</div><div class='del'>-	}</div><div class='del'>-	switch (col) {</div><div class='del'>-	case 0:</div><div class='del'>-		if (e_select_names_table_model-&gt;data[row].name == NULL) {</div><div class='del'>-			fill_in_info(e_select_names_table_model);</div><div class='del'>-		}</div><div class='del'>-		return e_select_names_table_model-&gt;data[row].name;</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		if (e_select_names_table_model-&gt;data[row].email == NULL) {</div><div class='del'>-			fill_in_info(e_select_names_table_model);</div><div class='del'>-		}</div><div class='del'>-		return e_select_names_table_model-&gt;data[row].email;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function sets the value at a particular point in our ETableModel. */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_set_value_at (ETableModel *etc, int col, int row, const void *val)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function returns whether a particular cell is editable. */</div><div class='del'>-static gboolean</div><div class='del'>-e_select_names_table_model_is_cell_editable (ETableModel *etc, int col, int row)</div><div class='del'>-{</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function duplicates the value passed to it. */</div><div class='del'>-static void *</div><div class='del'>-e_select_names_table_model_duplicate_value (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function frees the value passed to it. */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_free_value (ETableModel *etc, int col, void *value)</div><div class='del'>-{</div><div class='del'>-	g_free(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-e_select_names_table_model_initialize_value (ETableModel *etc, int col)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_select_names_table_model_value_is_empty (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return !(value &amp;&amp; *(char *)value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_select_names_table_model_value_to_string (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_model_changed (ESelectNamesModel     *source,</div><div class='del'>-					  ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	clear_info(model);</div><div class='del'>-	e_table_model_changed(E_TABLE_MODEL(model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_TABLE_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_SOURCE:</div><div class='del'>-		e_select_names_table_model_drop_source (model);</div><div class='del'>-		e_select_names_table_model_add_source (model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT (*arg)));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTableModel *model;</div><div class='del'>-</div><div class='del'>-	model = E_SELECT_NAMES_TABLE_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_SOURCE:</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model-&gt;source);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_table_model_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_init (ESelectNamesTableModel *model)</div><div class='del'>-{</div><div class='del'>-	model-&gt;source = NULL;</div><div class='del'>-	model-&gt;source_changed_id = 0;</div><div class='del'>-</div><div class='del'>-	model-&gt;count = -1;</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_table_model_class_init (ESelectNamesTableModelClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	ETableModelClass *table_model_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	table_model_class = E_TABLE_MODEL_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ESelectNamesTableModel::source",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_table_model_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_table_model_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_select_names_table_model_set_arg;</div><div class='del'>-</div><div class='del'>-	table_model_class-&gt;column_count = e_select_names_table_model_col_count;</div><div class='del'>-	table_model_class-&gt;row_count = e_select_names_table_model_row_count;</div><div class='del'>-	table_model_class-&gt;value_at = e_select_names_table_model_value_at;</div><div class='del'>-	table_model_class-&gt;set_value_at = e_select_names_table_model_set_value_at;</div><div class='del'>-	table_model_class-&gt;is_cell_editable = e_select_names_table_model_is_cell_editable;</div><div class='del'>-	table_model_class-&gt;duplicate_value = e_select_names_table_model_duplicate_value;</div><div class='del'>-	table_model_class-&gt;free_value = e_select_names_table_model_free_value;</div><div class='del'>-	table_model_class-&gt;initialize_value = e_select_names_table_model_initialize_value;</div><div class='del'>-	table_model_class-&gt;value_is_empty = e_select_names_table_model_value_is_empty;</div><div class='del'>-	table_model_class-&gt;value_to_string = e_select_names_table_model_value_to_string;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.h b/addressbook/gui/component/select-names/e-select-names-table-model.h<br/>deleted file mode 100644<br/>index 7a051d337c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-table-model.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-table-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@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'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_TABLE_MODEL_H__</div><div class='del'>-#define __E_SELECT_NAMES_TABLE_MODEL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_TABLE_MODEL            (e_select_names_table_model_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_TABLE_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModel))</div><div class='del'>-#define E_SELECT_NAMES_TABLE_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL, ESelectNamesTableModelClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_TABLE_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TABLE_MODEL))</div><div class='del'>-#define E_IS_SELECT_NAMES_TABLE_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TABLE_MODEL))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name;</div><div class='del'>-	char *email;</div><div class='del'>-} ESelectNamesTableModelData;</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesTableModel ESelectNamesTableModel;</div><div class='del'>-typedef struct _ESelectNamesTableModelClass ESelectNamesTableModelClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesTableModel {</div><div class='del'>-	ETableModel parent;</div><div class='del'>-</div><div class='del'>-	ESelectNamesModel *source;</div><div class='del'>-	int source_changed_id;</div><div class='del'>-</div><div class='del'>-	int count;</div><div class='del'>-	ESelectNamesTableModelData *data; /* This is used as an array. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesTableModelClass {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ETableModel *e_select_names_table_model_new  (ESelectNamesModel *source);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */			      </div><div class='del'>-GtkType     e_select_names_table_model_get_type (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_SELECT_NAMES_TABLE_MODEL_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.c b/addressbook/gui/component/select-names/e-select-names-text-model.c<br/>deleted file mode 100644<br/>index 71934c46dc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-text-model.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-text-model.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 -*- */</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'>- */</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 "e-select-names-text-model.h"</div><div class='del'>-</div><div class='del'>-/* Object argument IDs */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_SOURCE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void e_select_names_text_model_init       (ESelectNamesTextModel *model);</div><div class='del'>-static void e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass);</div><div class='del'>-</div><div class='del'>-static void e_select_names_text_model_destroy    (GtkObject *object);</div><div class='del'>-static void e_select_names_text_model_set_arg    (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_select_names_text_model_get_arg    (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-static void  e_select_names_text_model_set_text      (ETextModel *model, gchar *text);</div><div class='del'>-static void  e_select_names_text_model_insert        (ETextModel *model, gint position, gchar *text);</div><div class='del'>-static void  e_select_names_text_model_insert_length (ETextModel *model, gint position, gchar *text, gint length);</div><div class='del'>-static void  e_select_names_text_model_delete        (ETextModel *model, gint position, gint length);</div><div class='del'>-</div><div class='del'>-static void e_select_names_text_model_model_changed (ESelectNamesModel *source,</div><div class='del'>-						     ESelectNamesTextModel *model);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ETextModelClass *parent_class;</div><div class='del'>-#define PARENT_TYPE e_text_model_get_type()</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_text_model_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;ESelectNamesTextModel class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;ESelectNamesTextModel class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_select_names_text_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType model_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!model_type) {</div><div class='del'>-		GtkTypeInfo model_info = {</div><div class='del'>-			"ESelectNamesTextModel",</div><div class='del'>-			sizeof (ESelectNamesTextModel),</div><div class='del'>-			sizeof (ESelectNamesTextModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_select_names_text_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_select_names_text_model_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		model_type = gtk_type_unique (PARENT_TYPE, &amp;model_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return model_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_text_model_new:</div><div class='del'>- * @VCard: a string in vCard format</div><div class='del'>- *</div><div class='del'>- * Returns: a new #ESelectNamesTextModel that wraps the @VCard.</div><div class='del'>- */</div><div class='del'>-ETextModel *</div><div class='del'>-e_select_names_text_model_new (ESelectNamesModel *source)</div><div class='del'>-{</div><div class='del'>-	ETextModel *model = E_TEXT_MODEL(gtk_type_new(e_select_names_text_model_get_type()));</div><div class='del'>-	gtk_object_set(GTK_OBJECT(model),</div><div class='del'>-		       "source", source,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_select_names_text_model_model_changed (source, E_SELECT_NAMES_TEXT_MODEL(model));</div><div class='del'>-	return model;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_class_init (ESelectNamesTextModelClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	ETextModelClass *text_model_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	text_model_class = E_TEXT_MODEL_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class(PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ESelectNamesTextModel::source",</div><div class='del'>-				 GTK_TYPE_OBJECT, GTK_ARG_READWRITE, ARG_SOURCE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_select_names_text_model_destroy;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_text_model_get_arg;</div><div class='del'>-	object_class-&gt;set_arg = e_select_names_text_model_set_arg;</div><div class='del'>-</div><div class='del'>-	text_model_class-&gt;set_text      = e_select_names_text_model_set_text;</div><div class='del'>-	text_model_class-&gt;insert        = e_select_names_text_model_insert;</div><div class='del'>-	text_model_class-&gt;insert_length = e_select_names_text_model_insert_length;</div><div class='del'>-	text_model_class-&gt;delete        = e_select_names_text_model_delete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_length(EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	const ESelectNamesModelData *data = e_iterator_get(iterator);</div><div class='del'>-	return strlen(data-&gt;string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_set_text    	(ETextModel *model, gchar *text)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)-&gt;source;</div><div class='del'>-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));</div><div class='del'>-	int length = 0;</div><div class='del'>-	if (model-&gt;text) {</div><div class='del'>-		length = strlen(model-&gt;text);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_iterator_reset(iterator);</div><div class='del'>-	if (!e_iterator_is_valid(iterator)) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		iterator = NULL;</div><div class='del'>-	}</div><div class='del'>-	e_select_names_model_replace(source,</div><div class='del'>-				     iterator,</div><div class='del'>-				     0,</div><div class='del'>-				     length,</div><div class='del'>-				     text);</div><div class='del'>-	if (iterator)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_insert      	(ETextModel *model, gint position, gchar *text)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)-&gt;source;</div><div class='del'>-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));</div><div class='del'>-</div><div class='del'>-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		int this_length = get_length(iterator);</div><div class='del'>-		if (position &lt;= this_length) {</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			position -= this_length + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!e_iterator_is_valid(iterator)) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		iterator = NULL;</div><div class='del'>-	}</div><div class='del'>-	e_select_names_model_insert(source,</div><div class='del'>-				    iterator,</div><div class='del'>-				    position,</div><div class='del'>-				    text);</div><div class='del'>-	if (iterator)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_insert_length (ETextModel *model, gint position, gchar *text, gint length)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)-&gt;source;</div><div class='del'>-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));</div><div class='del'>-</div><div class='del'>-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		int this_length = get_length(iterator);</div><div class='del'>-		if (position &lt;= this_length) {</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			position -= this_length + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (!e_iterator_is_valid(iterator)) {</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-		iterator = NULL;</div><div class='del'>-	}</div><div class='del'>-	e_select_names_model_insert_length(source,</div><div class='del'>-					   iterator,</div><div class='del'>-					   position,</div><div class='del'>-					   text,</div><div class='del'>-					   length);</div><div class='del'>-	if (iterator)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_delete        (ETextModel *model, gint position, gint length)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesModel *source = E_SELECT_NAMES_TEXT_MODEL(model)-&gt;source;</div><div class='del'>-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(source));</div><div class='del'>-</div><div class='del'>-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		int this_length = get_length(iterator);</div><div class='del'>-		if (position &lt;= this_length) {</div><div class='del'>-			e_select_names_model_delete(source,</div><div class='del'>-						    iterator,</div><div class='del'>-						    position,</div><div class='del'>-						    length);</div><div class='del'>-			break;</div><div class='del'>-		} else {</div><div class='del'>-			position -= this_length + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (iterator)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(iterator));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_model_changed (ESelectNamesModel     *source,</div><div class='del'>-					 ESelectNamesTextModel *model)</div><div class='del'>-{</div><div class='del'>-	EList *list = e_select_names_model_get_data(source);</div><div class='del'>-	EIterator *iterator = e_list_get_iterator(list);</div><div class='del'>-	int length = 0;</div><div class='del'>-	int length_count = 0;</div><div class='del'>-	int *lengthsp;</div><div class='del'>-	char *string;</div><div class='del'>-	char *stringp;</div><div class='del'>-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		const ESelectNamesModelData *data = e_iterator_get(iterator);</div><div class='del'>-		length += strlen(data-&gt;string);</div><div class='del'>-		length ++;</div><div class='del'>-		length_count++;</div><div class='del'>-	}</div><div class='del'>-	if (length &gt; 0)</div><div class='del'>-		length --;</div><div class='del'>-</div><div class='del'>-	g_free(model-&gt;lengths);</div><div class='del'>-	model-&gt;lengths = g_new(int, length_count + 1);</div><div class='del'>-	lengthsp = model-&gt;lengths;</div><div class='del'>-</div><div class='del'>-	string = g_new(char, length + 1);</div><div class='del'>-	stringp = string;</div><div class='del'>-	*stringp = 0;</div><div class='del'>-	for (e_iterator_reset(iterator); e_iterator_is_valid(iterator); e_iterator_next(iterator)) {</div><div class='del'>-		const ESelectNamesModelData *data = e_iterator_get(iterator);</div><div class='del'>-		int this_length;</div><div class='del'>-</div><div class='del'>-		strcpy(stringp, data-&gt;string);</div><div class='del'>-		this_length = strlen(stringp);</div><div class='del'>-		stringp += this_length;</div><div class='del'>-		*(stringp++) = ',';</div><div class='del'>-		*(lengthsp++) = this_length;</div><div class='del'>-	}</div><div class='del'>-	if (stringp != string) {</div><div class='del'>-		stringp --;</div><div class='del'>-		*stringp = 0;</div><div class='del'>-	}</div><div class='del'>-	*lengthsp = -1;</div><div class='del'>-	g_free(E_TEXT_MODEL(model)-&gt;text);</div><div class='del'>-	E_TEXT_MODEL(model)-&gt;text = string;</div><div class='del'>-	e_text_model_changed(E_TEXT_MODEL(model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_add_source (ESelectNamesTextModel *model,</div><div class='del'>-				      ESelectNamesModel     *source)</div><div class='del'>-{</div><div class='del'>-	model-&gt;source = source;</div><div class='del'>-	if (model-&gt;source)</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(model-&gt;source));</div><div class='del'>-	model-&gt;source_changed_id = gtk_signal_connect(GTK_OBJECT(model-&gt;source), "changed",</div><div class='del'>-						      GTK_SIGNAL_FUNC(e_select_names_text_model_model_changed),</div><div class='del'>-						      model);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_drop_source (ESelectNamesTextModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;source_changed_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT(model-&gt;source), model-&gt;source_changed_id);</div><div class='del'>-	if (model-&gt;source)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;source));</div><div class='del'>-	model-&gt;source = NULL;</div><div class='del'>-	model-&gt;source_changed_id = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ESelectNamesTextModel lifecycle management and vcard loading/saving.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_TEXT_MODEL (object);</div><div class='del'>-	</div><div class='del'>-	e_select_names_text_model_drop_source(model);</div><div class='del'>-	g_free(model-&gt;lengths);</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'>-/* Set_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *model;</div><div class='del'>-	</div><div class='del'>-	model = E_SELECT_NAMES_TEXT_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_SOURCE:</div><div class='del'>-		e_select_names_text_model_drop_source(model);</div><div class='del'>-		e_select_names_text_model_add_source(model, E_SELECT_NAMES_MODEL(GTK_VALUE_OBJECT(*arg)));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the model */</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesTextModel *model;</div><div class='del'>-</div><div class='del'>-	model = E_SELECT_NAMES_TEXT_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_SOURCE:</div><div class='del'>-		GTK_VALUE_OBJECT(*arg) = GTK_OBJECT(model-&gt;source);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_select_names_text_model_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_select_names_text_model_init (ESelectNamesTextModel *model)</div><div class='del'>-{</div><div class='del'>-	model-&gt;source = NULL;</div><div class='del'>-	model-&gt;source_changed_id = 0;</div><div class='del'>-	model-&gt;lengths = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names-text-model.h b/addressbook/gui/component/select-names/e-select-names-text-model.h<br/>deleted file mode 100644<br/>index 3d6bed468e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names-text-model.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names-text-model.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'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __E_SELECT_NAMES_TEXT_MODEL_H__</div><div class='del'>-#define __E_SELECT_NAMES_TEXT_MODEL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-#include &lt;gal/e-text/e-text-model.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_SELECT_NAMES_TEXT_MODEL            (e_select_names_text_model_get_type ())</div><div class='del'>-#define E_SELECT_NAMES_TEXT_MODEL(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModel))</div><div class='del'>-#define E_SELECT_NAMES_TEXT_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL, ESelectNamesTextModelClass))</div><div class='del'>-#define E_IS_SELECT_NAMES_TEXT_MODEL(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_SELECT_NAMES_TEXT_MODEL))</div><div class='del'>-#define E_IS_SELECT_NAMES_TEXT_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_SELECT_NAMES_TEXT_MODEL))</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNamesTextModel ESelectNamesTextModel;</div><div class='del'>-typedef struct _ESelectNamesTextModelClass ESelectNamesTextModelClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesTextModel {</div><div class='del'>-	ETextModel parent;</div><div class='del'>-</div><div class='del'>-	ESelectNamesModel *source;</div><div class='del'>-	int source_changed_id;</div><div class='del'>-	int *lengths;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESelectNamesTextModelClass {</div><div class='del'>-	ETextModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-ETextModel *e_select_names_text_model_new  (ESelectNamesModel *source);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */			      </div><div class='del'>-GtkType     e_select_names_text_model_get_type (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_SELECT_NAMES_TEXT_MODEL_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names.c b/addressbook/gui/component/select-names/e-select-names.c<br/>deleted file mode 100644<br/>index ece38c5efe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,396 +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;gal/e-table/e-table-simple.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/widgets/e-addressbook-model.h&gt;</div><div class='del'>-#include &lt;addressbook/gui/component/e-cardlist-model.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include "e-select-names-table-model.h"</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'>-};</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'>-	ESelectNamesModel *source;</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'>-	object_class-&gt;set_arg = e_select_names_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_select_names_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_select_names_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define SPEC "&lt;ETableSpecification no-headers=\"true\" cursor-mode=\"line\"&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"35\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-	&lt;ETableState&gt;                   			       \</div><div class='del'>-		&lt;column source=\"0\"/&gt;     			       \</div><div class='del'>-	        &lt;grouping&gt; &lt;leaf column=\"0\" ascending=\"true\"/&gt; &lt;/grouping&gt; \</div><div class='del'>-	&lt;/ETableState&gt;                  			       \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-#define SPEC2 "&lt;ETableSpecification no-headers=\"true\" cursor-mode=\"line\"&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-	&lt;ETableState&gt;                   			       \</div><div class='del'>-		&lt;column source=\"0\"/&gt;     			       \</div><div class='del'>-        	&lt;grouping&gt; &lt;leaf column=\"0\" ascending=\"true\"/&gt; &lt;/grouping&gt; \</div><div class='del'>-	&lt;/ETableState&gt;                  			       \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-GtkWidget *e_addressbook_create_ebook_table(char *name, char *string1, char *string2, int num1, int num2);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_book(EBook *book, EBookStatus status, 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'>-		       "query", "(contains \"email\" \"\")",</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'>-	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'>-	gtk_object_set(GTK_OBJECT(model),</div><div class='del'>-		       "editable", FALSE,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	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_scrolled_new (model, NULL, SPEC, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(table), "model", model);</div><div class='del'>-	return table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_current_selection(ETableScrolled *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'>-	gtk_window_set_policy(GTK_WINDOW(e_select_names), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	e_select_names-&gt;table = E_TABLE_SCROLLED(glade_xml_get_widget(gui, "table-source"));</div><div class='del'>-	e_select_names-&gt;model = gtk_object_get_data(GTK_OBJECT(e_select_names-&gt;table), "model");</div><div class='del'>-</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'>-	gtk_object_unref(GTK_OBJECT(child-&gt;source));</div><div class='del'>-	g_free(key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_select_names_destroy (GtkObject *object) {</div><div class='del'>-	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'>-		ESelectNamesModelData new = {E_SELECT_NAMES_MODEL_DATA_TYPE_CARD,</div><div class='del'>-					     card,</div><div class='del'>-					     NULL};</div><div class='del'>-		char *name, *email;</div><div class='del'>-		ECardSimple *simple = e_card_simple_new(card);</div><div class='del'>-		EIterator *iterator;</div><div class='del'>-</div><div class='del'>-		name = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_FULL_NAME);</div><div class='del'>-		email = e_card_simple_get(simple, E_CARD_SIMPLE_FIELD_EMAIL);</div><div class='del'>-		if (name &amp;&amp; *name &amp;&amp; email &amp;&amp; *email) {</div><div class='del'>-			new.string = g_strdup_printf("\"%s\" &lt;%s&gt;", name, email);</div><div class='del'>-		} else if (email &amp;&amp; *email) {</div><div class='del'>-			new.string = g_strdup_printf("%s", email);</div><div class='del'>-		} else {</div><div class='del'>-			new.string = g_strdup("");</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		iterator = e_list_get_iterator(e_select_names_model_get_data(child-&gt;source));</div><div class='del'>-		e_iterator_last(iterator);</div><div class='del'>-		e_select_names_model_add_item(child-&gt;source, iterator, &amp;new);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-		g_free(email);</div><div class='del'>-		g_free(name);</div><div class='del'>-		g_free(new.string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_address(ETableScrolled *table, int row, ESelectNamesChild *child)</div><div class='del'>-{</div><div class='del'>-	EIterator *iterator = e_list_get_iterator(e_select_names_model_get_data(child-&gt;source));</div><div class='del'>-	e_iterator_reset(iterator);</div><div class='del'>-	for (; row &gt; 0; row--) {</div><div class='del'>-		e_iterator_next(iterator);</div><div class='del'>-	}</div><div class='del'>-	e_select_names_model_remove_item(child-&gt;source, iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_select_names_add_section(ESelectNames *e_select_names, char *name, char *id, ESelectNamesModel *source)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child;</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	GtkWidget *alignment;</div><div class='del'>-	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'>-</div><div class='del'>-	if (g_hash_table_lookup(e_select_names-&gt;children, id)) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	table = GTK_TABLE(glade_xml_get_widget (e_select_names-&gt;gui, "table-recipients"));</div><div class='del'>-</div><div class='del'>-	child = g_new(ESelectNamesChild, 1);</div><div class='del'>-</div><div class='del'>-	child-&gt;names = e_select_names;</div><div class='del'>-	child-&gt;title = g_strdup(_(name));</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;", child-&gt;title);</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_select_names_table_model_new(source);</div><div class='del'>-	etable = e_table_scrolled_new (model, NULL, SPEC2, NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(etable), "double_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(remove_address), child);</div><div class='del'>-</div><div class='del'>-	child-&gt;model = model;</div><div class='del'>-	child-&gt;source = source;</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(child-&gt;model));</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(child-&gt;source));</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'>-	g_hash_table_insert(e_select_names-&gt;children, g_strdup(id), child);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-card_copy(const void *value, void *closure)</div><div class='del'>-{</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(value));</div><div class='del'>-	return (void *)value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_free(void *value, void *closure)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EList *</div><div class='del'>-e_select_names_get_section(ESelectNames *e_select_names, char *id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child;</div><div class='del'>-	int i;</div><div class='del'>-	int rows;</div><div class='del'>-	EList *list;</div><div class='del'>-	</div><div class='del'>-	child = g_hash_table_lookup(e_select_names-&gt;children, id);</div><div class='del'>-	if (!child)</div><div class='del'>-		return NULL;</div><div class='del'>-	rows = e_table_model_row_count(child-&gt;model);</div><div class='del'>-	</div><div class='del'>-	list = e_list_new(card_copy, card_free, NULL);</div><div class='del'>-	for (i = 0; i &lt; rows; i++) {</div><div class='del'>-		ECard *card = e_cardlist_model_get(E_CARDLIST_MODEL(child-&gt;model), i);</div><div class='del'>-		e_list_append(list, card);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-	}</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESelectNamesModel *</div><div class='del'>-e_select_names_get_source(ESelectNames *e_select_names,</div><div class='del'>-			  char *id)</div><div class='del'>-{</div><div class='del'>-	ESelectNamesChild *child = g_hash_table_lookup(e_select_names-&gt;children, id);</div><div class='del'>-	if (child) {</div><div class='del'>-		if (child-&gt;source)</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(child-&gt;source));</div><div class='del'>-		return child-&gt;source;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/component/select-names/e-select-names.h b/addressbook/gui/component/select-names/e-select-names.h<br/>deleted file mode 100644<br/>index dba100e8f0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/e-select-names.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/e-select-names.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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;e-util/e-list.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include "e-select-names-model.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* ESelectNames - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_SELECT_NAMES_TYPE			(e_select_names_get_type ())</div><div class='del'>-#define E_SELECT_NAMES(obj)			(GTK_CHECK_CAST ((obj), E_SELECT_NAMES_TYPE, ESelectNames))</div><div class='del'>-#define E_SELECT_NAMES_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_SELECT_NAMES_TYPE, ESelectNamesClass))</div><div class='del'>-#define E_IS_SELECT_NAMES(obj)		(GTK_CHECK_TYPE ((obj), E_SELECT_NAMES_TYPE))</div><div class='del'>-#define E_IS_SELECT_NAMES_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_SELECT_NAMES_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESelectNames       ESelectNames;</div><div class='del'>-typedef struct _ESelectNamesClass  ESelectNamesClass;</div><div class='del'>-</div><div class='del'>-struct _ESelectNames</div><div class='del'>-{</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	</div><div class='del'>-	GHashTable *children; /* Of type char * to ESelectNamesChild */</div><div class='del'>-	int child_count;</div><div class='del'>-	ETableScrolled *table;</div><div class='del'>-	ETableModel *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'>-</div><div class='del'>-void       e_select_names_add_section  (ESelectNames *e_select_names,</div><div class='del'>-				       	char         *name,</div><div class='del'>-				       	char         *id,</div><div class='del'>-				       	ESelectNamesModel *source);</div><div class='del'>-ESelectNamesModel *e_select_names_get_source   (ESelectNames *e_select_names,</div><div class='del'>-						char *id);</div><div class='del'>-/* Returns a ref counted list of addresses. */</div><div class='del'>-EList     *e_select_names_get_section  (ESelectNames *e_select_names,</div><div class='del'>-				       	char         *id);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_SELECT_NAMES_H__ */</div><div class='head'>diff --git a/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo b/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo<br/>deleted file mode 100644<br/>index e66c3aa38a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/evolution-addressbook-select-names.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/evolution-addressbook-select-names.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:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"</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 Addressbook's name selection interface"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:factory:addressbook:select-names:b39eb1a1-f341-4d5a-9a91-e2616e206b2e"&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/Addressbook/SelectNames"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       value="Evolution's addressbook name selection interface."/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;
\ No newline at end of file</div><div class='head'>diff --git a/addressbook/gui/component/select-names/recipient.glade b/addressbook/gui/component/select-names/recipient.glade<br/>deleted file mode 100644<br/>index b60972d094..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/recipient.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/recipient.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;Recipient&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;recipient&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;gnome_help_support&gt;True&lt;/gnome_help_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;window1&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;hbox-top&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-      &lt;xalign&gt;1.08033e-07&lt;/xalign&gt;</div><div class='del'>-      &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-      &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-      &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;text-button&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;-&amp;gt;&lt;/label&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade<br/>deleted file mode 100644<br/>index 90ca93bd3a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/select-names.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/select-names.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,247 +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;visible&gt;False&lt;/visible&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;visible&gt;False&lt;/visible&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;Select name 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/select-names.glade.h b/addressbook/gui/component/select-names/select-names.glade.h<br/>deleted file mode 100644<br/>index 1cb9702956..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/component/select-names/select-names.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/component/select-names/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_("Select name 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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 1016d38301..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	$(BONOBO_GNOME_CFLAGS)			\</div><div class='del'>-	$(EXTRA_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'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"	\</div><div class='del'>-	-DEVOLUTIONDIR=\""$(evolutiondir)"\"	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"contact-editor\"</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libecontacteditor.a</div><div class='del'>-</div><div class='del'>-libecontacteditor_a_SOURCES = 			\</div><div class='del'>-	e-contact-editor-address.c		\</div><div class='del'>-	e-contact-editor-address.h		\</div><div class='del'>-	e-contact-editor-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/printing/libecontactprint.a	\</div><div class='del'>-	$(top_builddir)/addressbook/backend/ebook/libebook.la	\</div><div class='del'>-	$(top_builddir)/e-util/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/misc/libemiscwidgets.a \</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la			\</div><div class='del'>-	$(GNOME_PRINT_LIBS)					\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-evolutiondir = $(datadir)/evolution</div><div class='del'>-</div><div class='del'>-evolution_DATA = arrow.png</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA = 				\</div><div class='del'>-	contact-editor.glade		\</div><div class='del'>-	fulladdr.glade			\</div><div class='del'>-	fullname.glade			\</div><div class='del'>-	categories.glade		\</div><div class='del'>-	e-contact-editor-confirm-delete.glade</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(evolution_DATA)		\</div><div class='del'>-	$(glade_DATA)			\</div><div class='del'>-	e-contact-editor-strings.h	\</div><div class='del'>-	fulladdr.glade.h		\</div><div class='del'>-	fullname-strings.h		\</div><div class='del'>-	categories-strings.h		\</div><div class='del'>-	e-contact-editor-confirm-delete.glade.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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 5d49fd06ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/contact-editor.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/contact-editor.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2455 +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;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-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;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;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;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;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;table2&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;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;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;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;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;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;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;_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;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;_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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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'>-</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;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;button28&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;button29&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_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;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;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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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'>-</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;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;button43&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;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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-      &lt;show_tabs&gt;True&lt;/show_tabs&gt;</div><div class='del'>-      &lt;show_border&gt;True&lt;/show_border&gt;</div><div class='del'>-      &lt;tab_pos&gt;GTK_POS_TOP&lt;/tab_pos&gt;</div><div class='del'>-      &lt;scrollable&gt;False&lt;/scrollable&gt;</div><div class='del'>-      &lt;tab_hborder&gt;2&lt;/tab_hborder&gt;</div><div class='del'>-      &lt;tab_vborder&gt;2&lt;/tab_vborder&gt;</div><div class='del'>-      &lt;popup_enable&gt;False&lt;/popup_enable&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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;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;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;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;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;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;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&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;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;_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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-email1&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone4&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone2&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone1&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-phone3&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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;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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;6&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;7&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;5&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;6&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button-address&lt;/name&gt;</div><div class='del'>-	    &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEventBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;eventbox1&lt;/name&gt;</div><div class='del'>-	  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;/widget&gt;</div><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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;4&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;8&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;11&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;12&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;alignment-contacts&lt;/name&gt;</div><div class='del'>-	  &lt;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;button-fulladdr&lt;/name&gt;</div><div class='del'>-	  &lt;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;_Address...&lt;/label&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'>-      &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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-	&lt;label&gt;General&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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;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;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;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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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;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;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;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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;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&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&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;cxx_use_heap&gt;True&lt;/cxx_use_heap&gt;</div><div class='del'>-    &lt;has_progress&gt;True&lt;/has_progress&gt;</div><div class='del'>-    &lt;has_status&gt;True&lt;/has_status&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.c b/addressbook/gui/contact-editor/e-contact-editor-address.c<br/>deleted file mode 100644<br/>index 7df9cb8cb4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-address.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/e-contact-editor-address.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'>- * e-contact-editor-address.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;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-contact-editor-address.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_contact_editor_address_init		(EContactEditorAddress		 *card);</div><div class='del'>-static void e_contact_editor_address_class_init	(EContactEditorAddressClass	 *klass);</div><div class='del'>-static void e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_contact_editor_address_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void fill_in_info(EContactEditorAddress *editor);</div><div class='del'>-static void extract_info(EContactEditorAddress *editor);</div><div class='del'>-</div><div class='del'>-static GnomeDialogClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_ADDRESS</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_contact_editor_address_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType contact_editor_address_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!contact_editor_address_type)</div><div class='del'>-		{</div><div class='del'>-			static const GtkTypeInfo contact_editor_address_info =</div><div class='del'>-			{</div><div class='del'>-				"EContactEditorAddress",</div><div class='del'>-				sizeof (EContactEditorAddress),</div><div class='del'>-				sizeof (EContactEditorAddressClass),</div><div class='del'>-				(GtkClassInitFunc) e_contact_editor_address_class_init,</div><div class='del'>-				(GtkObjectInitFunc) e_contact_editor_address_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-				(GtkClassInitFunc) NULL,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			contact_editor_address_type = gtk_type_unique (gnome_dialog_get_type (), &amp;contact_editor_address_info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return contact_editor_address_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_class_init (EContactEditorAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GnomeDialogClass *dialog_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	dialog_class = (GnomeDialogClass *) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_dialog_get_type ());</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EContactEditorAddress::address", GTK_TYPE_POINTER, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_ADDRESS);</div><div class='del'>- </div><div class='del'>-	object_class-&gt;set_arg = e_contact_editor_address_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_contact_editor_address_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_contact_editor_address_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_init (EContactEditorAddress *e_contact_editor_address)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),</div><div class='del'>-				     GNOME_STOCK_BUTTON_OK);</div><div class='del'>-	</div><div class='del'>-	gnome_dialog_append_button ( GNOME_DIALOG(e_contact_editor_address),</div><div class='del'>-				     GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(e_contact_editor_address), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address-&gt;address = NULL;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/fulladdr.glade", NULL);</div><div class='del'>-	e_contact_editor_address-&gt;gui = gui;</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(gui, "table-checkaddress");</div><div class='del'>-	gtk_widget_ref(widget);</div><div class='del'>-	gtk_container_remove(GTK_CONTAINER(widget-&gt;parent), widget);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (e_contact_editor_address)-&gt;vbox), widget, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_unref(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_editor_address_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS(object);</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor_address-&gt;gui)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(e_contact_editor_address-&gt;gui));</div><div class='del'>-	e_card_delivery_address_free(e_contact_editor_address-&gt;address);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_contact_editor_address_new (const ECardDeliveryAddress *address)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_address_get_type ()));</div><div class='del'>-	gtk_object_set (GTK_OBJECT(widget),</div><div class='del'>-			"address", address,</div><div class='del'>-			NULL);</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_ADDRESS:</div><div class='del'>-		if (e_contact_editor_address-&gt;address)</div><div class='del'>-			e_card_delivery_address_free(e_contact_editor_address-&gt;address);</div><div class='del'>-		e_contact_editor_address-&gt;address = e_card_delivery_address_copy(GTK_VALUE_POINTER (*arg));</div><div class='del'>-		fill_in_info(e_contact_editor_address);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_address_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorAddress *e_contact_editor_address;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_address = E_CONTACT_EDITOR_ADDRESS (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_ADDRESS:</div><div class='del'>-		extract_info(e_contact_editor_address);</div><div class='del'>-		GTK_VALUE_POINTER (*arg) = e_card_delivery_address_copy(e_contact_editor_address-&gt;address);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_field(EContactEditorAddress *editor, char *field, char *string)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (editable) {</div><div class='del'>-		e_utf8_gtk_editable_set_text(editable, string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(EContactEditorAddress *editor)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *address = editor-&gt;address;</div><div class='del'>-	if (address) {</div><div class='del'>-		fill_in_field(editor, "entry-street" , address-&gt;street );</div><div class='del'>-		fill_in_field(editor, "entry-po"     , address-&gt;po     );</div><div class='del'>-		fill_in_field(editor, "entry-ext"    , address-&gt;ext    );</div><div class='del'>-		fill_in_field(editor, "entry-city"   , address-&gt;city   );</div><div class='del'>-		fill_in_field(editor, "entry-region" , address-&gt;region );</div><div class='del'>-		fill_in_field(editor, "entry-code"   , address-&gt;code   );</div><div class='del'>-		fill_in_field(editor, "entry-country", address-&gt;country);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-extract_field(EContactEditorAddress *editor, char *field)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (editable)</div><div class='del'>-		return e_utf8_gtk_editable_get_text(editable);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditorAddress *editor)</div><div class='del'>-{</div><div class='del'>-	ECardDeliveryAddress *address = editor-&gt;address;</div><div class='del'>-	if (!address) {</div><div class='del'>-		address = e_card_delivery_address_new();</div><div class='del'>-		editor-&gt;address = address;</div><div class='del'>-	}</div><div class='del'>-	address-&gt;street  = extract_field(editor, "entry-street" );</div><div class='del'>-	address-&gt;po      = extract_field(editor, "entry-po"     );</div><div class='del'>-	address-&gt;ext     = extract_field(editor, "entry-ext"    );</div><div class='del'>-	address-&gt;city    = extract_field(editor, "entry-city"   );</div><div class='del'>-	address-&gt;region  = extract_field(editor, "entry-region" );</div><div class='del'>-	address-&gt;code    = extract_field(editor, "entry-code"   );</div><div class='del'>-	address-&gt;country = extract_field(editor, "entry-country");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-address.h b/addressbook/gui/contact-editor/e-contact-editor-address.h<br/>deleted file mode 100644<br/>index a74e1bd967..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-address.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/e-contact-editor-address.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-address.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_ADDRESS_H__</div><div class='del'>-#define __E_CONTACT_EDITOR_ADDRESS_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'>-/* EContactEditorAddress - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * name         ECardName *     RW              The card currently being edited. Returns a copy.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS_TYPE			(e_contact_editor_address_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddress))</div><div class='del'>-#define E_CONTACT_EDITOR_ADDRESS_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_ADDRESS_TYPE, EContactEditorAddressClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_ADDRESS(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_ADDRESS_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_ADDRESS_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditorAddress       EContactEditorAddress;</div><div class='del'>-typedef struct _EContactEditorAddressClass  EContactEditorAddressClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditorAddress</div><div class='del'>-{</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECardDeliveryAddress *address;</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EContactEditorAddressClass</div><div class='del'>-{</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *e_contact_editor_address_new(const ECardDeliveryAddress *name);</div><div class='del'>-GtkType    e_contact_editor_address_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_ADDRESS_H__ */</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-categories.c b/addressbook/gui/contact-editor/e-contact-editor-categories.c<br/>deleted file mode 100644<br/>index 045f128b48..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-categories.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/e-contact-editor-categories.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,452 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</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;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-simple.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.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'>-static char * e_contact_editor_categories_value_to_string (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'>-	e_table_model_pre_change(categories-&gt;model);</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 = e_utf8_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'>-#define INITIAL_SPEC "&lt;ETableSpecification no-headers=\"true\" draw-grid=\"true\" cursor-mode=\"line\"&gt;\</div><div class='del'>-  &lt;ETableColumn model_col=\"0\" _title=\" \" expansion=\"0.0\" minimum_width=\"20\" resizable=\"false\" cell=\"checkbox\"       compare=\"integer\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"1\" _title=\"Category\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\" compare=\"string\"/&gt; \</div><div class='del'>-        &lt;ETableState&gt; \</div><div class='del'>-		&lt;column source=\"0\"/&gt;						\</div><div class='del'>-		&lt;column source=\"1\"/&gt;						\</div><div class='del'>-        	&lt;grouping&gt; &lt;leaf column=\"1\" ascending=\"true\"/&gt; &lt;/grouping&gt;	\</div><div class='del'>-        &lt;/ETableState&gt; \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-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'>-	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'>-					       e_contact_editor_categories_value_to_string,</div><div class='del'>-					       categories);</div><div class='del'>-</div><div class='del'>-	e_table = e_table_scrolled_new (categories-&gt;model, NULL, INITIAL_SPEC, NULL);</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'>-		e_utf8_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'>-		e_utf8_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='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_contact_editor_categories_value_to_string (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 g_strdup_printf("%d", (int) value);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup(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 3edff76b4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-categories.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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;gal/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-confirm-delete.glade b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade<br/>deleted file mode 100644<br/>index 7f52321021..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,85 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-contact-editor-confirm-delete&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-contact-editor-confirm-delete&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;gnome_help_support&gt;True&lt;/gnome_help_support&gt;</div><div class='del'>-  &lt;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;e-contact-editor-confirm-delete.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;GnomeMessageBox&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;confirm-dialog&lt;/name&gt;</div><div class='del'>-  &lt;message_box_type&gt;GNOME_MESSAGE_BOX_QUESTION&lt;/message_box_type&gt;</div><div class='del'>-  &lt;message&gt;Are you sure you want</div><div class='del'>-to delete this contact?&lt;/message&gt;</div><div class='del'>-  &lt;title&gt;Delete Contact?&lt;/title&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;False&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;True&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;dialog-vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;dialog-action_area1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h b/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h<br/>deleted file mode 100644<br/>index 7168db0a5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/e-contact-editor-confirm-delete.glade.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_("Are you sure you want\n"</div><div class='del'>-              "to delete this contact?");</div><div class='del'>-gchar *s = N_("Delete Contact?");</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 05e8d45702..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-fullname.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/e-contact-editor-fullname.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,218 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * 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;gal/widgets/e-unicode.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 (const ECardName *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_contact_editor_fullname_get_type ()));</div><div class='del'>-	gtk_object_set (GTK_OBJECT(widget),</div><div class='del'>-			"name", name,</div><div class='del'>-			NULL);</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_fullname_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EContactEditorFullname *e_contact_editor_fullname;</div><div class='del'>-</div><div class='del'>-	e_contact_editor_fullname = E_CONTACT_EDITOR_FULLNAME (o);</div><div class='del'>-	</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_NAME:</div><div class='del'>-		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'>-			e_utf8_gtk_entry_set_text(entry, string);</div><div class='del'>-		else</div><div class='del'>-			gtk_entry_set_text(entry, "");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_info(EContactEditorFullname *editor)</div><div class='del'>-{</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	if (name) {</div><div class='del'>-		fill_in_field(editor, "entry-title",  name-&gt;prefix);</div><div class='del'>-		fill_in_field(editor, "entry-first",  name-&gt;given);</div><div class='del'>-		fill_in_field(editor, "entry-middle", name-&gt;additional);</div><div class='del'>-		fill_in_field(editor, "entry-last",   name-&gt;family);</div><div class='del'>-		fill_in_field(editor, "entry-suffix", name-&gt;suffix);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-extract_field(EContactEditorFullname *editor, char *field)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *entry = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, field));</div><div class='del'>-	if (entry)</div><div class='del'>-		return e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditorFullname *editor)</div><div class='del'>-{</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	if (!name) {</div><div class='del'>-		name = e_card_name_new();</div><div class='del'>-		editor-&gt;name = name;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	name-&gt;prefix     = extract_field(editor, "entry-title" );</div><div class='del'>-	name-&gt;given      = extract_field(editor, "entry-first" );</div><div class='del'>-	name-&gt;additional = extract_field(editor, "entry-middle");</div><div class='del'>-	name-&gt;family     = extract_field(editor, "entry-last"  );</div><div class='del'>-	name-&gt;suffix     = extract_field(editor, "entry-suffix");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-fullname.h b/addressbook/gui/contact-editor/e-contact-editor-fullname.h<br/>deleted file mode 100644<br/>index bde6733976..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-fullname.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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(const ECardName *name);</div><div class='del'>-GtkType    e_contact_editor_fullname_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_FULLNAME_H__ */</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-editor-strings.h b/addressbook/gui/contact-editor/e-contact-editor-strings.h<br/>deleted file mode 100644<br/>index bb9c0b5b30..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor-strings.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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_("_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_("_Address...");</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 c4e8ed8640..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/e-contact-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1748 +0,0 @@</div><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-address.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 "e-util/e-gui-utils.h"</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;e-contact-save-as.h&gt;</div><div class='del'>-#include "addressbook/printing/e-contact-print.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print-envelope.h"</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	ADD_CARD,</div><div class='del'>-	COMMIT_CARD,</div><div class='del'>-	DELETE_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[DELETE_CARD] =</div><div class='del'>-	  gtk_signal_new ("delete_card",</div><div class='del'>-			  GTK_RUN_FIRST,</div><div class='del'>-			  object_class-&gt;type,</div><div class='del'>-			  GTK_SIGNAL_OFFSET (EContactEditorClass, delete_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", EVOLUTIONDIR, image);</div><div class='del'>-		pixmap = e_create_image_widget(NULL, image_temp, NULL, 0, 0);</div><div class='del'>-		gtk_container_add(GTK_CONTAINER(button),</div><div class='del'>-				  pixmap);</div><div class='del'>-		g_free(image_temp);</div><div class='del'>-		gtk_widget_show(pixmap);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(button), "button_press_event", func, editor);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_replace_buttons(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	_replace_button(editor, "button-phone1", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone2", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone3", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-phone4", "arrow.png", _phone_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-address", "arrow.png", _address_arrow_pressed);</div><div class='del'>-	_replace_button(editor, "button-email1", "arrow.png", _email_arrow_pressed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-wants_html_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	gboolean wants_html;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(widget),</div><div class='del'>-		       "active", &amp;wants_html,</div><div class='del'>-		       NULL);</div><div class='del'>-	gtk_object_set(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-		       "wants_html", wants_html,</div><div class='del'>-		       NULL);</div><div class='del'>-}</div><div class='del'>-</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 = e_utf8_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'>-#if 0</div><div class='del'>-	phone-&gt;number = NULL;</div><div class='del'>-#endif</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 = e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-</div><div class='del'>-	e_card_simple_set_email(editor-&gt;simple, editor-&gt;email_choice, string);</div><div class='del'>-</div><div class='del'>-	g_free (string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-address_text_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-	ECardAddrLabel *address;</div><div class='del'>-</div><div class='del'>-	if (editor-&gt;address_choice == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	address = e_card_address_label_new();</div><div class='del'>-</div><div class='del'>-	address-&gt;data = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-	e_card_simple_set_address(editor-&gt;simple, editor-&gt;address_choice, address);</div><div class='del'>-	e_card_address_label_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 &amp;&amp; ((name-&gt;given &amp;&amp; *name-&gt;given) || (name-&gt;family &amp;&amp; *name-&gt;family)))</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-name_to_style(const ECardName *name, char *company, int style)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	char *strings[4], **stringptr;</div><div class='del'>-	char *substring;</div><div class='del'>-	switch (style) {</div><div class='del'>-	case 0:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(", ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 1:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		string = g_strjoinv(" ", strings);</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		string = g_strdup(company);</div><div class='del'>-		break;</div><div class='del'>-	case 3: /* Fall Through */</div><div class='del'>-	case 4:</div><div class='del'>-		stringptr = strings;</div><div class='del'>-		if (name) {</div><div class='del'>-			if (name-&gt;family &amp;&amp; *name-&gt;family)</div><div class='del'>-				*(stringptr++) = name-&gt;family;</div><div class='del'>-			if (name-&gt;given &amp;&amp; *name-&gt;given)</div><div class='del'>-				*(stringptr++) = name-&gt;given;</div><div class='del'>-		}</div><div class='del'>-		*stringptr = NULL;</div><div class='del'>-		substring = g_strjoinv(", ", strings);</div><div class='del'>-		if (!(company &amp;&amp; *company))</div><div class='del'>-			company = "";</div><div class='del'>-		if (style == 3)</div><div class='del'>-			string = g_strdup_printf("%s (%s)", substring, company);</div><div class='del'>-		else</div><div class='del'>-			string = g_strdup_printf("%s (%s)", company, substring);</div><div class='del'>-		g_free(substring);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		string = g_strdup("");</div><div class='del'>-	}</div><div class='del'>-	return string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-file_as_get_style (EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, "entry-file-as"));</div><div class='del'>-	char *filestring;</div><div class='del'>-	char *trystring;</div><div class='del'>-	ECardName *name = editor-&gt;name;</div><div class='del'>-	int i;</div><div class='del'>-	int style;</div><div class='del'>-</div><div class='del'>-	filestring = e_utf8_gtk_entry_get_text(file_as);</div><div class='del'>-</div><div class='del'>-	style = -1;</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		trystring = name_to_style(name, editor-&gt;company, i);</div><div class='del'>-		if (!strcmp(trystring, filestring)) {</div><div class='del'>-			g_free(trystring);</div><div class='del'>-			g_free(filestring);</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-		g_free(trystring);</div><div class='del'>-	}</div><div class='del'>-	g_free (filestring);</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-file_as_set_style(EContactEditor *editor, int style)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	int i;</div><div class='del'>-	GList *strings = NULL;</div><div class='del'>-	GtkEntry *file_as = GTK_ENTRY(glade_xml_get_widget(editor-&gt;gui, "entry-file-as"));</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-		</div><div class='del'>-</div><div class='del'>-	if (style == -1) {</div><div class='del'>-		string = e_utf8_gtk_entry_get_text(file_as);</div><div class='del'>-		strings = g_list_append(strings, string);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(editor-&gt;gui, "combo-file-as");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 5; i++) {</div><div class='del'>-		if (style_makes_sense(editor-&gt;name, editor-&gt;company, i)) {</div><div class='del'>-			char *u;</div><div class='del'>-			u = name_to_style(editor-&gt;name, editor-&gt;company, i);</div><div class='del'>-			string = e_utf8_to_gtk_string (widget, u);</div><div class='del'>-			g_free (u);</div><div class='del'>-			if (string) strings = g_list_append(strings, string);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_COMBO(widget)) {</div><div class='del'>-		GtkCombo *combo = GTK_COMBO(widget);</div><div class='del'>-		gtk_combo_set_popdown_strings(combo, strings);</div><div class='del'>-		g_list_foreach(strings, (GFunc) g_free, NULL);</div><div class='del'>-		g_list_free(strings);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (style != -1) {</div><div class='del'>-		string = name_to_style(editor-&gt;name, editor-&gt;company, style);</div><div class='del'>-		e_utf8_gtk_entry_set_text(file_as, string);</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-name_entry_changed (GtkWidget *widget, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *file_as;</div><div class='del'>-	int style = 0;</div><div class='del'>-	char *string;</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'>-</div><div class='del'>-	string = e_utf8_gtk_entry_get_text (GTK_ENTRY(widget));</div><div class='del'>-	editor-&gt;name = e_card_name_from_string(string);</div><div class='del'>-	g_free (string);</div><div class='del'>-	</div><div class='del'>-	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 = e_utf8_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 (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'>-			e_utf8_gtk_entry_set_text(GTK_ENTRY(fname_widget), full_name);</div><div class='del'>-			g_free(full_name);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-full_addr_clicked(GtkWidget *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog;</div><div class='del'>-	int result;</div><div class='del'>-	const ECardDeliveryAddress *address;</div><div class='del'>-</div><div class='del'>-	address = e_card_simple_get_delivery_address(editor-&gt;simple, editor-&gt;address_choice);</div><div class='del'>-</div><div class='del'>-	dialog = GNOME_DIALOG(e_contact_editor_address_new(address));</div><div class='del'>-	gtk_widget_show(GTK_WIDGET(dialog));</div><div class='del'>-</div><div class='del'>-	result = gnome_dialog_run (dialog);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		ECardDeliveryAddress *new_address;</div><div class='del'>-		GtkWidget *address_widget;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(dialog),</div><div class='del'>-			       "address", &amp;new_address,</div><div class='del'>-			       NULL);</div><div class='del'>-		e_card_simple_set_delivery_address(editor-&gt;simple, editor-&gt;address_choice, new_address);</div><div class='del'>-</div><div class='del'>-		address_widget = glade_xml_get_widget(editor-&gt;gui, "text-address");</div><div class='del'>-		if (address_widget &amp;&amp; GTK_IS_EDITABLE(address_widget)) {</div><div class='del'>-			char *string = e_card_delivery_address_to_string(new_address);</div><div class='del'>-			e_utf8_gtk_editable_set_text(GTK_EDITABLE(address_widget), string);</div><div class='del'>-			g_free(string);</div><div class='del'>-		} else {</div><div class='del'>-			ECardAddrLabel *address = e_card_delivery_address_to_label(new_address);</div><div class='del'>-			e_card_simple_set_address(editor-&gt;simple, editor-&gt;address_choice, address);</div><div class='del'>-			e_card_address_label_free(address);</div><div class='del'>-		}</div><div class='del'>-		e_card_delivery_address_free(new_address);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-categories_clicked(GtkWidget *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	char *categories;</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 = e_utf8_gtk_entry_get_text(GTK_ENTRY(entry));</div><div class='del'>-	else if (editor-&gt;card)</div><div class='del'>-		gtk_object_get(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-			       "categories", &amp;categories,</div><div class='del'>-			       NULL);</div><div class='del'>-	dialog = GNOME_DIALOG(e_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'>-	g_free (categories);</div><div class='del'>-	if (result == 0) {</div><div class='del'>-		gtk_object_get(GTK_OBJECT(dialog),</div><div class='del'>-			       "categories", &amp;categories,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (entry &amp;&amp; GTK_IS_ENTRY(entry))</div><div class='del'>-			e_utf8_gtk_entry_set_text(GTK_ENTRY(entry), categories);</div><div class='del'>-		else</div><div class='del'>-			gtk_object_set(GTK_OBJECT(editor-&gt;card),</div><div class='del'>-				       "categories", categories,</div><div class='del'>-				       NULL);</div><div class='del'>-		g_free(categories);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_destroy(GTK_OBJECT(dialog));</div><div class='del'>-#if 0</div><div class='del'>-	if (!entry)</div><div class='del'>-		g_free(categories);</div><div class='del'>-#endif</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'>-gboolean</div><div class='del'>-e_contact_editor_confirm_delete(GtkWindow *parent)</div><div class='del'>-{</div><div class='del'>-	GnomeDialog *dialog;</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	int result;</div><div class='del'>-</div><div class='del'>-	gui = glade_xml_new (EVOLUTION_GLADEDIR "/e-contact-editor-confirm-delete.glade", NULL);</div><div class='del'>-</div><div class='del'>-	dialog = GNOME_DIALOG(glade_xml_get_widget(gui, "confirm-dialog"));</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_parent(dialog, parent);</div><div class='del'>-	</div><div class='del'>-	result = gnome_dialog_run_and_close(dialog);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(gui));</div><div class='del'>-</div><div class='del'>-	return !result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	if (e_contact_editor_confirm_delete(GTK_WINDOW(ce-&gt;app))) {</div><div class='del'>-</div><div class='del'>-		extract_info (ce);</div><div class='del'>-		e_card_simple_sync_card (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[DELETE_CARD],</div><div class='del'>-					 ce-&gt;card);</div><div class='del'>-		</div><div class='del'>-		file_close_cb(widget, data);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the signal to request printing a card */</div><div class='del'>-static void</div><div class='del'>-print_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(e_contact_print_card_dialog_new(ce-&gt;card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the signal to request printing a card */</div><div class='del'>-static void</div><div class='del'>-print_envelope_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	extract_info (ce);</div><div class='del'>-	e_card_simple_sync_card (ce-&gt;simple);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(e_contact_print_envelope_dialog_new(ce-&gt;card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Toolbar/Save and Close callback */</div><div class='del'>-static void</div><div class='del'>-tb_save_and_close_cb (BonoboUIComponent *uih, void *data, const char *path)</div><div class='del'>-{</div><div class='del'>-	EContactEditor *ce;</div><div class='del'>-</div><div class='del'>-	ce = E_CONTACT_EDITOR (data);</div><div class='del'>-	save_card (ce);</div><div class='del'>-	close_dialog (ce);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSave", file_save_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveAs", file_save_as_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorSaveClose", tb_save_and_close_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorDelete", delete_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrint", print_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorPrintEnvelope", print_envelope_cb),</div><div class='del'>-	/*	BONOBO_UI_UNSAFE_VERB ("ContactEditorPageSetup", file_page_setup_menu), */</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ContactEditorClose", file_close_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_ui (EContactEditor *ce)</div><div class='del'>-{</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (</div><div class='del'>-		ce-&gt;uic, verbs, ce);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (ce-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-contact-editor.xml",</div><div class='del'>-			       "evolution-contact-editor");</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 GList *</div><div class='del'>-add_to_tab_order(GList *list, GladeXML *gui, char *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(gui, name);</div><div class='del'>-	return g_list_prepend(list, widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_tab_order(GladeXML *gui)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *container;</div><div class='del'>-	GList *list = NULL;</div><div class='del'>-</div><div class='del'>-	container = glade_xml_get_widget(gui, "table-contact-editor-general");</div><div class='del'>-</div><div class='del'>-	if (container) {</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-fullname");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-jobtitle");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-company");</div><div class='del'>-		list = add_to_tab_order(list, gui, "combo-file-as");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone1");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone2");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone3");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-phone4");</div><div class='del'>-		list = g_list_reverse(list);</div><div class='del'>-		e_container_change_tab_order(GTK_CONTAINER(container), list);</div><div class='del'>-		g_list_free(list);</div><div class='del'>-</div><div class='del'>-		list = NULL;</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-email1");</div><div class='del'>-		list = add_to_tab_order(list, gui, "entry-web");</div><div class='del'>-		list = add_to_tab_order(list, gui, "text-address");</div><div class='del'>-		list = add_to_tab_order(list, gui, "alignment-contacts");</div><div class='del'>-		list = g_list_reverse(list);</div><div class='del'>-		e_container_change_tab_order(GTK_CONTAINER(container), list);</div><div class='del'>-		g_list_free(list);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_editor_init (EContactEditor *e_contact_editor)</div><div class='del'>-{</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GtkWidget *bonobo_win;</div><div class='del'>-	GtkWidget *wants_html;</div><div class='del'>-	BonoboUIContainer *container;</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;email_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_info = NULL;</div><div class='del'>-	e_contact_editor-&gt;email_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_popup = NULL;</div><div class='del'>-	e_contact_editor-&gt;email_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;phone_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;address_list = NULL;</div><div class='del'>-	e_contact_editor-&gt;name = e_card_name_new();</div><div class='del'>-	e_contact_editor-&gt;company = g_strdup("");</div><div class='del'>-	</div><div class='del'>-	e_contact_editor-&gt;email_choice = 0;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[0] = E_CARD_SIMPLE_PHONE_ID_BUSINESS;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[1] = E_CARD_SIMPLE_PHONE_ID_HOME;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[2] = E_CARD_SIMPLE_PHONE_ID_BUSINESS_FAX;</div><div class='del'>-	e_contact_editor-&gt;phone_choice[3] = E_CARD_SIMPLE_PHONE_ID_MOBILE;</div><div class='del'>-	e_contact_editor-&gt;address_choice = 0;</div><div class='del'>-</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'>-	setup_tab_order(gui);</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;app = glade_xml_get_widget (gui, "contact editor");</div><div class='del'>-</div><div class='del'>-	e_container_foreach_leaf (GTK_CONTAINER (e_contact_editor-&gt;app),</div><div class='del'>-				  (GtkCallback) add_field_callback,</div><div class='del'>-				  e_contact_editor);</div><div class='del'>-</div><div class='del'>-	_replace_buttons(e_contact_editor);</div><div class='del'>-	set_entry_changed_signals(e_contact_editor);</div><div class='del'>-</div><div class='del'>-	wants_html = glade_xml_get_widget(e_contact_editor-&gt;gui, "checkbutton-htmlmail");</div><div class='del'>-	if (wants_html &amp;&amp; GTK_IS_TOGGLE_BUTTON(wants_html))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(wants_html), "toggled",</div><div class='del'>-				   wants_html_changed, e_contact_editor);</div><div class='del'>-	</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-fullname");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   full_name_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-fulladdr");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   full_addr_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget(e_contact_editor-&gt;gui, "button-categories");</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_BUTTON(widget))</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(widget), "clicked",</div><div class='del'>-				   categories_clicked, e_contact_editor);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Construct the app */</div><div class='del'>-	bonobo_win = bonobo_window_new ("contact-editor-dialog", "Contact Editor");</div><div class='del'>-</div><div class='del'>-	/* FIXME: The sucking bit */</div><div class='del'>-	{</div><div class='del'>-		GtkWidget *contents;</div><div class='del'>-</div><div class='del'>-		contents = gnome_dock_get_client_area (</div><div class='del'>-			GNOME_DOCK (GNOME_APP (e_contact_editor-&gt;app)-&gt;dock));</div><div class='del'>-		if (!contents) {</div><div class='del'>-			g_message ("contact_editor_construct(): Could not get contents");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		gtk_widget_ref (contents);</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (contents-&gt;parent), contents);</div><div class='del'>-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);</div><div class='del'>-		gtk_widget_destroy (e_contact_editor-&gt;app);</div><div class='del'>-		e_contact_editor-&gt;app = bonobo_win;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Build the menu and toolbar */</div><div class='del'>-</div><div class='del'>-	container = bonobo_ui_container_new ();</div><div class='del'>-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (e_contact_editor-&gt;app));</div><div class='del'>-</div><div class='del'>-	e_contact_editor-&gt;uic = bonobo_ui_component_new_default ();</div><div class='del'>-	if (!e_contact_editor-&gt;uic) {</div><div class='del'>-		g_message ("e_contact_editor_init(): eeeeek, could not create the UI handler!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	bonobo_ui_component_set_container (e_contact_editor-&gt;uic,</div><div class='del'>-					   bonobo_object_corba_objref (</div><div class='del'>-						   BONOBO_OBJECT (container)));</div><div class='del'>-</div><div class='del'>-	create_ui (e_contact_editor);</div><div class='del'>-</div><div class='del'>-	/* 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'>-	if (e_contact_editor-&gt;name)</div><div class='del'>-		e_card_name_free(e_contact_editor-&gt;name);</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, e_utf8_gtk_entry_get_text(GTK_ENTRY(dialog_entry)));</div><div class='del'>-			g_free(*info);</div><div class='del'>-			*info = NULL;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_dialog_destroy(EContactEditor *editor, GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	gnome_dialog_close(GNOME_DIALOG(dialog));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-e_contact_editor_build_dialog(EContactEditor *editor, gchar *entry_id, gchar *label_id, gchar *title, GList **list, GnomeUIInfo **info)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog_entry = gtk_entry_new();</div><div class='del'>-	GtkWidget *entry = glade_xml_get_widget(editor-&gt;gui, entry_id);</div><div class='del'>-	GtkWidget *label = glade_xml_get_widget(editor-&gt;gui, label_id);</div><div class='del'>-	</div><div class='del'>-	GtkWidget *dialog = gnome_dialog_new(title,</div><div class='del'>-					     NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(GNOME_DIALOG(dialog)-&gt;vbox),</div><div class='del'>-			  gtk_widget_new (gtk_frame_get_type(),</div><div class='del'>-					  "border_width", 4,</div><div class='del'>-					  "label", title,</div><div class='del'>-					  "child", gtk_widget_new(gtk_alignment_get_type(),</div><div class='del'>-								  "child", dialog_entry,</div><div class='del'>-								  "xalign", .5,</div><div class='del'>-								  "yalign", .5,</div><div class='del'>-								  "xscale", 1.0,</div><div class='del'>-								  "yscale", 1.0,</div><div class='del'>-								  "border_width", 9,</div><div class='del'>-								  NULL),</div><div class='del'>-					  NULL));</div><div class='del'>-</div><div class='del'>-	gnome_dialog_append_button_with_pixmap(GNOME_DIALOG(dialog),</div><div class='del'>-					       "Add",</div><div class='del'>-					       GNOME_STOCK_PIXMAP_ADD);</div><div class='del'>-	gnome_dialog_append_button(GNOME_DIALOG(dialog), GNOME_STOCK_BUTTON_CANCEL);</div><div class='del'>-	gnome_dialog_set_default(GNOME_DIALOG(dialog), 0);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog), "clicked",</div><div class='del'>-			   _dialog_clicked, editor);</div><div class='del'>-	gtk_signal_connect_while_alive(GTK_OBJECT(editor), "destroy",</div><div class='del'>-				       _dialog_destroy, GTK_OBJECT(dialog), GTK_OBJECT(dialog));</div><div class='del'>-	</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_entry", entry);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_label", label);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_dialog_entry", dialog_entry);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_list", list);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog),</div><div class='del'>-			    "e_contact_editor_info", info);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all(dialog);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-_phone_arrow_pressed (GtkWidget *widget, GdkEventButton *button, EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	int which;</div><div class='del'>-	int i;</div><div class='del'>-	gchar *label;</div><div class='del'>-	gchar *entry;</div><div class='del'>-	int result;</div><div class='del'>-	if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone1") ) {</div><div class='del'>-		which = 1;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone2") ) {</div><div class='del'>-		which = 2;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone3") ) {</div><div class='del'>-		which = 3;</div><div class='del'>-	} else if ( widget == glade_xml_get_widget(editor-&gt;gui, "button-phone4") ) {</div><div class='del'>-		which = 4;</div><div class='del'>-	} else</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	label = g_strdup_printf("label-phone%d", which);</div><div class='del'>-	entry = g_strdup_printf("entry-phone%d", which);</div><div class='del'>-</div><div class='del'>-	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 = e_utf8_gtk_entry_get_text(entry);</div><div class='del'>-	if (!string)</div><div class='del'>-		string = "";</div><div class='del'>-	if (strcmp(string, oldstring))</div><div class='del'>-		e_utf8_gtk_entry_set_text(entry, string);</div><div class='del'>-	g_free (oldstring);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_phone_field(GtkWidget *entry, const ECardPhone *phone)</div><div class='del'>-{</div><div class='del'>-	set_field(GTK_ENTRY(entry), phone ? phone-&gt;number : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_fields(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-</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'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, address-&gt;data);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		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'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, value);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_card_field(EContactEditor *editor, ECard *card, char *id, char *key)</div><div class='del'>-{</div><div class='del'>-	char *string;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-		       key, &amp;string,</div><div class='del'>-		       NULL);</div><div class='del'>-	fill_in_field(editor, id, string);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-fill_in_single_field(EContactEditor *editor, char *name)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *simple = editor-&gt;simple;</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, name);</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-		int position = 0;</div><div class='del'>-		GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-		const ECardArbitrary *arbitrary;</div><div class='del'>-</div><div class='del'>-		gtk_editable_delete_text(editable, 0, -1);</div><div class='del'>-		arbitrary = e_card_simple_get_arbitrary(simple,</div><div class='del'>-							name);</div><div class='del'>-		if (arbitrary &amp;&amp; arbitrary-&gt;value) {</div><div class='del'>-			gchar *u = e_utf8_to_gtk_string ((GtkWidget *) editable, arbitrary-&gt;value);</div><div class='del'>-			gtk_editable_insert_text(editable, u, strlen(u), &amp;position);</div><div class='del'>-			g_free (u);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-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'>-		gboolean wants_html, wants_html_set;</div><div class='del'>-</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card),</div><div class='del'>-			       "file_as",       &amp;file_as,</div><div class='del'>-			       "name",          &amp;name,</div><div class='del'>-			       "anniversary",   &amp;anniversary,</div><div class='del'>-			       "birth_date",    &amp;bday,</div><div class='del'>-			       "wants_html_set",&amp;wants_html_set,</div><div class='del'>-			       "wants_html",    &amp;wants_html,</div><div class='del'>-			       NULL);</div><div class='del'>-	</div><div class='del'>-		for (i = 0; i &lt; sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {</div><div class='del'>-			fill_in_card_field(editor, card, field_mapping[i].id, field_mapping[i].key);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (list = editor-&gt;arbitrary_fields; list; list = list-&gt;next) {</div><div class='del'>-			fill_in_single_field(editor, list-&gt;data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (wants_html_set) {</div><div class='del'>-			GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, "checkbutton-htmlmail");</div><div class='del'>-			if (widget &amp;&amp; GTK_IS_CHECK_BUTTON(widget)) {</div><div class='del'>-				gtk_object_set(GTK_OBJECT(widget),</div><div class='del'>-					       "active", wants_html,</div><div class='del'>-					       NULL);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* File as has to come after company and name or else it'll get messed up when setting them. */</div><div class='del'>-		fill_in_field(editor, "entry-file-as", file_as);</div><div class='del'>-		</div><div class='del'>-		e_card_name_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 = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; *string)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       key, string,</div><div class='del'>-				       NULL);</div><div class='del'>-		else</div><div class='del'>-			gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-				       key, NULL,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		if (string) g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_single_field(EContactEditor *editor, char *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = glade_xml_get_widget(editor-&gt;gui, name);</div><div class='del'>-	ECardSimple *simple = editor-&gt;simple;</div><div class='del'>-	if (widget &amp;&amp; GTK_IS_EDITABLE(widget)) {</div><div class='del'>-		GtkEditable *editable = GTK_EDITABLE(widget);</div><div class='del'>-		char *string = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-		if (string &amp;&amp; *string)</div><div class='del'>-			e_card_simple_set_arbitrary(simple,</div><div class='del'>-						    name,</div><div class='del'>-						    NULL,</div><div class='del'>-						    string);</div><div class='del'>-		else</div><div class='del'>-			e_card_simple_set_arbitrary(simple,</div><div class='del'>-						    name,</div><div class='del'>-						    NULL,</div><div class='del'>-						    NULL);</div><div class='del'>-		if (string) g_free(string);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-extract_info(EContactEditor *editor)</div><div class='del'>-{</div><div class='del'>-	ECard *card = editor-&gt;card;</div><div class='del'>-	if (card) {</div><div class='del'>-		ECardDate *anniversary;</div><div class='del'>-		ECardDate *bday;</div><div class='del'>-		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 = e_utf8_gtk_editable_get_chars(editable, 0, -1);</div><div class='del'>-</div><div class='del'>-			if (string &amp;&amp; *string)</div><div class='del'>-				gtk_object_set(GTK_OBJECT(card),</div><div class='del'>-					       "file_as", string,</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			if (string) g_free(string);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; sizeof(field_mapping) / sizeof(field_mapping[0]); i++) {</div><div class='del'>-			extract_field(editor, card, field_mapping[i].id, field_mapping[i].key);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (list = editor-&gt;arbitrary_fields; list; list = list-&gt;next) {</div><div class='del'>-			extract_single_field(editor, list-&gt;data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (editor-&gt;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 fae6939595..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-editor.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/e-contact-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,114 +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 "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EContactEditor - A dialog displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * card         ECard *         RW              The card currently being edited</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_CONTACT_EDITOR_TYPE			(e_contact_editor_get_type ())</div><div class='del'>-#define E_CONTACT_EDITOR(obj)			(GTK_CHECK_CAST ((obj), E_CONTACT_EDITOR_TYPE, EContactEditor))</div><div class='del'>-#define E_CONTACT_EDITOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_CONTACT_EDITOR_TYPE, EContactEditorClass))</div><div class='del'>-#define E_IS_CONTACT_EDITOR(obj)		(GTK_CHECK_TYPE ((obj), E_CONTACT_EDITOR_TYPE))</div><div class='del'>-#define E_IS_CONTACT_EDITOR_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_CONTACT_EDITOR_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EContactEditor       EContactEditor;</div><div class='del'>-typedef struct _EContactEditorClass  EContactEditorClass;</div><div class='del'>-</div><div class='del'>-struct _EContactEditor</div><div class='del'>-{</div><div class='del'>-	GtkObject object;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-</div><div class='del'>-	/* UI handler */</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	</div><div class='del'>-	GladeXML *gui;</div><div class='del'>-	GtkWidget *app;</div><div class='del'>-	GnomeUIInfo *email_info;</div><div class='del'>-	GnomeUIInfo *phone_info;</div><div class='del'>-	GnomeUIInfo *address_info;</div><div class='del'>-	GtkWidget *email_popup;</div><div class='del'>-	GtkWidget *phone_popup;</div><div class='del'>-	GtkWidget *address_popup;</div><div class='del'>-	GList *email_list;</div><div class='del'>-	GList *phone_list;</div><div class='del'>-	GList *address_list;</div><div class='del'>-</div><div class='del'>-	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 (* delete_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'>-</div><div class='del'>-gboolean e_contact_editor_confirm_delete(GtkWindow *parent);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_CONTACT_EDITOR_H__ */</div><div class='head'>diff --git a/addressbook/gui/contact-editor/e-contact-save-as.c b/addressbook/gui/contact-editor/e-contact-save-as.c<br/>deleted file mode 100644<br/>index 7209c5e8f8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-save-as.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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;gal/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 d1c84dc596..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/e-contact-save-as.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_contact_save_as(gchar *title, ECard *card);</div><div class='del'>-</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/email.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/contact-editor/fulladdr.glade b/addressbook/gui/contact-editor/fulladdr.glade<br/>deleted file mode 100644<br/>index e46064bb92..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/fulladdr.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/fulladdr.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,477 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;fulladdr&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;fulladdr&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;fulladdr.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-checkaddress&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Check Address&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;True&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-  &lt;auto_close&gt;False&lt;/auto_close&gt;</div><div class='del'>-  &lt;hide_on_close&gt;False&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;vbox-container&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;has_default&gt;True&lt;/has_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-checkaddress&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;4&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;4&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;6&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Address:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_LEFT&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-street&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_City:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-city&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-city&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-ext&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_PO Box:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-po&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Address _2:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-ext&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-po&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-street&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;has_focus&gt;True&lt;/has_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_State/Province:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-region&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-region&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-country&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;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;USA</div><div class='del'>-Canada</div><div class='del'>-Finland</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-country&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-code&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;100&lt;/width&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;3&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;4&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_ZIP Code:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-code&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Countr_y:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-country&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/fulladdr.glade.h b/addressbook/gui/contact-editor/fulladdr.glade.h<br/>deleted file mode 100644<br/>index 7db13fcf4d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/fulladdr.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/fulladdr.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +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 Address");</div><div class='del'>-gchar *s = N_("_Address:");</div><div class='del'>-gchar *s = N_("_City:");</div><div class='del'>-gchar *s = N_("_PO Box:");</div><div class='del'>-gchar *s = N_("Address _2:");</div><div class='del'>-gchar *s = N_("_State/Province:");</div><div class='del'>-gchar *s = N_("USA");</div><div class='del'>-gchar *s = N_("Canada");</div><div class='del'>-gchar *s = N_("Finland");</div><div class='del'>-gchar *s = N_("_ZIP Code:");</div><div class='del'>-gchar *s = N_("Countr_y:");</div><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 4d4303270a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/fullname-strings.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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_("\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='del'>-gchar *s = N_("_First:");</div><div class='del'>-gchar *s = N_("_Title:");</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='head'>diff --git a/addressbook/gui/contact-editor/fullname.glade b/addressbook/gui/contact-editor/fullname.glade<br/>deleted file mode 100644<br/>index f2dfa23834..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/contact-editor/fullname.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/fullname.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,389 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;fullname&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;fullname&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;use_widget_names&gt;True&lt;/use_widget_names&gt;</div><div class='del'>-  &lt;output_main_file&gt;False&lt;/output_main_file&gt;</div><div class='del'>-  &lt;output_support_files&gt;False&lt;/output_support_files&gt;</div><div class='del'>-  &lt;output_build_files&gt;False&lt;/output_build_files&gt;</div><div class='del'>-  &lt;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;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CANCEL&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;table-checkfullname&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;8&lt;/border_width&gt;</div><div class='del'>-      &lt;rows&gt;5&lt;/rows&gt;</div><div class='del'>-      &lt;columns&gt;3&lt;/columns&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;row_spacing&gt;6&lt;/row_spacing&gt;</div><div class='del'>-      &lt;column_spacing&gt;21&lt;/column_spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-title&lt;/name&gt;</div><div class='del'>-	&lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	&lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	&lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	&lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	&lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	&lt;items&gt;</div><div class='del'>-Mr.</div><div class='del'>-Mrs.</div><div class='del'>-Dr.</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-title&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkCombo&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;combo-suffix&lt;/name&gt;</div><div class='del'>-	&lt;value_in_list&gt;False&lt;/value_in_list&gt;</div><div class='del'>-	&lt;ok_if_empty&gt;True&lt;/ok_if_empty&gt;</div><div class='del'>-	&lt;case_sensitive&gt;False&lt;/case_sensitive&gt;</div><div class='del'>-	&lt;use_arrows&gt;True&lt;/use_arrows&gt;</div><div class='del'>-	&lt;use_arrows_always&gt;False&lt;/use_arrows_always&gt;</div><div class='del'>-	&lt;items&gt;</div><div class='del'>-Sr.</div><div class='del'>-Jr.</div><div class='del'>-I</div><div class='del'>-II</div><div class='del'>-III</div><div class='del'>-Esq.</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;GtkCombo:entry&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;entry-suffix&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-first&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-middle&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;entry-last&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_First:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-first&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Title:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-title&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Middle:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-middle&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Last:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-last&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label4&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;_Suffix:&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;focus_target&gt;entry-suffix&lt;/focus_target&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	  &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	  &lt;top_attach&gt;4&lt;/top_attach&gt;</div><div class='del'>-	  &lt;bottom_attach&gt;5&lt;/bottom_attach&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	  &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	  &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	  &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	  &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	  &lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/addressbook/gui/contact-editor/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/contact-editor/web.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/addressbook/gui/search/.cvsignore b/addressbook/gui/search/.cvsignore<br/>deleted file mode 100644<br/>index d6c55c7345..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/search/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/addressbook/gui/search/Makefile.am b/addressbook/gui/search/Makefile.am<br/>deleted file mode 100644<br/>index d932aaac77..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/search/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>-ruledir = $(datadir)/evolution</div><div class='del'>-rule_DATA = addresstypes.xml</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = addresstypes.xml</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-addressbook-search\"		\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend		\</div><div class='del'>-	-I$(top_builddir)/addressbook/backend		\</div><div class='del'>-	-I$(top_srcdir)/addressbook/contact-editor	\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-text			\</div><div class='del'>-	-I$(top_srcdir)/widgets/misc			\</div><div class='del'>-	-DSEARCH_RULE_DIR=\"$(ruledir)\"		\</div><div class='del'>-	$(BONOBO_GNOME_CFLAGS)				\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libeaddressbooksearch.a</div><div class='del'>-</div><div class='del'>-libeaddressbooksearch_a_SOURCES =		\</div><div class='del'>-	e-addressbook-search-dialog.c		\</div><div class='del'>-	e-addressbook-search-dialog.h</div><div class='head'>diff --git a/addressbook/gui/search/addresstypes.xml b/addressbook/gui/search/addresstypes.xml<br/>deleted file mode 100644<br/>index bf64e841b0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/addresstypes.xml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/search/addresstypes.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,61 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;filterdescription&gt;</div><div class='del'>-&lt;partset&gt;</div><div class='del'>- &lt;part name="name"&gt;</div><div class='del'>-  &lt;title&gt;Name&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="name-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-        &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(contains "full_name" ${name})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-        &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (contains "full_name" ${name}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-        &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(is "full_name" ${name})))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-        &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (is "full_name" ${name}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="begin"&gt;</div><div class='del'>-        &lt;title&gt;begins with&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(beginswith "full_name" ${name})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="end"&gt;</div><div class='del'>-        &lt;title&gt;ends in&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(endswith "full_name" ${name})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="string" name="name"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="email"&gt;</div><div class='del'>-  &lt;title&gt;Email&lt;/title&gt;</div><div class='del'>-   &lt;input type="optionlist" name="email-type"&gt;</div><div class='del'>-    &lt;option value="contains"&gt;</div><div class='del'>-        &lt;title&gt;contains&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(contains "email" ${email})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="not contains"&gt;</div><div class='del'>-        &lt;title&gt;does not contain&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (contains "email" ${email}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is"&gt;</div><div class='del'>-        &lt;title&gt;is&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(is "email" ${email})&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-    &lt;option value="is not"&gt;</div><div class='del'>-        &lt;title&gt;is not&lt;/title&gt;</div><div class='del'>-	&lt;code&gt;(not (is "email" ${email}))&lt;/code&gt;</div><div class='del'>-    &lt;/option&gt;</div><div class='del'>-   &lt;/input&gt;</div><div class='del'>-   &lt;input type="address" name="email"/&gt;</div><div class='del'>- &lt;/part&gt;</div><div class='del'>- &lt;part name="sexp"&gt;</div><div class='del'>-   &lt;title&gt;Expression&lt;/title&gt;</div><div class='del'>-   &lt;input type="code" name="code"/&gt;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-&lt;/partset&gt;</div><div class='del'>-&lt;/filterdescription&gt;</div><div class='head'>diff --git a/addressbook/gui/search/e-addressbook-search-dialog.c b/addressbook/gui/search/e-addressbook-search-dialog.c<br/>deleted file mode 100644<br/>index 60f92cfff4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/e-addressbook-search-dialog.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/search/e-addressbook-search-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,223 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-addressbook-search-dialog.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;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include "e-addressbook-search-dialog.h"</div><div class='del'>-#include "addressbook/gui/widgets/e-minicard-view-widget.h"</div><div class='del'>-#include &lt;gal/widgets/e-scroll-frame.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_addressbook_search_dialog_init		 (EAddressbookSearchDialog		 *widget);</div><div class='del'>-static void e_addressbook_search_dialog_class_init	 (EAddressbookSearchDialogClass	 *klass);</div><div class='del'>-static void e_addressbook_search_dialog_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_search_dialog_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_search_dialog_destroy       (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static ECanvasClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gnome_dialog_get_type())</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_search_dialog_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-  if (!type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo info =</div><div class='del'>-      {</div><div class='del'>-        "EAddressbookSearchDialog",</div><div class='del'>-        sizeof (EAddressbookSearchDialog),</div><div class='del'>-        sizeof (EAddressbookSearchDialogClass),</div><div class='del'>-        (GtkClassInitFunc) e_addressbook_search_dialog_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_addressbook_search_dialog_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_dialog_class_init (EAddressbookSearchDialogClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	ECanvasClass *canvas_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS (klass);</div><div class='del'>-	canvas_class = E_CANVAS_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookSearchDialog::book", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg       = e_addressbook_search_dialog_set_arg;</div><div class='del'>-	object_class-&gt;get_arg       = e_addressbook_search_dialog_get_arg;</div><div class='del'>-	object_class-&gt;destroy       = e_addressbook_search_dialog_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_widget (EAddressbookSearchDialog *view)</div><div class='del'>-{</div><div class='del'>-	FilterPart *part;</div><div class='del'>-</div><div class='del'>-	view-&gt;context = rule_context_new();</div><div class='del'>-	/* FIXME: hide this in a class */</div><div class='del'>-	rule_context_add_part_set(view-&gt;context, "partset", filter_part_get_type(),</div><div class='del'>-				  rule_context_add_part, rule_context_next_part);</div><div class='del'>-	rule_context_load(view-&gt;context, SEARCH_RULE_DIR "/addresstypes.xml", "");</div><div class='del'>-	view-&gt;rule = filter_rule_new();</div><div class='del'>-	part = rule_context_next_part(view-&gt;context, NULL);</div><div class='del'>-	if (part == NULL) {</div><div class='del'>-		g_warning("Problem loading search for addressbook no parts to load");</div><div class='del'>-		return gtk_entry_new();</div><div class='del'>-	} else {</div><div class='del'>-		filter_rule_add_part(view-&gt;rule, filter_part_clone(part));</div><div class='del'>-		return filter_rule_get_widget(view-&gt;rule, view-&gt;context);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_query (EAddressbookSearchDialog *view)</div><div class='del'>-{</div><div class='del'>-	GString *out = g_string_new("");</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	filter_rule_build_code(view-&gt;rule, out);</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	printf("Searching using %s\n", ret);</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-button_press (GtkWidget *widget, EAddressbookSearchDialog *dialog)</div><div class='del'>-{</div><div class='del'>-	char *query;</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(dialog-&gt;scrolled_window);</div><div class='del'>-	query = get_query(dialog);</div><div class='del'>-	gtk_object_set(GTK_OBJECT(dialog-&gt;view),</div><div class='del'>-		       "query", query,</div><div class='del'>-		       NULL);</div><div class='del'>-	g_free(query);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_dialog_init (EAddressbookSearchDialog *view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *button;</div><div class='del'>-	GnomeDialog *dialog = GNOME_DIALOG (view);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_policy(GTK_WINDOW(view), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	view-&gt;search = get_widget(view);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(dialog-&gt;vbox), view-&gt;search, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show(view-&gt;search);</div><div class='del'>-</div><div class='del'>-	button = gtk_button_new_with_label(_("Search"));</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(dialog-&gt;vbox), button, FALSE, FALSE, 0);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(button_press), view);</div><div class='del'>-	gtk_widget_show(button);</div><div class='del'>-</div><div class='del'>-	view-&gt;view = e_minicard_view_widget_new();</div><div class='del'>-	gtk_widget_show(view-&gt;view);</div><div class='del'>-</div><div class='del'>-	view-&gt;scrolled_window = e_scroll_frame_new(NULL, NULL);</div><div class='del'>-	e_scroll_frame_set_policy(E_SCROLL_FRAME(view-&gt;scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);</div><div class='del'>-	gtk_container_add(GTK_CONTAINER(view-&gt;scrolled_window), view-&gt;view);</div><div class='del'>-	</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(dialog-&gt;vbox), view-&gt;scrolled_window, TRUE, TRUE, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_addressbook_search_dialog_new (EBook *book)</div><div class='del'>-{</div><div class='del'>-	EAddressbookSearchDialog *view = gtk_type_new (e_addressbook_search_dialog_get_type ());</div><div class='del'>-	gtk_object_set(GTK_OBJECT(view-&gt;view),</div><div class='del'>-		       "book", book,</div><div class='del'>-		       NULL);</div><div class='del'>-	return GTK_WIDGET(view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_dialog_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookSearchDialog *emvw;</div><div class='del'>-</div><div class='del'>-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (o);</div><div class='del'>-</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		gtk_object_set(GTK_OBJECT(emvw-&gt;view),</div><div class='del'>-			       "book", GTK_VALUE_OBJECT (*arg),</div><div class='del'>-			       NULL);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_dialog_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookSearchDialog *emvw;</div><div class='del'>-</div><div class='del'>-	emvw = E_ADDRESSBOOK_SEARCH_DIALOG (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		gtk_object_get(GTK_OBJECT(emvw-&gt;view),</div><div class='del'>-			       "book", &amp;(GTK_VALUE_OBJECT (*arg)),</div><div class='del'>-			       NULL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_dialog_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookSearchDialog *view;</div><div class='del'>-</div><div class='del'>-	view = E_ADDRESSBOOK_SEARCH_DIALOG (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref((GtkObject *)view-&gt;context);</div><div class='del'>-	gtk_object_unref((GtkObject *)view-&gt;rule);</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS(parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/search/e-addressbook-search-dialog.h b/addressbook/gui/search/e-addressbook-search-dialog.h<br/>deleted file mode 100644<br/>index dc54275a77..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/search/e-addressbook-search-dialog.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/search/e-addressbook-search-dialog.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'>-/* e-minicard-view-widget.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_ADDRESSBOOK_SEARCH_DIALOG_H__</div><div class='del'>-#define __E_ADDRESSBOOK_SEARCH_DIALOG_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;ebook/e-book.h&gt;</div><div class='del'>-</div><div class='del'>-#include "filter/rule-context.h"</div><div class='del'>-#include "filter/filter-rule.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH_DIALOG_TYPE			(e_addressbook_search_dialog_get_type ())</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH_DIALOG(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialog))</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE, EAddressbookSearchDialogClass))</div><div class='del'>-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG(obj) 		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))</div><div class='del'>-#define E_IS_ADDRESSBOOK_SEARCH_DIALOG_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_DIALOG_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressbookSearchDialog       EAddressbookSearchDialog;</div><div class='del'>-typedef struct _EAddressbookSearchDialogClass  EAddressbookSearchDialogClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookSearchDialog</div><div class='del'>-{</div><div class='del'>-	GnomeDialog parent;</div><div class='del'>-</div><div class='del'>-	GtkWidget *search;</div><div class='del'>-	GtkWidget *view;</div><div class='del'>-</div><div class='del'>-	RuleContext *context;</div><div class='del'>-	FilterRule *rule;</div><div class='del'>-	GtkWidget *scrolled_window;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EAddressbookSearchDialogClass</div><div class='del'>-{</div><div class='del'>-	GnomeDialogClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType    e_addressbook_search_dialog_get_type (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *e_addressbook_search_dialog_new (EBook *book);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_ADDRESSBOOK_SEARCH_DIALOG_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/.cvsignore b/addressbook/gui/widgets/.cvsignore<br/>deleted file mode 100644<br/>index 472fd2593f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,12 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-minicard-label-test</div><div class='del'>-minicard-test</div><div class='del'>-minicard-view-test</div><div class='del'>-minicard-widget-test</div><div class='del'>-reflow-test</div><div class='head'>diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am<br/>deleted file mode 100644<br/>index 91e361bee1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,126 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-minicard\"			\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_srcdir)/addressbook/backend/ebook	\</div><div class='del'>-	-I$(top_srcdir)/addressbook/contact-editor	\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-text			\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-table			\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-reflow		\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-table			\</div><div class='del'>-	-I$(top_srcdir)/widgets/misc			\</div><div class='del'>-	$(BONOBO_GNOME_CFLAGS)				\</div><div class='del'>-	$(EXTRA_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-addressbook-model.c			\</div><div class='del'>-	e-addressbook-model.h			\</div><div class='del'>-	e-addressbook-search.c			\</div><div class='del'>-	e-addressbook-search.h			\</div><div class='del'>-	e-addressbook-view.c			\</div><div class='del'>-	e-addressbook-view.h			\</div><div class='del'>-	e-minicard-control.c			\</div><div class='del'>-	e-minicard-control.h			\</div><div class='del'>-	e-minicard-label.c			\</div><div class='del'>-	e-minicard-label.h			\</div><div class='del'>-	e-minicard-view-widget.c		\</div><div class='del'>-	e-minicard-view-widget.h		\</div><div class='del'>-	e-minicard-view.c			\</div><div class='del'>-	e-minicard-view.h			\</div><div class='del'>-	e-minicard-widget.c			\</div><div class='del'>-	e-minicard-widget.h			\</div><div class='del'>-	e-minicard.c				\</div><div class='del'>-	e-minicard.h</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =				\</div><div class='del'>-	minicard-widget-test			\</div><div class='del'>-	minicard-label-test			\</div><div class='del'>-	minicard-test				\</div><div class='del'>-	reflow-test</div><div class='del'>-#	minicard-view-test</div><div class='del'>-</div><div class='del'>-minicard_label_test_SOURCES = 	\</div><div class='del'>-	test-minicard-label.c</div><div class='del'>-</div><div class='del'>-minicard_label_test_LDADD =				\</div><div class='del'>-	$(EXTRA_GNOME_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'>-</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'>-	libeminicard.a							\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)						\</div><div class='del'>-	$(GNOME_PRINT_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)/e-util/ename/libename.la			\</div><div class='del'>-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\</div><div class='del'>-	$(top_builddir)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</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'>-	$(BONOBO_GNOME_LIBS)						\</div><div class='del'>-	$(GNOME_PRINT_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)/e-util/ename/libename.la			\</div><div class='del'>-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\</div><div class='del'>-	$(top_builddir)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</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'>-#	$(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)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-#	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\</div><div class='del'>-#	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-minicard_widget_test_SOURCES = 	\</div><div class='del'>-	e-minicard-widget-test.c</div><div class='del'>-</div><div class='del'>-minicard_widget_test_LDADD =						\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)						\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)						\</div><div class='del'>-	$(GNOME_PRINT_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)/e-util/ename/libename.la			\</div><div class='del'>-	$(top_builddir)/addressbook/contact-editor/libecontacteditor.a	\</div><div class='del'>-	$(top_builddir)/addressbook/printing/libecontactprint.a		\</div><div class='del'>-	$(top_builddir)/widgets/misc/libemiscwidgets.a 			\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-glade_DATA = alphabet.glade </div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 			\</div><div class='del'>-	$(glade_DATA)		\</div><div class='del'>-	alphabet.glade.h</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 830b70879c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-model.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-addressbook-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,444 +0,0 @@</div><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'>-	ARG_EDITABLE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_book_view(EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;book_view &amp;&amp; model-&gt;create_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (model-&gt;book_view),</div><div class='del'>-				      model-&gt;create_card_id);</div><div class='del'>-	if (model-&gt;book_view &amp;&amp; model-&gt;remove_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (model-&gt;book_view),</div><div class='del'>-				      model-&gt;remove_card_id);</div><div class='del'>-	if (model-&gt;book_view &amp;&amp; model-&gt;modify_card_id)</div><div class='del'>-		gtk_signal_disconnect(GTK_OBJECT (model-&gt;book_view),</div><div class='del'>-				      model-&gt;modify_card_id);</div><div class='del'>-</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'>-</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'>-	model-&gt;book_view = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_destroy(GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);</div><div class='del'>-	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'>-</div><div class='del'>-	remove_book_view(model);</div><div class='del'>-</div><div class='del'>-	if (model-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(model-&gt;book));</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'>-</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 (addressbook-&gt;editable) {</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'>-</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 E_ADDRESSBOOK_MODEL(etc)-&gt;editable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-addressbook_append_row (ETableModel *etm, ETableModel *source, gint row)</div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	EAddressbookModel *addressbook = E_ADDRESSBOOK_MODEL(etm);</div><div class='del'>-	int col;</div><div class='del'>-</div><div class='del'>-	card = e_card_new("");</div><div class='del'>-	simple = e_card_simple_new(card);</div><div class='del'>-</div><div class='del'>-	for (col = 0; col &lt; E_CARD_SIMPLE_FIELD_LAST - 1; col++) {</div><div class='del'>-		const void *val = e_table_model_value_at(source, col, row);</div><div class='del'>-		e_card_simple_set(simple,</div><div class='del'>-				  col + 1,</div><div class='del'>-				  val);</div><div class='del'>-	}</div><div class='del'>-	e_card_simple_sync_card(simple);</div><div class='del'>-	e_book_add_card(addressbook-&gt;book, card, NULL, NULL);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function duplicates the value passed to it. */</div><div class='del'>-static void *</div><div class='del'>-addressbook_duplicate_value (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This function frees the value passed to it. */</div><div class='del'>-static void</div><div class='del'>-addressbook_free_value (ETableModel *etc, int col, void *value)</div><div class='del'>-{</div><div class='del'>-	g_free(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void *</div><div class='del'>-addressbook_initialize_value (ETableModel *etc, int col)</div><div class='del'>-{</div><div class='del'>-	return g_strdup("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-addressbook_value_is_empty (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return !(value &amp;&amp; *(char *)value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-addressbook_value_to_string (ETableModel *etc, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup(value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-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'>-	e_table_model_pre_change(E_TABLE_MODEL(model));</div><div class='del'>-	for ( ; cards; cards = cards-&gt;next) {</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'>-	e_table_model_pre_change(E_TABLE_MODEL(model));</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'>-	gtk_object_add_arg_type ("EAddressbookModel::editable", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_EDITABLE);</div><div class='del'>-	</div><div class='del'>-	model_class-&gt;column_count = addressbook_col_count;</div><div class='del'>-	model_class-&gt;row_count = addressbook_row_count;</div><div class='del'>-	model_class-&gt;value_at = addressbook_value_at;</div><div class='del'>-	model_class-&gt;set_value_at = addressbook_set_value_at;</div><div class='del'>-	model_class-&gt;is_cell_editable = addressbook_is_cell_editable;</div><div class='del'>-	model_class-&gt;append_row = addressbook_append_row;</div><div class='del'>-	model_class-&gt;duplicate_value = addressbook_duplicate_value;</div><div class='del'>-	model_class-&gt;free_value = addressbook_free_value;</div><div class='del'>-	model_class-&gt;initialize_value = addressbook_initialize_value;</div><div class='del'>-	model_class-&gt;value_is_empty = addressbook_value_is_empty;</div><div class='del'>-	model_class-&gt;value_to_string = addressbook_value_to_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_model_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *model = E_ADDRESSBOOK_MODEL(object);</div><div class='del'>-	model-&gt;book = NULL;</div><div class='del'>-	model-&gt;query = g_strdup("(contains \"x-evolution-any-field\" \"\")");</div><div class='del'>-	model-&gt;book_view = NULL;</div><div class='del'>-	model-&gt;get_view_idle = 0;</div><div class='del'>-	model-&gt;create_card_id = 0;</div><div class='del'>-	model-&gt;remove_card_id = 0;</div><div class='del'>-	model-&gt;modify_card_id = 0;</div><div class='del'>-	model-&gt;data = NULL;</div><div class='del'>-	model-&gt;data_count = 0;</div><div class='del'>-	model-&gt;editable = TRUE;</div><div class='del'>-	model-&gt;first_get_view = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_view_loaded (EBook *book, EBookStatus status, EBookView *book_view, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *model = closure;</div><div class='del'>-	int i;</div><div class='del'>-	remove_book_view(model);</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'>-</div><div class='del'>-	e_table_model_pre_change(E_TABLE_MODEL(model));</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'>-		if (model-&gt;first_get_view) {</div><div class='del'>-			char *capabilities;</div><div class='del'>-			capabilities = e_book_get_static_capabilities(model-&gt;book);</div><div class='del'>-			if (strstr(capabilities, "local")) {</div><div class='del'>-				e_book_get_book_view(model-&gt;book, model-&gt;query, book_view_loaded, model);</div><div class='del'>-			}</div><div class='del'>-			model-&gt;first_get_view = FALSE;</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			e_book_get_book_view(model-&gt;book, model-&gt;query, book_view_loaded, model);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	model-&gt;get_view_idle = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ECard *</div><div class='del'>-e_addressbook_model_get_card(EAddressbookModel *model,</div><div class='del'>-			     int                row)</div><div class='del'>-{</div><div class='del'>-	if (model-&gt;data &amp;&amp; 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'>-	case ARG_EDITABLE:</div><div class='del'>-		model-&gt;editable = GTK_VALUE_BOOL (*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_addressbook_model_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookModel *e_addressbook_model;</div><div class='del'>-</div><div class='del'>-	e_addressbook_model = E_ADDRESSBOOK_MODEL (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(e_addressbook_model-&gt;book);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = g_strdup(e_addressbook_model-&gt;query);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_EDITABLE:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = e_addressbook_model-&gt;editable;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type){</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EAddressbookModel",</div><div class='del'>-			sizeof (EAddressbookModel),</div><div class='del'>-			sizeof (EAddressbookModelClass),</div><div class='del'>-			(GtkClassInitFunc) e_addressbook_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_addressbook_model_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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='del'>-</div><div class='del'>-void   e_addressbook_model_stop    (EAddressbookModel *model)</div><div class='del'>-{</div><div class='del'>-	remove_book_view(model);</div><div class='del'>-}</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 860fb641ac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-model.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-addressbook-model.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'>-#ifndef _E_ADDRESSBOOK_MODEL_H_</div><div class='del'>-#define _E_ADDRESSBOOK_MODEL_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-book-view.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</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'>-</div><div class='del'>-	guint editable : 1;</div><div class='del'>-	guint first_get_view : 1;</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'>-void   e_addressbook_model_stop    (EAddressbookModel *model);</div><div class='del'>-</div><div class='del'>-#endif /* _E_ADDRESSBOOK_MODEL_H_ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-search.c b/addressbook/gui/widgets/e-addressbook-search.c<br/>deleted file mode 100644<br/>index e58e72d560..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-search.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-addressbook-search.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,333 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-addressbook-search.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'>-</div><div class='del'>-#include "e-addressbook-search.h"</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_addressbook_search_init		(EAddressbookSearch		 *card);</div><div class='del'>-static void e_addressbook_search_class_init	(EAddressbookSearchClass	 *klass);</div><div class='del'>-static void e_addressbook_search_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_search_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_search_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	QUERY_CHANGED,</div><div class='del'>-	MENU_ACTIVATED,</div><div class='del'>-</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gint eas_signals [LAST_SIGNAL] = { 0, };</div><div class='del'>-</div><div class='del'>-static GtkHBoxClass *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_OPTION_CHOICE,</div><div class='del'>-	ARG_TEXT,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_search_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'>-			"EAddressbookSearch",</div><div class='del'>-			sizeof (EAddressbookSearch),</div><div class='del'>-			sizeof (EAddressbookSearchClass),</div><div class='del'>-			(GtkClassInitFunc) e_addressbook_search_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_addressbook_search_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_hbox_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_class_init (EAddressbookSearchClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_hbox_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_addressbook_search_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_addressbook_search_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_addressbook_search_destroy;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookSearch::option_choice", GTK_TYPE_ENUM,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_OPTION_CHOICE);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookSearch::text", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_TEXT);</div><div class='del'>-</div><div class='del'>-	eas_signals [QUERY_CHANGED] =</div><div class='del'>-		gtk_signal_new ("query_changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookSearchClass, query_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'>-	eas_signals [MENU_ACTIVATED] =</div><div class='del'>-		gtk_signal_new ("menu_activated",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EAddressbookSearchClass, menu_activated),</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'>-	gtk_object_class_add_signals (object_class, eas_signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eas_query_changed(EAddressbookSearch *eas)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit(GTK_OBJECT (eas),</div><div class='del'>-			eas_signals [QUERY_CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eas_menu_activated(EAddressbookSearch *eas, int item)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit(GTK_OBJECT (eas),</div><div class='del'>-			eas_signals [MENU_ACTIVATED],</div><div class='del'>-			item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eas_menubar_activated(GtkWidget *widget, EAddressbookSearch *eas)</div><div class='del'>-{</div><div class='del'>-	int id = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (widget), "EasMenuId"));</div><div class='del'>-</div><div class='del'>-	eas_menu_activated(eas, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	EAS_CLEAR = 0,</div><div class='del'>-} EasMenuId;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *text;</div><div class='del'>-	char *name;</div><div class='del'>-	int id;</div><div class='del'>-} EasMenuItem;</div><div class='del'>-</div><div class='del'>-static EasMenuItem eas_menu_items[] = {</div><div class='del'>-	{ N_("Show All"), "all", 0 },</div><div class='del'>-	{ NULL, "sep", -1 },</div><div class='del'>-	{ N_("Advanced"), "advanced", 1},</div><div class='del'>-	{ NULL, NULL, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eas_pack_menubar(EAddressbookSearch *eas)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu, *menuitem;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	for (i = 0; eas_menu_items[i].name; i++) {</div><div class='del'>-		GtkWidget *item;</div><div class='del'>-</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(eas_menu_items[i].text));</div><div class='del'>-</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "EasMenuId", GINT_TO_POINTER(eas_menu_items[i].id));</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-				    GTK_SIGNAL_FUNC (eas_menubar_activated),</div><div class='del'>-				    eas);</div><div class='del'>-	}</div><div class='del'>-	gtk_widget_show_all (menu);</div><div class='del'>-</div><div class='del'>-	menuitem = gtk_menu_item_new_with_label(_("Search"));</div><div class='del'>-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), menu);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (menuitem);</div><div class='del'>-</div><div class='del'>-	gtk_menu_bar_append (GTK_MENU_BAR(eas-&gt;menubar), menuitem);</div><div class='del'>-	gtk_widget_set_sensitive (eas-&gt;menubar, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	EAS_ANY = 0,</div><div class='del'>-	EAS_FULL_NAME = 1,</div><div class='del'>-	EAS_EMAIL = 2,</div><div class='del'>-} EasChoiceId;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *text;</div><div class='del'>-	char *name;</div><div class='del'>-	int id;</div><div class='del'>-} EasChoice;</div><div class='del'>-</div><div class='del'>-static EasChoice eas_choices[] = {</div><div class='del'>-	{ N_("Any field contains"), "x-evolution-any-field", EAS_ANY },</div><div class='del'>-	{ N_("Name contains"), "full_name", EAS_FULL_NAME },</div><div class='del'>-	{ N_("Email contains"), "email", EAS_EMAIL },</div><div class='del'>-	{ NULL, NULL, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eas_option_activated(GtkWidget *widget, EAddressbookSearch *eas)</div><div class='del'>-{</div><div class='del'>-	int id = GPOINTER_TO_INT(gtk_object_get_data (GTK_OBJECT (widget), "EasChoiceId"));</div><div class='del'>-</div><div class='del'>-	eas-&gt;option_choice = id;</div><div class='del'>-	eas_query_changed(eas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eas_entry_activated(GtkWidget *widget, EAddressbookSearch *eas)</div><div class='del'>-{</div><div class='del'>-	eas_query_changed(eas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eas_pack_option_menu(EAddressbookSearch *eas)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-	for (i = 0; eas_choices[i].name; i++) {</div><div class='del'>-		GtkWidget *item;</div><div class='del'>-</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(eas_choices[i].text));</div><div class='del'>-</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (item), "EasChoiceId", GINT_TO_POINTER(eas_choices[i].id));</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (item), "activate",</div><div class='del'>-				    GTK_SIGNAL_FUNC (eas_option_activated),</div><div class='del'>-				    eas);</div><div class='del'>-	}</div><div class='del'>-	gtk_widget_show_all (menu);</div><div class='del'>-</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (eas-&gt;option), </div><div class='del'>-				  menu);</div><div class='del'>-	gtk_option_menu_set_history (GTK_OPTION_MENU (eas-&gt;option), 0);</div><div class='del'>-	gtk_widget_set_sensitive (eas-&gt;option, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_init (EAddressbookSearch *eas)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *spacer;</div><div class='del'>-</div><div class='del'>-	gtk_box_set_spacing(GTK_BOX(eas), GNOME_PAD);</div><div class='del'>-</div><div class='del'>-	eas-&gt;menubar = gtk_menu_bar_new();</div><div class='del'>-	eas_pack_menubar(eas);</div><div class='del'>-	gtk_widget_show(eas-&gt;menubar);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(eas), eas-&gt;menubar, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	eas-&gt;option = gtk_option_menu_new();</div><div class='del'>-	eas_pack_option_menu(eas);</div><div class='del'>-	gtk_widget_show(eas-&gt;option);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(eas), eas-&gt;option, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	eas-&gt;entry = gtk_entry_new();</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (eas-&gt;entry), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (eas_entry_activated), eas);</div><div class='del'>-	gtk_widget_show(eas-&gt;entry);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(eas), eas-&gt;entry, TRUE, TRUE, 0);</div><div class='del'>-	eas-&gt;option_choice = 0;</div><div class='del'>-</div><div class='del'>-	spacer = gtk_drawing_area_new();</div><div class='del'>-	gtk_widget_show(spacer);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(eas), spacer, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_set_usize(spacer, 100, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_search_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	if (GTK_OBJECT_CLASS(parent_class)-&gt;destroy)</div><div class='del'>-		GTK_OBJECT_CLASS(parent_class)-&gt;destroy(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_addressbook_search_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_search_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_addressbook_search_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookSearch *eas = E_ADDRESSBOOK_SEARCH(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_OPTION_CHOICE:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = eas-&gt;option_choice;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_TEXT:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = e_utf8_gtk_editable_get_text(GTK_EDITABLE(eas-&gt;entry));</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'>-e_addressbook_search_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookSearch *eas = E_ADDRESSBOOK_SEARCH(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_OPTION_CHOICE:</div><div class='del'>-		eas-&gt;option_choice = GTK_VALUE_ENUM (*arg);</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (eas-&gt;option), eas-&gt;option_choice);</div><div class='del'>-		eas_query_changed(eas);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ARG_TEXT:</div><div class='del'>-		e_utf8_gtk_editable_set_text(GTK_EDITABLE(eas-&gt;entry), GTK_VALUE_STRING (*arg));</div><div class='del'>-		eas_query_changed(eas);</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='head'>diff --git a/addressbook/gui/widgets/e-addressbook-search.h b/addressbook/gui/widgets/e-addressbook-search.h<br/>deleted file mode 100644<br/>index 5b229ee03e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-search.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-addressbook-search.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-addressbook-search.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_ADDRESSBOOK_SEARCH_H__</div><div class='del'>-#define __E_ADDRESSBOOK_SEARCH_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.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'>-/* EAddressbookSearch - A card displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH_TYPE			(e_addressbook_search_get_type ())</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_SEARCH_TYPE, EAddressbookSearch))</div><div class='del'>-#define E_ADDRESSBOOK_SEARCH_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_SEARCH_TYPE, EAddressbookSearchClass))</div><div class='del'>-#define E_IS_ADDRESSBOOK_SEARCH(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_SEARCH_TYPE))</div><div class='del'>-#define E_IS_ADDRESSBOOK_SEARCH_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_SEARCH_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_ADDRESSBOOK_SEARCH_NONE, /* initialized to this */</div><div class='del'>-	E_ADDRESSBOOK_SEARCH_TABLE,</div><div class='del'>-	E_ADDRESSBOOK_SEARCH_MINICARD</div><div class='del'>-} EAddressbookSearchType;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressbookSearch       EAddressbookSearch;</div><div class='del'>-typedef struct _EAddressbookSearchClass  EAddressbookSearchClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookSearch</div><div class='del'>-{</div><div class='del'>-	GtkHBox parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	GtkWidget *menubar;</div><div class='del'>-	GtkWidget *option;</div><div class='del'>-	GtkWidget *entry;</div><div class='del'>-	int        option_choice;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EAddressbookSearchClass</div><div class='del'>-{</div><div class='del'>-	GtkHBoxClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*query_changed)  (EAddressbookSearch *search);</div><div class='del'>-	void (*menu_activated) (EAddressbookSearch *search, int item);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkWidget *e_addressbook_search_new        (void);</div><div class='del'>-GtkType    e_addressbook_search_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_ADDRESSBOOK_SEARCH_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c<br/>deleted file mode 100644<br/>index 3d081ab14c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-view.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-addressbook-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,731 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-table-field-chooser.c</div><div class='del'>- * Copyright (C) 2000  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'>-</div><div class='del'>-#include "e-addressbook-view.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-scroll-frame.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-addressbook-model.h"</div><div class='del'>-</div><div class='del'>-#include "e-minicard-view-widget.h"</div><div class='del'>-</div><div class='del'>-#include "e-contact-editor.h"</div><div class='del'>-#include "e-contact-save-as.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print-envelope.h"</div><div class='del'>-#include "e-card-simple.h"</div><div class='del'>-#include "e-card.h"</div><div class='del'>-#include "e-book.h"</div><div class='del'>-</div><div class='del'>-#include "glade/glade-xml.h"</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomeprint/gnome-print.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-dialog.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master.h&gt;</div><div class='del'>-#include &lt;libgnomeprint/gnome-print-master-preview.h&gt;</div><div class='del'>-</div><div class='del'>-static void e_addressbook_view_init		(EAddressbookView		 *card);</div><div class='del'>-static void e_addressbook_view_class_init	(EAddressbookViewClass	 *klass);</div><div class='del'>-static void e_addressbook_view_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_addressbook_view_destroy (GtkObject *object);</div><div class='del'>-static void change_view_type (EAddressbookView *view, EAddressbookViewType view_type);</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_QUERY,</div><div class='del'>-	ARG_TYPE,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_addressbook_view_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		static const GtkTypeInfo info =</div><div class='del'>-		{</div><div class='del'>-			"EAddressbookView",</div><div class='del'>-			sizeof (EAddressbookView),</div><div class='del'>-			sizeof (EAddressbookViewClass),</div><div class='del'>-			(GtkClassInitFunc) e_addressbook_view_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_addressbook_view_init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-		       	/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (gtk_table_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_class_init (EAddressbookViewClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_table_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_addressbook_view_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_addressbook_view_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_addressbook_view_destroy;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookView::book", GTK_TYPE_OBJECT,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookView::query", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_QUERY);</div><div class='del'>-	gtk_object_add_arg_type ("EAddressbookView::type", GTK_TYPE_ENUM,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_init (EAddressbookView *eav)</div><div class='del'>-{</div><div class='del'>-	eav-&gt;view_type = E_ADDRESSBOOK_VIEW_NONE;</div><div class='del'>-</div><div class='del'>-	eav-&gt;book = NULL;</div><div class='del'>-	eav-&gt;query = g_strdup("(contains \"x-evolution-any-field\" \"\")");</div><div class='del'>-</div><div class='del'>-	eav-&gt;object = NULL;</div><div class='del'>-	eav-&gt;widget = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);</div><div class='del'>-</div><div class='del'>-	if (eav-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(eav-&gt;book));</div><div class='del'>-	g_free(eav-&gt;query);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS(parent_class)-&gt;destroy)</div><div class='del'>-		GTK_OBJECT_CLASS(parent_class)-&gt;destroy(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_addressbook_view_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_addressbook_view_get_type ()));</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (eav-&gt;book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(eav-&gt;book));</div><div class='del'>-		if (GTK_VALUE_OBJECT(*arg)) {</div><div class='del'>-			eav-&gt;book = E_BOOK(GTK_VALUE_OBJECT(*arg));</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(eav-&gt;book));</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			eav-&gt;book = NULL;</div><div class='del'>-		if (eav-&gt;object)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(eav-&gt;object),</div><div class='del'>-				       "book", eav-&gt;book,</div><div class='del'>-				       NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		g_free(eav-&gt;query);</div><div class='del'>-		eav-&gt;query = g_strdup(GTK_VALUE_STRING(*arg));</div><div class='del'>-		if (!eav-&gt;query)</div><div class='del'>-			eav-&gt;query = g_strdup("(contains \"x-evolution-any-field\" \"\")");</div><div class='del'>-		if (eav-&gt;object)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(eav-&gt;object),</div><div class='del'>-				       "query", eav-&gt;query,</div><div class='del'>-				       NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TYPE:</div><div class='del'>-		change_view_type(eav, GTK_VALUE_ENUM(*arg));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_addressbook_view_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EAddressbookView *eav = E_ADDRESSBOOK_VIEW(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (eav-&gt;book)</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(eav-&gt;book);</div><div class='del'>-		else</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = NULL;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = eav-&gt;query;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_TYPE:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = eav-&gt;view_type;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EAddressbookView *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;widget &amp;&amp; E_IS_MINICARD_VIEW_WIDGET(closure-&gt;view-&gt;widget))</div><div class='del'>-		e_minicard_view_widget_jump_to_letter(E_MINICARD_VIEW_WIDGET(closure-&gt;view-&gt;widget), 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 (EAddressbookView *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 (EAddressbookView *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 (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *scrollframe;</div><div class='del'>-	GtkWidget *alphabet;</div><div class='del'>-	GtkWidget *minicard_view;</div><div class='del'>-	GtkWidget *minicard_hbox;</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_visual (gdk_rgb_get_visual ());</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-</div><div class='del'>-	minicard_hbox = gtk_hbox_new(FALSE, 0);</div><div class='del'>-</div><div class='del'>-	minicard_view = e_minicard_view_widget_new();</div><div class='del'>-</div><div class='del'>-	view-&gt;object = GTK_OBJECT(minicard_view);</div><div class='del'>-	view-&gt;widget = minicard_hbox;</div><div class='del'>-</div><div class='del'>-	scrollframe = e_scroll_frame_new (NULL, NULL);</div><div class='del'>-	e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),</div><div class='del'>-				   GTK_POLICY_AUTOMATIC,</div><div class='del'>-				   GTK_POLICY_AUTOMATIC);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (scrollframe), minicard_view);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(minicard_hbox), scrollframe, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	alphabet = create_alphabet(view);</div><div class='del'>-	if (alphabet) {</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(alphabet));</div><div class='del'>-		gtk_widget_unparent(alphabet);</div><div class='del'>-		gtk_box_pack_start(GTK_BOX(minicard_hbox), alphabet, FALSE, FALSE, 0);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(alphabet));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_table_attach(GTK_TABLE(view), minicard_hbox,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,</div><div class='del'>-			 0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all( GTK_WIDGET(minicard_hbox) );</div><div class='del'>-</div><div class='del'>-	gtk_widget_pop_visual ();</div><div class='del'>-	gtk_widget_pop_colormap ();</div><div class='del'>-}</div><div class='del'>-</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 for the delete_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-delete_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_remove_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'>-table_double_click(ETableScrolled *table, gint row, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (E_IS_ADDRESSBOOK_MODEL(view-&gt;object)) {</div><div class='del'>-		EAddressbookModel *model = E_ADDRESSBOOK_MODEL(view-&gt;object);</div><div class='del'>-		ECard *card = e_addressbook_model_get_card(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(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), "delete_card",</div><div class='del'>-				    GTK_SIGNAL_FUNC (delete_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'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	EBook *book;</div><div class='del'>-	ECard *card;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-} CardAndBook;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-card_and_book_free (CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card_and_book-&gt;card));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card_and_book-&gt;book));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_as (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	e_contact_save_as(_("Save as VCard"), card_and_book-&gt;card);</div><div class='del'>-	card_and_book_free(card_and_book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_show(e_contact_print_card_dialog_new(card_and_book-&gt;card));</div><div class='del'>-	card_and_book_free(card_and_book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_envelope (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	gtk_widget_show(e_contact_print_envelope_dialog_new(card_and_book-&gt;card));</div><div class='del'>-	card_and_book_free(card_and_book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete (GtkWidget *widget, CardAndBook *card_and_book)</div><div class='del'>-{</div><div class='del'>-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(card_and_book-&gt;widget)))) {</div><div class='del'>-		/* Add the card in the contact editor to our ebook */</div><div class='del'>-		e_book_remove_card (card_and_book-&gt;book,</div><div class='del'>-				    card_and_book-&gt;card,</div><div class='del'>-				    NULL,</div><div class='del'>-				    NULL);</div><div class='del'>-	}</div><div class='del'>-	card_and_book_free(card_and_book);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-table_right_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (E_IS_ADDRESSBOOK_MODEL(view-&gt;object)) {</div><div class='del'>-		EAddressbookModel *model = E_ADDRESSBOOK_MODEL(view-&gt;object);</div><div class='del'>-		CardAndBook *card_and_book;</div><div class='del'>-		</div><div class='del'>-		EPopupMenu menu[] = {</div><div class='del'>-			{"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, </div><div class='del'>-			{"Print", NULL, GTK_SIGNAL_FUNC(print), 0},</div><div class='del'>-			{"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0},</div><div class='del'>-			{"Delete", NULL, GTK_SIGNAL_FUNC(delete), 0}, </div><div class='del'>-			{NULL, NULL, NULL, 0}</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		card_and_book = g_new(CardAndBook, 1);</div><div class='del'>-		card_and_book-&gt;card = e_addressbook_model_get_card(model, row);</div><div class='del'>-		card_and_book-&gt;widget = GTK_WIDGET(table);</div><div class='del'>-		gtk_object_get(GTK_OBJECT(model),</div><div class='del'>-			       "book", &amp;(card_and_book-&gt;book),</div><div class='del'>-			       NULL);</div><div class='del'>-		</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(card_and_book-&gt;book));</div><div class='del'>-		</div><div class='del'>-		e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, card_and_book);</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'>-#define SPEC "&lt;?xml version=\"1.0\"?&gt;      \</div><div class='del'>-&lt;ETableSpecification click-to-add=\"true\" draw-grid=\"true\" _click-to-add-message=\"* Click here to add a contact *\"&gt;   \</div><div class='del'>-  &lt;ETableColumn model_col= \"0\" _title=\"Name\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"2\" _title=\"Email\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"3\" _title=\"Primary\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"4\" _title=\"Business\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"5\" _title=\"Home\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"6\" _title=\"Organization\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"7\" _title=\"Business\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"8\" _title=\"Home\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col= \"9\" _title=\"Mobile\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"10\" _title=\"Car\"           expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"11\" _title=\"Business Fax\"  expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"12\" _title=\"Home Fax\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"13\" _title=\"Business 2\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"14\" _title=\"Home 2\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"15\" _title=\"ISDN\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"16\" _title=\"Other\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"17\" _title=\"Pager\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"18\" _title=\"Other\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"19\" _title=\"Email 2\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"20\" _title=\"Email 3\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"21\" _title=\"Web Site\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"22\" _title=\"Department\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"23\" _title=\"Office\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"24\" _title=\"Title\"         expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"25\" _title=\"Profession\"    expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"26\" _title=\"Manager\"       expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"27\" _title=\"Assistant\"     expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"28\" _title=\"Nickname\"      expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"29\" _title=\"Spouse\"        expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"30\" _title=\"Note\"          expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableColumn model_col=\"31\" _title=\"Free-busy URL\" expansion=\"1.0\" minimum_width=\"20\" resizable=\"true\" cell=\"string\"       compare=\"string\"/&gt; \</div><div class='del'>-  &lt;ETableState&gt;                            \</div><div class='del'>-    &lt;column source=\"0\"/&gt;                 \</div><div class='del'>-    &lt;column source=\"1\"/&gt;                 \</div><div class='del'>-    &lt;column source=\"5\"/&gt;                 \</div><div class='del'>-    &lt;column source=\"3\"/&gt;                 \</div><div class='del'>-    &lt;column source=\"4\"/&gt;                 \</div><div class='del'>-    &lt;grouping&gt;                             \</div><div class='del'>-      &lt;leaf column=\"0\" ascending=\"true\"/&gt; \</div><div class='del'>-    &lt;/grouping&gt;                            \</div><div class='del'>-  &lt;/ETableState&gt;                           \</div><div class='del'>-&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_table_view (EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	</div><div class='del'>-	simple = e_card_simple_new(NULL);</div><div class='del'>-</div><div class='del'>-	model = e_addressbook_model_new();</div><div class='del'>-</div><div class='del'>-	/* Here we create the table.  We give it the three pieces of</div><div class='del'>-	   the table we've created, the header, the model, and the</div><div class='del'>-	   initial layout.  It does the rest.  */</div><div class='del'>-	table = e_table_scrolled_new (model, NULL, SPEC, NULL);</div><div class='del'>-</div><div class='del'>-	view-&gt;object = GTK_OBJECT(model);</div><div class='del'>-	view-&gt;widget = table;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(table), "double_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(table_double_click), view);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(table), "right_click",</div><div class='del'>-			   GTK_SIGNAL_FUNC(table_right_click), view);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach(GTK_TABLE(view), table,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 0, 1,</div><div class='del'>-			 GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND,</div><div class='del'>-			 0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show( GTK_WIDGET(table) );</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(simple));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_view_type (EAddressbookView *view, EAddressbookViewType view_type)</div><div class='del'>-{</div><div class='del'>-	if (view_type == view-&gt;view_type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (view-&gt;widget) {</div><div class='del'>-		gtk_widget_destroy (view-&gt;widget);</div><div class='del'>-		view-&gt;widget = NULL;</div><div class='del'>-	}</div><div class='del'>-	view-&gt;object = NULL;</div><div class='del'>-</div><div class='del'>-	switch (view_type) {</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_MINICARD:</div><div class='del'>-		create_minicard_view (view);</div><div class='del'>-		break;</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_TABLE:</div><div class='del'>-		create_table_view (view);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("view_type must be either TABLE or MINICARD\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	view-&gt;view_type = view_type;</div><div class='del'>-</div><div class='del'>-	gtk_object_set(view-&gt;object,</div><div class='del'>-		       "query", view-&gt;query,</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'>-e_contact_print_destroy(GnomeDialog *dialog, gpointer data)</div><div class='del'>-{</div><div class='del'>-	ETableScrolled *table = gtk_object_get_data(GTK_OBJECT(dialog), "table");</div><div class='del'>-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(printable));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(table));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_button(GnomeDialog *dialog, gint button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePrintMaster *master;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	EPrintable *printable = gtk_object_get_data(GTK_OBJECT(dialog), "printable");</div><div class='del'>-	GtkWidget *preview;</div><div class='del'>-	switch( button ) {</div><div class='del'>-	case GNOME_PRINT_PRINT:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_printable_reset(printable);</div><div class='del'>-		while (e_printable_data_left(printable)) {</div><div class='del'>-			if (gnome_print_gsave(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_translate(pc, 72, 72) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			e_printable_print_page(printable,</div><div class='del'>-					       pc,</div><div class='del'>-					       6.5 * 72,</div><div class='del'>-					       5 * 72,</div><div class='del'>-					       TRUE);</div><div class='del'>-			if (gnome_print_grestore(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_showpage(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-		}</div><div class='del'>-		gnome_print_master_close(master);</div><div class='del'>-		gnome_print_master_print(master);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(master));</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_PREVIEW:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_printable_reset(printable);</div><div class='del'>-		while (e_printable_data_left(printable)) {</div><div class='del'>-			if (gnome_print_gsave(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_translate(pc, 72, 72) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			e_printable_print_page(printable,</div><div class='del'>-					       pc,</div><div class='del'>-					       6.5 * 72,</div><div class='del'>-					       9 * 72,</div><div class='del'>-					       TRUE);</div><div class='del'>-			if (gnome_print_grestore(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-			if (gnome_print_showpage(pc) == -1)</div><div class='del'>-				/* FIXME */;</div><div class='del'>-		}</div><div class='del'>-		gnome_print_master_close(master);</div><div class='del'>-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));</div><div class='del'>-		gtk_widget_show_all(preview);</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(master));</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_CANCEL:</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_print(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;view_type == E_ADDRESSBOOK_VIEW_MINICARD) {</div><div class='del'>-		char *query;</div><div class='del'>-		EBook *book;</div><div class='del'>-		GtkWidget *print;</div><div class='del'>-</div><div class='del'>-		gtk_object_get (view-&gt;object,</div><div class='del'>-				"query", &amp;query,</div><div class='del'>-				"book", &amp;book,</div><div class='del'>-				NULL);</div><div class='del'>-		print = e_contact_print_dialog_new(book, query);</div><div class='del'>-		g_free(query);</div><div class='del'>-		gtk_widget_show_all(print);</div><div class='del'>-	} else if (view-&gt;view_type == E_ADDRESSBOOK_VIEW_TABLE) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-		EPrintable *printable;</div><div class='del'>-</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_scrolled_get_printable(E_TABLE_SCROLLED(view-&gt;widget));</div><div class='del'>-</div><div class='del'>-		gtk_object_ref(GTK_OBJECT(view-&gt;widget));</div><div class='del'>-</div><div class='del'>-		gtk_object_set_data(GTK_OBJECT(dialog), "table", view-&gt;widget);</div><div class='del'>-		gtk_object_set_data(GTK_OBJECT(dialog), "printable", printable);</div><div class='del'>-		</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-				   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);</div><div class='del'>-		gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-				   "destroy", GTK_SIGNAL_FUNC(e_contact_print_destroy), NULL);</div><div class='del'>-		gtk_widget_show(dialog);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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'>-void</div><div class='del'>-e_addressbook_view_delete_selection(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;view_type == E_ADDRESSBOOK_VIEW_MINICARD)</div><div class='del'>-		e_minicard_view_widget_remove_selection (E_MINICARD_VIEW_WIDGET(view-&gt;object), card_deleted_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_show_all(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	gtk_object_set(GTK_OBJECT(view),</div><div class='del'>-		       "query", NULL,</div><div class='del'>-		       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_addressbook_view_stop(EAddressbookView *view)</div><div class='del'>-{</div><div class='del'>-	switch(view-&gt;view_type) {</div><div class='del'>- 	case E_ADDRESSBOOK_VIEW_MINICARD:</div><div class='del'>-		e_minicard_view_widget_stop(E_MINICARD_VIEW_WIDGET (view-&gt;object));</div><div class='del'>-		break;</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_TABLE:</div><div class='del'>-		e_addressbook_model_stop(E_ADDRESSBOOK_MODEL (view-&gt;object));</div><div class='del'>-		break;</div><div class='del'>-	case E_ADDRESSBOOK_VIEW_NONE:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-addressbook-view.h b/addressbook/gui/widgets/e-addressbook-view.h<br/>deleted file mode 100644<br/>index 60da283a75..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-addressbook-view.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-addressbook-view.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-addressbook-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_ADDRESSBOOK_VIEW_H__</div><div class='del'>-#define __E_ADDRESSBOOK_VIEW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.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'>-/* EAddressbookView - A card displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_ADDRESSBOOK_VIEW_TYPE			(e_addressbook_view_get_type ())</div><div class='del'>-#define E_ADDRESSBOOK_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookView))</div><div class='del'>-#define E_ADDRESSBOOK_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_ADDRESSBOOK_VIEW_TYPE, EAddressbookViewClass))</div><div class='del'>-#define E_IS_ADDRESSBOOK_VIEW(obj)		(GTK_CHECK_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))</div><div class='del'>-#define E_IS_ADDRESSBOOK_VIEW_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_ADDRESSBOOK_VIEW_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_ADDRESSBOOK_VIEW_NONE, /* initialized to this */</div><div class='del'>-	E_ADDRESSBOOK_VIEW_TABLE,</div><div class='del'>-	E_ADDRESSBOOK_VIEW_MINICARD</div><div class='del'>-} EAddressbookViewType;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EAddressbookView       EAddressbookView;</div><div class='del'>-typedef struct _EAddressbookViewClass  EAddressbookViewClass;</div><div class='del'>-</div><div class='del'>-struct _EAddressbookView</div><div class='del'>-{</div><div class='del'>-	GtkTable parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	EAddressbookViewType view_type;</div><div class='del'>-</div><div class='del'>-	EBook *book;</div><div class='del'>-	char  *query;</div><div class='del'>-</div><div class='del'>-	GtkObject *object;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	GtkWidget *vbox;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EAddressbookViewClass</div><div class='del'>-{</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkWidget *e_addressbook_view_new               (void);</div><div class='del'>-GtkType    e_addressbook_view_get_type          (void);</div><div class='del'>-</div><div class='del'>-void       e_addressbook_view_print             (EAddressbookView *view);</div><div class='del'>-void       e_addressbook_view_delete_selection  (EAddressbookView *view);</div><div class='del'>-void       e_addressbook_view_show_all          (EAddressbookView *view);</div><div class='del'>-void       e_addressbook_view_stop              (EAddressbookView *view);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_ADDRESSBOOK_VIEW_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-control.c b/addressbook/gui/widgets/e-minicard-control.c<br/>deleted file mode 100644<br/>index d69f422f63..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-control.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,331 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * e-minicard-control.c</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *    Chris Lahey &lt;clahey@helixcode.com&gt;</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;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-</div><div class='del'>-#include "e-minicard-control.h"</div><div class='del'>-#include "e-minicard-widget.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-enum {</div><div class='del'>-	PROP_RUNNING</div><div class='del'>-} MyArgs;</div><div class='del'>-</div><div class='del'>-#define RUNNING_KEY  "Clock::Running"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  BonoboArg         *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	GtkObject *clock = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROP_RUNNING:</div><div class='del'>-	{</div><div class='del'>-		gboolean b = GPOINTER_TO_UINT (gtk_object_get_data (clock, RUNNING_KEY));</div><div class='del'>-		BONOBO_ARG_SET_BOOLEAN (arg, b);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d", arg_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_prop (BonoboPropertyBag *bag,</div><div class='del'>-	  const BonoboArg   *arg,</div><div class='del'>-	  guint              arg_id,</div><div class='del'>-	  gpointer           user_data)</div><div class='del'>-{</div><div class='del'>-	GtkClock *clock = user_data;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-</div><div class='del'>-	case PROP_RUNNING:</div><div class='del'>-	{</div><div class='del'>-		guint i;</div><div class='del'>-</div><div class='del'>-		i = BONOBO_ARG_GET_BOOLEAN (arg);</div><div class='del'>-</div><div class='del'>-		if (i)</div><div class='del'>-			gtk_clock_start (clock);</div><div class='del'>-		else</div><div class='del'>-			gtk_clock_stop (clock);</div><div class='del'>-</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (clock), RUNNING_KEY,</div><div class='del'>-				     GUINT_TO_POINTER (i));</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unhandled arg %d", arg_id);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Bonobo::PersistStream</div><div class='del'>- *</div><div class='del'>- * These two functions implement the Bonobo::PersistStream load and</div><div class='del'>- * save methods which allow data to be loaded into and out of the</div><div class='del'>- * BonoboObject.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-stream_read (Bonobo_Stream stream)</div><div class='del'>-{</div><div class='del'>-	Bonobo_Stream_iobuf *buffer;</div><div class='del'>-	CORBA_Environment    ev;</div><div class='del'>-	char *data = NULL;</div><div class='del'>-	gint length = 0;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	do {</div><div class='del'>-#define READ_CHUNK_SIZE 65536</div><div class='del'>-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,</div><div class='del'>-				    &amp;buffer, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (buffer-&gt;_length &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		data = g_realloc (data,</div><div class='del'>-				  length + buffer-&gt;_length);</div><div class='del'>-</div><div class='del'>-		memcpy (data + length,</div><div class='del'>-			buffer-&gt;_buffer, buffer-&gt;_length);</div><div class='del'>-</div><div class='del'>-		length += buffer-&gt;_length;</div><div class='del'>-</div><div class='del'>-		CORBA_free (buffer);</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	CORBA_free (buffer);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (data == NULL)</div><div class='del'>-	  data = g_strdup("");</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-} /* stream_read */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:load method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	ECard *card;</div><div class='del'>-	char *vcard;</div><div class='del'>-	GtkWidget *minicard = data;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/vCard") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    </div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((vcard = stream_read (stream)) == NULL) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_FileNotFound, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	card = e_card_new(vcard);</div><div class='del'>-	g_free(vcard);</div><div class='del'>-	gtk_object_set(GTK_OBJECT(minicard),</div><div class='del'>-		       "card", card,</div><div class='del'>-		       NULL);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-} /* pstream_load */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:save method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	char                *vcard;</div><div class='del'>-	ECard               *card;</div><div class='del'>-	EMinicardWidget     *minicard = data;</div><div class='del'>-	int                  length;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/vCard") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-vCard") != 0) {	    </div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (minicard),</div><div class='del'>-			"card", &amp;card,</div><div class='del'>-			NULL);</div><div class='del'>-	vcard = e_card_get_vcard(card);</div><div class='del'>-	length = strlen (vcard);</div><div class='del'>-	bonobo_stream_client_write (stream, vcard, length, ev);</div><div class='del'>-	g_free (vcard);</div><div class='del'>-} /* pstream_save */</div><div class='del'>-</div><div class='del'>-static CORBA_long</div><div class='del'>-pstream_get_max_size (BonoboPersistStream *ps, void *data,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-  GtkWidget *minicard = data;</div><div class='del'>-  ECard *card;</div><div class='del'>-  char *vcard;</div><div class='del'>-  gint length;</div><div class='del'>-  </div><div class='del'>-  gtk_object_get (GTK_OBJECT (minicard),</div><div class='del'>-		  "card", &amp;card, NULL);</div><div class='del'>-  vcard = e_card_get_vcard(card);</div><div class='del'>-  length = strlen (vcard);</div><div class='del'>-  g_free (vcard);</div><div class='del'>-</div><div class='del'>-  return length;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Persist_ContentTypeList *</div><div class='del'>-pstream_get_content_types (BonoboPersistStream *ps, void *closure,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	return bonobo_persist_generate_content_types (2, "text/vCard", "text/x-vCard");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-book_open_cb (EBook *book, EBookStatus status, gpointer closure)</div><div class='del'>-{</div><div class='del'>-	ECard *card = closure;</div><div class='del'>-	e_book_add_card(book, card, NULL, NULL);</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_in_addressbook(GtkWidget *button, EMinicardWidget *minicard)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	gchar *path, *uri;</div><div class='del'>-	ECard *card;</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;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-				      "evolution/local/Contacts/addressbook.db");</div><div class='del'>-	uri = g_strdup_printf ("file://%s", path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(minicard),</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'>-</div><div class='del'>-	if (! e_book_load_uri (book, uri, book_open_cb, card)) {</div><div class='del'>-		printf ("error calling load_uri!\n");</div><div class='del'>-	}</div><div class='del'>-	g_free(uri);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-e_minicard_control_factory (BonoboGenericFactory *Factory, void *closure)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	BonoboPropertyBag  *pb;</div><div class='del'>-#endif</div><div class='del'>-	BonoboControl      *control;</div><div class='del'>-	BonoboPersistStream *stream;</div><div class='del'>-	GtkWidget	   *minicard;</div><div class='del'>-	GtkWidget          *button;</div><div class='del'>-	GtkWidget          *vbox;</div><div class='del'>-</div><div class='del'>-	/* Create the control. */</div><div class='del'>-</div><div class='del'>-	minicard = e_minicard_widget_new ();</div><div class='del'>-	gtk_widget_show (minicard);</div><div class='del'>-</div><div class='del'>-	button = gtk_button_new_with_label(_("Save in addressbook"));</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(button), "clicked",</div><div class='del'>-			   GTK_SIGNAL_FUNC(save_in_addressbook), minicard);</div><div class='del'>-	gtk_widget_show (button);</div><div class='del'>-</div><div class='del'>-	vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(vbox), minicard, TRUE, TRUE, 0);</div><div class='del'>-	gtk_box_pack_start(GTK_BOX(vbox), button, FALSE, FALSE, 0);</div><div class='del'>-	gtk_widget_show (vbox);</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (vbox);</div><div class='del'>-</div><div class='del'>-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,</div><div class='del'>-					    pstream_get_max_size,</div><div class='del'>-					    pstream_get_content_types,</div><div class='del'>-					    minicard);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* Create the properties. */</div><div class='del'>-	pb = bonobo_property_bag_new (get_prop, set_prop, clock);</div><div class='del'>-	bonobo_control_set_properties (control, pb);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (pb, "running", PROP_RUNNING,</div><div class='del'>-				 BONOBO_ARG_BOOLEAN, NULL,</div><div class='del'>-				 "Whether or not the clock is running", 0);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (stream == NULL) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (control));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (control),</div><div class='del'>-				    BONOBO_OBJECT (stream));</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_control_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory =</div><div class='del'>-		bonobo_generic_factory_new (</div><div class='del'>-		        "OAFIID:control-factory:e_minicard:16bb7c25-c7d2-46dc-a5f0-a0975d0e0595",</div><div class='del'>-			e_minicard_control_factory, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register a EMinicard control factory.");</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-control.h b/addressbook/gui/widgets/e-minicard-control.h<br/>deleted file mode 100644<br/>index 4a0da88435..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-control.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-control.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#ifndef __E_MINICARD_CONTROL_H__</div><div class='del'>-#define __E_MINICARD_CONTROL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-</div><div class='del'>-void             e_minicard_control_factory_init (void);</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_CONTROL_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-label.c b/addressbook/gui/widgets/e-minicard-label.c<br/>deleted file mode 100644<br/>index 3bdf1f2c47..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-label.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-label.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,444 +0,0 @@</div><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 &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-</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'>-	GdkFont *font;</div><div class='del'>-</div><div class='del'>-	font = ((GtkWidget *) item-&gt;canvas)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	e_minicard_label = E_MINICARD_LABEL (item);</div><div class='del'>-	group = GNOME_CANVAS_GROUP( item );</div><div class='del'>-</div><div class='del'>-	e_minicard_label-&gt;rect =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 gnome_canvas_rect_get_type(),</div><div class='del'>-				 "x1", (double) 0,</div><div class='del'>-				 "y1", (double) 0,</div><div class='del'>-				 "x2", (double) e_minicard_label-&gt;width - 1,</div><div class='del'>-				 "y2", (double) e_minicard_label-&gt;height - 1,</div><div class='del'>-				 "outline_color", NULL,</div><div class='del'>-				 NULL );</div><div class='del'>-	e_minicard_label-&gt;fieldname =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 e_text_get_type(),</div><div class='del'>-				 "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				 "clip_width", (double) ( e_minicard_label-&gt;width / 2 - 4 ),</div><div class='del'>-				 "clip", TRUE,</div><div class='del'>-				 "use_ellipsis", TRUE,</div><div class='del'>-				 "font_gdk", font,</div><div class='del'>-				 "fill_color", "black",</div><div class='del'>-				 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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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-widget.c b/addressbook/gui/widgets/e-minicard-view-widget.c<br/>deleted file mode 100644<br/>index c6809bf1d0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view-widget.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-view-widget.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,276 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-minicard-view-widget.c</div><div class='del'>- * Copyright (C) 2000  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;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include "e-minicard-view-widget.h"</div><div class='del'>-static void e_minicard_view_widget_init		 (EMinicardViewWidget		 *widget);</div><div class='del'>-static void e_minicard_view_widget_class_init	 (EMinicardViewWidgetClass	 *klass);</div><div class='del'>-static void e_minicard_view_widget_set_arg       (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_view_widget_get_arg       (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_view_widget_destroy       (GtkObject *object);</div><div class='del'>-static void e_minicard_view_widget_reflow        (ECanvas *canvas);</div><div class='del'>-static void e_minicard_view_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation);</div><div class='del'>-static void e_minicard_view_widget_realize       (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-static ECanvasClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_BOOK,</div><div class='del'>-	ARG_QUERY</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_minicard_view_widget_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-  if (!type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo info =</div><div class='del'>-      {</div><div class='del'>-        "EMinicardViewWidget",</div><div class='del'>-        sizeof (EMinicardViewWidget),</div><div class='del'>-        sizeof (EMinicardViewWidgetClass),</div><div class='del'>-        (GtkClassInitFunc) e_minicard_view_widget_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_minicard_view_widget_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      type = gtk_type_unique (e_canvas_get_type (), &amp;info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_class_init (EMinicardViewWidgetClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	ECanvasClass *canvas_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS (klass);</div><div class='del'>-	canvas_class = E_CANVAS_CLASS (klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (e_canvas_get_type ());</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardViewWidget::book", GTK_TYPE_OBJECT, </div><div class='del'>-				 GTK_ARG_READWRITE, ARG_BOOK);</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardViewWidget::query", GTK_TYPE_STRING,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_QUERY);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg       = e_minicard_view_widget_set_arg;</div><div class='del'>-	object_class-&gt;get_arg       = e_minicard_view_widget_get_arg;</div><div class='del'>-	object_class-&gt;destroy       = e_minicard_view_widget_destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;realize       = e_minicard_view_widget_realize;</div><div class='del'>-	widget_class-&gt;size_allocate = e_minicard_view_widget_size_allocate;</div><div class='del'>-</div><div class='del'>-	canvas_class-&gt;reflow        = e_minicard_view_widget_reflow;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_init (EMinicardViewWidget *view)</div><div class='del'>-{</div><div class='del'>-	view-&gt;emv = NULL;</div><div class='del'>-	view-&gt;rect = NULL;</div><div class='del'>-</div><div class='del'>-	view-&gt;book = NULL;</div><div class='del'>-	view-&gt;query = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_minicard_view_widget_new (void)</div><div class='del'>-{</div><div class='del'>-	return GTK_WIDGET (gtk_type_new (e_minicard_view_widget_get_type ()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *emvw;</div><div class='del'>-</div><div class='del'>-	emvw = E_MINICARD_VIEW_WIDGET (o);</div><div class='del'>-</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		if (emvw-&gt;book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(emvw-&gt;book));</div><div class='del'>-		if (GTK_VALUE_OBJECT (*arg)) {</div><div class='del'>-			emvw-&gt;book = E_BOOK(GTK_VALUE_OBJECT (*arg));</div><div class='del'>-			if (emvw-&gt;book)</div><div class='del'>-				gtk_object_ref(GTK_OBJECT(emvw-&gt;book));</div><div class='del'>-		} else</div><div class='del'>-			emvw-&gt;book = NULL;</div><div class='del'>-		if (emvw-&gt;emv)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(emvw-&gt;emv),</div><div class='del'>-				       "book", emvw-&gt;book,</div><div class='del'>-				       NULL);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		emvw-&gt;query = g_strdup(GTK_VALUE_STRING (*arg));</div><div class='del'>-		if (emvw-&gt;emv)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(emvw-&gt;emv),</div><div class='del'>-				       "query", emvw-&gt;query,</div><div class='del'>-				       NULL);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *emvw;</div><div class='del'>-</div><div class='del'>-	emvw = E_MINICARD_VIEW_WIDGET (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_BOOK:</div><div class='del'>-		GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emvw-&gt;book);</div><div class='del'>-		break;</div><div class='del'>-	case ARG_QUERY:</div><div class='del'>-		GTK_VALUE_STRING (*arg) = g_strdup(emvw-&gt;query);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(object);</div><div class='del'>-</div><div class='del'>-	if (view-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(view-&gt;book));</div><div class='del'>-	g_free(view-&gt;query);</div><div class='del'>-  </div><div class='del'>-	GTK_OBJECT_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_view_widget_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);</div><div class='del'>-</div><div class='del'>-	view-&gt;rect = gnome_canvas_item_new(</div><div class='del'>-		gnome_canvas_root( GNOME_CANVAS(view) ),</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;emv = gnome_canvas_item_new(</div><div class='del'>-		gnome_canvas_root( GNOME_CANVAS(view) ),</div><div class='del'>-		e_minicard_view_get_type(),</div><div class='del'>-		"height", (double) 100,</div><div class='del'>-		"minimum_width", (double) 100,</div><div class='del'>-		NULL );</div><div class='del'>-	gtk_object_set(GTK_OBJECT(view-&gt;emv),</div><div class='del'>-		       "book", view-&gt;book,</div><div class='del'>-		       "query", view-&gt;query,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS(parent_class)-&gt;realize)</div><div class='del'>-		GTK_WIDGET_CLASS(parent_class)-&gt;realize (widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	if (GTK_WIDGET_CLASS(parent_class)-&gt;size_allocate)</div><div class='del'>-		GTK_WIDGET_CLASS(parent_class)-&gt;size_allocate (widget, allocation);</div><div class='del'>-	</div><div class='del'>-	if (GTK_WIDGET_REALIZED(widget)) {</div><div class='del'>-		double width;</div><div class='del'>-		EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(widget);</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set( view-&gt;emv,</div><div class='del'>-				       "height", (double) allocation-&gt;height,</div><div class='del'>-				       NULL );</div><div class='del'>-		gnome_canvas_item_set( view-&gt;emv,</div><div class='del'>-				       "minimum_width", (double) allocation-&gt;width,</div><div class='del'>-				       NULL );</div><div class='del'>-		gtk_object_get(GTK_OBJECT(view-&gt;emv),</div><div class='del'>-			       "width", &amp;width,</div><div class='del'>-			       NULL);</div><div class='del'>-		width = MAX(width, allocation-&gt;width);</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (view), 0, 0, width - 1, allocation-&gt;height - 1);</div><div class='del'>-		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'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_view_widget_reflow(ECanvas *canvas)</div><div class='del'>-{</div><div class='del'>-	double width;</div><div class='del'>-	EMinicardViewWidget *view = E_MINICARD_VIEW_WIDGET(canvas);</div><div class='del'>-</div><div class='del'>-	if (E_CANVAS_CLASS(parent_class)-&gt;reflow)</div><div class='del'>-		E_CANVAS_CLASS(parent_class)-&gt;reflow (canvas);</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(view-&gt;emv),</div><div class='del'>-		       "width", &amp;width,</div><div class='del'>-		       NULL);</div><div class='del'>-	width = MAX(width, GTK_WIDGET(canvas)-&gt;allocation.width);</div><div class='del'>-	gnome_canvas_set_scroll_region(GNOME_CANVAS(canvas), 0, 0, width - 1, GTK_WIDGET(canvas)-&gt;allocation.height - 1);</div><div class='del'>-	gnome_canvas_item_set( view-&gt;rect,</div><div class='del'>-			       "x2", (double) width,</div><div class='del'>-			       "y2", (double) GTK_WIDGET(canvas)-&gt;allocation.height,</div><div class='del'>-			       NULL );	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_view_widget_remove_selection(EMinicardViewWidget *view,</div><div class='del'>-					EBookCallback  cb,</div><div class='del'>-					gpointer       closure)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;emv)</div><div class='del'>-		e_minicard_view_remove_selection(E_MINICARD_VIEW(view-&gt;emv), cb, closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,</div><div class='del'>-						    char           letter)</div><div class='del'>-{</div><div class='del'>-	if (view-&gt;emv)</div><div class='del'>-		e_minicard_view_jump_to_letter(E_MINICARD_VIEW(view-&gt;emv), letter);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_view_widget_stop(EMinicardViewWidget *view)</div><div class='del'>-{</div><div class='del'>-	e_minicard_view_stop(E_MINICARD_VIEW(view-&gt;emv));</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-view-widget.h b/addressbook/gui/widgets/e-minicard-view-widget.h<br/>deleted file mode 100644<br/>index cf20c9a4df..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view-widget.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-view-widget.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-minicard-view-widget.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_WIDGET_H__</div><div class='del'>-#define __E_MINICARD_VIEW_WIDGET_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "e-minicard-view.h"</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_VIEW_WIDGET_TYPE			(e_minicard_view_widget_get_type ())</div><div class='del'>-#define E_MINICARD_VIEW_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidget))</div><div class='del'>-#define E_MINICARD_VIEW_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_WIDGET_TYPE, EMinicardViewWidgetClass))</div><div class='del'>-#define E_IS_MINICARD_VIEW_WIDGET(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))</div><div class='del'>-#define E_IS_MINICARD_VIEW_WIDGET_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_WIDGET_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicardViewWidget       EMinicardViewWidget;</div><div class='del'>-typedef struct _EMinicardViewWidgetClass  EMinicardViewWidgetClass;</div><div class='del'>-</div><div class='del'>-struct _EMinicardViewWidget</div><div class='del'>-{</div><div class='del'>-	ECanvas parent;</div><div class='del'>-</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	GnomeCanvasItem *emv;</div><div class='del'>-</div><div class='del'>-	EBook *book;</div><div class='del'>-	char *query;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardViewWidgetClass</div><div class='del'>-{</div><div class='del'>-	ECanvasClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType    e_minicard_view_widget_get_type (void);</div><div class='del'>-void       e_minicard_view_widget_remove_selection (EMinicardViewWidget *view,</div><div class='del'>-						    EBookCallback  cb,</div><div class='del'>-						    gpointer       closure);</div><div class='del'>-void       e_minicard_view_widget_jump_to_letter   (EMinicardViewWidget *view,</div><div class='del'>-						    char           letter);</div><div class='del'>-void       e_minicard_view_widget_stop             (EMinicardViewWidget *view);						    </div><div class='del'>-</div><div class='del'>-GtkWidget *e_minicard_view_widget_new (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_VIEW_WIDGET_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-view.c b/addressbook/gui/widgets/e-minicard-view.c<br/>deleted file mode 100644<br/>index 7169e41542..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,453 +0,0 @@</div><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;gal/widgets/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 \"x-evolution-any-field\" \"\")");</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'>-	view-&gt;first_get_view = TRUE;</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'>-		if (view-&gt;first_get_view) {</div><div class='del'>-			char *capabilities;</div><div class='del'>-			capabilities = e_book_get_static_capabilities(view-&gt;book);</div><div class='del'>-			if (strstr(capabilities, "local")) {</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;first_get_view = FALSE;</div><div class='del'>-		}</div><div class='del'>-		else</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'>-</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'>-		if (GTK_VALUE_OBJECT (*arg)) {</div><div class='del'>-			view-&gt;book = E_BOOK(GTK_VALUE_OBJECT (*arg));</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'>-		else</div><div class='del'>-			view-&gt;book = NULL;</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'>-	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'>-}</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</div><div class='del'>-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='del'>-</div><div class='del'>-void</div><div class='del'>-e_minicard_view_stop             (EMinicardView *view)</div><div class='del'>-{</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'>-	view-&gt;book_view = NULL;</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 e4c1be870a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-view.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-view.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-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 &lt;gal/widgets/e-reflow-sorted.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-book.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EMinicardView - A canvas item container.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * book         EBook           RW              book to query</div><div class='del'>- * query        string          RW              query string</div><div class='del'>- *</div><div class='del'>- * From EReflowSorted:   (you should really know what you're doing if you set these.)</div><div class='del'>- * compare_func  GCompareFunc   RW              compare function</div><div class='del'>- * string_func   EReflowStringFunc RW           string function</div><div class='del'>- *</div><div class='del'>- * From EReflow:</div><div class='del'>- * minimum_width double         RW              minimum width of the reflow.  width &gt;= minimum_width</div><div class='del'>- * width        double          R               width of the reflow</div><div class='del'>- * height       double          RW              height of the reflow</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_VIEW_TYPE			(e_minicard_view_get_type ())</div><div class='del'>-#define E_MINICARD_VIEW(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_VIEW_TYPE, EMinicardView))</div><div class='del'>-#define E_MINICARD_VIEW_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_VIEW_TYPE, EMinicardViewClass))</div><div class='del'>-#define E_IS_MINICARD_VIEW(obj) 		(GTK_CHECK_TYPE ((obj), E_MINICARD_VIEW_TYPE))</div><div class='del'>-#define E_IS_MINICARD_VIEW_CLASS(klass) 	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_VIEW_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicardView       EMinicardView;</div><div class='del'>-typedef struct _EMinicardViewClass  EMinicardViewClass;</div><div class='del'>-</div><div class='del'>-struct _EMinicardView</div><div class='del'>-{</div><div class='del'>-	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'>-	guint first_get_view : 1;</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'>-void       e_minicard_view_stop             (EMinicardView *view);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_VIEW_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-widget-test.c b/addressbook/gui/widgets/e-minicard-widget-test.c<br/>deleted file mode 100644<br/>index f6489f2a6a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-widget-test.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-widget-test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,113 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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'>-#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'>-#include "config.h"</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "e-minicard-widget.h"</div><div class='del'>-</div><div class='del'>-/* This is a horrible thing to do, but it is just a test. */</div><div class='del'>-</div><div class='del'>-static void destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-  exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Minicard Widget Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, Helix Code, Inc." ),</div><div class='del'>-		      authors,</div><div class='del'>-		      _( "This should test the minicard widget" ),</div><div class='del'>-		      NULL);</div><div class='del'>-  gtk_widget_show (about);                                            </div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int main( int argc, char *argv[] )</div><div class='del'>-{</div><div class='del'>-  GtkWidget *app;</div><div class='del'>-  GtkWidget *minicard;</div><div class='del'>-  ECard *card;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  gnome_init( "Minicard Widget Test", VERSION, argc, argv);</div><div class='del'>-  app = gnome_app_new("Minicard Widget Test", NULL);</div><div class='del'>-</div><div class='del'>-  minicard = e_minicard_widget_new();</div><div class='del'>-  card = e_card_new(TEST_VCARD);</div><div class='del'>-  gtk_object_set(GTK_OBJECT(minicard),</div><div class='del'>-		 "card", card,</div><div class='del'>-		 NULL);</div><div class='del'>-</div><div class='del'>-  gnome_app_set_contents( GNOME_APP( app ), minicard );</div><div class='del'>-</div><div class='del'>-  /* Connect the signals */</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_widget_show_all( app );</div><div class='del'>-</div><div class='del'>-  gtk_main(); </div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-widget.c b/addressbook/gui/widgets/e-minicard-widget.c<br/>deleted file mode 100644<br/>index 3f765425e4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-widget.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-widget.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,236 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-table-field-chooser.c</div><div class='del'>- * Copyright (C) 2000  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-widget.h"</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-</div><div class='del'>-static void e_minicard_widget_init		(EMinicardWidget		 *card);</div><div class='del'>-static void e_minicard_widget_class_init	(EMinicardWidgetClass	 *klass);</div><div class='del'>-static void e_minicard_widget_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_minicard_widget_destroy (GtkObject *object);</div><div class='del'>-static void e_minicard_widget_size_request	 (GtkWidget	    *widget, GtkRequisition    *requisition);</div><div class='del'>-static void e_minicard_widget_size_allocate	 (GtkWidget	    *widget, GtkAllocation     *allocation);</div><div class='del'>-static void e_minicard_widget_reflow             (ECanvas           *canvas);</div><div class='del'>-</div><div class='del'>-static ECanvasClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_CARD,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_minicard_widget_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type)</div><div class='del'>-		{</div><div class='del'>-			static const GtkTypeInfo info =</div><div class='del'>-			{</div><div class='del'>-				"EMinicardWidget",</div><div class='del'>-				sizeof (EMinicardWidget),</div><div class='del'>-				sizeof (EMinicardWidgetClass),</div><div class='del'>-				(GtkClassInitFunc) e_minicard_widget_class_init,</div><div class='del'>-				(GtkObjectInitFunc) e_minicard_widget_init,</div><div class='del'>-				/* reserved_1 */ NULL,</div><div class='del'>-				/* reserved_2 */ NULL,</div><div class='del'>-				(GtkClassInitFunc) NULL,</div><div class='del'>-			};</div><div class='del'>-</div><div class='del'>-			type = gtk_type_unique (e_canvas_get_type (), &amp;info);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_class_init (EMinicardWidgetClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	ECanvasClass   *ecanvas_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS(klass);</div><div class='del'>-	ecanvas_class = E_CANVAS_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (e_canvas_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_minicard_widget_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_minicard_widget_get_arg;</div><div class='del'>-	object_class-&gt;destroy = e_minicard_widget_destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;size_request  = e_minicard_widget_size_request;</div><div class='del'>-	widget_class-&gt;size_allocate = e_minicard_widget_size_allocate;</div><div class='del'>-</div><div class='del'>-	ecanvas_class-&gt;reflow = e_minicard_widget_reflow;</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("EMinicardWidget::card", GTK_TYPE_OBJECT,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_CARD);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_size_request(GtkWidget *widget, GtkRequisition *requisition)</div><div class='del'>-{</div><div class='del'>-	double height;</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);</div><div class='del'>-	gtk_object_get(GTK_OBJECT(emw-&gt;item),</div><div class='del'>-		       "height", &amp;height,</div><div class='del'>-		       NULL);</div><div class='del'>-	if (height &lt;= 0)</div><div class='del'>-		height = 1;</div><div class='del'>-	widget-&gt;requisition.height = height;</div><div class='del'>-	widget-&gt;requisition.width  = 200;</div><div class='del'>-	requisition-&gt;height = height;</div><div class='del'>-	requisition-&gt;width  = 200;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	double height;</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(widget);</div><div class='del'>-	gnome_canvas_item_set( emw-&gt;item,</div><div class='del'>-			       "width", (double) allocation-&gt;width,</div><div class='del'>-			       NULL );</div><div class='del'>-	gtk_object_get(GTK_OBJECT(emw-&gt;item),</div><div class='del'>-		       "height", &amp;height,</div><div class='del'>-		       NULL);</div><div class='del'>-	height = MAX(height, allocation-&gt;height);</div><div class='del'>-	gnome_canvas_set_scroll_region(GNOME_CANVAS( emw ), 0, 0, allocation-&gt;width - 1, height - 1);</div><div class='del'>-	gnome_canvas_item_set( emw-&gt;rect,</div><div class='del'>-			       "x2", (double) allocation-&gt;width,</div><div class='del'>-			       "y2", (double) height,</div><div class='del'>-			       NULL );</div><div class='del'>-	if (GTK_WIDGET_CLASS(parent_class)-&gt;size_allocate)</div><div class='del'>-		GTK_WIDGET_CLASS(parent_class)-&gt;size_allocate(widget, allocation);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void e_minicard_widget_reflow(ECanvas *canvas)</div><div class='del'>-{</div><div class='del'>-	double height;</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(canvas);</div><div class='del'>-	gtk_object_get(GTK_OBJECT(emw-&gt;item),</div><div class='del'>-		       "height", &amp;height,</div><div class='del'>-		       NULL);</div><div class='del'>-</div><div class='del'>-	height = MAX(height, GTK_WIDGET(emw)-&gt;allocation.height);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS(emw), 0, 0, GTK_WIDGET(emw)-&gt;allocation.width - 1, height - 1);</div><div class='del'>-	gnome_canvas_item_set( emw-&gt;rect,</div><div class='del'>-			       "x2", (double) GTK_WIDGET(emw)-&gt;allocation.width,</div><div class='del'>-			       "y2", (double) height,</div><div class='del'>-			       NULL );	</div><div class='del'>-	</div><div class='del'>-	gtk_widget_queue_resize(GTK_WIDGET(canvas));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_init (EMinicardWidget *emw)</div><div class='del'>-{</div><div class='del'>-	emw-&gt;rect = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),</div><div class='del'>-					   gnome_canvas_rect_get_type(),</div><div class='del'>-					   "x1", (double) 0,</div><div class='del'>-					   "y1", (double) 0,</div><div class='del'>-					   "x2", (double) 100,</div><div class='del'>-					   "y2", (double) 100,</div><div class='del'>-					   "fill_color", "white",</div><div class='del'>-					   NULL );</div><div class='del'>-</div><div class='del'>-	emw-&gt;item = gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(emw)),</div><div class='del'>-					  e_minicard_get_type(),</div><div class='del'>-					  "width", (double) 100,</div><div class='del'>-					  NULL );</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region ( GNOME_CANVAS( emw ),</div><div class='del'>-					 0, 0,</div><div class='del'>-					 100, 100 );</div><div class='del'>-	</div><div class='del'>-	emw-&gt;card = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);</div><div class='del'>-</div><div class='del'>-	if (emw-&gt;card)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(emw-&gt;card));</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS(parent_class)-&gt;destroy)</div><div class='del'>-		GTK_OBJECT_CLASS(parent_class)-&gt;destroy(object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget*</div><div class='del'>-e_minicard_widget_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget = GTK_WIDGET (gtk_type_new (e_minicard_widget_get_type ()));</div><div class='del'>-	return widget;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id){</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		if (emw-&gt;card)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(emw-&gt;card));</div><div class='del'>-		if (GTK_VALUE_OBJECT(*arg)) {</div><div class='del'>-		  emw-&gt;card = E_CARD(GTK_VALUE_OBJECT(*arg));</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(emw-&gt;card));</div><div class='del'>-		}</div><div class='del'>-		else</div><div class='del'>-			emw-&gt;card = NULL;</div><div class='del'>-		if (emw-&gt;item)</div><div class='del'>-			gtk_object_set(GTK_OBJECT(emw-&gt;item),</div><div class='del'>-				       "card", emw-&gt;card,</div><div class='del'>-				       NULL);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_widget_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicardWidget *emw = E_MINICARD_WIDGET(object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_CARD:</div><div class='del'>-		if (emw-&gt;card)</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = GTK_OBJECT(emw-&gt;card);</div><div class='del'>-		else</div><div class='del'>-			GTK_VALUE_OBJECT (*arg) = NULL;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard-widget.h b/addressbook/gui/widgets/e-minicard-widget.h<br/>deleted file mode 100644<br/>index 95b56cf3de..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard-widget.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard-widget.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-minicard-widget.h</div><div class='del'>- * Copyright (C) 2000  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_WIDGET_H__</div><div class='del'>-#define __E_MINICARD_WIDGET_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EMinicardWidget - A card displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_WIDGET_TYPE			(e_minicard_widget_get_type ())</div><div class='del'>-#define E_MINICARD_WIDGET(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_WIDGET_TYPE, EMinicardWidget))</div><div class='del'>-#define E_MINICARD_WIDGET_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_WIDGET_TYPE, EMinicardWidgetClass))</div><div class='del'>-#define E_IS_MINICARD_WIDGET(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_WIDGET_TYPE))</div><div class='del'>-#define E_IS_MINICARD_WIDGET_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_WIDGET_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicardWidget       EMinicardWidget;</div><div class='del'>-typedef struct _EMinicardWidgetClass  EMinicardWidgetClass;</div><div class='del'>-</div><div class='del'>-struct _EMinicardWidget</div><div class='del'>-{</div><div class='del'>-	ECanvas parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	ECard *card;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicardWidgetClass</div><div class='del'>-{</div><div class='del'>-	ECanvasClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *e_minicard_widget_new(void);</div><div class='del'>-GtkType    e_minicard_widget_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_MINICARD_WIDGET_H__ */</div><div class='head'>diff --git a/addressbook/gui/widgets/e-minicard.c b/addressbook/gui/widgets/e-minicard.c<br/>deleted file mode 100644<br/>index 4dda2cee1d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,816 +0,0 @@</div><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 "addressbook/backend/ebook/e-book.h"</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-popup-menu.h&gt;</div><div class='del'>-#include "addressbook/printing/e-contact-print.h"</div><div class='del'>-#include "addressbook/printing/e-contact-print-envelope.h"</div><div class='del'>-#include "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'>-	minicard-&gt;changed = FALSE;</div><div class='del'>-</div><div class='del'>-	e_canvas_item_set_reflow_callback(GNOME_CANVAS_ITEM(minicard), e_minicard_reflow);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-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'>-		e_minicard-&gt;changed = FALSE;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EMinicard *e_minicard;</div><div class='del'>-</div><div class='del'>-	e_minicard = E_MINICARD (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_WIDTH:</div><div class='del'>-	  GTK_VALUE_DOUBLE (*arg) = e_minicard-&gt;width;</div><div class='del'>-	  break;</div><div class='del'>-	case ARG_HEIGHT:</div><div class='del'>-	  GTK_VALUE_DOUBLE (*arg) = e_minicard-&gt;height;</div><div class='del'>-	  break;</div><div class='del'>-	case ARG_HAS_FOCUS:</div><div class='del'>-		GTK_VALUE_ENUM (*arg) = e_minicard-&gt;has_focus ? E_FOCUS_CURRENT : E_FOCUS_NONE;</div><div class='del'>-		break;</div><div class='del'>-	case ARG_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'>-	GtkWidget *canvas;</div><div class='del'>-</div><div class='del'>-	e_minicard = E_MINICARD (item);</div><div class='del'>-	group = GNOME_CANVAS_GROUP( item );</div><div class='del'>-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)-&gt;canvas);</div><div class='del'>-</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;realize)</div><div class='del'>-		(* GNOME_CANVAS_ITEM_CLASS(parent_class)-&gt;realize) (item);</div><div class='del'>-	</div><div class='del'>-	e_minicard-&gt;rect =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 gnome_canvas_rect_get_type(),</div><div class='del'>-				 "x1", (double) 0,</div><div class='del'>-				 "y1", (double) 0,</div><div class='del'>-				 "x2", (double) e_minicard-&gt;width - 1,</div><div class='del'>-				 "y2", (double) e_minicard-&gt;height - 1,</div><div class='del'>-				 "outline_color", NULL,</div><div class='del'>-				 NULL );</div><div class='del'>-</div><div class='del'>-	e_minicard-&gt;header_rect =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 gnome_canvas_rect_get_type(),</div><div class='del'>-				 "x1", (double) 2,</div><div class='del'>-				 "y1", (double) 2,</div><div class='del'>-				 "x2", (double) e_minicard-&gt;width - 3,</div><div class='del'>-				 "y2", (double) e_minicard-&gt;height - 3,</div><div class='del'>-				 "fill_color_gdk", &amp;canvas-&gt;style-&gt;bg[GTK_STATE_NORMAL],</div><div class='del'>-				 NULL );</div><div class='del'>-</div><div class='del'>-	e_minicard-&gt;header_text =</div><div class='del'>-	  gnome_canvas_item_new( group,</div><div class='del'>-				 e_text_get_type(),</div><div class='del'>-				 "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				 "width", (double) ( e_minicard-&gt;width - 12 ),</div><div class='del'>-				 "clip", TRUE,</div><div class='del'>-				 "use_ellipsis", TRUE,</div><div class='del'>-#if 0</div><div class='del'>-				 "font", "fixed-bold-10",</div><div class='del'>-#endif</div><div class='del'>-				 "fill_color_gdk", &amp;canvas-&gt;style-&gt;fg[GTK_STATE_NORMAL],</div><div class='del'>-				 "text", "",</div><div class='del'>-				 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'>-static void</div><div class='del'>-delete (GtkWidget *widget, EMinicard *minicard)</div><div class='del'>-{</div><div class='del'>-	EBook *book;</div><div class='del'>-	</div><div class='del'>-	if (e_contact_editor_confirm_delete(GTK_WINDOW(gtk_widget_get_toplevel(GTK_WIDGET(GNOME_CANVAS_ITEM(minicard)-&gt;canvas))))) {</div><div class='del'>-		e_card_simple_sync_card(minicard-&gt;simple);</div><div class='del'>-		</div><div class='del'>-		gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(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_remove_card (book,</div><div class='del'>-				    minicard-&gt;card,</div><div class='del'>-				    card_changed_cb,</div><div class='del'>-				    NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print (GtkWidget *widget, EMinicard *minicard)</div><div class='del'>-{</div><div class='del'>-	e_card_simple_sync_card(minicard-&gt;simple);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(e_contact_print_card_dialog_new(minicard-&gt;card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-print_envelope (GtkWidget *widget, EMinicard *minicard)</div><div class='del'>-{</div><div class='del'>-	e_card_simple_sync_card(minicard-&gt;simple);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show(e_contact_print_envelope_dialog_new(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 for the commit_card signal from the contact editor */</div><div class='del'>-static void</div><div class='del'>-delete_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_remove_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'>-	GtkWidget *canvas;</div><div class='del'>-	</div><div class='del'>-	e_minicard = E_MINICARD (item);</div><div class='del'>-	canvas = GTK_WIDGET (GNOME_CANVAS_ITEM (item)-&gt;canvas);</div><div class='del'>-	</div><div class='del'>-	switch( event-&gt;type ) {</div><div class='del'>-	case GDK_FOCUS_CHANGE:</div><div class='del'>-		{</div><div class='del'>-			GdkEventFocus *focus_event = (GdkEventFocus *) event;</div><div class='del'>-			if ( focus_event-&gt;in ) {</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;rect, </div><div class='del'>-						       "outline_color_gdk", &amp;canvas-&gt;style-&gt;bg[GTK_STATE_NORMAL], </div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_rect, </div><div class='del'>-						       "fill_color_gdk", &amp;canvas-&gt;style-&gt;bg[GTK_STATE_SELECTED],</div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_text, </div><div class='del'>-						       "fill_color_gdk", &amp;canvas-&gt;style-&gt;text[GTK_STATE_SELECTED],</div><div class='del'>-						       NULL );</div><div class='del'>-				e_minicard-&gt;has_focus = TRUE;</div><div class='del'>-			} else {</div><div class='del'>-				EBook *book = NULL;</div><div class='del'>-</div><div class='del'>-				if (e_minicard-&gt;changed) {</div><div class='del'>-				</div><div class='del'>-					e_card_simple_sync_card(e_minicard-&gt;simple);</div><div class='del'>-</div><div class='del'>-					if (E_IS_MINICARD_VIEW(GNOME_CANVAS_ITEM(e_minicard)-&gt;parent)) {</div><div class='del'>-					</div><div class='del'>-						gtk_object_get(GTK_OBJECT(GNOME_CANVAS_ITEM(e_minicard)-&gt;parent),</div><div class='del'>-							       "book", &amp;book,</div><div class='del'>-							       NULL);</div><div class='del'>-					</div><div class='del'>-					}</div><div class='del'>-				</div><div class='del'>-					if (book) {</div><div class='del'>-					</div><div class='del'>-						/* Add the card in the contact editor to our ebook */</div><div class='del'>-						e_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'>-					} else {</div><div class='del'>-						remodel(e_minicard);</div><div class='del'>-						e_canvas_item_request_reflow(GNOME_CANVAS_ITEM(e_minicard));</div><div class='del'>-					}</div><div class='del'>-					e_minicard-&gt;changed = FALSE;</div><div class='del'>-				}</div><div class='del'>-					</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_gdk", </div><div class='del'>-						       &amp;canvas-&gt;style-&gt;bg[GTK_STATE_NORMAL],</div><div class='del'>-						       NULL );</div><div class='del'>-				gnome_canvas_item_set( e_minicard-&gt;header_text, </div><div class='del'>-						       "fill_color_gdk", </div><div class='del'>-						       &amp;canvas-&gt;style-&gt;fg[GTK_STATE_NORMAL],</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'>-			if (E_IS_MINICARD_VIEW(item-&gt;parent)) {</div><div class='del'>-				EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, </div><div class='del'>-						      {"Print", NULL, GTK_SIGNAL_FUNC(print), 0},</div><div class='del'>-						      {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0},</div><div class='del'>-						      {"Delete", NULL, GTK_SIGNAL_FUNC(delete), 0},</div><div class='del'>-						      {NULL, NULL, NULL, 0}};</div><div class='del'>-				e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, e_minicard);</div><div class='del'>-			} else {</div><div class='del'>-				EPopupMenu menu[] = { {"Save as VCard", NULL, GTK_SIGNAL_FUNC(save_as), 0}, </div><div class='del'>-						      {"Print Envelope", NULL, GTK_SIGNAL_FUNC(print_envelope), 0},</div><div class='del'>-						      {"Print", NULL, GTK_SIGNAL_FUNC(print), 0},</div><div class='del'>-						      {NULL, NULL, NULL, 0}};</div><div class='del'>-				e_popup_menu_run (menu, (GdkEventButton *)event, 0, 0, e_minicard);</div><div class='del'>-			}</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 = NULL;</div><div class='del'>-			if (E_IS_MINICARD_VIEW(item-&gt;parent)) {</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'>-			}</div><div class='del'>-			ce = e_contact_editor_new (e_minicard-&gt;card, FALSE);</div><div class='del'>-</div><div class='del'>-			if (book != NULL) {</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), "delete_card",</div><div class='del'>-						    GTK_SIGNAL_FUNC (delete_card_cb), book);</div><div class='del'>-			}</div><div class='del'>-</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'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_KEY_PRESS:</div><div class='del'>-		if (event-&gt;key.keyval == GDK_Tab || </div><div class='del'>-		    event-&gt;key.keyval == GDK_KP_Tab || </div><div class='del'>-		    event-&gt;key.keyval == GDK_ISO_Left_Tab) {</div><div class='del'>-			GList *list;</div><div class='del'>-			for (list = e_minicard-&gt;fields; list; list = list-&gt;next) {</div><div class='del'>-				EMinicardField *field = E_MINICARD_FIELD(list-&gt;data);</div><div class='del'>-				GnomeCanvasItem *item = field-&gt;label;</div><div class='del'>-				EFocus has_focus;</div><div class='del'>-				gtk_object_get(GTK_OBJECT(item),</div><div class='del'>-					       "has_focus", &amp;has_focus,</div><div class='del'>-					       NULL);</div><div class='del'>-				if (has_focus != E_FOCUS_NONE) {</div><div class='del'>-					if (event-&gt;key.state &amp; GDK_SHIFT_MASK)</div><div class='del'>-						list = list-&gt;prev;</div><div class='del'>-					else</div><div class='del'>-						list = list-&gt;next;</div><div class='del'>-					if (list) {</div><div class='del'>-						EMinicardField *field = E_MINICARD_FIELD(list-&gt;data);</div><div class='del'>-						GnomeCanvasItem *item = field-&gt;label;</div><div class='del'>-						gnome_canvas_item_set(item,</div><div class='del'>-								      "has_focus", (event-&gt;key.state &amp; GDK_SHIFT_MASK) ? E_FOCUS_END : E_FOCUS_START,</div><div class='del'>-								      NULL);</div><div class='del'>-						return 1;</div><div class='del'>-					} else {</div><div class='del'>-						return 0;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;event)</div><div class='del'>-		return (* GNOME_CANVAS_ITEM_CLASS( parent_class )-&gt;event) (item, event);</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_minicard_resize_children( EMinicard *e_minicard )</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-	</div><div class='del'>-	if (e_minicard-&gt;header_text) {</div><div class='del'>-		gnome_canvas_item_set( e_minicard-&gt;header_text,</div><div class='del'>-				       "width", (double) e_minicard-&gt;width - 12,</div><div class='del'>-				       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'>-		gnome_canvas_item_set( E_MINICARD_FIELD( list-&gt;data )-&gt;label,</div><div class='del'>-				       "width", (double) e_minicard-&gt;width - 4.0,</div><div class='del'>-				       NULL );</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-field_changed (EText *text, EMinicard *e_minicard)</div><div class='del'>-{</div><div class='del'>-	ECardSimpleType type;</div><div class='del'>-	char *string;</div><div class='del'>-</div><div class='del'>-	type = GPOINTER_TO_INT</div><div class='del'>-		(gtk_object_get_data(GTK_OBJECT(text),</div><div class='del'>-				     "EMinicard:field"));</div><div class='del'>-	gtk_object_get(GTK_OBJECT(text),</div><div class='del'>-		       "text", &amp;string,</div><div class='del'>-		       NULL);</div><div class='del'>-	e_card_simple_set(e_minicard-&gt;simple,</div><div class='del'>-			  type,</div><div class='del'>-			  string);</div><div class='del'>-	g_free(string);</div><div class='del'>-	e_minicard-&gt;changed = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-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'>-	GdkFont *font;</div><div class='del'>-</div><div class='del'>-	font = ((GtkWidget *) ((GnomeCanvasItem *) e_minicard)-&gt;canvas)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {</div><div class='del'>-		gdouble this_width;</div><div class='del'>-		name = g_strdup_printf("%s:", e_card_simple_get_name(e_minicard-&gt;simple, field));</div><div class='del'>-		this_width = gdk_text_width(font, name, strlen(name));</div><div class='del'>-		if (width &lt; this_width)</div><div class='del'>-			width = this_width;</div><div class='del'>-		g_free(name);</div><div class='del'>-	}</div><div class='del'>-	return width;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remodel( EMinicard *e_minicard )</div><div class='del'>-{</div><div class='del'>-	int count = 0;</div><div class='del'>-	if (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 - 2 &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 a0272ee58b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/e-minicard.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/e-minicard.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-minicard.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 "addressbook/backend/ebook/e-card.h"</div><div class='del'>-#include "addressbook/backend/ebook/e-card-simple.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* EMinicard - A small card displaying information about a contact.</div><div class='del'>- *</div><div class='del'>- * The following arguments are available:</div><div class='del'>- *</div><div class='del'>- * name		type		read/write	description</div><div class='del'>- * --------------------------------------------------------------------------------</div><div class='del'>- * width        double          RW              width of the card</div><div class='del'>- * height       double          R               height of the card</div><div class='del'>- * card		ECard*		RW		Pointer to the ECard</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_MINICARD_TYPE			(e_minicard_get_type ())</div><div class='del'>-#define E_MINICARD(obj)			(GTK_CHECK_CAST ((obj), E_MINICARD_TYPE, EMinicard))</div><div class='del'>-#define E_MINICARD_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_MINICARD_TYPE, EMinicardClass))</div><div class='del'>-#define E_IS_MINICARD(obj)		(GTK_CHECK_TYPE ((obj), E_MINICARD_TYPE))</div><div class='del'>-#define E_IS_MINICARD_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_MINICARD_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMinicard       EMinicard;</div><div class='del'>-typedef struct _EMinicardClass  EMinicardClass;</div><div class='del'>-typedef enum _EMinicardFocusType EMinicardFocusType;</div><div class='del'>-</div><div class='del'>-enum _EMinicardFocusType {</div><div class='del'>-	E_MINICARD_FOCUS_TYPE_START,</div><div class='del'>-	E_MINICARD_FOCUS_TYPE_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMinicard</div><div class='del'>-{</div><div class='del'>-	GnomeCanvasGroup parent;</div><div class='del'>-	</div><div class='del'>-	/* item specific fields */</div><div class='del'>-	ECard *card;</div><div class='del'>-	ECardSimple *simple;</div><div class='del'>-	</div><div class='del'>-	GnomeCanvasItem *rect;</div><div class='del'>-	GnomeCanvasItem *header_rect;</div><div class='del'>-	GnomeCanvasItem *header_text;</div><div class='del'>-</div><div class='del'>-	GList *fields; /* Of type EMinicardField */</div><div class='del'>-	guint needs_remodeling : 1;</div><div class='del'>-</div><div class='del'>-	guint changed : 1;</div><div class='del'>-	</div><div class='del'>-	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 0566a85760..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-minicard-label.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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;gal/widgets/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 2a8e7093fe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/gui/widgets/test-reflow.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/gui/widgets/test-reflow.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,194 +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;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-reflow.h&gt;</div><div class='del'>-#include "e-minicard.h"</div><div class='del'>-#include &lt;gal/widgets/e-scroll-frame.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 *reflow;</div><div class='del'>-GnomeCanvasItem *rect;</div><div class='del'>-GtkAllocation last_alloc;</div><div class='del'>-</div><div class='del'>-static void destroy_callback(GtkWidget *app, gpointer data)</div><div class='del'>-{</div><div class='del'>-  exit(0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void allocate_callback(GtkWidget *canvas, GtkAllocation *allocation, gpointer data)</div><div class='del'>-{</div><div class='del'>-  double width;</div><div class='del'>-  last_alloc = *allocation;</div><div class='del'>-  gnome_canvas_item_set( reflow,</div><div class='del'>-			 "height", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-  gnome_canvas_item_set( reflow,</div><div class='del'>-			 "minimum_width", (double) allocation-&gt;width,</div><div class='del'>-			 NULL );</div><div class='del'>-  gtk_object_get(GTK_OBJECT(reflow),</div><div class='del'>-		 "width", &amp;width,</div><div class='del'>-		 NULL);</div><div class='del'>-  width = MAX(width, allocation-&gt;width);</div><div class='del'>-  gnome_canvas_set_scroll_region(GNOME_CANVAS( canvas ), 0, 0, width - 1, allocation-&gt;height - 1);</div><div class='del'>-  gnome_canvas_item_set( rect,</div><div class='del'>-			 "x2", (double) width,</div><div class='del'>-			 "y2", (double) allocation-&gt;height,</div><div class='del'>-			 NULL );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void resize(GnomeCanvas *canvas, gpointer data)</div><div class='del'>-{</div><div class='del'>-	double width;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(reflow),</div><div class='del'>-		       "width", &amp;width,</div><div class='del'>-		       NULL);</div><div class='del'>-	width = MAX(width, last_alloc.width);</div><div class='del'>-	gnome_canvas_set_scroll_region(canvas , 0, 0, width - 1, last_alloc.height - 1);</div><div class='del'>-	gnome_canvas_item_set( rect,</div><div class='del'>-			       "x2", (double) width,</div><div class='del'>-			       "y2", (double) last_alloc.height,</div><div class='del'>-			       NULL );	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void about_callback( GtkWidget *widget, gpointer data )</div><div class='del'>-{</div><div class='del'>-  </div><div class='del'>-  const gchar *authors[] =</div><div class='del'>-  {</div><div class='del'>-    "Christopher James Lahey &lt;clahey@umich.edu&gt;",</div><div class='del'>-    NULL</div><div class='del'>-  };</div><div class='del'>-</div><div class='del'>-  GtkWidget *about =</div><div class='del'>-    gnome_about_new ( _( "Reflow Test" ), VERSION,</div><div class='del'>-		      _( "Copyright (C) 2000, 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 *scrollframe;</div><div class='del'>-  int i;</div><div class='del'>-</div><div class='del'>-  /*  bindtextdomain (PACKAGE, GNOMELOCALEDIR);</div><div class='del'>-      textdomain (PACKAGE);*/</div><div class='del'>-</div><div class='del'>-  gnome_init( "Reflow Test", VERSION, argc, argv);</div><div class='del'>-  app = gnome_app_new("Reflow Test", NULL);</div><div class='del'>-</div><div class='del'>-  vbox = gtk_vbox_new(FALSE, 0);</div><div class='del'>-</div><div class='del'>-  canvas = e_canvas_new();</div><div class='del'>-  rect = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				gnome_canvas_rect_get_type(),</div><div class='del'>-				"x1", (double) 0,</div><div class='del'>-				"y1", (double) 0,</div><div class='del'>-				"x2", (double) 100,</div><div class='del'>-				"y2", (double) 100,</div><div class='del'>-				"fill_color", "white",</div><div class='del'>-				NULL );</div><div class='del'>-  reflow = gnome_canvas_item_new( gnome_canvas_root( GNOME_CANVAS( canvas ) ),</div><div class='del'>-				  e_reflow_get_type(),</div><div class='del'>-				  "height", (double) 100,</div><div class='del'>-				  "minimum_width", (double) 100,</div><div class='del'>-				  NULL );</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "reflow",</div><div class='del'>-		      GTK_SIGNAL_FUNC( resize ),</div><div class='del'>-		      ( gpointer ) app);</div><div class='del'>-  for ( i = 0; i &lt; 200; i++ )</div><div class='del'>-    {</div><div class='del'>-      GnomeCanvasItem *item;</div><div class='del'>-      ECard *card = e_card_new (TEST_VCARD);</div><div class='del'>-      item = gnome_canvas_item_new( GNOME_CANVAS_GROUP(reflow),</div><div class='del'>-				    e_minicard_get_type(),</div><div class='del'>-				    "card", card,</div><div class='del'>-				    NULL);</div><div class='del'>-      e_reflow_add_item(E_REFLOW(reflow), item);</div><div class='del'>-    }</div><div class='del'>-  gnome_canvas_set_scroll_region ( GNOME_CANVAS( canvas ),</div><div class='del'>-				   0, 0,</div><div class='del'>-				   100, 100 );</div><div class='del'>-</div><div class='del'>-  scrollframe = e_scroll_frame_new (gtk_layout_get_hadjustment(GTK_LAYOUT(canvas)),</div><div class='del'>-				    gtk_layout_get_vadjustment(GTK_LAYOUT(canvas)));</div><div class='del'>-  e_scroll_frame_set_policy (E_SCROLL_FRAME (scrollframe),</div><div class='del'>-			     GTK_POLICY_AUTOMATIC,</div><div class='del'>-			     GTK_POLICY_NEVER);</div><div class='del'>-  </div><div class='del'>-  gtk_container_add (GTK_CONTAINER (scrollframe), canvas);</div><div class='del'>-</div><div class='del'>-  gnome_app_set_contents( GNOME_APP( app ), scrollframe );</div><div class='del'>-</div><div class='del'>-  /* Connect the signals */</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( app ), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC( destroy_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect( GTK_OBJECT( canvas ), "size_allocate",</div><div class='del'>-		      GTK_SIGNAL_FUNC( allocate_callback ),</div><div class='del'>-		      ( gpointer ) app );</div><div class='del'>-</div><div class='del'>-  gtk_widget_show_all( app );</div><div class='del'>-  gdk_window_set_back_pixmap( GTK_LAYOUT(canvas)-&gt;bin_window, NULL, FALSE);</div><div class='del'>-</div><div class='del'>-  gtk_main(); </div><div class='del'>-</div><div class='del'>-  /* Not reached. */</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/printing/.cvsignore b/addressbook/printing/.cvsignore<br/>deleted file mode 100644<br/>index 96194f7fd7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 a28f8bf7c1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/printing/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-ecpsdir    = $(datadir)/evolution/ecps</div><div class='del'>-</div><div class='del'>-ecps_DATA  =				\</div><div class='del'>-	smallbook.ecps			\</div><div class='del'>-	medbook.ecps			\</div><div class='del'>-	phonelist.ecps</div><div class='del'>-</div><div class='del'>-gladedir   = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA = 				\</div><div class='del'>-	e-contact-print.glade</div><div class='del'>-</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"addressbook-printing\"	\</div><div class='del'>-	-I$(top_srcdir)/addressbook		\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-        -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"	\</div><div class='del'>-	-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\"	\</div><div class='del'>-	-DDATADIR=\""$(datadir)"\"		\</div><div class='del'>-	$(GNOME_PRINT_CFLAGS)			\</div><div class='del'>-        $(BONOBO_GNOME_CFLAGS)			\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES =				\</div><div class='del'>-	libecontactprint.a</div><div class='del'>-</div><div class='del'>-libecontactprint_a_SOURCES = 			\</div><div class='del'>-	e-contact-print-envelope.c		\</div><div class='del'>-	e-contact-print-envelope.h		\</div><div class='del'>-	e-contact-print-style-editor.c		\</div><div class='del'>-	e-contact-print-style-editor.h		\</div><div class='del'>-	e-contact-print-types.h			\</div><div class='del'>-	e-contact-print.c			\</div><div class='del'>-	e-contact-print.h</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =	\</div><div class='del'>-	contact-print-test	\</div><div class='del'>-	contact-print-style-editor-test</div><div class='del'>-</div><div class='del'>-contact_print_test_SOURCES = 	\</div><div class='del'>-	test-print.c</div><div class='del'>-</div><div class='del'>-contact_print_test_LDADD =	\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)	\</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)/e-util/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'>-	$(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)/e-util/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 = \</div><div class='del'>-	$(glade_DATA)	\</div><div class='del'>-	$(ecps_DATA)	\</div><div class='del'>-	e-contact-print.glade.h</div><div class='head'>diff --git a/addressbook/printing/e-contact-print-envelope.c b/addressbook/printing/e-contact-print-envelope.c<br/>deleted file mode 100644<br/>index c702728e4e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-envelope.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/printing/e-contact-print-envelope.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'>-/* </div><div class='del'>- * e-contact-print-envelope.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-envelope.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;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'>-</div><div class='del'>-#define ENVELOPE_HEIGHT (72.0 * 4.0)</div><div class='del'>-#define ENVELOPE_WIDTH (72.0 * 10.0)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	int start;</div><div class='del'>-	int length;</div><div class='del'>-} EcpeLine;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-startset(void *pointer, EcpeLine **iterator)</div><div class='del'>-{</div><div class='del'>-	(*iterator)--;</div><div class='del'>-	(*iterator)-&gt;start = GPOINTER_TO_INT(pointer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-lengthset(void *pointer, EcpeLine **iterator)</div><div class='del'>-{</div><div class='del'>-	(*iterator)--;</div><div class='del'>-	(*iterator)-&gt;length = GPOINTER_TO_INT(pointer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static EcpeLine *</div><div class='del'>-ecpe_break(char *address)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int length = 0;</div><div class='del'>-	int laststart = 0;</div><div class='del'>-	GList *startlist = NULL;</div><div class='del'>-	GList *lengthlist = NULL;</div><div class='del'>-	EcpeLine *ret_val;</div><div class='del'>-	EcpeLine *iterator;</div><div class='del'>-</div><div class='del'>-	for (i = 0; address[i]; i++) {</div><div class='del'>-		if (address[i] == '\n') {</div><div class='del'>-			startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));</div><div class='del'>-			lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));</div><div class='del'>-			length ++;</div><div class='del'>-			laststart = i + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	startlist = g_list_prepend (startlist, GINT_TO_POINTER(laststart));</div><div class='del'>-	lengthlist = g_list_prepend (lengthlist, GINT_TO_POINTER(i - laststart));</div><div class='del'>-	length ++;</div><div class='del'>-</div><div class='del'>-	ret_val = g_new(EcpeLine, length + 1);</div><div class='del'>-</div><div class='del'>-	iterator = ret_val + length;</div><div class='del'>-	g_list_foreach(startlist, (GFunc) startset, &amp;iterator);</div><div class='del'>-	g_list_free(startlist);</div><div class='del'>-</div><div class='del'>-	iterator = ret_val + length;</div><div class='del'>-	g_list_foreach(lengthlist, (GFunc) lengthset, &amp;iterator);</div><div class='del'>-	g_list_free(lengthlist);</div><div class='del'>-</div><div class='del'>-	ret_val[length].start = -1;</div><div class='del'>-	ret_val[length].length = -1;</div><div class='del'>-</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecpe_linelist_dimensions(GnomeFont *font, char *address, EcpeLine *linelist, double *widthp, double *heightp)</div><div class='del'>-{</div><div class='del'>-	double width = 0;</div><div class='del'>-	int i;</div><div class='del'>-	if (widthp) {</div><div class='del'>-		for (i = 0; linelist[i].length != -1; i++) {</div><div class='del'>-			width = MAX(width, gnome_font_get_width_string_n (font, address + linelist[i].start, linelist[i].length));</div><div class='del'>-		}</div><div class='del'>-		*widthp = width;</div><div class='del'>-	} else {</div><div class='del'>-		for (i = 0; linelist[i].length != -1; i++)</div><div class='del'>-			/* Intentionally empty */;</div><div class='del'>-	}</div><div class='del'>-	if (heightp) {</div><div class='del'>-		*heightp = gnome_font_get_size(font) * i;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecpe_linelist_print(GnomePrintContext *pc, GnomeFont *font, char *address, EcpeLine *linelist, double x, double y)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	for (i = 0; linelist[i].length != -1; i++) {</div><div class='del'>-		gnome_print_moveto(pc, x, y + gnome_font_get_ascender(font));</div><div class='del'>-		gnome_print_show_sized (pc, address + linelist[i].start, linelist[i].length);</div><div class='del'>-		y -= gnome_font_get_size(font);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_contact_print_envelope_close(GnomeDialog *dialog, gpointer data)</div><div class='del'>-{</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-ecpe_print(GnomePrintContext *pc, ECard *ecard)</div><div class='del'>-{</div><div class='del'>-	ECardSimple *card = e_card_simple_new(ecard);</div><div class='del'>-	char *address;</div><div class='del'>-	EcpeLine *linelist;</div><div class='del'>-	double x;</div><div class='del'>-	double y;</div><div class='del'>-	GnomeFont *font;</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	gnome_print_rotate(pc, 90);</div><div class='del'>-	gnome_print_translate(pc, 72.0 * 11.0 - ENVELOPE_WIDTH, -72.0 * 8.5 + (72.0 * 8.5 - ENVELOPE_HEIGHT) / 2);</div><div class='del'>-</div><div class='del'>-	address = e_card_simple_get(card, E_CARD_SIMPLE_FIELD_ADDRESS_BUSINESS);</div><div class='del'>-	linelist = ecpe_break(address);</div><div class='del'>-	font = gnome_font_new("Helvetica", 12);</div><div class='del'>-	ecpe_linelist_dimensions(font, address, linelist, &amp;x, &amp;y);</div><div class='del'>-	x = (ENVELOPE_WIDTH - x) / 2;</div><div class='del'>-	y = (ENVELOPE_HEIGHT - y) / 2;</div><div class='del'>-	ecpe_linelist_print(pc, font, address, linelist, x, y);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(font));</div><div class='del'>-	g_free(linelist);</div><div class='del'>-</div><div class='del'>-	g_free(address);</div><div class='del'>-</div><div class='del'>-	gnome_print_showpage(pc);</div><div class='del'>-	gnome_print_context_close(pc);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_envelope_button(GnomeDialog *dialog, gint button, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePrintMaster *master;</div><div class='del'>-	GnomePrintContext *pc;</div><div class='del'>-	ECard *card = NULL;</div><div class='del'>-	GtkWidget *preview;</div><div class='del'>-</div><div class='del'>-	card = gtk_object_get_data(GTK_OBJECT(dialog), "card");</div><div class='del'>-</div><div class='del'>-	switch( button ) {</div><div class='del'>-	case GNOME_PRINT_PRINT:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-</div><div class='del'>-		ecpe_print(pc, card);</div><div class='del'>-		</div><div class='del'>-		gnome_print_master_print(master);</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_PREVIEW:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-</div><div class='del'>-		ecpe_print(pc, card);</div><div class='del'>-		</div><div class='del'>-		preview = GTK_WIDGET(gnome_print_master_preview_new(master, "Print Preview"));</div><div class='del'>-		gtk_widget_show_all(preview);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_CANCEL:</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_print_envelope_dialog_new(ECard *card)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_print_dialog_new("Print envelope", GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-	card = e_card_duplicate(card);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_envelope_button), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "close", GTK_SIGNAL_FUNC(e_contact_print_envelope_close), NULL);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='head'>diff --git a/addressbook/printing/e-contact-print-envelope.h b/addressbook/printing/e-contact-print-envelope.h<br/>deleted file mode 100644<br/>index 45aa051401..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-envelope.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/printing/e-contact-print-envelope.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-contact-print-envelope.h</div><div class='del'>- * Copyright (C) 2000  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_ENVELOPE_H</div><div class='del'>-#define E_CONTACT_PRINT_ENVELOPE_H</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-card.h&gt;</div><div class='del'>-#include "e-contact-print-types.h"</div><div class='del'>-</div><div class='del'>-GtkWidget *e_contact_print_envelope_dialog_new(ECard *card);</div><div class='del'>-</div><div class='del'>-#endif /* E_CONTACT_PRINT_ENVELOPE_H */</div><div class='head'>diff --git a/addressbook/printing/e-contact-print-style-editor.c b/addressbook/printing/e-contact-print-style-editor.c<br/>deleted file mode 100644<br/>index 5eb5cadacf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print-style-editor.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 337f0f2007..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/printing/e-contact-print.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1113 +0,0 @@</div><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;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-book.h&gt;</div><div class='del'>-#include &lt;addressbook/backend/ebook/e-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'>-	gboolean uses_book;</div><div class='del'>-	int type;</div><div class='del'>-	EBook *book;</div><div class='del'>-	gchar *query;</div><div class='del'>-</div><div class='del'>-	GList *cards;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_contact_divide_text(GnomePrintContext *pc, GnomeFont *font, double width, const gchar *text, GList **return_val /* Of type char[] */)</div><div class='del'>-{</div><div class='del'>-	if ( width == -1 || gnome_font_get_width_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 * gnome_font_get_size (font);</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 - 1) * .2 * gnome_font_get_size (font);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-e_contact_output_and_advance(EContactPrintContext *ctxt, GnomeFont *font, double x, double width, gchar *text)</div><div class='del'>-{</div><div class='del'>-	ctxt-&gt;y -= .1 * gnome_font_get_size (font);</div><div class='del'>-	e_contact_output(ctxt-&gt;pc, font, x, ctxt-&gt;y, width, text);</div><div class='del'>-	ctxt-&gt;y -= e_contact_text_height(ctxt-&gt;pc, font, width, text);</div><div class='del'>-	ctxt-&gt;y -= .1 * gnome_font_get_size (font);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_rectangle(GnomePrintContext *pc, </div><div class='del'>-		   gdouble x0,</div><div class='del'>-		   gdouble y0,</div><div class='del'>-		   gdouble x1,</div><div class='del'>-		   gdouble y1,</div><div class='del'>-		   gdouble r,</div><div class='del'>-		   gdouble g,</div><div class='del'>-		   gdouble b)</div><div class='del'>-{</div><div class='del'>-	gnome_print_gsave(pc);</div><div class='del'>-	gnome_print_setrgbcolor(pc, r, g, b);</div><div class='del'>-	gnome_print_moveto(pc, x0, y0);</div><div class='del'>-	gnome_print_lineto(pc, x1, y0);</div><div class='del'>-	gnome_print_lineto(pc, x1, y1);</div><div class='del'>-	gnome_print_lineto(pc, x0, y1);</div><div class='del'>-	gnome_print_lineto(pc, x0, y0);</div><div class='del'>-	gnome_print_fill(pc);</div><div class='del'>-	gnome_print_grestore(pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_contact_get_letter_tab_width (EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	return gnome_font_get_width_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'>-	unsigned char character;</div><div class='del'>-	gdouble x, y;</div><div class='del'>-	gdouble page_width = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble tab_height, tab_width;</div><div class='del'>-	gdouble font_size;</div><div class='del'>-	tab_height = 72 * (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin - ctxt-&gt;style-&gt;bottom_margin) / 27.0;</div><div class='del'>-	font_size = tab_height / 2;</div><div class='del'>-	tab_width = e_contact_get_letter_tab_width(ctxt) - 18;</div><div class='del'>-	x = page_width + 72 * (ctxt-&gt;style-&gt;left_margin) - tab_width;</div><div class='del'>-	y = 72 * (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_print_gsave( ctxt-&gt;pc );</div><div class='del'>-	if ( ctxt-&gt;style-&gt;print_using_grey )</div><div class='del'>-		e_contact_rectangle( ctxt-&gt;pc, x, 72 * (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin), x + tab_width, ctxt-&gt;style-&gt;bottom_margin * 72, .85, .85, .85 );</div><div class='del'>-	for ( character = 'A' - 1; character &lt;= 'Z'; character ++ ) {</div><div class='del'>-		char string[] = "123";</div><div class='del'>-		if ( character &gt;= 'A' ) {</div><div class='del'>-			string[0] = tolower(character);</div><div class='del'>-			string[1] = 0;</div><div class='del'>-		}</div><div class='del'>-		if ( character &gt;= ctxt-&gt;first_char_on_page &amp;&amp; character &lt;= ctxt-&gt;last_char_on_page ) {</div><div class='del'>-			e_contact_rectangle( ctxt-&gt;pc, x + 1, y - 1, x + tab_width - 1, y - (tab_height - 1), 0, 0, 0 );</div><div class='del'>-			gnome_print_setrgbcolor( ctxt-&gt;pc, 1, 1, 1 );</div><div class='del'>-			e_contact_output( ctxt-&gt;pc, ctxt-&gt;letter_tab_font, x + tab_width / 2 - gnome_font_get_width_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") + gnome_font_get_size (ctxt-&gt;style-&gt;body_font) / 5;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double</div><div class='del'>-e_contact_get_letter_heading_height (EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble ascender, descender;</div><div class='del'>-	ascender = gnome_font_get_ascender(ctxt-&gt;letter_heading_font);</div><div class='del'>-	descender = gnome_font_get_descender(ctxt-&gt;letter_heading_font);</div><div class='del'>-	return ascender + descender + 9;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_letter_heading (EContactPrintContext *ctxt, gchar *character)</div><div class='del'>-{</div><div class='del'>-	gdouble ascender, descender;</div><div class='del'>-	gdouble width;</div><div class='del'>-</div><div class='del'>-	width = gnome_font_get_width_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 += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-		       "file_as", &amp;file_as,</div><div class='del'>-		       NULL);</div><div class='del'>-	height += e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;headings_font, column_width - 4, file_as);</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-	</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; 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 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-		}</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .4;</div><div class='del'>-	return height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_card (ECardSimple *simple, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_width;</div><div class='del'>-	char *file_as;</div><div class='del'>-	int field;</div><div class='del'>-</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	column_width = (page_width + 18) / ctxt-&gt;style-&gt;num_columns - 18;</div><div class='del'>-</div><div class='del'>-	gnome_print_gsave(ctxt-&gt;pc);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(simple-&gt;card),</div><div class='del'>-		       "file_as", &amp;file_as,</div><div class='del'>-		       NULL);</div><div class='del'>-	if (ctxt-&gt;style-&gt;print_using_grey)</div><div class='del'>-		e_contact_rectangle(ctxt-&gt;pc, ctxt-&gt;x, ctxt-&gt;y + gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .3, ctxt-&gt;x + column_width, ctxt-&gt;y - e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;headings_font, column_width - 4, file_as) - gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .3, .85, .85, .85);</div><div class='del'>-	e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;headings_font, ctxt-&gt;x + 2, ctxt-&gt;y, column_width - 4, file_as);</div><div class='del'>-	ctxt-&gt;y -= e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;headings_font, column_width - 4, file_as);</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-	</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; 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 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-		}</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .4;</div><div class='del'>-	gnome_print_grestore(ctxt-&gt;pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_start_new_column (EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_offset;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs ) </div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	column_offset = (page_width + 18) / ctxt-&gt;style-&gt;num_columns;</div><div class='del'>-	ctxt-&gt;column ++;</div><div class='del'>-	if (ctxt-&gt;column &gt;= ctxt-&gt;style-&gt;num_columns) {</div><div class='del'>-		e_contact_start_new_page(ctxt);</div><div class='del'>-		ctxt-&gt;column = 0;</div><div class='del'>-	}</div><div class='del'>-	ctxt-&gt;x = (72 * ctxt-&gt;style-&gt;left_margin) + column_offset * ctxt-&gt;column;</div><div class='del'>-	ctxt-&gt;y = 72 * (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete_sequence(EBookView *book_view, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GList *cards = ctxt-&gt;cards;</div><div class='del'>-</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;first_contact = TRUE;</div><div class='del'>-	ctxt-&gt;character = NULL;</div><div class='del'>-	ctxt-&gt;y = (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin) * 72;</div><div class='del'>-	ctxt-&gt;x = (ctxt-&gt;style-&gt;left_margin) * 72;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs ) </div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-</div><div class='del'>-	for(; cards; cards = cards-&gt;next) {</div><div class='del'>-		ECard *card = cards-&gt;data;</div><div class='del'>-		ECardSimple *simple = e_card_simple_new(card);</div><div class='del'>-		guchar *file_as;</div><div class='del'>-</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'>-	if (book_view)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(book_view));</div><div class='del'>-	if (ctxt-&gt;type == GNOME_PRINT_PREVIEW) {</div><div class='del'>-		GtkWidget *preview;</div><div class='del'>-		preview = GTK_WIDGET(gnome_print_master_preview_new(ctxt-&gt;master, "Print Preview"));</div><div class='del'>-		gtk_widget_show_all(preview);</div><div class='del'>-	} else {</div><div class='del'>-		gnome_print_master_print(ctxt-&gt;master);</div><div class='del'>-	}</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;pc));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;master));</div><div class='del'>-	if (ctxt-&gt;book)</div><div class='del'>-		gtk_object_unref(GTK_OBJECT(ctxt-&gt;book));</div><div class='del'>-	g_free(ctxt-&gt;query);</div><div class='del'>-	g_list_foreach(ctxt-&gt;cards, (GFunc) gtk_object_unref, NULL);</div><div class='del'>-	g_list_free(ctxt-&gt;cards);</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;style-&gt;headings_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;style-&gt;body_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;style-&gt;header_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;style-&gt;footer_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;letter_heading_font));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(ctxt-&gt;letter_tab_font));</div><div class='del'>-	g_free(ctxt-&gt;style);</div><div class='del'>-	g_free(ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-card_compare (ECard *card1, ECard *card2) {</div><div class='del'>-	if (card1 &amp;&amp; card2) {</div><div class='del'>-		char *file_as1, *file_as2;</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card1),</div><div class='del'>-			       "file_as", &amp;file_as1,</div><div class='del'>-			       NULL);</div><div class='del'>-		gtk_object_get(GTK_OBJECT(card2),</div><div class='del'>-			       "file_as", &amp;file_as2,</div><div class='del'>-			       NULL);</div><div class='del'>-		if (file_as1 &amp;&amp; file_as2)</div><div class='del'>-			return 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'>-	e_book_get_book_view(book, query, (EBookBookViewCallback) book_view_loaded, ctxt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static double</div><div class='del'>-e_contact_get_phone_list_size(ECardSimple *simple, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	double height = 0;</div><div class='del'>-	int field;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-	</div><div class='del'>-	for(field = E_CARD_SIMPLE_FIELD_FULL_NAME; field != E_CARD_SIMPLE_FIELD_LAST; field++) {</div><div class='del'>-		char *string;</div><div class='del'>-		string = e_card_simple_get(simple, field);</div><div class='del'>-		if (string &amp;&amp; *string) {</div><div class='del'>-			if ( 1 ) /* field is a phone field. */ {</div><div class='del'>-				gchar *field = string;</div><div class='del'>-				height += e_contact_text_height(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, 100, field);</div><div class='del'>-				height += .2 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		g_free(string);</div><div class='del'>-	}</div><div class='del'>-	height += gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .4;</div><div class='del'>-	return height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_print_phone_list (ECard *card, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_width;</div><div class='del'>-	double xoff, dotwidth;</div><div class='del'>-	int dotcount;</div><div class='del'>-	char *dots;</div><div class='del'>-	int i;</div><div class='del'>-	char *file_as;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	column_width = (page_width + 18) / ctxt-&gt;style-&gt;num_columns - 18;</div><div class='del'>-</div><div class='del'>-	gnome_print_gsave(ctxt-&gt;pc);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .2;</div><div class='del'>-</div><div class='del'>-	e_contact_output(ctxt-&gt;pc, ctxt-&gt;style-&gt;body_font, ctxt-&gt;x, ctxt-&gt;y, -1, e_card_get_string_fileas(card));</div><div class='del'>-	</div><div class='del'>-	xoff = column_width - 9 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-	dotwidth = xoff - </div><div class='del'>-		gnome_font_get_width_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 * gnome_font_get_size (ctxt-&gt;style-&gt;body_font);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	ctxt-&gt;y -= gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * .4;</div><div class='del'>-	gnome_print_grestore(ctxt-&gt;pc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_do_print_phone_list (EBook *book, char *query, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	ECard *card = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	gdouble page_width  = 72 * (ctxt-&gt;style-&gt;page_width - ctxt-&gt;style-&gt;left_margin - ctxt-&gt;style-&gt;right_margin);</div><div class='del'>-	gdouble column_width;</div><div class='del'>-	ctxt-&gt;first_contact = TRUE;</div><div class='del'>-	ctxt-&gt;character = NULL;</div><div class='del'>-	ctxt-&gt;y = (ctxt-&gt;style-&gt;page_height - ctxt-&gt;style-&gt;top_margin) * 72;</div><div class='del'>-	ctxt-&gt;x = (ctxt-&gt;style-&gt;left_margin) * 72;</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs ) </div><div class='del'>-		page_width -= e_contact_get_letter_tab_width(ctxt);</div><div class='del'>-	</div><div class='del'>-	ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-</div><div class='del'>-	column_width = (page_width + 18) / ctxt-&gt;style-&gt;num_columns - 18;</div><div class='del'>-	/*</div><div class='del'>-	for(card = e_book_get_first(book); card; card = e_book_get_next(book)) {</div><div class='del'>-	*/</div><div class='del'>-	for (i=0; i &lt; 30; i++) {</div><div class='del'>-		guchar *file_as = e_card_get_string_fileas(card);</div><div class='del'>-		if ( file_as &amp;&amp; (!character || *character != tolower(*file_as)) ) {</div><div class='del'>-			if (ctxt-&gt;style-&gt;sections_start_new_page &amp;&amp; ! first_contact) {</div><div class='del'>-				e_contact_start_new_page(ctxt);</div><div class='del'>-			}</div><div class='del'>-			else if ((!first_contact) &amp;&amp; (ctxt-&gt;y - e_contact_get_letter_heading_height(ctxt) - e_contact_get_phone_list_size(card, ctxt, shown_fields) &lt; ctxt-&gt;style-&gt;bottom_margin * 72))</div><div class='del'>-				e_contact_start_new_column(ctxt);</div><div class='del'>-			if (!character)</div><div class='del'>-				character = g_strdup(" ");</div><div class='del'>-			*character = tolower(*file_as);</div><div class='del'>-			if ( ctxt-&gt;style-&gt;letter_headings )</div><div class='del'>-				e_contact_print_letter_heading(ctxt, character);</div><div class='del'>-			ctxt-&gt;first_section = FALSE;</div><div class='del'>-		} </div><div class='del'>-		else if ( (!first_contact) &amp;&amp; (ctxt-&gt;y - e_contact_get_card_size(card, ctxt, shown_fields) &lt; ctxt-&gt;style-&gt;bottom_margin * 72)) {</div><div class='del'>-			e_contact_start_new_column(ctxt);</div><div class='del'>-			if ( ctxt-&gt;style-&gt;letter_headings )</div><div class='del'>-				e_contact_print_letter_heading(ctxt, character);</div><div class='del'>-		}</div><div class='del'>-		ctxt-&gt;last_char_on_page = toupper(*file_as);</div><div class='del'>-		if ( ctxt-&gt;last_char_on_page &lt; ctxt-&gt;first_char_on_page )</div><div class='del'>-			ctxt-&gt;first_char_on_page = ctxt-&gt;last_char_on_page;</div><div class='del'>-		e_contact_print_phone_list(card, ctxt, shown_fields);</div><div class='del'>-		first_contact = FALSE;</div><div class='del'>-	}</div><div class='del'>-	ctxt-&gt;last_char_on_page = 'Z';</div><div class='del'>-	if ( ctxt-&gt;style-&gt;letter_tabs )</div><div class='del'>-		e_contact_print_letter_tab(ctxt);</div><div class='del'>-	gnome_print_showpage(ctxt-&gt;pc);</div><div class='del'>-	gnome_print_context_close(ctxt-&gt;pc);</div><div class='del'>-	g_free(character);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_do_print (EBook *book, char *query, EContactPrintContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	switch ( ctxt-&gt;style-&gt;type ) {</div><div class='del'>-	case E_CONTACT_PRINT_TYPE_CARDS:</div><div class='del'>-		e_contact_do_print_cards( book, query, ctxt);</div><div class='del'>-		break;</div><div class='del'>-#if 0</div><div class='del'>-	case E_CONTACT_PRINT_TYPE_PHONE_LIST:</div><div class='del'>-		e_contact_do_print_phone_list( book, query, ctxt );</div><div class='del'>-		break;</div><div class='del'>-#endif</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void lowify( char *data )</div><div class='del'>-{</div><div class='del'>-	for ( ; *data; data++ )</div><div class='del'>-		*data = tolower((unsigned char) *data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean get_bool( char *data )</div><div class='del'>-{</div><div class='del'>-	if ( data ) {</div><div class='del'>-		lowify ( data );</div><div class='del'>-		return ! strcmp(data, "true");</div><div class='del'>-	} else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void get_string( char *data, char **variable )</div><div class='del'>-{</div><div class='del'>-	g_free ( *variable );</div><div class='del'>-	if ( data )</div><div class='del'>-		*variable = g_strdup( data );</div><div class='del'>-	else</div><div class='del'>-		*variable = g_strdup( "" );</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int get_integer( char *data )</div><div class='del'>-{</div><div class='del'>-	if ( data )</div><div class='del'>-		return atoi(data);</div><div class='del'>-	else </div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static double get_float( char *data )</div><div class='del'>-{</div><div class='del'>-	if ( data )</div><div class='del'>-		return atof(data);</div><div class='del'>-	else </div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void get_font( char *data, GnomeFont **variable )</div><div class='del'>-{</div><div class='del'>-	if ( data ) {</div><div class='del'>-		GnomeFont *font = gnome_font_new_from_full_name( data );</div><div class='del'>-		if ( font ) {</div><div class='del'>-			gtk_object_unref( GTK_OBJECT(*variable) );</div><div class='del'>-			*variable = font;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_contact_build_style(EContactPrintStyle *style)</div><div class='del'>-{</div><div class='del'>-	xmlDocPtr styledoc;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	style-&gt;title = g_strdup("");</div><div class='del'>-	style-&gt;type = E_CONTACT_PRINT_TYPE_CARDS;</div><div class='del'>-	style-&gt;sections_start_new_page = TRUE;</div><div class='del'>-	style-&gt;num_columns = 2;</div><div class='del'>-	style-&gt;blank_forms = 2;</div><div class='del'>-	style-&gt;letter_tabs = TRUE;</div><div class='del'>-	style-&gt;letter_headings = FALSE;</div><div class='del'>-	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'>-	gboolean uses_book = (gint) gtk_object_get_data(GTK_OBJECT(dialog), "uses_book");</div><div class='del'>-	EBook *book = NULL;</div><div class='del'>-	char *query = NULL;</div><div class='del'>-	ECard *card = NULL;</div><div class='del'>-	gdouble font_size;</div><div class='del'>-	if (uses_book) {</div><div class='del'>-		book = gtk_object_get_data(GTK_OBJECT(dialog), "book");</div><div class='del'>-		query = gtk_object_get_data(GTK_OBJECT(dialog), "query");</div><div class='del'>-	} else {</div><div class='del'>-		card = gtk_object_get_data(GTK_OBJECT(dialog), "card");</div><div class='del'>-	}</div><div class='del'>-	switch( button ) {</div><div class='del'>-	case GNOME_PRINT_PRINT:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_contact_build_style(style);</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;x = 0;</div><div class='del'>-		ctxt-&gt;y = 0;</div><div class='del'>-		ctxt-&gt;column = 0;</div><div class='del'>-		ctxt-&gt;style = style;</div><div class='del'>-		ctxt-&gt;master = master;</div><div class='del'>-		ctxt-&gt;first_section = TRUE;</div><div class='del'>-		ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-		ctxt-&gt;type = GNOME_PRINT_PRINT;</div><div class='del'>-</div><div class='del'>-		font_size = 72 * ctxt-&gt;style-&gt;page_height / 27.0 / 2.0;</div><div class='del'>-		ctxt-&gt;letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * 1.5);</div><div class='del'>-		ctxt-&gt;letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), font_size);</div><div class='del'>-	</div><div class='del'>-		ctxt-&gt;pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, </div><div class='del'>-										   72 * style-&gt;paper_width, </div><div class='del'>-										   72 * style-&gt;paper_height,</div><div class='del'>-										   72 * style-&gt;page_width,</div><div class='del'>-										   72 * style-&gt;page_height));</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;book = book;</div><div class='del'>-		ctxt-&gt;query = query;</div><div class='del'>-		if (uses_book) {</div><div class='del'>-			ctxt-&gt;cards = NULL;</div><div class='del'>-			e_contact_do_print(book, ctxt-&gt;query, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			ctxt-&gt;cards = g_list_append(NULL, card);</div><div class='del'>-			complete_sequence(NULL, ctxt);</div><div class='del'>-		}</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_PREVIEW:</div><div class='del'>-		master = gnome_print_master_new_from_dialog( GNOME_PRINT_DIALOG(dialog) );</div><div class='del'>-		pc = gnome_print_master_get_context( master );</div><div class='del'>-		e_contact_build_style(style);</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;x = 0;</div><div class='del'>-		ctxt-&gt;y = 0;</div><div class='del'>-		ctxt-&gt;column = 0;</div><div class='del'>-		ctxt-&gt;style = style;</div><div class='del'>-		ctxt-&gt;master = master;</div><div class='del'>-		ctxt-&gt;first_section = TRUE;</div><div class='del'>-		ctxt-&gt;first_char_on_page = 'A' - 1;</div><div class='del'>-		ctxt-&gt;type = GNOME_PRINT_PREVIEW;</div><div class='del'>-</div><div class='del'>-		font_size = 72 * ctxt-&gt;style-&gt;page_height / 27.0 / 2.0;</div><div class='del'>-		ctxt-&gt;letter_heading_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), gnome_font_get_size (ctxt-&gt;style-&gt;headings_font) * 1.5);</div><div class='del'>-		ctxt-&gt;letter_tab_font = gnome_font_new(gnome_font_get_name(ctxt-&gt;style-&gt;headings_font), font_size);</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;pc = GNOME_PRINT_CONTEXT(gnome_print_multipage_new_from_sizes(pc, </div><div class='del'>-										   72 * style-&gt;paper_width, </div><div class='del'>-										   72 * style-&gt;paper_height,</div><div class='del'>-										   72 * style-&gt;page_width,</div><div class='del'>-										   72 * style-&gt;page_height));</div><div class='del'>-		</div><div class='del'>-		ctxt-&gt;book = book;</div><div class='del'>-		ctxt-&gt;query = g_strdup(query);</div><div class='del'>-		if (uses_book) {</div><div class='del'>-			ctxt-&gt;cards = NULL;</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(book));</div><div class='del'>-			e_contact_do_print(book, ctxt-&gt;query, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			ctxt-&gt;cards = g_list_append(NULL, card);</div><div class='del'>-			gtk_object_ref(GTK_OBJECT(card));</div><div class='del'>-			complete_sequence(NULL, ctxt);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GNOME_PRINT_CANCEL:</div><div class='del'>-		if (uses_book)</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(book));</div><div class='del'>-		else</div><div class='del'>-			gtk_object_unref(GTK_OBJECT(card));</div><div class='del'>-		g_free(query);</div><div class='del'>-		gnome_dialog_close(dialog);</div><div class='del'>-		g_free(style);</div><div class='del'>-		g_free(ctxt);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_print_dialog_new(EBook *book, char *query)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_print_dialog_new("Print cards", GNOME_PRINT_DIALOG_RANGE | GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-	gnome_print_dialog_construct_range_any(GNOME_PRINT_DIALOG(dialog), GNOME_PRINT_RANGE_ALL | GNOME_PRINT_RANGE_SELECTION,</div><div class='del'>-					       NULL, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(book));</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 1);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "book", book);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "query", g_strdup(query));</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_contact_print_card_dialog_new(ECard *card)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_print_dialog_new("Print card", GNOME_PRINT_DIALOG_COPIES);</div><div class='del'>-</div><div class='del'>-	card = e_card_duplicate(card);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "card", card);</div><div class='del'>-	gtk_object_set_data(GTK_OBJECT(dialog), "uses_book", (void *) 0);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "clicked", GTK_SIGNAL_FUNC(e_contact_print_button), NULL);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(dialog),</div><div class='del'>-			   "close", GTK_SIGNAL_FUNC(e_contact_print_close), NULL);</div><div class='del'>-	return dialog;</div><div class='del'>-}</div><div class='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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 fb17271f6b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/addressbook/printing/e-contact-print.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>addressbook/printing/e-contact-print.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'>- * 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'>-GtkWidget *e_contact_print_card_dialog_new(ECard *card);</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 7a5cd77d59..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-imagesdir = $(datadir)/images/evolution</div><div class='del'>-</div><div class='del'>-images_DATA = \</div><div class='del'>-	briefcase.png       		\</div><div class='del'>-	cellphone.png       		\</div><div class='del'>-	envelope.png        		\</div><div class='del'>-	evolution-calendar-mini.png 	\</div><div class='del'>-	evolution-calendar.png 		\</div><div class='del'>-	evolution-contacts-mini.png 	\</div><div class='del'>-	evolution-contacts.png 		\</div><div class='del'>-	evolution-inbox-mini.png 	\</div><div class='del'>-	evolution-inbox.png 		\</div><div class='del'>-	evolution-notes-mini.png 	\</div><div class='del'>-	evolution-notes.png 		\</div><div class='del'>-	evolution-tasks-mini.png 	\</div><div class='del'>-	evolution-tasks.png 		\</div><div class='del'>-	evolution-today.png 		\</div><div class='del'>-	globe.png           		\</div><div class='del'>-	house.png           		\</div><div class='del'>-	malehead.png			\</div><div class='del'>-	service-close.png		\</div><div class='del'>-	service-configure.png		\</div><div class='del'>-	service-down.png		\</div><div class='del'>-	service-left.png		\</div><div class='del'>-	service-right.png		\</div><div class='del'>-	service-up.png			\</div><div class='del'>-	splash.png</div><div class='del'>-</div><div class='del'>-buttonsdir = $(datadir)/images/evolution/buttons</div><div class='del'>-buttons_DATA = 				\</div><div class='del'>-	add-service.png			\</div><div class='del'>-	compose-message.png		\</div><div class='del'>-	copy-message.png		\</div><div class='del'>-	fetch-mail.png			\</div><div class='del'>-	forward.png			\</div><div class='del'>-	move-message.png		\</div><div class='del'>-	reply-to-all.png		\</div><div class='del'>-	reply.png</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	add-service.png	\</div><div class='del'>-	attachment.xpm \</div><div class='del'>-	compose-message.png \</div><div class='del'>-	copy-message.png \</div><div class='del'>-	empty.xpm \</div><div class='del'>-	fetch-mail.png \</div><div class='del'>-	forward.png \</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'>-	move-message.png \</div><div class='del'>-	priority-high.xpm \</div><div class='del'>-	priority-low.xpm \</div><div class='del'>-	reply.png \</div><div class='del'>-	reply-to-all.png \</div><div class='del'>-	tree-expanded.xpm \</div><div class='del'>-	tree-unexpanded.xpm \</div><div class='del'>-	score-lowest.xpm \</div><div class='del'>-	score-lower.xpm \</div><div class='del'>-	score-low.xpm \</div><div class='del'>-	score-normal.xpm \</div><div class='del'>-	score-high.xpm \</div><div class='del'>-	score-higher.xpm \</div><div class='del'>-	score-highest.xpm \</div><div class='del'>-	$(images_DATA)</div><div class='head'>diff --git a/art/add-attachment.png b/art/add-attachment.png<br/>deleted file mode 100644<br/>index 024b203fe0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/add-attachment.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/add-attachment.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/add-service.png b/art/add-service.png<br/>deleted file mode 100644<br/>index 62ddebe678..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/add-service.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/add-service.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/attachment.xpm b/art/attachment.xpm<br/>deleted file mode 100644<br/>index 1bcc0386d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/attachment.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/cellphone.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/compose-message.png b/art/compose-message.png<br/>deleted file mode 100644<br/>index 2b0b97c791..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/compose-message.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/compose-message.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/copy-message.png b/art/copy-message.png<br/>deleted file mode 100644<br/>index bd7c71d0a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/copy-message.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/copy-message.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 aca06618b1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/empty.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 685812c137..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-contacts-mini.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 0d2cfb7e5f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/evolution-contacts.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/evolution-today.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/fetch-mail.png b/art/fetch-mail.png<br/>deleted file mode 100644<br/>index 30cda0564d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/fetch-mail.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/fetch-mail.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/forward.png b/art/forward.png<br/>deleted file mode 100644<br/>index 45ac85807b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/forward.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/forward.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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/move-message.png b/art/move-message.png<br/>deleted file mode 100644<br/>index f9a3443109..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/move-message.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/move-message.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/pin.png b/art/pin.png<br/>deleted file mode 100644<br/>index fff34d7d96..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/pin.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/pin.png</a><br/>+++ /dev/null</div>Binary files differ<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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/priority-low.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * priority_low_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #21405A",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"     ......     ",</div><div class='del'>-"      ....      ",</div><div class='del'>-"      ....      ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"       ..       ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/reply-to-all.png b/art/reply-to-all.png<br/>deleted file mode 100644<br/>index 6f42de1de0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/reply-to-all.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/reply-to-all.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/reply.png b/art/reply.png<br/>deleted file mode 100644<br/>index cc8be8511f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/reply.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/reply.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/score-high.xpm b/art/score-high.xpm<br/>deleted file mode 100644<br/>index bb7bd47562..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-high.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/score-high.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_high_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #00FF00",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .+   ",</div><div class='del'>-"    @@@    .++  ",</div><div class='del'>-"   @#@#@   .++  ",</div><div class='del'>-"   @$%$@   .++  ",</div><div class='del'>-"   @$$$@   . +  ",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-higher.xpm b/art/score-higher.xpm<br/>deleted file mode 100644<br/>index 696e74bed5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-higher.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/score-higher.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_higher_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #00FF00",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .++  ",</div><div class='del'>-"    @@@    .++++",</div><div class='del'>-"   @#@#@   .++++",</div><div class='del'>-"   @$%$@   .++++",</div><div class='del'>-"   @$$$@   .  ++",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-highest.xpm b/art/score-highest.xpm<br/>deleted file mode 100644<br/>index d8dab65079..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-highest.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/score-highest.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_highest_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #00FF00",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .++++",</div><div class='del'>-"    @@@    .++++",</div><div class='del'>-"   @#@#@   .++++",</div><div class='del'>-"   @$%$@   .++++",</div><div class='del'>-"   @$$$@   .    ",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-low.xpm b/art/score-low.xpm<br/>deleted file mode 100644<br/>index e071741adc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-low.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/score-low.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_low_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #FF0000",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .+   ",</div><div class='del'>-"    @@@    .++  ",</div><div class='del'>-"   @#@#@   .++  ",</div><div class='del'>-"   @$%$@   .++  ",</div><div class='del'>-"   @$$$@   . +  ",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-lower.xpm b/art/score-lower.xpm<br/>deleted file mode 100644<br/>index 74da90d670..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-lower.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/score-lower.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_lower_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #FF0000",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .++  ",</div><div class='del'>-"    @@@    .++++",</div><div class='del'>-"   @#@#@   .++++",</div><div class='del'>-"   @$%$@   .++++",</div><div class='del'>-"   @$$$@   .  ++",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-lowest.xpm b/art/score-lowest.xpm<br/>deleted file mode 100644<br/>index 9beee1849f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-lowest.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/score-lowest.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,26 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_lowest_xpm[] = {</div><div class='del'>-"16 16 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #BCBCBC",</div><div class='del'>-"+	c #FF0000",</div><div class='del'>-"@	c #000000",</div><div class='del'>-"#	c #17D1EA",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"           .++++",</div><div class='del'>-"    @@@    .++++",</div><div class='del'>-"   @#@#@   .++++",</div><div class='del'>-"   @$%$@   .++++",</div><div class='del'>-"   @$$$@   .    ",</div><div class='del'>-"   @@$@@   .    ",</div><div class='del'>-"  @@$$$@@  .    ",</div><div class='del'>-" @@$$$$$@@@@    ",</div><div class='del'>-" @@$$$$$@@ .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-" @@$$$$$@  .    ",</div><div class='del'>-"  @$$$$$@  .    ",</div><div class='del'>-"   %%$%%   .    ",</div><div class='del'>-"   %% %%   .    ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/score-normal.xpm b/art/score-normal.xpm<br/>deleted file mode 100644<br/>index 82b618cb8d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/score-normal.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/score-normal.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * score_normal_xpm[] = {</div><div class='del'>-"16 16 5 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #17D1EA",</div><div class='del'>-"@	c #FFFFFF",</div><div class='del'>-"#	c #EF9815",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    ...         ",</div><div class='del'>-"   .+.+.        ",</div><div class='del'>-"   .@#@.        ",</div><div class='del'>-"   .@@@.        ",</div><div class='del'>-"   ..@..        ",</div><div class='del'>-"  ..@@@..       ",</div><div class='del'>-" ..@@@@@..      ",</div><div class='del'>-" ..@@@@@..      ",</div><div class='del'>-" ..@@@@@..      ",</div><div class='del'>-" ..@@@@@..      ",</div><div class='del'>-"  .@@@@@.       ",</div><div class='del'>-"   ##@##        ",</div><div class='del'>-"   ## ##        ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/send.png b/art/send.png<br/>deleted file mode 100644<br/>index fb95df6016..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/send.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/send.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-close.png b/art/service-close.png<br/>deleted file mode 100644<br/>index a45e8cb91c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-close.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/service-close.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-configure.png b/art/service-configure.png<br/>deleted file mode 100644<br/>index 7eacacc421..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-configure.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/service-configure.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-down.png b/art/service-down.png<br/>deleted file mode 100644<br/>index e5b6bf6e93..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-down.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/service-down.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-left.png b/art/service-left.png<br/>deleted file mode 100644<br/>index 828bee5ed3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-left.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/service-left.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-right.png b/art/service-right.png<br/>deleted file mode 100644<br/>index 21d974bbb7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-right.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/service-right.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/service-up.png b/art/service-up.png<br/>deleted file mode 100644<br/>index fda040d181..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/service-up.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/service-up.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/splash.png b/art/splash.png<br/>deleted file mode 100644<br/>index d6c9dcd176..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/splash.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/splash.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/art/tree-expanded.xpm b/art/tree-expanded.xpm<br/>deleted file mode 100644<br/>index fc748953eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/tree-expanded.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/tree-expanded.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * tree_expanded_xpm[] = {</div><div class='del'>-"16 16 3 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+.....+.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/art/tree-unexpanded.xpm b/art/tree-unexpanded.xpm<br/>deleted file mode 100644<br/>index 0dfb12a0a5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/art/tree-unexpanded.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>art/tree-unexpanded.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * tree_unexpanded_xpm[] = {</div><div class='del'>-"16 16 3 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .+++.+++.   ",</div><div class='del'>-"    .+++.+++.   ",</div><div class='del'>-"    .+.....+.   ",</div><div class='del'>-"    .+++.+++.   ",</div><div class='del'>-"    .+++.+++.   ",</div><div class='del'>-"    .+++++++.   ",</div><div class='del'>-"    .........   ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>autogen.sh</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-#!/bin/sh</div><div class='del'>-# Run this to generate all the initial makefiles, etc.</div><div class='del'>-</div><div class='del'>-srcdir=`dirname $0`</div><div class='del'>-test -z "$srcdir" &amp;&amp; srcdir=.</div><div class='del'>-</div><div class='del'>-PKG_NAME="evolution"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-. $srcdir/macros/autogen.sh</div><div class='head'>diff --git a/calendar/.cvsignore b/calendar/.cvsignore<br/>deleted file mode 100644<br/>index b7f7dea650..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-_libs</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='head'>diff --git a/calendar/AUTHORS b/calendar/AUTHORS<br/>deleted file mode 100644<br/>index 7e482aef97..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/AUTHORS?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 426ee0b488..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7413 +0,0 @@</div><div class='del'>-2000-11-05  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Removed the old recurrence page.</div><div class='del'>-	Wheeeeeeeeee!</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (make_recurrence_special): Clear the monthly</div><div class='del'>-	widgets.</div><div class='del'>-	(make_recur_monthly_special): Create the monthly widgets.</div><div class='del'>-	(clear_widgets): Clear the monthly values.</div><div class='del'>-	(simple_recur_to_comp_object): Fill in the monthly values.</div><div class='del'>-	(fill_recurrence_widgets): Fill in the monthly and yearly source</div><div class='del'>-	values.</div><div class='del'>-	(dialog_to_comp_object): Take in a CalComponent instead of using</div><div class='del'>-	the event editor's directly.</div><div class='del'>-	(recur_to_comp_object): Likewise.</div><div class='del'>-	(simple_recur_to_comp_object): Likewise.</div><div class='del'>-	(EventEditorPrivate): Removed the widgets from the old recurrence</div><div class='del'>-	page.</div><div class='del'>-	(get_widgets): Likewise.</div><div class='del'>-	(clear_widgets): Likewise.</div><div class='del'>-	(dialog_to_comp_object): If the description or summary are empty,</div><div class='del'>-	just clear the description list or summary property, respectively,</div><div class='del'>-	instead of saving empty ones.</div><div class='del'>-	(simple_recur_to_comp_object): Set the week_start field.</div><div class='del'>-</div><div class='del'>-	* gui/main.c: Fix includes, and add calendar-config.h.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): The glade messages</div><div class='del'>-	file should not be in SOURCES.</div><div class='del'>-</div><div class='del'>-2000-11-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* doc/.cvsignore, doc/C/.cvsignore: Removed unnecessary .cvsignore</div><div class='del'>-	files.</div><div class='del'>-</div><div class='del'>-2000-11-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (check_all_day): Block signals from the</div><div class='del'>-	toggle button.</div><div class='del'>-	(date_changed_cb): Merged check_dates() and check_times() into</div><div class='del'>-	this function; provide better behavior as well.</div><div class='del'>-	(check_dates): Removed function.</div><div class='del'>-	(check_times): Removed function.</div><div class='del'>-	(init_widgets): Connect to the "changed" signal on the start_time</div><div class='del'>-	and end_time widgets.</div><div class='del'>-	(check_all_day): Use a better test.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Clean the idl-generated sources properly.</div><div class='del'>-	* cal-client/Makefile.am: Likewise.</div><div class='del'>-</div><div class='del'>-2000-11-03  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: added some checks for the type of an</div><div class='del'>-	incoming iCal component before passing it off to the CalComponent</div><div class='del'>-	routines.</div><div class='del'>-</div><div class='del'>-2000-11-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (init_widgets): The date editor's</div><div class='del'>-	signal is now "changed".</div><div class='del'>-	(completed_changed): Renamed callback to reflect the name of the</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-2000-11-01  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c: (main): added call to bindtextdomain and textdomain, so</div><div class='del'>-	all calendar gui shows up localized.</div><div class='del'>-	</div><div class='del'>-2000-10-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (count_by_xxx): Hmmm.  SHRT_MAX changed to</div><div class='del'>-	ICAL_RECURRENCE_ARRAY_MAX in libical.  Deal with it.</div><div class='del'>-	(fill_recurrence_widgets): Likewise.</div><div class='del'>-	(simple_recur_to_comp_object): Fixed incorrect assertion.  The</div><div class='del'>-	weekday picker is not the immediate child of the recurrence</div><div class='del'>-	special container.</div><div class='del'>-	(fill_recurrence_widgets): Call make_recurrence_special() after</div><div class='del'>-	setting the recurrence period type.</div><div class='del'>-	(fill_ending_date): Call make_recurrence_ending_special().  This</div><div class='del'>-	would be so much nicer if GTK+ were model/view all over.</div><div class='del'>-</div><div class='del'>-2000-10-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Remove add/del/mod hashes and</div><div class='del'>-	add changed_hash.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: ditto</div><div class='del'>-	</div><div class='del'>-	* conduits/todo/todo-conduit.c (next_changed_item): Utility function</div><div class='del'>-	to get the next "really" changed item (changed status can be cleared now)</div><div class='del'>-	(compute_status): Compute status based on changed_hash</div><div class='del'>-	(pre_sync): Fill changed_hash and counts adds/mods/dels</div><div class='del'>-	(set_status_cleared): New callback handler - avoid double syncing</div><div class='del'>-	(for_each_modified): Use next_changed_item to iterate</div><div class='del'>-	(add_archive_record): kill</div><div class='del'>-	(delete_archive_record): kill</div><div class='del'>-	(archive_record): New callback handler - mark/unmark archive status</div><div class='del'>-	(conduit_get_gpilot_conduit): Adjust signal connects</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-2000-10-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (sensitize_recur_widgets): New function.  We</div><div class='del'>-	split it from the radio callback so that we can call it explicitly</div><div class='del'>-	from fill_recurrence_widgets().</div><div class='del'>-	(fill_recurrence_widgets): Call sensitize_recur_widgets() as</div><div class='del'>-	appropriate.</div><div class='del'>-</div><div class='del'>-2000-10-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (new_calendar): Removed the geometry and</div><div class='del'>-	hidden arguments.  This code is ancient.</div><div class='del'>-	(all_calendars): Made static.  This sucks; configuration should be</div><div class='del'>-	notification-based instead of "let's iterate through all open</div><div class='del'>-	calendars".</div><div class='del'>-	(active_calendars): Removed.  Functions can check the length of</div><div class='del'>-	the all_calendars list if they are interested.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (sync_entries): Do not take in an extra data</div><div class='del'>-	pointer.</div><div class='del'>-	(summary_changed_cb): Use a single call back to sync both entries.</div><div class='del'>-	(sync_date_edits): New function to sync two EDateEdit widgets.</div><div class='del'>-	(init_widgets): Connect the general and recurrence starting date</div><div class='del'>-	widgets.</div><div class='del'>-</div><div class='del'>-2000-10-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (sync_entries): New function.</div><div class='del'>-	(general_summary_changed_cb): Sync the general summary to the</div><div class='del'>-	recurrence summary widget.</div><div class='del'>-	(recurrence_summary_changed_cb): Vice-versa.</div><div class='del'>-	(init_widgets): Hook to the summaries.</div><div class='del'>-</div><div class='del'>-	* event-editor-dialog.glade: Do not expand/fill the start and end</div><div class='del'>-	date so that the "all day event" button is not pushed all the way</div><div class='del'>-	to the right.</div><div class='del'>-	Decrease the spacing between the recurrence sentence widgets.</div><div class='del'>-	Remove a spurious empty label that was lurking around the</div><div class='del'>-	recurrence widgets.</div><div class='del'>-	Make the alarm widgets expand the right way.</div><div class='del'>-	Delete old recurrence widgets.</div><div class='del'>-</div><div class='del'>-2000-10-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (init_widgets): Connect to the recurrence</div><div class='del'>-	ending menu.</div><div class='del'>-	(recur_ending_selection_done_cb): Implemented.</div><div class='del'>-	(make_recurrence_ending_special): Implemented.</div><div class='del'>-	(make_recur_ending_until_special): Implemented.</div><div class='del'>-	(fill_ending_date): Implemented.</div><div class='del'>-	(make_recur_ending_count_special): Implemented.</div><div class='del'>-	(simple_recur_to_comp_object): Fill in the ending date.</div><div class='del'>-	(clear_widgets): Clear the recurrence ending widgets.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Moved the recurrence type radio</div><div class='del'>-	buttons to a single hbox to save space.</div><div class='del'>-	Fixed the lower value of the recurrence interval spin button.</div><div class='del'>-	Removed the stale widgets from the recurrence ending date part.</div><div class='del'>-</div><div class='del'>-2000-10-27  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: fixed problems in which I allocated CORBA</div><div class='del'>-	strings of 0 length, but then didn't NULL terminate them.</div><div class='del'>-</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (check_for_slow_setting): </div><div class='del'>-	Check boundary case of fast sync</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (check_for_slow_setting): ditto</div><div class='del'>-</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (add_archive_record): Remove</div><div class='del'>-	invalid test.</div><div class='del'>-	(local_record_from_comp): If the event is all day, mark it as timeless</div><div class='del'>-	(comp_from_remote_record): Timeless events take up all day</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (add_archive_record): ditto</div><div class='del'>-</div><div class='del'>-2000-10-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (add_archive_record): Take proper</div><div class='del'>-	number of parameters</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (add_archive_record): ditto</div><div class='del'>-</div><div class='del'>-2000-10-26  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (EventEditorPrivate): Integrate Anna's new</div><div class='del'>-	recurrence page.  Replace the old widget pointers with the new</div><div class='del'>-	ones.  Modified the relevant functions accordingly and added</div><div class='del'>-	plenty of new ones.</div><div class='del'>-	(event_editor_get_cal_client): New function.</div><div class='del'>-	(fill_recurrence_widgets): This is *THE* tricky function for you.</div><div class='del'>-	It has to discriminate whether we get a recurrence we support for</div><div class='del'>-	editing or not.  And this is not trivial.  Sigh.</div><div class='del'>-	(event_editor_update_widgets): Added preconditions and API docs.</div><div class='del'>-</div><div class='del'>-	* event-editor-dialog.glade: Fixed all the spacings/</div><div class='del'>-	paddings/packing options so that the widgets will look right if</div><div class='del'>-	the dialog box is resized.  Also fixes some misaligned widgets.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_set_rdate_list): Removed</div><div class='del'>-	incorrect assertion.</div><div class='del'>-</div><div class='del'>-2000-10-26  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (str_tolower): unsigned chars to isalpha</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (weekdaylist, weekdaynum): ditto.</div><div class='del'>-</div><div class='del'>-2000-10-25  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: brushed up some code to deal with</div><div class='del'>-	the organizer entry, and solidified the CORBA memory-freeing</div><div class='del'>-	issues.</div><div class='del'>-</div><div class='del'>-2000-10-25  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* removed the Evolution-Composer generated files, due</div><div class='del'>-	to a tip on how we do things.</div><div class='del'>-</div><div class='del'>-2000-10-25  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: I fixed a bunch of memory-deallocation</div><div class='del'>-	bugs, and finished the initial integration with the mailer.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: made the build us the Evolution-Composer.idl</div><div class='del'>-	from the composer directory.</div><div class='del'>-</div><div class='del'>-2000-10-25  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Evolution-Composer.idl: added this from the composer IDL sources</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: changed to reflect the above IDL and the associated</div><div class='del'>-	orbit-idl generated files.</div><div class='del'>-</div><div class='del'>-	* gui/Evolution-Composer.h,</div><div class='del'>-	  gui/Evolution-Composer-common.c,</div><div class='del'>-	  gui/Evolution-Composer-stubs.c,</div><div class='del'>-	  gui/Evolution-Composer-skels.c:</div><div class='del'>-	the generated files, as per the above description.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: more work towards mailer integration.</div><div class='del'>-</div><div class='del'>-2000-10-24  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: I've added code to interact with the mailer's</div><div class='del'>-	CORBA interfaces, though it's not yet working.</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_comp): Use</div><div class='del'>-	new e-pilot-map lookup function</div><div class='del'>-	(match): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp): Use</div><div class='del'>-	new e-pilot-map lookup function</div><div class='del'>-	(match): ditto</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES):</div><div class='del'>-	* gui/dialogs/Makefile.am (INCLUDES):</div><div class='del'>-	* gui/Makefile.am (INCLUDES):</div><div class='del'>-	* cal-util/Makefile.am (INCLUDES):</div><div class='del'>-	* cal-client/Makefile.am (INCLUDES): Update GNOMELOCALEDIR.</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Use new libeconduit calls and</div><div class='del'>-	abstraction</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: Add libeconduit-static.la</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (post_sync): Use e_pilot_map_write</div><div class='del'>-	(pre_sync): Use e_pilot_map_read</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Add libeconduit-static.la</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (post_sync): Use e_pilot_map_write</div><div class='del'>-	(pre_sync): Use e_pilot_map_read</div><div class='del'>-</div><div class='del'>-2000-10-21  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.c</div><div class='del'>-	(cal_prefs_dialog_use_24_hour_toggled): removed debug message.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_save_state): new function</div><div class='del'>-	to save the state of the table to a given file.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.h (struct _ECalendarTable): added etable field</div><div class='del'>-	so we can access it to save the state.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_destroy): call</div><div class='del'>-	e_calendar_table_save_state() to save the state of the TaskPad.</div><div class='del'>-	(setup_widgets): load the state of the TaskPad.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c: added support for the default view.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_construct):</div><div class='del'>-	(gnome_calendar_set_view_internal): use/set the default view setting.</div><div class='del'>-</div><div class='del'>-2000-10-20  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-editor.c: added more (working) integration with the</div><div class='del'>-	meeting schedular.</div><div class='del'>-</div><div class='del'>-2000-10-20  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-utils/cal-component.c: in set_datetime(), I put an #if 0'd portion</div><div class='del'>-	of the code back into operation, because the icalproperty_remove_parameter()</div><div class='del'>-	function is now implemented.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-editor.c: added more (unworking) integration with the</div><div class='del'>-	meeting schedular.</div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_destroy): New destroy</div><div class='del'>-	handler to properly stop the timer, sync the log and unref</div><div class='del'>-	the URI.</div><div class='del'>-	(cal_backend_last_client_gone): Just emit the signal,</div><div class='del'>-	clean up work is done in cal_backend_destroy now.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_load): Unref the</div><div class='del'>-	uri we are replacing NOT the new uri.</div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Fix build</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: Fix build</div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (delete_archive_record):</div><div class='del'>-	Don't throw an error</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (delete_archive_record): ditto</div><div class='del'>-</div><div class='del'>-2000-10-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c: Add defines</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions</div><div class='del'>-	can't make this a public interface in the usual way as then the</div><div class='del'>-	symbols would be exported</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be</div><div class='del'>-	happy! Add some defines to include only the necessary config functions.</div><div class='del'>-	(conduit_get_gpilot_conduit): Hook up archive signals</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Same as above</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-control-applet.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h: ditto</div><div class='del'>-</div><div class='del'>-2000-10-20  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h: s/BonoboUIHandler/BonoboUIComponent/</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (properties_cmd): ditto.</div><div class='del'>-</div><div class='del'>-2000-10-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_value_at): use</div><div class='del'>-	cal_component_has_alarms().</div><div class='del'>-</div><div class='del'>-2000-10-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): added</div><div class='del'>-	_click-to-add-message, though I'm not sure if i18n will work.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_obj_time_add_hours):</div><div class='del'>-	(cal_obj_time_add_minutes):</div><div class='del'>-	(cal_obj_time_add_seconds): updated to handle -ve args.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_add_day): set tm_isdst to -1 before calling</div><div class='del'>-	mktime().</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_chunk): don't call the</div><div class='del'>-	callback if the event ends exactly on the interval start time.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_reshape_event_span):</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_reshape_long_event):</div><div class='del'>-	(e_day_view_reshape_day_event): use cal_component_has_alarms().</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.[hc]: added cal_component_has_alarms().</div><div class='del'>-</div><div class='del'>-2000-10-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.c (config_read): set default MonthVPanePosition</div><div class='del'>-	to 1 rather than 0, so if you move the hpane you'll see the date</div><div class='del'>-	navigator.</div><div class='del'>-</div><div class='del'>-2000-10-19  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.[ch]: added a public function which causes the</div><div class='del'>-	event editor to reload its widgets to the associated CalComponent.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: added rudimentary support for the phat</div><div class='del'>-	e-meeting-time-selector widget, though it has no effect on the</div><div class='del'>-	component yet.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: the meeting editor depends on the meeting widget</div><div class='del'>-	library, now.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: I added another toolbar button that summons</div><div class='del'>-	from the hoary deep the meeting time widget.</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Add `event-editor-dialog.glade.h'.</div><div class='del'>-	(EXTRA_DIST): Add `$(glade_messages)'.</div><div class='del'>-</div><div class='del'>-2000-10-19  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (tb_print_cb): remove; redundant.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (create_menu, create_toolbar): kill.</div><div class='del'>-	(event_editor_destroy): upd.</div><div class='del'>-	(event_editor_construct): update to new UI handler, cast</div><div class='del'>-	priv-&gt;general_summary to a widget not an object.</div><div class='del'>-</div><div class='del'>-2000-10-18  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (create_menu, create_toolbar): die.</div><div class='del'>-	(debug_xml_cb): add debugging hook.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: add EVOLUTION_DATADIR</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c (task_editor_construct): upd for new UI.</div><div class='del'>-</div><div class='del'>-2000-10-17  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c: Add defines</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: put #ifdefs around functions</div><div class='del'>-	can't make this a public interface in the usual way as then the</div><div class='del'>-	symbols would be exported</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Kill warnings. clahey will be</div><div class='del'>-	happy! Add some defines to include only the necessary config functions.</div><div class='del'>-	(conduit_get_gpilot_conduit): Hook up archive signals</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Same as above</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-control-applet.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-config.h: ditto</div><div class='del'>-</div><div class='del'>-2000-10-16  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: You can now add incoming iTip</div><div class='del'>-	messages to your calendar store.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: added a progress bar dialog</div><div class='del'>-	in case the calendar loading takes a long time.</div><div class='del'>-</div><div class='del'>-2000-10-16  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: Remove pilot cruft.  All pilot stuff</div><div class='del'>-	is in the conduits now and uses the logging facility.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c: ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c: ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c: ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal.h: ditto</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: ditto</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (local_record_from_comp):</div><div class='del'>-	Take a stab at storing recurrence stuff on the pilot properly</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_update_object): Don't log the</div><div class='del'>-	event until after the update in case its a new item</div><div class='del'>-</div><div class='del'>-2000-10-16  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dayview.xpm, gui/workweekview.xpm, gui/weekview.xpm</div><div class='del'>-	gui/monthview.xpm gui/yearview.xpm: Updated icons, let me know</div><div class='del'>-	if you like these or not, I might work on these some more but</div><div class='del'>-	I wanted to put these versions up anyway to get feedback..</div><div class='del'>-</div><div class='del'>-2000-10-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove CPPFLAGS def since the -D there was</div><div class='del'>-	already in INCLUDES</div><div class='del'>-</div><div class='del'>-2000-10-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.oafinfo: Added an</div><div class='del'>-	"evolution:shell-component-icon" attribute.</div><div class='del'>-</div><div class='del'>-2000-10-12  Jesse Pavel &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.{c,glade}: Made the control much more</div><div class='del'>-	relavent to the function at hand.</div><div class='del'>-</div><div class='del'>-2000-10-12  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (E_CALENDAR_TABLE_SPEC): set the 2 icon</div><div class='del'>-	columns to a min width of 18 and resizable to FALSE.</div><div class='del'>-</div><div class='del'>-2000-10-12  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate):</div><div class='del'>-	(update_pixmaps):</div><div class='del'>-	(set_pixmap): set the pixmaps of the toolbar buttons for the views,</div><div class='del'>-	and removed a lot of old unused stuff. We'll use plain buttons for</div><div class='del'>-	the view buttons for now, until Bonobo toolbars support radio buttons.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_dayjump): check day_button is not</div><div class='del'>-	NULL before using it.</div><div class='del'>-	(gnome_calendar_update_view_buttons): check button is not NULL.</div><div class='del'>-</div><div class='del'>-2000-10-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw): got 12/24</div><div class='del'>-	hour format the wrong way round.</div><div class='del'>-</div><div class='del'>-2000-10-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (comp_from_remote_record):</div><div class='del'>-	Store recurrence stuff on the desktop properly</div><div class='del'>-	(get_ical_day): Utility function</div><div class='del'>-</div><div class='del'>-2000-10-12  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: Disable the executive summary.</div><div class='del'>-</div><div class='del'>-2000-10-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_entry): Take CalObjType</div><div class='del'>-	as a param because its impossible to determine after a delete.</div><div class='del'>-	(cal_backend_remove_object): Calculate CalObjType and pass</div><div class='del'>-	it to cal_backend_log_entry</div><div class='del'>-	(cal_backend_update_object): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_comp): Kill</div><div class='del'>-	unused variables.</div><div class='del'>-	(add_archive_record): Don't kill the sync if this happens</div><div class='del'>-	(update_record): Kill old function</div><div class='del'>-	(replace_record): New function to handle replace_record signal</div><div class='del'>-	(conduit_get_gpilot_conduit): Listen for replace record signal</div><div class='del'>-	(add_record): Always add a new record, never replace</div><div class='del'>-	(replace_record): Always replace an existing record</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Same as above</div><div class='del'>-</div><div class='del'>-2000-10-10  Jesse Pavel  &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.c: set a default size for the control.</div><div class='del'>-</div><div class='del'>-2000-10-10  Jesse Pavel  &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.oafinfo: Added information about the</div><div class='del'>-	text/calendar MIME type, so that the evolution-calendar is called</div><div class='del'>-	to deal with iMIP attachments.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.[ch]: These files implement a Bonobo</div><div class='del'>-	control that will eventually deal with iMIP/iTIP messages from</div><div class='del'>-	the mailer. Right now, it's not working.</div><div class='del'>-</div><div class='del'>-	* gui/e-itip-control.glade: The Glade GUI for the above-mentioned</div><div class='del'>-	control.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: added references to the files I created.</div><div class='del'>-</div><div class='del'>-	* gui/main.c: called the initialization function of the Bonobo</div><div class='del'>-	control factory.</div><div class='del'>-</div><div class='del'>-2000-10-11  Tuomas Kuosmanen  &lt;tigert@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/task-assigned-to.xpm gui/task-assigned.xpm</div><div class='del'>-	gui/recur.xpm gui/task-recurring.xpm gui/task.xpm:</div><div class='del'>-	New versions of the icons for the tasklist/pad.</div><div class='del'>-</div><div class='del'>-2000-10-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_unset_cb): don't free evolution_dir</div><div class='del'>-	as we need it to save the config settings.</div><div class='del'>-</div><div class='del'>-2000-10-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): call calendar_config_write_on_exit() to write</div><div class='del'>-	out some special config settings (as the mail component does).</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (properties_cmd): changed to use the new</div><div class='del'>-	preferences dialog.</div><div class='del'>-	(update_all_config_settings): new function to iterate over all the</div><div class='del'>-	calendars and update the config settings.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.glade: preferences dialog.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/cal-prefs-dialog.[hc]: new files for the preferences</div><div class='del'>-	dialog.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-config.[hc]: new files to handle loading/saving config</div><div class='del'>-	settings.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: fixed bug in YEARLY when no filters were set,</div><div class='del'>-	plus minor changes.</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: updated.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c:</div><div class='del'>-	* gui/popup-menu.c: update to #include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): called calendar_config_init.</div><div class='del'>-	(owner_set_cb):</div><div class='del'>-	(owner_unset_cb): updated the prototypes.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): added call to calendar_config_write_on_exit().</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.h:</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): added global evolution_dir</div><div class='del'>-	just like the mail component, so we know we to store config stuff.</div><div class='del'>-</div><div class='del'>-2000-10-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Fixed the column elements here.</div><div class='del'>-</div><div class='del'>-2000-10-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Updated to use the new ETable</div><div class='del'>-	specification stuff.</div><div class='del'>-</div><div class='del'>-2000-10-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (map_sax_start_element): The</div><div class='del'>-	element is "pilot_id" not "pilotid".  Update both maps</div><div class='del'>-	(compute_pid): Utility function to set a local records pid</div><div class='del'>-	(local_record_from_comp): Compute the pid and status here,</div><div class='del'>-	no longer use the old cal_component pilot interfaces</div><div class='del'>-	(free_match): Its a *local not a **local</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: same as above</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Have both a uid and pid map</div><div class='del'>-</div><div class='del'>-	* conduits/todo/calendar-conduit.h: same as above</div><div class='del'>-</div><div class='del'>-2000-10-09  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/*: Adjust to using gnome-pilot-sync-abs conduit which</div><div class='del'>-	is based on the latest pilot link changes.</div><div class='del'>-</div><div class='del'>-2000-10-09  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the executive-summary library and cflags</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.oafinfo: Added oaf servers for the</div><div class='del'>-	executive summary and executive summary factory.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-summary.[ch]: New files to create the summary.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (summary_fn): Create the executive</div><div class='del'>-	summary component.</div><div class='del'>-	(component_factory_init): Start the summary factory as well.</div><div class='del'>-</div><div class='del'>-2000-10-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/weekday-picker.[ch]: New widget to pick weekdays.</div><div class='del'>-</div><div class='del'>-2000-10-05  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: upd.</div><div class='del'>-	(calendar_control_activate): upd.</div><div class='del'>-	(calendar_control_deactivate): upd.</div><div class='del'>-</div><div class='del'>-2000-10-05  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c:</div><div class='del'>-	* gui/e-week-view.c: when the user types in a new event, don't create</div><div class='del'>-	it until the user hits Return or switches focus. Removed the</div><div class='del'>-	editing_new_event flags.</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: rewritten to work on ics files. Now I can</div><div class='del'>-	start testing the recurrence code.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: a few fixes.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_check_if_new_event_fits): fixed to</div><div class='del'>-	return TRUE for long events, not FALSE.</div><div class='del'>-</div><div class='del'>-2000-10-04  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_todo_details): As a temporary solution to the</div><div class='del'>-	to-do printing, just print the summaries.  We'll use the ETable</div><div class='del'>-	printing stuff later.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_day_summary_cb): Use g_list_append() correctly.</div><div class='del'>-	(print_todo_details_cb): Likewise.</div><div class='del'>-	(print_day_summary): Initialize psi.events.  This code was</div><div class='del'>-	obviously never tested.</div><div class='del'>-	(print_todo_details): Likewise.</div><div class='del'>-	(print_day_details): Initialize pdi.slots.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (range_selector_new): Fix strftime() %a versus %b</div><div class='del'>-	confusion.  Fixes bugzilla #644.</div><div class='del'>-	(range_selector_new): Fix the whole localization mess by making</div><div class='del'>-	better use of strftime().  Now we generate whole date strings at a</div><div class='del'>-	time and compose them later.  Fixes bugzilla #643.</div><div class='del'>-</div><div class='del'>-2000-10-02  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: added support for the ROLE and RSVP parameters</div><div class='del'>-	in both the GUI and underlying iCal.</div><div class='del'>-</div><div class='del'>-2000-09-29  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: added support for organizers in the meeting</div><div class='del'>-	scheduler.</div><div class='del'>-</div><div class='del'>-2000-09-29  Jesse Pavel   &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.c: added code that makes changes to the underlying</div><div class='del'>-	iCAL structure of an event, when the user changes meeting information.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-dialog.glade: this is the Glade UI for the meeting dialog</div><div class='del'>-	and accoutrements.</div><div class='del'>-</div><div class='del'>-2000-09-29  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: updated to support RDATE end times or</div><div class='del'>-	durations. Note that if you have two RDATEs with the same start times,</div><div class='del'>-	but with different end dates/durations set, the results are</div><div class='del'>-	unpredictable. So the event editor dialog should check for this.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):</div><div class='del'>-	make strftime() strings translatable, and changed the formats a bit.</div><div class='del'>-</div><div class='del'>-	* NOTE: someone needs to check print.c to make sure strftime strings</div><div class='del'>-	are OK for i18n.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.h: Changed EDayViewDateFormat enum. We now try to</div><div class='del'>-	include the weekday if possible. Also changed EDayView struct so we</div><div class='del'>-	store the month &amp; weekdays with the longest names rather than the</div><div class='del'>-	actual widths. This helps i18n.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_recalc_cell_sizes): used _() for</div><div class='del'>-	strftime strings, tried to see if weekday fits, and rearranged a</div><div class='del'>-	bit to make i18n easier.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw): used _() for</div><div class='del'>-	strftime strings, and updated to use new formats.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: added use_24_hour_format boolean to</div><div class='del'>-	CalendarModelPrivate so we can display dates in 12-hour format if</div><div class='del'>-	requested. This meant adding a CalendarModel argument to a few</div><div class='del'>-	functions. Also added get/set functions to set use_24_hour_format.</div><div class='del'>-	I suppose ideally we should have an ECellDate renderer and this option</div><div class='del'>-	should go there.</div><div class='del'>-</div><div class='del'>-2000-09-27  Jesse Pavel	  &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: changed a menu entry so that it will invoke</div><div class='del'>-	my meeting editor.</div><div class='del'>-</div><div class='del'>-	* gui/e-meeting-edit.[ch]: added these files to provide preliminary</div><div class='del'>-	support for iTIP meeting scheduling. Currently, only the GUI works;</div><div class='del'>-	there is not yet any backend support.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: added entries for e-meeting-edit.[ch]</div><div class='del'>-</div><div class='del'>-2000-09-24  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: set the height of the scrolled</div><div class='del'>-	window for the description field, since the default window height</div><div class='del'>-	doesn't seem to be working.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: added functions to get the actual</div><div class='del'>-	icalproperty lists for RRULE and EXRULE properties.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.[hc]: added support for COUNT, though I need to</div><div class='del'>-	test it a bit. Also fixed the call to generate_instances_for_year() so</div><div class='del'>-	it uses the chunk dates.</div><div class='del'>-</div><div class='del'>-2000-09-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: got rid of 1 '_' in '__Formatting'.</div><div class='del'>-</div><div class='del'>-2000-09-22  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): upd.</div><div class='del'>-</div><div class='del'>-2000-09-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (verbs): Removed the "about calendar"</div><div class='del'>-	command, since we don't want to have both "About Evolution" and</div><div class='del'>-	"About Calendar".</div><div class='del'>-</div><div class='del'>-2000-09-21  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): _UIHandler</div><div class='del'>-	update.</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (pre_sync): Don't fail if there</div><div class='del'>-	is no map file.</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Add since field to context</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (map_set_node_timet): New utility</div><div class='del'>-	function</div><div class='del'>-	(map_sax_start_element): Look for the map timestamp as well</div><div class='del'>-	(map_write): Write the map timestamp</div><div class='del'>-	(pre_sync): Use the map time stamp when looking for changed entries</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Make sure</div><div class='del'>-	we are in a valid timestamp</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_name): Make the log file</div><div class='del'>-	name relevant to the actual calendar file, rather than just the</div><div class='del'>-	directory.</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_log_entries): Oops</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_log_entries): Use a local</div><div class='del'>-	sax handler.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (pre_sync): Use xmlSAXParseFile</div><div class='del'>-	(map_sax_parse): Delete</div><div class='del'>-</div><div class='del'>-2000-09-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_log_sax_start_element): Properly</div><div class='del'>-	assign the CalObjChange type.</div><div class='del'>-	(cal_backend_log_sax_parse): Delete</div><div class='del'>-	(cal_backend_get_log_entries): Use xmlSAXUserParseFile</div><div class='del'>-</div><div class='del'>-2000-09-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_set_uri): New utility function</div><div class='del'>-	(cal_backend_load): use above</div><div class='del'>-	(cal_backend_create): use above</div><div class='del'>-	(cal_backend_log_name): Take a uri instead of a backend param</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c: Get rid of useless hash functions</div><div class='del'>-	(cal_backend_file_load): Check to make sure path exists and is</div><div class='del'>-	local</div><div class='del'>-	(cal_backend_file_load): Unref the current uri if there is one</div><div class='del'>-	(cal_backend_file_create): ditto</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_last_client_gone): Sync before</div><div class='del'>-	shooting ourselves in the foot</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (save): Fully implement backing up the</div><div class='del'>-	calendar before writing out the new entry.</div><div class='del'>-</div><div class='del'>-2000-09-19  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (check_for_slow_setting): Add some</div><div class='del'>-	other cases where a slow sync is in order</div><div class='del'>-	(pre_sync): Pre load the uids, the map and the add/mod/del lists</div><div class='del'>-	(match_record): Use the map hash to match records</div><div class='del'>-	(iterate): Iterate using the pre-loaded uid list</div><div class='del'>-	(iterate_specific): Iterate using the add/mod/del lists</div><div class='del'>-	(purge): Delete all entries in the del list</div><div class='del'>-	(set_status): Set status by adding to an appropriate list</div><div class='del'>-	(set_pilot_id): Set pilot_id by updating map hash</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Add lists for added, modified and</div><div class='del'>-	deleted objects</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (map_name): Get the pilot_id-&gt;uid map</div><div class='del'>-	file name</div><div class='del'>-	(map_sax_start_element): SAX handler to extract a pilot_id-&gt;uid</div><div class='del'>-	mapping</div><div class='del'>-	(map_sax_parse): Parse the given file and build a pilot_id-&gt;uid hash</div><div class='del'>-	(map_write_foreach): Write out individual mapping elements</div><div class='del'>-	(map_write): Write out the pilot_id-&gt;uid mapping</div><div class='del'>-	(start_calendar_server_cb): Rename from gnome_calendar_load_cb</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: Rename pilotID to pilot_id</div><div class='del'>-</div><div class='del'>-	* conduits/todo/e-todo.conduit.in: A little renaming</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Fix build slightly</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (build_change_seq): Build a corba sequence out of a list</div><div class='del'>-	of CalObjChanges</div><div class='del'>-	(Cal_get_objects_in_range): Implement new corba function</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_init): Intiliaze to NULL</div><div class='del'>-	(cal_backend_load): Track the uri so we can write the log file</div><div class='del'>-	to the same place</div><div class='del'>-	(cal_backend_log_name): Figure out the log filename/path based on</div><div class='del'>-	the calendar uri</div><div class='del'>-	(cal_backend_set_node_timet): Set an xml node property value from</div><div class='del'>-	a time_t</div><div class='del'>-	(cal_backend_log_entry): Adds a log entry to list waiting to be written</div><div class='del'>-	out</div><div class='del'>-	(cal_backend_log_sync): Syncs the log entries to disk</div><div class='del'>-	(cal_backend_log_sax_start_element): SAX callback for reading in</div><div class='del'>-	log entries</div><div class='del'>-	(cal_backend_log_sax_end_element): ditto</div><div class='del'>-	(cal_backend_log_sax_parse): Main SAX parser call to parse the log</div><div class='del'>-	file looking for particular log entries and creating a CalObjChange</div><div class='del'>-	hash with the last change for each object</div><div class='del'>-	(cal_backend_get_log_entries): Returns a hash of objects of a given</div><div class='del'>-	type changed since the given time</div><div class='del'>-	(cal_backend_update_object): Add appropriate log entries</div><div class='del'>-	(cal_backend_remove_object): ditto</div><div class='del'>-	(cal_backend_get_changed_uids): Implement new idl interface call</div><div class='del'>-	(cal_backend_foreach_changed): Convert CalObjChange hash into a list</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.[hc]: Remove crufty files</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_type_by_uid): New</div><div class='del'>-	function that returns the CalObjType for a uid.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: Update prototypes.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (build_change_list): Build a list</div><div class='del'>-	of CalObjChange items from a corba sequence.</div><div class='del'>-	(cal_client_get_changed_uids): New accessor method for the</div><div class='del'>-	similarly named addition to the idl file.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: Update prototypes and add CalObjChangeType</div><div class='del'>-	enum.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_obj_change_list_free): New utility</div><div class='del'>-	method to free a list of CalObjChange objects.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl: Add get_changed_uids method</div><div class='del'>-	and associated types.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and</div><div class='del'>-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.h, gui/e-calendar-table.c, gui/e-day-view.c,</div><div class='del'>-	gui/e-week-view-event-item.c, gui/e-week-view.c,</div><div class='del'>-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/main.c,</div><div class='del'>-	gui/print.c, gui/dialogs/task-editor.c: Fixed the #include lines</div><div class='del'>-	to deal properly with gal.</div><div class='del'>-</div><div class='del'>-	* gui/check-filled.xpm: New file since we can't include it from</div><div class='del'>-	e-table anymore.</div><div class='del'>-</div><div class='del'>-2000-09-16  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (INCLUDES): add datadir</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): use it.</div><div class='del'>-</div><div class='del'>-2000-09-14  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/.cvsignore: Shush</div><div class='del'>-</div><div class='del'>-2000-09-14  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Add headers with GPL notice and credit copyright to those appropriate</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c (doHelp): Update name,</div><div class='del'>-	authors, copyright for about dialog.</div><div class='del'>-	(activate_sync_type): Tidy</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Rename binaries and libs to e-todo*</div><div class='del'>-	to avoid conflicts.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/e-todo.conduit.in: Reflect binary/lib name changes</div><div class='del'>-</div><div class='del'>-	* conduits/todo/e-todo-conduit-control-applet.desktop: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo.conduit.in: Removed</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.desktop: Removed</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h (todoconduit_load_configuration):</div><div class='del'>-	The config file will now be called e-todo-conduit</div><div class='del'>-	(todoconduit_save_configuration): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Some renaming to keep consistent.</div><div class='del'>-	(pre_sync): Remove commented out function that does not exist.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: ditto</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-09-07  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: Re-write most UI handler code.</div><div class='del'>-</div><div class='del'>-2000-09-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (obj_updated_cb): Removed an unused</div><div class='del'>-	variable.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (obj_updated_cb): See if the new object</div><div class='del'>-	matches the type of objects we were told to deal with.</div><div class='del'>-	(load_objects): Likewise.</div><div class='del'>-</div><div class='del'>-2000-09-13  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (remove_component): Only remove the pilot</div><div class='del'>-	item from the hash if it exists in the first place.</div><div class='del'>-</div><div class='del'>-2000-09-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (add_component): plug leakage</div><div class='del'>-</div><div class='del'>-2000-09-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: Hack to compile for distcheck.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: Remove calobj.h dependency</div><div class='del'>-</div><div class='del'>-2000-09-12  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_load): Use g_int_*</div><div class='del'>-	for now</div><div class='del'>-	(cal_backend_file_create): ditto</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_compobject): Make</div><div class='del'>-	this actually fill in the todo record.</div><div class='del'>-	(find_record_in_repository): Add debug stuff</div><div class='del'>-	(iterate_specific): Use the already exisiting utility function</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id): correct</div><div class='del'>-	the status and id types. g_strdup the uid since this is not a</div><div class='del'>-	constified return</div><div class='del'>-	(cal_backend_file_get_uid_by_pilot_id): correct the id type</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove `ui.xml' stuff.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c: Dont' #include calobj.h anymore as it's gone.</div><div class='del'>-</div><div class='del'>-2000-09-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_construct): Connect to the</div><div class='del'>-	"cal_loaded" signal of the client here.</div><div class='del'>-	(connect_load): Removed function.</div><div class='del'>-	(disconnect_load): Removed function.</div><div class='del'>-	(cal_loaded_cb): Store the URI we are loading in the GnomeCal</div><div class='del'>-	structure instead of in a weird closure.  This gets rid of the</div><div class='del'>-	connect/disconnect mess as well.</div><div class='del'>-	(gnome_calendar_open): Store the URI in the GnomeCal.</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: Fixed a warning (removed unused variable</div><div class='del'>-	gfloat width from e_day_view_get_event_position.)</div><div class='del'>-</div><div class='del'>-2000-09-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Handle renaming, header cleanup</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Rename GCalLocalRecord to</div><div class='del'>-	EToDoLocalRecord, header cleanup</div><div class='del'>-</div><div class='del'>-2000-09-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Use</div><div class='del'>-	description list instead of comment list for pilot todo note</div><div class='del'>-	(transmit): Check for null cal component properties, set priority</div><div class='del'>-	correctly, use description list instead of comment list.  Make</div><div class='del'>-	pilot record private when appropriate.</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (comp_from_remote_record): Only</div><div class='del'>-	set the due date only if it exists</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_complete): Relying on the status</div><div class='del'>-	field is somewhat faulty since it is related to group scheduling</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (update_calendar_entry_in_repository):</div><div class='del'>-	Make log output a little more sensible</div><div class='del'>-	(comp_from_remote_record): Minor correction when making a CalComponent</div><div class='del'>-	from scratch.</div><div class='del'>-	(update_record): Use comp_from_remote_record for new items, rather</div><div class='del'>-	than repeating the code here.</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Remove catch_ret_val function</div><div class='del'>-	since its no longer useful.  Fix naming of various fields from</div><div class='del'>-	the header changes.  Use GnomePilotRecord* stuff instead of</div><div class='del'>-	ICAL_PILOT_SYNC_*</div><div class='del'>-	(e_todo_context_new): Rename from gcalconduit_new_context. Now takes</div><div class='del'>-	a pilot id and loads the configuration here</div><div class='del'>-	(e_todo_context_destroy): Rename from gcalconduit_destroy_context.</div><div class='del'>-	Unref the client and destroy the configuration if they exist here</div><div class='del'>-	(start_calendar_server): Change the default calendar name</div><div class='del'>-	(local_record_from_comp_uid): Rename from local_record_from_ical_uid</div><div class='del'>-	(local_record_from_compobject): Rename from</div><div class='del'>-	local_record_from_icalobject.  Properly do the pilot id and status.</div><div class='del'>-	(comp_from_remote_record): Rename from ical_from_remote_record.</div><div class='del'>-	Handle due, complete, classification and pilot stuff properly</div><div class='del'>-	(pre_sync): Remove some old stuff.  We need to figure out how to</div><div class='del'>-	set some of the field values.</div><div class='del'>-	(set_status): Reflect pilot status changes from above</div><div class='del'>-	(conduit_destroy_gpilot_conduit): Remove cleanup stuff that is</div><div class='del'>-	now done by e_todo_context_destroy</div><div class='del'>-	(conduit_get_gpilot_conduit): Only set the context as object</div><div class='del'>-	data of the conduit.</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Rename GCalConduitContext to</div><div class='del'>-	EToDoConduitContext.  Remove some unused struct fields.</div><div class='del'>-	For GCalLocalRecord, rename ical to comp.</div><div class='del'>-</div><div class='del'>-2000-09-11  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: changed to use EDateEdit.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: added "None" option to</div><div class='del'>-	Classification option menu, and used custom widgets for the date</div><div class='del'>-	entries so we can use EDateEdit widgets.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: changed to use EDateEdit. Note that this needs</div><div class='del'>-	to be fixed at some point to handle invalid dates, i.e. when</div><div class='del'>-	e_date_edit_get_time returns -1.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (ensure_task_complete):</div><div class='del'>-	(ensure_task_not_complete): new functions to set the related properties</div><div class='del'>-	to make sure a task is marked as complete on not, i.e. "Date Completed"</div><div class='del'>-	"Status" and "Percent" properties.</div><div class='del'>-</div><div class='del'>-2000-09-08  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_complete): use the status field rather</div><div class='del'>-	than the completed date, as it is more reliable.</div><div class='del'>-	(get_is_overdue): use get_is_complete().</div><div class='del'>-	(calendar_model_mark_task_complete): check if it is already complete,</div><div class='del'>-	and if so don't update it.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_status):</div><div class='del'>-	(cal_component_set_status): added functions to support the STATUS</div><div class='del'>-	property. Also added the property to CalComponentPrivate and set it</div><div class='del'>-	to NULL in free_icalcomponent(). Someone should check my code as I've</div><div class='del'>-	mainly done a Cut &amp; Paste job.</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-	* conduits/todo/todo-conduit.c: Convert "//" style comments</div><div class='del'>-	(local_record_from_ical_uid): Remove iCalObject cruft</div><div class='del'>-	(ical_from_remote_record): ditto</div><div class='del'>-	(free_match): Properly unref the CalComponent</div><div class='del'>-</div><div class='del'>-2000-09-10  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (local_record_from_icalobject): Use</div><div class='del'>-	cal component pilot stuff properly</div><div class='del'>-	(find_record_in_repository): Remove cruft</div><div class='del'>-	(ical_from_remote_record): Remove cruft</div><div class='del'>-	(update_record): Set the vtype immediately after creation. Remove cruft</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.h: Remove iCalObject stuff</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-config.h: Move all the config stuff</div><div class='del'>-	here, I need to kill the warnings at some point</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.c (doRevertSettings):</div><div class='del'>-	Set all the state variables correctly on a revert</div><div class='del'>-	(doSaveSettings): Update original state</div><div class='del'>-	(doHelp): Rename from about_cb</div><div class='del'>-	(main): Destroy configurations when done</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Tidy</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cbf_pilot_hash): Function for hashing</div><div class='del'>-	pilot ids</div><div class='del'>-	(cbf_pilot_equal): For hash table of pilot ids</div><div class='del'>-	(cal_backend_file_destroy): Destroy pilot id hash</div><div class='del'>-	(add_component): Insert the uid into the pilot hash</div><div class='del'>-	(remove_component): Remove the uid from the pilot hash</div><div class='del'>-	(cal_backend_file_load): Create the pilot hash</div><div class='del'>-	(cal_backend_file_create): ditto</div><div class='del'>-	(cal_backend_file_get_uid_by_pilot_id): Implement using the pilot hash</div><div class='del'>-	(cal_backend_file_update_pilot_id): ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: Update prototypes</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_pilot_id): Implement</div><div class='del'>-	using ical X properties</div><div class='del'>-	(cal_component_set_pilot_id): ditto</div><div class='del'>-	(cal_component_get_pilot_status): ditto</div><div class='del'>-	(cal_component_set_pilot_status): ditto</div><div class='del'>-	(cal_component_free_pilot_id): Free a pilot id</div><div class='del'>-	(cal_component_free_pilot_status): Free a pilot status</div><div class='del'>-</div><div class='del'>-2000-09-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_builddir)/libical/src/libical' so that we get</div><div class='del'>-	`icalversion.h' from the build directory instead of taking it from</div><div class='del'>-	the installation directory, which is of course Wrong (tm).</div><div class='del'>-	* gui/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-2000-09-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (cal_loaded_cb): New function with the</div><div class='del'>-	loading/creation state machine.  It is carefully modelled after</div><div class='del'>-	the state machine that started the Universe, so bow before it.</div><div class='del'>-	(gnome_calendar_construct): Do not connect to cal_loaded here.</div><div class='del'>-	(connect_load): The closure for the cal_loaded callback is a bit</div><div class='del'>-	tricky, so provide a function to create it and connect to the</div><div class='del'>-	signal.</div><div class='del'>-	(disconnect_load): Disconnect from the signal and free the</div><div class='del'>-	closure.</div><div class='del'>-	(gnome_calendar_load_cb): Removed obsolete buggy function.</div><div class='del'>-	(gnome_calendar_open): Use the new mechanism.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (set_prop): The default filename is now</div><div class='del'>-	calendar.ics.</div><div class='del'>-</div><div class='del'>-2000-09-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (transmit): Use</div><div class='del'>-	icaltime_as_timet</div><div class='del'>-</div><div class='del'>-2000-09-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c, gui/e-day-view.c, gui/e-week-view.c,</div><div class='del'>-	gui/event-editor.c, gui/getdate.y, gui/gncal-todo.c,</div><div class='del'>-	gui/gnome-cal.c, gui/dialogs/task-editor.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-09-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am: Tidy</div><div class='del'>-</div><div class='del'>-	* conduits/todo/Makefile.am: Tidy</div><div class='del'>-</div><div class='del'>-2000-09-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Fall equinox cleanup!</div><div class='del'>-</div><div class='del'>-	OK, I know the equinox is not here yet, but weather has changed</div><div class='del'>-	enough to warrant it.</div><div class='del'>-</div><div class='del'>-	Sigh.  This place is definitely not the tropics.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (obj_updated_cb): Renamed from</div><div class='del'>-	gnome_calendar_object_updated_cb(); fixed prototype.</div><div class='del'>-	(obj_removed_cb): Renamed from gnome_calendar_object_removed_cb();</div><div class='del'>-	fixed prototype.</div><div class='del'>-	(GnomeCalendarPrivate): Moved all the GnomeCalendar fields to a</div><div class='del'>-	private structure so I don't have to rebuild the whole calendar</div><div class='del'>-	GUI directory every time something changes in the object.</div><div class='del'>-	(GnomeCalendarPrivate): Removed the property bag and the control</div><div class='del'>-	fields; they are local to the control-factory now.</div><div class='del'>-	(gnome_calendar_update_view_buttons): Remove the</div><div class='del'>-	ignore_view_button_clicks mess and just block the signal.</div><div class='del'>-	(gnome_calendar_set_view): Added a "focus" argument to indicate</div><div class='del'>-	whether we want the main widget in the specified view to grab the</div><div class='del'>-	focus.</div><div class='del'>-	(gnome_calendar_set_view_internal): Handle the focus argument here.</div><div class='del'>-	(gnome_calendar_set_view_buttons): Temporary hack to notify the</div><div class='del'>-	calendar about its buttons.</div><div class='del'>-	(gnome_calendar_get_selected_time_range): New function.</div><div class='del'>-	(gnome_calendar_get_cal_client): New function.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c (calendar_properties_init): Keep the</div><div class='del'>-	property bag local to here; it does not need to be in the calendar</div><div class='del'>-	object yet.</div><div class='del'>-	(control_factory_fn): Renamed from control_factory().  Just use</div><div class='del'>-	control_factory_new_control().</div><div class='del'>-	(control_factory_new_control): Moved the stuff over from</div><div class='del'>-	create_control(), and keep the control local to here.  Check the</div><div class='del'>-	return value of bonobo_control_new().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (show_day_view_clicked): Remove the</div><div class='del'>-	ignore_view_button_clicks mess.</div><div class='del'>-	(new_calendar): Removed the useless "page" argument.</div><div class='del'>-	(calendar_control_activate): Use gnome_calendar_set_view_buttons()</div><div class='del'>-	for now.</div><div class='del'>-</div><div class='del'>-2000-09-07  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Added -lunicode</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.c: More UTF-8 wrappers</div><div class='del'>-	(priority_index_to_value): Kill warning, add assertion</div><div class='del'>-</div><div class='del'>-2000-09-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	Use new cal_component_has_recurrences convenience function</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_show_popup_menu): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_value_at): ditto</div><div class='del'>-	(calendar_model_value_at): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_event_click): ditto</div><div class='del'>-	(e_day_view_on_event_right_click): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_motion): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_motion): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_motion): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_motion): ditto</div><div class='del'>-	(e_day_view_reshape_day_event): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw_long_event):</div><div class='del'>-	ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_long_event_click): ditto</div><div class='del'>-</div><div class='del'>-2000-09-06  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_generate_instances): Use</div><div class='del'>-	new convenience functions and only get the recurrence</div><div class='del'>-	stuff if needed.  Free the recurrence stuff if used.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h: Add new prototypes</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_has_exrules): Utility</div><div class='del'>-	function to determine whether a cal component has any exrules</div><div class='del'>-	(cal_component_has_exdates): Ditto for exdates</div><div class='del'>-	(cal_component_has_exceptions): Utility function to determine</div><div class='del'>-	whether a cal component has any exception rules</div><div class='del'>-	(cal_component_has_recurrences):Utility function to determine</div><div class='del'>-	whether a cal component has any recurrence rules</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Kill all exdates if</div><div class='del'>-	there are no dates in the box</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_year): Add a special</div><div class='del'>-	case for when there are exceptions but no rrules or rdates.</div><div class='del'>-	(cal_obj_remove_exceptions): Use date only compare func</div><div class='del'>-	(cal_obj_date_only_compare_func): New compare function that</div><div class='del'>-	compares the date only, not the time.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Need a break for the</div><div class='del'>-	yearly recurrence type</div><div class='del'>-	(dialog_to_comp_object): We need to allocate icaltimetypes for the</div><div class='del'>-	exdate list</div><div class='del'>-	(fill_widgets): Handle a weekly recurrence with no particular day set</div><div class='del'>-	(dialog_to_comp_object): Kill all rrules if "None" is selected as</div><div class='del'>-	the recurrence type by the user</div><div class='del'>-</div><div class='del'>-2000-09-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_open_task): uses the new</div><div class='del'>-	TaskEditor dialog.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor.[hc]:</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade: updated. Still need to fix the</div><div class='del'>-	'Status' property (CalComponent doesn't support it yet), and use a</div><div class='del'>-	replacement for GnomeDateEdit, since we need to support setting 'None'</div><div class='del'>-	as the date.</div><div class='del'>-</div><div class='del'>-2000-09-04  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (obj_updated_cb):</div><div class='del'>-	(obj_removed_cb): compare the updated object's uid with the one we</div><div class='del'>-	are editing, and just return if it doesn't match.</div><div class='del'>-</div><div class='del'>-2000-09-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): added check to see</div><div class='del'>-	if the client has loaded successfully. Gets rid of a few warnings.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (generate_instances_for_year): The exdate</div><div class='del'>-	and rdate lists are a list of icaltimetypes, not CalComponentPeriods</div><div class='del'>-</div><div class='del'>-	*gui/e-day-view.c (e_day_view_on_delete_occurrence): The exdate list</div><div class='del'>-	is a list of icaltimetypes, not CalComponentDateTimes</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Append</div><div class='del'>-	the exdate to the list AFTER we create the date value.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_free_recur_list): Free</div><div class='del'>-	the data, not the list element.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_generate_instances): Compute</div><div class='del'>-	the event duration using the event start/end times, not the</div><div class='del'>-	interval times.</div><div class='del'>-</div><div class='del'>-2000-09-05  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (cal_recur_from_icalrecurrencetype): Check</div><div class='del'>-	to see if r-&gt;enddate is (time_t)-1 and set to 0 if so</div><div class='del'>-</div><div class='del'>-2000-09-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am (INCLUDES): Add libical include</div><div class='del'>-	directories and `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-	* conduits/todo/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c: e_utf8_wrappers</div><div class='del'>-</div><div class='del'>-2000-09-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c,</div><div class='del'>-	conduits/todo/todo-conduit.c, gui/e-week-view.c, gui/gnome-cal.c:</div><div class='del'>-	Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-09-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new): Use</div><div class='del'>-	gnome_calendar_construct() so that we can check for proper</div><div class='del'>-	creation of the client.</div><div class='del'>-	(gnome_calendar_destroy): Check that the client exists before we</div><div class='del'>-	unref it.</div><div class='del'>-	(gnome_calendar_construct): Do the CalClient creation here.  Bind</div><div class='del'>-	the views to it here as well instead of in setup_widgets().</div><div class='del'>-	(gnome_calendar_init): Call setup_widgets() here.</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_destroy): Unref the</div><div class='del'>-	model.</div><div class='del'>-</div><div class='del'>-2000-09-01  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: Update for new libical.</div><div class='del'>-	Conduits should atleast compile now.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: ditto</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Build the conduits only when they've been</div><div class='del'>-	enabled.</div><div class='del'>-</div><div class='del'>-2000-09-01  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Make toolbar save and close button.</div><div class='del'>-	We should put a similar menu option in sometime.</div><div class='del'>-</div><div class='del'>-2000-08-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (array_to_list): Use</div><div class='del'>-	ICAL_RECURRENCE_ARRAY_MAX instead of MAX_SHORT</div><div class='del'>-</div><div class='del'>-2000-08-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (file_delete_cb): Implement delete option</div><div class='del'>-	(dialog_to_comp_object): Set the weekday start value and use</div><div class='del'>-	local not UTC time</div><div class='del'>-</div><div class='del'>-2000-08-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (file_delete_cb): No need to spit a warning</div><div class='del'>-	if removal fails.</div><div class='del'>-	(event_editor_destroy): Free the exception clist data.  Unref the</div><div class='del'>-	calendar client here.</div><div class='del'>-	(close_dialog): Just call gtk_object_destroy() on the event</div><div class='del'>-	editor; the destroy handler will free everything else.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_object_exists): Removed</div><div class='del'>-	function; this is not useful because we operate asynchronously.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_appointment): No need to</div><div class='del'>-	spit a warning if removal fails.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_delete_task): Likewise.</div><div class='del'>-</div><div class='del'>-2000-08-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (file_delete_cb): Implement delete option</div><div class='del'>-	(recurrence_toggled): Make an ugly hack to get the recurrence</div><div class='del'>-	pages showing properly since we don't yet implement all of the</div><div class='del'>-	recurrence rule stuff.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_object_exists): New function</div><div class='del'>-	to see if an object exists and is obtainable from the backend</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h: Add prototype</div><div class='del'>-</div><div class='del'>-2000-08-31  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (editor_closed_cb): Event editor destroyed</div><div class='del'>-	callback to do hash cleanup</div><div class='del'>-	(gnome_calendar_edit_object): Set event editor calendar client.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h: Add new prototype</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Trash signal stuff.  We will manipulate</div><div class='del'>-	the client directly.  Make the toolbar save and menu save items</div><div class='del'>-	work identically.  Add icons to the toolbar.</div><div class='del'>-	(save_event_object): Call cal_client_update_object</div><div class='del'>-	(close_dialog): Unref the client and disconnect signals</div><div class='del'>-	Actually destroy the event editor object.</div><div class='del'>-	(obj_updated_cb): New function.  Doesn't really do anything</div><div class='del'>-	yet but it will inform the user the event has changed elsewhere</div><div class='del'>-	in the future.</div><div class='del'>-	(obj_removed_cb): ditto</div><div class='del'>-	(event_editor_set_cal_client): New function to set the calendar</div><div class='del'>-	client</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_appointment): Commit</div><div class='del'>-	the sequence to the cal component and use non UTC times.</div><div class='del'>-</div><div class='del'>-2000-08-30  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c: Countless small changes for gnome-print 0.21+</div><div class='del'>-</div><div class='del'>-2000-08-30  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[hc]:</div><div class='del'>-	* gui/e-day-view-main-item.c:</div><div class='del'>-	* gui/e-week-view.[hc]:</div><div class='del'>-	* gui/e-week-view-main-item.c:</div><div class='del'>-	* gui/calendar-commands.c:</div><div class='del'>-	* gui/gnome-cal.[hc]: switched to using new ECalendar widget,</div><div class='del'>-	and a few other fixes.</div><div class='del'>-</div><div class='del'>-2000-08-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCal): Removed unused field event_editor.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): Oops, set the</div><div class='del'>-	dtstart/dtend on the component before adding it.</div><div class='del'>-	(e_day_view_on_editing_stopped): No need to check for an UID.</div><div class='del'>-	Update the summary properly.</div><div class='del'>-</div><div class='del'>-2000-08-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: Make sure the is_utc flag is always</div><div class='del'>-	FALSE for icaltime_from_timet</div><div class='del'>-	(e_week_view_on_unrecur_appointment): Use icaltimetype struct</div><div class='del'>-	from the stack and make sure tzid is always NULL</div><div class='del'>-	(e_week_view_key_press): ditto</div><div class='del'>-</div><div class='del'>-2000-08-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: Make sure the is_utc flag is always</div><div class='del'>-	FALSE for icaltime_from_timet</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Use icaltimetype struct</div><div class='del'>-	from the stack and make sure tzid is always NULL</div><div class='del'>-	(e_day_view_finish_long_event_resize): ditto</div><div class='del'>-	(e_day_view_finish_resize): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): ditto</div><div class='del'>-</div><div class='del'>-2000-08-30  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (add_instance): Actually add the</div><div class='del'>-	comp_instance struct to the instances list.  We now appear</div><div class='del'>-	to able to keep events and todos between sessions. Yay!</div><div class='del'>-</div><div class='del'>-2000-08-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Now the views monitor the client by themselves; it does not make</div><div class='del'>-	sense to proxy all notifications through the GnomeCal.  The</div><div class='del'>-	GnomeCal should just be a meta-widget that holds all the views.</div><div class='del'>-</div><div class='del'>-	At some later point we'll want to decouple the views from the</div><div class='del'>-	GnomeCal so that they can be embedded anywhere; they should emit</div><div class='del'>-	signals to request appropriate actions from the toplevel GUI</div><div class='del'>-	instead of calling the GnomeCal directly.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_set_cal_client): New function; now</div><div class='del'>-	the day view monitors the client by itself.</div><div class='del'>-	(cal_loaded_cb): New callback; moved over from</div><div class='del'>-	e_day_view_update_all_events().</div><div class='del'>-	(obj_updated_cb): New callback; moved over from</div><div class='del'>-	e_day_view_update_event().</div><div class='del'>-	(obj_removed_cb): New callback; moved over from</div><div class='del'>-	e_day_view_remove_event().</div><div class='del'>-	(e_day_view_update_all_events): Removed function.</div><div class='del'>-	(e_day_view_update_event): Removed function.</div><div class='del'>-	(e_day_view_remove_event): Removed function.</div><div class='del'>-	(*): Use the day_view-&gt;client directly instead of fetching it from</div><div class='del'>-	the GnomeCal.</div><div class='del'>-	(e_day_view_destroy): Unref the client.</div><div class='del'>-	(e_day_view_reload_events): Check if the client is loaded.</div><div class='del'>-	(e_day_view_key_press): Set the vtype of the new component.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_set_cal_client): New function.</div><div class='del'>-	(cal_loaded_cb): New callback.</div><div class='del'>-	(obj_updated_cb): New callback.</div><div class='del'>-	(obj_removed_cb): New callback.</div><div class='del'>-	(e_week_view_update_all_events): Removed function.</div><div class='del'>-	(e_week_view_update_event): Removed function.</div><div class='del'>-	(e_week_view_remove_event): Removed function.</div><div class='del'>-	(*): Use the week_view-&gt;client directly.</div><div class='del'>-	(e_week_view_destroy): Unref the client.</div><div class='del'>-	(e_week_view_reload_events): Check if the client is loaded.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (setup_widgets): Set the cal_client on all the</div><div class='del'>-	views.</div><div class='del'>-	(gnome_calendar_update_all): Do not update the views, since now</div><div class='del'>-	they do it themselves.</div><div class='del'>-	(gnome_calendar_object_updated_cb): Likewise.</div><div class='del'>-	(gnome_calendar_object_removed_cb): Likewise.</div><div class='del'>-	(setup_widgets): Remove all to-do list cruft.</div><div class='del'>-	(gnome_calendar_colors_changed): Likewise.</div><div class='del'>-	(gnome_calendar_todo_properties_changed): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h (todo_style_changed): Removed variable.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c: Removed old clist cruft; just left in the</div><div class='del'>-	temporary dialog box for now.</div><div class='del'>-</div><div class='del'>-2000-08-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c:</div><div class='del'>-	* cal-client/cal-client.c:</div><div class='del'>-	* conduits/todo/todo-conduit.h:</div><div class='del'>-	* conduits/calendar/calendar-conduit.h: remove USING_OAF checks.</div><div class='del'>-</div><div class='del'>-2000-08-29  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use</div><div class='del'>-	event_editor_set_event_object</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_set_event_object): Rename</div><div class='del'>-	from event_editor_set_ical_object</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h: Update prototype</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_appointment):</div><div class='del'>-	Call cal_component_commit_sequence after event changes. Default</div><div class='del'>-	to these being all day events.</div><div class='del'>-</div><div class='del'>-2000-08-29  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): These are not UTC</div><div class='del'>-	times</div><div class='del'>-</div><div class='del'>-2000-08-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_is_loaded): New function.</div><div class='del'>-	We need this from code that dynamically updates from a client and</div><div class='del'>-	could not have connected to the "cal_loaded" signal right after</div><div class='del'>-	the client was created.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (load_objects): Do not try to load the</div><div class='del'>-	objects if the client has not been loaded yet.</div><div class='del'>-	(cal_loaded_cb): Check the status value.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.h (CalendarModel): Declare the private</div><div class='del'>-	structure here so that gdb will give me love.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.h (CalFactory): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.h (Cal): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.h (CalListener): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h (CalClient): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h (CalBackend): This no longer has a private</div><div class='del'>-	structure, so remove it.</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (libcal_util_la_SOURCES): Removed the</div><div class='del'>-	vCalendar and old iCalendar cruft.</div><div class='del'>-	(libcal_utilinclude_HEADERS): Likewise.</div><div class='del'>-	Removed the obsolete iCalendar test program.</div><div class='del'>-</div><div class='del'>-2000-08-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.h: We no longer need time_from_icaltimetype</div><div class='del'>-	as libical has the API for this</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c: ditto</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: Replace time_from_icaltimetype with</div><div class='del'>-	icaltime_as_timet</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: ditto</div><div class='del'>-</div><div class='del'>-2000-08-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (remove_component): Remove the</div><div class='del'>-	icalcomponent from the toplevel calendar here.</div><div class='del'>-	(cal_backend_file_update_object): Do not remove it here.</div><div class='del'>-	(cal_backend_file_remove_object): Do not remove it here.</div><div class='del'>-	(add_component): Add the icalcomponent to the toplevel calendar if</div><div class='del'>-	asked to.</div><div class='del'>-	(cal_backend_file_update_object): Do not add it here.</div><div class='del'>-</div><div class='del'>-2000-08-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): Initiliaze tzid to</div><div class='del'>-	null, only set recurrence rules and exception dates if there</div><div class='del'>-	are any</div><div class='del'>-</div><div class='del'>-2000-08-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (save): Write out the calendar object</div><div class='del'>-	(cal_backend_file_update_object): Remove/add the icalcomponent</div><div class='del'>-	from our master icalcomponent (the calendar)</div><div class='del'>-	(cal_backend_file_remove_object): Remove the icalcomponent</div><div class='del'>-	from our master icalcomponent</div><div class='del'>-</div><div class='del'>-2000-08-26  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove gnorba stuff</div><div class='del'>-</div><div class='del'>-	* gui/main.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/*.gnorba: ditto</div><div class='del'>-</div><div class='del'>-2000-08-25  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): Uncomment</div><div class='del'>-	debug code.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (set_complete): Set the completed</div><div class='del'>-	date to the current date</div><div class='del'>-	(calendar_model_set_value_at): Handle complete field</div><div class='del'>-</div><div class='del'>-2000-08-25  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_complete): Don't attempt to</div><div class='del'>-	free this if its null</div><div class='del'>-	(calendar_model_duplicate_value): Implement for summary field</div><div class='del'>-	value</div><div class='del'>-	(calendar_model_initialize_value): Remove debug code</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c: Correct etable init xml</div><div class='del'>-	(create_column): Pass the id to e_table_header_add_column</div><div class='del'>-	rather than a hard coded one</div><div class='del'>-	(e_calendar_table_init): Make sure summary column isn't</div><div class='del'>-	added twice.  Add an alarms column, else etable won't</div><div class='del'>-	work with columns who have an ID higher than that</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (ok_button): Properly append to list</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (dialog_to_comp_object): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): The base</div><div class='del'>-	times are not UTC</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_appointment): ditto</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Update for libical 0.19</div><div class='del'>-</div><div class='del'>-2000-08-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c, gui/e-day-view.c, gui/e-week-view.c,</div><div class='del'>-	gui/event-editor.c, gui/gncal-todo.c, gui/gnome-cal.c, gui/prop.c:</div><div class='del'>-	Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_appointment): Do not alloc</div><div class='del'>-	the struct icaltimetype but point to one on the stack.  More</div><div class='del'>-	importantly, set the date.tzid to NULL.</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (save_event_object_cb): Make signal</div><div class='del'>-	names saner</div><div class='del'>-	(released_event_object_cb): ditto</div><div class='del'>-	(gnome_calendar_edit_object): ditto</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h: Make signal names saner</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_class_init): Make signal</div><div class='del'>-	names saner now that we don't use ical object</div><div class='del'>-	(save_event_object): ditto with callback names</div><div class='del'>-	(file_save_cb): ditto</div><div class='del'>-	(tb_save_and_close_cb): ditto</div><div class='del'>-	(event_editor_set_ical_object): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event): Umm,</div><div class='del'>-	!= CAL_COMPONENT_EVENT (I hope that wasn't me!)</div><div class='del'>-</div><div class='del'>-2000-08-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): Do not alloc</div><div class='del'>-	the struct icaltimetype but point to one on the stack.  More</div><div class='del'>-	importantly, set the date.tzid to NULL.</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Remove owner field</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (clear_widgets): Forget about owner field</div><div class='del'>-	(get_widgets): ditto</div><div class='del'>-	(fill_widgets): ditto</div><div class='del'>-</div><div class='del'>-2000-08-24  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_initialize_value): Handle</div><div class='del'>-	summary field</div><div class='del'>-	(calendar_model_value_is_empty): ditto</div><div class='del'>-	(calendar_model_free_value): ditto</div><div class='del'>-</div><div class='del'>-2000-08-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Remove status bar</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_set_rrule_list): Allow</div><div class='del'>-	a null list</div><div class='del'>-	(cal_component_set_rdate_list): Allow a null list</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): Commit</div><div class='del'>-	the CalComponent sequence</div><div class='del'>-</div><div class='del'>-2000-08-23  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c: #include &lt;e-util/e-cursors.h&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c (e_day_view_time_item_draw):</div><div class='del'>-	Initialize time_min_x1 and hour_r to keep gcc happy.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event_label): Warning fix.</div><div class='del'>-	(e_day_view_update_main_canvas_drag): Initialize start_row.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw):</div><div class='del'>-	Initialize time_y_small_min, icon_x.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Re-enable the gui directory.</div><div class='del'>-</div><div class='del'>-	* gui/prop.c (prop_store_alarm_default_values): Temporarily #if 0</div><div class='del'>-	out.</div><div class='del'>-</div><div class='del'>-2000-08-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press): Set vtype of new</div><div class='del'>-	CalComponent</div><div class='del'>-	(e_week_view_on_new_appointment): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): ditto</div><div class='del'>-</div><div class='del'>-2000-08-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c: Include gnome.h for gettext purposes</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: ditto</div><div class='del'>-</div><div class='del'>-	* gui/prop.c: #if out some alarm stuff</div><div class='del'>-</div><div class='del'>-2000-08-23  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.c (e_calendar_table_init): Updated</div><div class='del'>-	function.</div><div class='del'>-	(e_calendar_table_open_task): Updated function.</div><div class='del'>-</div><div class='del'>-2000-08-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_duplicate_value): Updated</div><div class='del'>-	function.</div><div class='del'>-	(calendar_model_free_value): Updated function.</div><div class='del'>-	(calendar_model_initialize_value): Updated function.</div><div class='del'>-	(calendar_model_value_is_empty): Updated function.</div><div class='del'>-	(remove_object): Updated function.</div><div class='del'>-	(obj_updated_cb): Updated function.</div><div class='del'>-	(calendar_model_get_cal_client): Added inline docs.</div><div class='del'>-	(calendar_model_delete_task): Updated.</div><div class='del'>-	(calendar_model_mark_task_complete): Updated.</div><div class='del'>-	(calendar_model_get_cal_object): Updated.</div><div class='del'>-</div><div class='del'>-2000-08-21  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (set_categories): New function.</div><div class='del'>-	(parse_time): Moved over from the old set_time_t().  This just</div><div class='del'>-	parses the time and leaves the warning dialog for the caller.</div><div class='del'>-	(set_datetime): New function.</div><div class='del'>-	(set_geo): Updated old function.</div><div class='del'>-	(set_percent): Updated old function.</div><div class='del'>-	(set_priority): Updated old function.</div><div class='del'>-	(set_summary): New function.</div><div class='del'>-	(set_url): New function.</div><div class='del'>-	(calendar_model_set_value_at): Updated function.</div><div class='del'>-	(calendar_model_is_cell_editable): Updated function.</div><div class='del'>-	(calendar_model_append_row): Updated.  Added an ugly hack to</div><div class='del'>-	accomodate ETable's lack of a real API for adding new items.</div><div class='del'>-	Also, don't try to set columns that are not editable.</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_reload_events):</div><div class='del'>-	Use CalObjType</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_reload_events): ditto</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw_day_event):</div><div class='del'>-	Use CalComponent instead of iCalObject.  #if some alarm stuff</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_draw_long_event):</div><div class='del'>-	Use CalComponent instead of iCalObject.  #if some alarm stuff</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.h: Update prototypes</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment):</div><div class='del'>-	Remove commented out portions.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):</div><div class='del'>-	Tidy.</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c</div><div class='del'>-	(e_day_view_update_event): Use CalComponent</div><div class='del'>-	instead of iCalObject.  Work around not having a compare</div><div class='del'>-	dates routine for two CalComponents.</div><div class='del'>-	(e_day_view_reshape_long_event): Use CalComponent instead</div><div class='del'>-	of iCalObject, #if some alarm stuff</div><div class='del'>-	(e_day_view_reshape_day_event): ditto</div><div class='del'>-	(e_day_view_reload_events): Use revamped CalClient</div><div class='del'>-	(e_day_view_update_event_cb): Use CalComponent</div><div class='del'>-	instead of iCalObject</div><div class='del'>-	(e_day_view_foreach_event_with_uid): ditto</div><div class='del'>-	(e_day_view_remove_event_cb): ditto</div><div class='del'>-	(e_day_view_update_event_label): ditto</div><div class='del'>-	(e_day_view_find_event_from_uid): ditto</div><div class='del'>-	(e_day_view_on_event_click): ditto</div><div class='del'>-	(e_day_view_on_event_right_click): ditto</div><div class='del'>-	(e_day_view_on_new_appointment): ditto</div><div class='del'>-	(e_day_view_on_edit_appointment): ditto</div><div class='del'>-	(e_day_view_on_delete_occurrence): ditto</div><div class='del'>-	(e_day_view_on_delete_appointment): ditto</div><div class='del'>-	(e_day_view_on_unrecur_appointment): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_motion): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_motion): ditto</div><div class='del'>-	(e_day_view_finish_long_event_resize): ditto</div><div class='del'>-	(e_day_view_finish_resize): ditto</div><div class='del'>-	(e_day_view_free_event_array): ditto</div><div class='del'>-	(e_day_view_add_event): ditto</div><div class='del'>-	(e_day_view_key_press): ditto</div><div class='del'>-	(e_day_view_on_editing_stopped): ditto</div><div class='del'>-	(e_day_view_update_top_canvas_drag): ditto</div><div class='del'>-	(e_day_view_update_main_canvas_drag): ditto</div><div class='del'>-	(e_day_view_on_drag_data_get): ditto</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): ditto</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): ditto</div><div class='del'>-</div><div class='del'>-2000-08-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw_icons):</div><div class='del'>-	Use CalComponent instead of iCalObject.  #if some alarm stuff</div><div class='del'>-</div><div class='del'>-2000-08-20  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_update_event): Use CalComponent</div><div class='del'>-	instead of iCalObject.  Work around not having a compare</div><div class='del'>-	dates routine for two CalComponents.</div><div class='del'>-	(e_week_view_reload_events): Use revamped CalClient</div><div class='del'>-	(e_week_view_reshape_event_span): Use CalComponent instead</div><div class='del'>-	of iCalObject, #if some alarm stuff</div><div class='del'>-	(e_week_view_update_event_cb): Use CalComponent instead of</div><div class='del'>-	iCalObject</div><div class='del'>-	(e_week_view_foreach_event_with_uid): ditto</div><div class='del'>-	(e_week_view_remove_event_cb): ditto</div><div class='del'>-	(e_week_view_free_events): ditto</div><div class='del'>-	(e_week_view_add_event): ditto</div><div class='del'>-	(e_week_view_on_editing_stopped): ditto</div><div class='del'>-	(e_week_view_find_event_from_uid): ditto</div><div class='del'>-	(e_week_view_key_press): ditto</div><div class='del'>-	(e_week_view_show_popup_menu): ditto</div><div class='del'>-	(e_week_view_on_new_appointment): ditto</div><div class='del'>-	(e_week_view_on_edit_appointment): ditto</div><div class='del'>-	(e_week_view_on_delete_occurrence): ditto</div><div class='del'>-	(e_week_view_on_delete_appointment): ditto</div><div class='del'>-	(e_week_view_on_unrecur_appointment): ditto</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.h: Update prototypes.</div><div class='del'>-</div><div class='del'>-2000-08-18  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h: Update prototypes.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Need to come back here later to fix the</div><div class='del'>-	alarm stuff.  The gui also needs to be completely redone to</div><div class='del'>-	support the fancier CalComponent settings (exrules, rdates, etc)</div><div class='del'>-	There are some warnings that I put in to mark some of these</div><div class='del'>-	spots</div><div class='del'>-	(event_editor_destroy): Use Calcomponent instead</div><div class='del'>-	of iCalObject</div><div class='del'>-	(make_title_from_comp): ditto</div><div class='del'>-	(clear_widgets): ditto</div><div class='del'>-	(fill_widgets): ditto</div><div class='del'>-	(classification_get): ditto</div><div class='del'>-	(dialog_to_comp_object): ditto</div><div class='del'>-	(save_ical_object): ditto</div><div class='del'>-	(close_dialog): ditto</div><div class='del'>-	(event_editor_set_ical_object): ditto</div><div class='del'>-</div><div class='del'>-2000-08-17  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (ok_button): Use CalComponent instead of</div><div class='del'>-	iCalObject</div><div class='del'>-	(cancel_button): ditto</div><div class='del'>-	(gncal_todo_edit): ditto</div><div class='del'>-	(add_todo): ditto</div><div class='del'>-	(edit_todo): ditto</div><div class='del'>-	(delete_todo): ditto</div><div class='del'>-	(insert_in_clist): ditto</div><div class='del'>-	(gncal_todo_update): ditto</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.h: Update prototypes</div><div class='del'>-</div><div class='del'>-2000-08-16  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Rework gnome-cal.c - alarms are a tad broken ATM so this</div><div class='del'>-	will need more cleaning later.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (snooze): Use CalComponent instead of</div><div class='del'>-	iCalObject</div><div class='del'>-	(edit): ditto</div><div class='del'>-	(audio_notification): ditto</div><div class='del'>-	(display_notification_cb): Use CalComponent member of</div><div class='del'>-	alarm_notify_closure rather than iCalObject</div><div class='del'>-	(display_notification): ditto</div><div class='del'>-	(trigger_alarm_cb): ditto.  Use CalComponent alarm types</div><div class='del'>-	(gnome_calendar_tag_calendar_cb): New</div><div class='del'>-	cal_client_generate_instances callback to</div><div class='del'>-	mark_gtk_calendar_day's</div><div class='del'>-	(gnome_calendar_tag_calendar): Use above callback</div><div class='del'>-	(save_ical_object_cb): Use CalComponent instead of</div><div class='del'>-	iCalObject</div><div class='del'>-	(gnome_calendar_edit_object): ditto</div><div class='del'>-	(gnome_calendar_new_appointment): ditto</div><div class='del'>-</div><div class='del'>-2000-08-15  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/mark.c (mark_month_item_cb): Callback used to mark every</div><div class='del'>-	event in a month.</div><div class='del'>-	(mark_month_item): Use cal_client_generate_instances with</div><div class='del'>-	above callback</div><div class='del'>-</div><div class='del'>-2000-08-15  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (print_month_small): Use</div><div class='del'>-	cal_client_get_objects_in_range</div><div class='del'>-	(print_day_details_cb): Callback used to create columns and fill</div><div class='del'>-	events into a day view.  Code should be shared with e-day-view</div><div class='del'>-	in reality.  Maybe need to go back to layout.[hc] a bit later</div><div class='del'>-	(print_day_details): Use cal_client_generate_instances with</div><div class='del'>-	above callback. Iterate over results to expand events to fit.</div><div class='del'>-	(print_day_summary_cb): Callback to build list of event info</div><div class='del'>-	for a day</div><div class='del'>-	(print_day_summary): Use cal_client_generate_instances with</div><div class='del'>-	above callback to generate the required event info for printing</div><div class='del'>-	(print_todo_details_cb): Callback used create list of todo info</div><div class='del'>-	(print_todo_details): Use cal_client_generate_instances with</div><div class='del'>-	above callback to generate required todo info for printing.</div><div class='del'>-</div><div class='del'>-	* gui/layout.[hc]: No longer used.</div><div class='del'>-</div><div class='del'>-2000-08-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_is_overdue): Finished implementing.</div><div class='del'>-	(calendar_model_value_at): Handle the color field.</div><div class='del'>-</div><div class='del'>-2000-08-11  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_pilot_id):</div><div class='del'>-	(cal_component_set_pilot_id):  stubs for pilot id accessors</div><div class='del'>-	(cal_component_get_pilot_status):</div><div class='del'>-	(cal_component_set_pilot_status): stubs for pilot status accessors</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (transmit): start to</div><div class='del'>-	convert to cal-component interface</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (transmit): same</div><div class='del'>-</div><div class='del'>-2000-08-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (get_geo): Generate a prettier string for</div><div class='del'>-	the geographical position.</div><div class='del'>-	(get_classification): New function.</div><div class='del'>-	(get_categories): New function.</div><div class='del'>-	(get_completed): New function.</div><div class='del'>-	(get_dtend): New function.</div><div class='del'>-	(get_dtstart): New function.</div><div class='del'>-	(get_due): New function.</div><div class='del'>-	(get_percent): New function.</div><div class='del'>-	(get_priority): New function.</div><div class='del'>-	(get_summary): New function.</div><div class='del'>-	(get_transparency): New function.</div><div class='del'>-	(get_url): New function.</div><div class='del'>-	(get_has_alarms): New function.</div><div class='del'>-	(get_has_recurrences): New function.</div><div class='del'>-	(get_is_complete): New function.</div><div class='del'>-	(get_is_overdue): New function.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the GEO</div><div class='del'>-	property.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_geo): Likewise.</div><div class='del'>-	(cal_component_set_geo): Likewise.</div><div class='del'>-	(cal_component_free_geo): Likewise.</div><div class='del'>-	(cal_component_set_exdate_list): Removed incorrect assertion.</div><div class='del'>-	(cal_component_set_exrule_list): Removed incorrect assertion.</div><div class='del'>-	(cal_component_get_next_alarm): Oops, this had not been</div><div class='del'>-	implemented at all.</div><div class='del'>-	(cal_component_has_rdates): New function.</div><div class='del'>-	(cal_component_has_rrules): New function.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h (CalComponentField): Added the GEO</div><div class='del'>-	property.</div><div class='del'>-</div><div class='del'>-2000-08-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the</div><div class='del'>-	PERCENT-COMPLETE property.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_percent): Likewise.</div><div class='del'>-	(cal_component_set_percent): Likewise.</div><div class='del'>-	(cal_component_free_percent): Likewise.</div><div class='del'>-	(scan_property): Handle the PRIORITY property.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_priority): Likewise.</div><div class='del'>-	(cal_component_set_priority): Likewise.</div><div class='del'>-	(cal_component_free_priority): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.h (CalComponentField): New enumeration</div><div class='del'>-	with the list of fields we support for ETable.</div><div class='del'>-</div><div class='del'>-2000-08-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): Update prototype.</div><div class='del'>-</div><div class='del'>-2000-08-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new_appointment): New function.</div><div class='del'>-	Mostly moved over from calendar-commands.c:display_objedit().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_iterate): Removed.  Wheee!</div><div class='del'>-	(display_objedit): Removed.</div><div class='del'>-	(new_appointment_cb): New function.  Just call</div><div class='del'>-	gnome_calendar_new_appointment().</div><div class='del'>-	(display_objedit_today): Removed.</div><div class='del'>-	(calendar_control_activate): Removed the "New appointment for</div><div class='del'>-	today" option, since it is pretty useless.</div><div class='del'>-</div><div class='del'>-2000-08-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_generate_instances): There.</div><div class='del'>-	A pretty function to generate recurrence instances atomically so</div><div class='del'>-	that clients don't have to jump through hoops.  Now we can get rid</div><div class='del'>-	of the ugly calendar_iterate() function.</div><div class='del'>-</div><div class='del'>-2000-08-09  Cody Russell  &lt;bratsche@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: Make the toolbar honor the user's</div><div class='del'>-	gnomecc settings for detachable toolbars.</div><div class='del'>-</div><div class='del'>-2000-08-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/alarm.c (pop_alarm): Oops, subtract the new alarm's trigger</div><div class='del'>-	time from the current time.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c, gui/e-calendar-table.c, pcs/cal.c:</div><div class='del'>-	Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-08-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal): Added a get_objects_in_range()</div><div class='del'>-	method.  Takes in a time range and the type of component we are</div><div class='del'>-	interested in; returns a list of UIDs.  The idea is that</div><div class='del'>-	ocurrences get computed in the client; we can have multiple</div><div class='del'>-	recurrences in iCalendar and we cannot identify them trivially</div><div class='del'>-	across the wire.</div><div class='del'>-	(Cal): Removed the get_events_in_range() method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_free_uid_list): New function.</div><div class='del'>-	(cal_backend_get_objects_in_range): New function.</div><div class='del'>-	(cal_backend_get_events_in_range): Removed.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_objects_in_range):</div><div class='del'>-	Implemented new method.</div><div class='del'>-	(cal_backend_file_get_events_in_range): Removed.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_events_in_range): Removed.</div><div class='del'>-	(uncorba_obj_type): New function.</div><div class='del'>-	(Cal_get_uids): Use uncorba_obj_type().</div><div class='del'>-	(Cal_get_n_objects): Likewise.</div><div class='del'>-	(Cal_get_objects_in_range): Implemented new method.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_events_in_range): Removed.</div><div class='del'>-	(cal_client_get_objects_in_range): Implemented.</div><div class='del'>-	(corba_obj_type): New function.</div><div class='del'>-	(cal_client_get_n_objects): Use corba_obj_type().</div><div class='del'>-	(cal_client_get_uids): Likewise.</div><div class='del'>-</div><div class='del'>-2000-08-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_clone): New function.</div><div class='del'>-	(cal_component_get_icalcomponent): Ensure that the SEQUENCE</div><div class='del'>-	property does not need incrementing.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-notify-dialog.c (alarm_notify_dialog): Use</div><div class='del'>-	CalComponent.  Deal with an empty summary property.</div><div class='del'>-</div><div class='del'>-2000-08-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_as_string): Doh,</div><div class='del'>-	libical owns the string's memory, so do not free it.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (create_client): Connect to the destroy</div><div class='del'>-	signal of the client here.</div><div class='del'>-</div><div class='del'>-	* cal-client/test.ics: New test file, modified from Eric Busboom's</div><div class='del'>-	test file from RFC 2445.</div><div class='del'>-</div><div class='del'>-2000-08-05  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (dump_component): This was gone for</div><div class='del'>-	some reason.</div><div class='del'>-	(main): Load a new test file.</div><div class='del'>-</div><div class='del'>-2000-08-04  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_commit_sequence): New</div><div class='del'>-	function to commit changes to the SEQUENCE property.</div><div class='del'>-	(cal_component_get_as_string): Ensure that the sequence has been</div><div class='del'>-	committed.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): Use</div><div class='del'>-	CalComponent instead of the old iCalObject.</div><div class='del'>-	(cal_client_update_object): Use iCalObject.  Commit the SEQUENCE</div><div class='del'>-	property before stringifying the object and piping it over to the</div><div class='del'>-	Wombat.</div><div class='del'>-</div><div class='del'>-2000-08-04  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c (conduit_get_gpilot_conduit): if</div><div class='del'>-	oaf isn't initialized by the time the conduit starts, start it</div><div class='del'>-	up.  we do this because we need to start wombat with oaf, and</div><div class='del'>-	gpilotd doesn't currently start oaf.</div><div class='del'>-</div><div class='del'>-2000-08-04  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): unref.</div><div class='del'>-</div><div class='del'>-2000-08-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_get_uid_by_pilot_id):</div><div class='del'>-	Added stub for now.</div><div class='del'>-	(cal_backend_file_update_pilot_id): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (libpcs_a_SOURCES): Removed cal-backend-imc.[ch]</div><div class='del'>-	from the list of sources.  The idea is to move vCalendar importing</div><div class='del'>-	to the GUI as a convenience function.</div><div class='del'>-</div><div class='del'>-2000-08-02  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id): call</div><div class='del'>-	save (cbimc) after setting the pilot id and status.</div><div class='del'>-</div><div class='del'>-2000-08-02  Joe Shaw  &lt;joe@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.c (cal_backend_file_update_pilot_id):</div><div class='del'>-	Fixed a g_return_if_fail that had two parameters and thus</div><div class='del'>-	wouldn't build.</div><div class='del'>-</div><div class='del'>-2000-08-03  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_append_row): updated to match</div><div class='del'>-	the new ETableModel append_row. This meant we could also get rid of</div><div class='del'>-	the row_being_added and idle_id hack.</div><div class='del'>-</div><div class='del'>-2000-08-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: Emit "model_pre_change" signals as</div><div class='del'>-	appropriate.</div><div class='del'>-</div><div class='del'>-2000-08-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-file.[ch]: New files for the iCalendar file</div><div class='del'>-	backend.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-file.[ch].</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_set_icalcomponent):</div><div class='del'>-	Return an operation success code for if we are passed a component</div><div class='del'>-	of a type we don't support.</div><div class='del'>-</div><div class='del'>-2000-07-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c (*): Use CalComponent and the new property</div><div class='del'>-	types instead of the old iCalObject stuff.</div><div class='del'>-	(cal_recur_generate_instances): Renamed from</div><div class='del'>-	cal_object_generate_events().  Ensure that the component has the</div><div class='del'>-	DTSTART property.</div><div class='del'>-	(generate_instances_for_year): Renamed from</div><div class='del'>-	cal_object_generate_events_for_year().</div><div class='del'>-	(cal_obj_expand_recurrence): Made static.</div><div class='del'>-	(cal_recur_from_icalrecurrencetype): New function.  We should</div><div class='del'>-	really convert this whole file to use struct icalrecurrencetype</div><div class='del'>-	instead.</div><div class='del'>-	(cal_recur_free): New function.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.h (CalRecurType): Renamed from CalObjRecurType.</div><div class='del'>-	(CalRecurrence): Renamed from CalObjRecurrence.</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_from_icaltimetype): New function.</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: Commented out the test-recur program.</div><div class='del'>-</div><div class='del'>-2000-08-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Removed doc directory, since it is the old gnome-pim docs which</div><div class='del'>-	aren't used any more.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): removed doc.</div><div class='del'>-</div><div class='del'>-2000-07-26  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: compile fix for Solaris</div><div class='del'>-	(works under Linux, too; don't know about others)</div><div class='del'>-</div><div class='del'>-	* this is a test of whether CVS merge does what I</div><div class='del'>-	think it will do.</div><div class='del'>-</div><div class='del'>-2000-07-26  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	OK, it seems that we have all the interesting properties for</div><div class='del'>-	single-user calendars now.  RFC 2445 can bite me.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the RRULE</div><div class='del'>-	property.  Yay!.</div><div class='del'>-	(scan_recur): Likewise, yow!</div><div class='del'>-	(get_recur_list): Likewise, yeehaw!</div><div class='del'>-	(get_recur_list): Likewise, honk honk!</div><div class='del'>-	(set_recur_list): Likewise, booooga booooga!</div><div class='del'>-	(cal_component_get_rrule_list): Likewise, squeek squeek!</div><div class='del'>-	(cal_component_set_rrule_list): That's it, I ran out of sounds.</div><div class='del'>-	(cal_component_free_recur_list): Likewise.</div><div class='del'>-	(scan_property): Handle the EXRULE property.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_exrule_list): Likewise.</div><div class='del'>-	(cal_component_set_exrule_list): Likewise.</div><div class='del'>-	(set_period_list): Oops, free the old properties as well as</div><div class='del'>-	removing them.</div><div class='del'>-	(set_text_list): Ditto.</div><div class='del'>-	(cal_component_set_exdate_list): Ditto.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: Put all the functions used to free</div><div class='del'>-	returned values all together.</div><div class='del'>-	(cal_component_set_rdate_list): Oops, mark SEQUENCE property to be</div><div class='del'>-	incremented since the RFC requires it.</div><div class='del'>-	(scan_property): Handle the EXDATE property.</div><div class='del'>-	(scan_exdate): Likewise.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(cal_component_get_exdate_list): Likewise.</div><div class='del'>-	(cal_component_set_exdate_list): Likewise.</div><div class='del'>-	(cal_component_free_exdate_list): Likewise.</div><div class='del'>-</div><div class='del'>-2000-07-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Fixed a typo</div><div class='del'>-</div><div class='del'>-2000-07-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added a few xpm files to the EXTRA DIST section</div><div class='del'>-</div><div class='del'>-2000-07-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_free_period_list): New function.</div><div class='del'>-	(scan_property): Handle the RDATE property.</div><div class='del'>-	(scan_period): Likewise.</div><div class='del'>-	(free_icalcomponent): Likewise.</div><div class='del'>-	(get_period_list): Likewise.</div><div class='del'>-	(set_period_list): Likewise.</div><div class='del'>-	(cal_component_get_rdate_list): Likewise.</div><div class='del'>-	(cal_component_set_rdate_list): Likewise.</div><div class='del'>-	(scan_text): Simplify a bit since we only handle the ALTREP</div><div class='del'>-	parameter; there is no need to iterate over all parameters.</div><div class='del'>-	(scan_datetime): Simplify; just handle the TZID parameter.</div><div class='del'>-	(scan_summary): Simplify; just handle the ALTREP parameter.</div><div class='del'>-	(cal_component_get_as_string): New function.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (CalObjType): Removed the TYPE_OTHER;</div><div class='del'>-	now we only expose the types of objects we know about.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h (CalObjType): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_n_objects): Likewise.</div><div class='del'>-	(cal_client_get_uids): Likewise.</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c (get_calendar_objects): Likewise.</div><div class='del'>-	(check_for_slow_setting): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (count_objects): Likewise.</div><div class='del'>-	(build_uids_list): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_uids): Likewise.</div><div class='del'>-	(Cal_get_n_objects): Likewise.</div><div class='del'>-</div><div class='del'>-2000-07-25  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-calendar-table.[hc]: new ECalendarTable to show an ETable view</div><div class='del'>-	for Todo/Event items.</div><div class='del'>-</div><div class='del'>-	* gui/task-assigned-to.xpm:</div><div class='del'>-	* gui/task-recurring.xpm:</div><div class='del'>-	* gui/task-assigned.xpm:</div><div class='del'>-	* gui/task.xpm: new pixmaps (all the same at present) to go in the</div><div class='del'>-	icon column of the ETable.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: hid the silly 'Calendar' labels on the</div><div class='del'>-	GnomeDateEdits and hid the times when you select 'All day event'.</div><div class='del'>-	Also adjusted the time_t's so that when an all day event finishes on</div><div class='del'>-	say midnight 13th May, we show 12th May in the dialog, since it</div><div class='del'>-	implicitly includes all of that day up to midnight.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/task-editor-dialog.glade:</div><div class='del'>-	* gui/dialogs/task-editor.[hc]: unfinished dialog to edit tasks.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c: temporary hack so that we can use the simple dialog</div><div class='del'>-	with our new ETable.</div><div class='del'>-</div><div class='del'>-2000-07-23  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.h: added a few more fields.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_create_from_vobject): check for a</div><div class='del'>-	NULL return from vObjectUStringZValue for URL property to avoid SEGV.</div><div class='del'>-	For some reason an empty 'URL:' property appears and causes trouble.</div><div class='del'>-</div><div class='del'>-2000-07-20  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (factory_fn): Update for the new</div><div class='del'>-	`evolution_shell_component_new()' arg.</div><div class='del'>-</div><div class='del'>-2000-07-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_set_trigger):</div><div class='del'>-	Finish filling the trigger.  What a pain, again.</div><div class='del'>-	(cal_component_alarm_free_trigger): Implemented.</div><div class='del'>-</div><div class='del'>-2000-07-19  Fatih Demir	&lt;kabalak@gmx.net&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit-control-applet.desktop:</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit-control-applet.desktop:</div><div class='del'>-		Added the Turkish desktop entries.</div><div class='del'>-</div><div class='del'>-2000-07-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_alarm_free): Free the</div><div class='del'>-	icalcomponent if this is an unattached alarm.</div><div class='del'>-	(scan_alarm_property): Handle the TRIGGER property.</div><div class='del'>-	(cal_component_alarm_get_trigger): Ditto.  Royal pain.</div><div class='del'>-	(cal_component_alarm_set_trigger): Ditto.  Less pain.</div><div class='del'>-</div><div class='del'>-2000-07-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): Fixed inline</div><div class='del'>-	docs.</div><div class='del'>-	(cal_client_new): Ditto.</div><div class='del'>-	(cal_client_get_n_objects): Added inline docs.</div><div class='del'>-</div><div class='del'>-2000-07-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (CalComponentAlarm): New internal</div><div class='del'>-	represntation for alarm components.  We really don't map them to a</div><div class='del'>-	CalComponent because it is more convenient to handle them as</div><div class='del'>-	"child" structures.</div><div class='del'>-	(make_alarm): New function to create a CalComponentAlarm from an</div><div class='del'>-	icalcomponent representing a VALARM.</div><div class='del'>-	(scan_alarm_property): New function to scan a property from an</div><div class='del'>-	alarm component.  We support ACTION.</div><div class='del'>-	(cal_component_get_first_alarm): New function to start an iterator</div><div class='del'>-	over the alarms in a calendar component.</div><div class='del'>-	(cal_component_alarm_get_action): New function.</div><div class='del'>-	(cal_component_alarm_set_action): New function.</div><div class='del'>-</div><div class='del'>-2000-07-13  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/todo/todo-conduit.c: conduit based on the calendar conduit.</div><div class='del'>-	this conduit syncs a pilot's ToDoDB database to wombat's list of "todo"</div><div class='del'>-	events.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (simple_todo_editor): set todo's priority control</div><div class='del'>-	based on value from ical object during edit.</div><div class='del'>-</div><div class='del'>-2000-07-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c: Revert Michael's GnomeFont patch until the</div><div class='del'>-	gnome-print API stabilizes.</div><div class='del'>-</div><div class='del'>-2000-07-12  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (titled_box, print_text, print_month_small),</div><div class='del'>-	(bound_text): GnomeFont update.</div><div class='del'>-</div><div class='del'>-2000-07-12  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/calendar-conduit.c: fixed various problems</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: build a static version of the library</div><div class='del'>-	to link with the conduits</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: same</div><div class='del'>-</div><div class='del'>-2000-07-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the COMPLETED</div><div class='del'>-	property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_completed): Ditto.</div><div class='del'>-	(cal_component_set_completed): Ditto.</div><div class='del'>-	(scan_property): Handle the TRANSPARENCY property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_transparency): Ditto.</div><div class='del'>-	(cal_component_set_transparency): Ditto.</div><div class='del'>-	(scan_property): Handle the URL property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_url): Ditto.</div><div class='del'>-	(cal_component_set_url): Ditto.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (queue_load_create_job): Removed unneeded</div><div class='del'>-	check for the URI.</div><div class='del'>-	(load_fn): Be more paranoid about the URI and notify the listener</div><div class='del'>-	if we got passed a bad URI.  Simplify the termination code a bit.</div><div class='del'>-	(create_fn): Likewise.</div><div class='del'>-	(queue_load_create_job): Be more paranoid about the URI.</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Remove pilot stuff for now.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Remove `conduits'.</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (EXTRA_DIST): remove gnomecal.conduit</div><div class='del'>-</div><div class='del'>-	* conduits/calendar/Makefile.am (EXTRA_DIST): We want</div><div class='del'>-	calendar.conduit.in, not calendar.conduit.</div><div class='del'>-</div><div class='del'>-2000-07-10  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SUBDIRS):</div><div class='del'>-	* conduits/calendar/Makefile.am: moved calendar-conduit stuff from</div><div class='del'>-	the gui directory to here.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): added conduits to SIBDIRS</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Remove</div><div class='del'>-	"close calendar" command.</div><div class='del'>-</div><div class='del'>-2000-07-08  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_button_press): Handle mouse wheel scrolling.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_time_canvas_button_press): New function to handle</div><div class='del'>-	mouse wheel scrolling.</div><div class='del'>-	(e_day_view_on_main_canvas_button_press): Handle mouse wheel scrolling.</div><div class='del'>-</div><div class='del'>-2000-07-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the SEQUENCE</div><div class='del'>-	property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_sequence): Ditto.</div><div class='del'>-	(cal_component_set_sequence): Ditto.</div><div class='del'>-	(cal_component_free_sequence): Ditto.</div><div class='del'>-	(cal_component_set_last_modified): Removed incorrect assertion.</div><div class='del'>-	(CalComponentPrivate): New need_sequence_inc flag.  The sequence</div><div class='del'>-	number must be incremented when certain properties change, so we</div><div class='del'>-	store a flag that says if we need to bump it when piping the</div><div class='del'>-	object over the wire.</div><div class='del'>-	(free_icalcomponent): Reset need_sequence_inc.</div><div class='del'>-	(cal_component_set_dtstart): Set need_sequence_inc.</div><div class='del'>-	(cal_component_set_dtend): Ditto.</div><div class='del'>-	(cal_component_set_due): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the</div><div class='del'>-	LAST-MODIFIED property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_last_modified): Ditto.</div><div class='del'>-	(cal_component_set_last_modified): Ditto.</div><div class='del'>-	(get_icaltimetype): New function to get struct icaltimetype</div><div class='del'>-	values.</div><div class='del'>-	(cal_component_get_created): Use get_icaltimetype().</div><div class='del'>-	(set_icaltimetype): New function to set struct icaltimetype</div><div class='del'>-	values.</div><div class='del'>-	(cal_component_set_created): Use set_icaltimetype().</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_property): Handle the CREATED</div><div class='del'>-	property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_free_icaltimetype): Ditto.</div><div class='del'>-	(cal_component_get_created): Ditto.</div><div class='del'>-	(cal_component_set_created): Ditto.</div><div class='del'>-	(cal_component_init): Do not create an UID here.</div><div class='del'>-	(ensure_mandatory_properties): New function to ensure that the</div><div class='del'>-	mandatory RFC properties are indeed in the component.  If they are</div><div class='del'>-	not, we create them on the fly.</div><div class='del'>-	(cal_component_set_new_vtype): Use ensure_mandatory_properties().</div><div class='del'>-	(cal_component_set_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_uid): Return the UID in a parameter, not as a</div><div class='del'>-	function return value, for consistency's sake.</div><div class='del'>-	(scan_property): Handle the DTSTAMP property.</div><div class='del'>-	(free_icalcomponent): Ditto.</div><div class='del'>-	(cal_component_get_dtstamp): Ditto.</div><div class='del'>-	(cal_component_set_dtstamp): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-04  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (gncal_todo_update): Use &amp;obj instead of &amp;ico in</div><div class='del'>-	the call to cal_client_get_object(). The ToDo list should work now.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: set the toplevel GnomeApp to invisible</div><div class='del'>-	so it doesn't appear and then resize.</div><div class='del'>-</div><div class='del'>-2000-07-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_summary): Use</div><div class='del'>-	CalComponentText instead of CalComponentPropSummary.  Removed the</div><div class='del'>-	latter typedef.</div><div class='del'>-	(cal_component_set_summary): Likewise.</div><div class='del'>-	(scan_property): Handle the CLASSIFICATION property.</div><div class='del'>-	(cal_component_get_classification): Ditto.</div><div class='del'>-	(cal_component_set_classification): Ditto.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_free_text_list): Renamed</div><div class='del'>-	from cal_component_free_description_list().  We can share this</div><div class='del'>-	function since both comments and descriptions have the same form.</div><div class='del'>-	(scan_text): Ditto.</div><div class='del'>-	(get_text_list): New function.</div><div class='del'>-	(set_text_list): New function.</div><div class='del'>-	(cal_component_get_description_list): Use get_text_list().</div><div class='del'>-	(cal_component_set_description_list): Use set_text_list().</div><div class='del'>-	(cal_component_set_uid): Add sanity check.</div><div class='del'>-	(cal_component_get_summary): Ditto.</div><div class='del'>-	(cal_component_get_description_list): Ditto.</div><div class='del'>-	(cal_component_get_dtstart): Ditto.</div><div class='del'>-	(cal_component_get_dtend): Ditto.</div><div class='del'>-	(cal_component_get_due): Ditto.</div><div class='del'>-	(scan_property): Handle the COMMENT property.</div><div class='del'>-	(cal_component_get_comment_list): Ditto.</div><div class='del'>-	(cal_component_set_comment_list): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_categories): Handle CATEGORIES.</div><div class='del'>-	This can appear multiple times, so we maintain a list.  We</div><div class='del'>-	compress them later to a single property with multiple values.</div><div class='del'>-	(cal_component_get_categories_list): Ditto.</div><div class='del'>-	(cal_component_set_categories_list): Ditto.</div><div class='del'>-	(cal_component_free_categories_list): Ditto.</div><div class='del'>-	(free_icalcomponent): Properly free the mappings.</div><div class='del'>-</div><div class='del'>-2000-07-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (scan_datetime): Handle date/time and</div><div class='del'>-	timezone pairs.</div><div class='del'>-	(scan_property): Handle DTSTART and DTEND.</div><div class='del'>-	(cal_component_free_datetime): Ditto.</div><div class='del'>-	(get_datetime): Ditto.</div><div class='del'>-	(cal_component_get_dtstart): Ditto.</div><div class='del'>-	(set_datetime): Ditto.</div><div class='del'>-	(cal_component_set_dtstart): Ditto.</div><div class='del'>-	(cal_component_get_dtend): Ditto.</div><div class='del'>-	(cal_component_set_dtend): Ditto.</div><div class='del'>-	(scan_property): Handle DUE date.</div><div class='del'>-	(cal_component_get_due): Ditto.</div><div class='del'>-	(cal_component_set_due): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_description_list):</div><div class='del'>-	Handle the DESCRIPTION property.  There can be multiple</div><div class='del'>-	descriptions with parameters each, so we deal with a list instead</div><div class='del'>-	of a single structure.</div><div class='del'>-	(cal_component_set_description_list): Ditto.</div><div class='del'>-	(cal_component_free_description_list): Ditto.</div><div class='del'>-	(scan_property): Ditto.</div><div class='del'>-	(scan_description): Ditto.</div><div class='del'>-</div><div class='del'>-2000-06-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c (cal_component_get_summary): To avoid</div><div class='del'>-	passing a million parameters to setters/getters for properties</div><div class='del'>-	that support parameters, we now pass client-side structures</div><div class='del'>-	instead.  Here we use CalComponentPropSummary.</div><div class='del'>-	(cal_component_set_summary): Ditto.</div><div class='del'>-</div><div class='del'>-2000-06-29  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c: Make calendar die when evolution quits.</div><div class='del'>-</div><div class='del'>-2000-06-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.c: Change of plans.  We use an</div><div class='del'>-	icalcomponent from libical as our core representation so that we</div><div class='del'>-	can preserve extension fields and fields that we don't (yet)</div><div class='del'>-	support.  CalComponent is just a wrapper with a nice API that</div><div class='del'>-	provides non-iterative, random access to the ical's fields.</div><div class='del'>-	(cal_component_destroy): Free the thing correctly.</div><div class='del'>-	(cal_component_get_vtype): Re-implement in terms of icalcomponent.</div><div class='del'>-	(cal_component_set_icalcomponent): New function to set the</div><div class='del'>-	CalComponent's data from an existing icalcomponent.</div><div class='del'>-	(cal_component_get_icalcomponent): New function.</div><div class='del'>-	(cal_component_set_new_vtype): New convenience function to create</div><div class='del'>-	an empty component.</div><div class='del'>-	(scan_icalcomponent): Core scanning function.</div><div class='del'>-	(scan_property): Another core scanning function.</div><div class='del'>-	(cal_component_get_uid): Use the property directly.</div><div class='del'>-	(cal_component_get_summary): Ditto.  Handle the altrep parameter</div><div class='del'>-	as well.</div><div class='del'>-	(cal_component_set_summary): Ditto.  Feel the pain, motherfucker.</div><div class='del'>-	It is ridiculous how much code this involves.</div><div class='del'>-	(scan_summary): Ditto.</div><div class='del'>-</div><div class='del'>-2000-06-29  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (owner_set_cb): Get an</div><div class='del'>-	EvolutionShellClient instead of an Evolution_Shell to match the</div><div class='del'>-	changes in libeshell.</div><div class='del'>-</div><div class='del'>-2000-06-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Do not link and include the pilot stuff for the</div><div class='del'>-	calendar component, just for the Pilot conduit.  Commented out the</div><div class='del'>-	Pilot part so that Evolution can build.  Sigh, we'll have to</div><div class='del'>-	modify gnome-pilot to use OAF.</div><div class='del'>-</div><div class='del'>-2000-06-29  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (LINK_FLAGS): Make the calendar-pilot-sync</div><div class='del'>-	program conditional on HAVE_GNOME_PILOT, and add</div><div class='del'>-	GNOME_PILOT_CFLAGS, GNOME_PILOT_LIBS, and PISOCK_LIBS in the</div><div class='del'>-	appropriate places.</div><div class='del'>-</div><div class='del'>-2000-06-29  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_uid_by_pilot_id):</div><div class='del'>-	(Cal_update_pilot_id):</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_update_pilot_id):</div><div class='del'>-	(cal_backend_imc_get_uid_by_pilot_id):</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_uid_by_pilot_id):</div><div class='del'>-	(cal_backend_update_pilot_id):  server code to service these:</div><div class='del'>-</div><div class='del'>-	* gui/calendar-pilot-sync.c: updated to make use of cal-client.</div><div class='del'>-	also uses dirty bits on both sides to aid in syncing.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_uid_by_pilot_id): new</div><div class='del'>-	function -- ask the cal server to return uid given an object's</div><div class='del'>-	pilot id.</div><div class='del'>-	(cal_client_update_pilot_id): new function -- inform the</div><div class='del'>-	cal server of an objects pilot id and pilot dirty-flag.</div><div class='del'>-</div><div class='del'>-2000-06-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-component.[ch]: New files for the new iCalendar</div><div class='del'>-	component object.  Today's properties: basic component type, UID,</div><div class='del'>-	SUMMARY.</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: Added cal-component.[ch] to the list of</div><div class='del'>-	sources.</div><div class='del'>-</div><div class='del'>-2000-06-27  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES): use BONOBO_VFS_GNOME_CFLAGS.</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: Added an #ifdefed value_to_string handler</div><div class='del'>-	assignment.</div><div class='del'>-</div><div class='del'>-2000-06-26  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_duplicate_value):</div><div class='del'>-	Implement.</div><div class='del'>-	(calendar_model_initialize_value): Implement.</div><div class='del'>-	(calendar_model_value_is_empty): Implement.</div><div class='del'>-</div><div class='del'>-2000-06-21  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_reshape_long_event): set event before</div><div class='del'>-	using it!</div><div class='del'>-	(e_day_view_init): used new colors from tigert.</div><div class='del'>-</div><div class='del'>-2000-06-21  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c, gui/e-week-view.c: Remove the usage of the "x"</div><div class='del'>-	and "y" arguments.</div><div class='del'>-</div><div class='del'>-2000-06-21  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_direction): changed so it keeps the</div><div class='del'>-	selection range. It just moves it on one day/week etc. This makes</div><div class='del'>-	it very handy for the keyboard shortcut code.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): fixed bug</div><div class='del'>-	setting the radio button active.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[hc]: added support for keyboard navigation and</div><div class='del'>-	selection of the time range.</div><div class='del'>-</div><div class='del'>-2000-06-20  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_set_value_at): Implemented.</div><div class='del'>-	(calendar_model_is_cell_editable): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_update_object): Take in an</div><div class='del'>-	iCalObject instead of a stringified version.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_update_object): Removed.</div><div class='del'>-	(gnome_calendar_remove_object): Removed.</div><div class='del'>-	(save_ical_object_cb): Use the CalClient function.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_occurrence): Likewise.</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Likewise.</div><div class='del'>-	(e_day_view_finish_long_event_resize): Likewise.</div><div class='del'>-	(e_day_view_finish_resize): Likewise.</div><div class='del'>-	(e_day_view_key_press): Likewise.</div><div class='del'>-	(e_day_view_on_editing_stopped): Likewise.</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): Likewise.</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): Likewise.</div><div class='del'>-	(e_day_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_editing_stopped): Likewise.</div><div class='del'>-	(e_week_view_key_press): Likewise.</div><div class='del'>-	(e_week_view_on_delete_occurrence): Likewise.</div><div class='del'>-	(e_week_view_on_unrecur_appointment): Likewise.</div><div class='del'>-	(e_week_view_on_delete_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (ok_button): Likewise.</div><div class='del'>-	(delete_todo): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-19  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: tidied up dialog a bit, adding</div><div class='del'>-	space etc.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_reshape_events): removed debug msg.</div><div class='del'>-</div><div class='del'>-2000-06-18  Ettore Perazzoli &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (INCLUDES): Include from</div><div class='del'>-	`$(top_builddir)/libical/src/libical' too.  [For the generated</div><div class='del'>-	libical `icalversion.h' header.]</div><div class='del'>-	* cal-client/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-18  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_top_canvas_drag_data_received):</div><div class='del'>-	fixed a DnD bug.</div><div class='del'>-</div><div class='del'>-2000-06-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am (INCLUDES): Fix to not depend on</div><div class='del'>-	installed ical.h</div><div class='del'>-</div><div class='del'>-2000-06-17  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: added little buttons which are shown when there</div><div class='del'>-	are more events than will fit in a day. Clicking on the button takes</div><div class='del'>-	the user to the 1-Day view and shows the full day.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c:</div><div class='del'>-	* gui/e-week-view.c: set the "use_ellipsis" arg to TRUE for the EText</div><div class='del'>-	items so we get tooltips automatically. Though we may want to use our</div><div class='del'>-	own code to show tooltips so we can show the tips when the mouse is</div><div class='del'>-	around the edges of the event box, and we may want to show the start</div><div class='del'>-	and end times of the event in full.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate):</div><div class='del'>-	* gui/gnome-cal.h: added view_toolbar_buttons[] so we can access the</div><div class='del'>-	radio buttons in the code easily. We need this if we want to jump to</div><div class='del'>-	another view programmatically.</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/jump.xpm: new icon for the EWeekView to jump to the day.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (EXTRA_DIST): added jump.xpm</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (calendar_model_class_init): #ifdef'ed out</div><div class='del'>-	references to functions which don't exist yet, so evolution still</div><div class='del'>-	compiles.</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: updated.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.[hc]: mostly finished, though it depends on the</div><div class='del'>-	iCalObject struct being updated to support more of iCalendar.</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/.cvsignore: added icalendar-test.</div><div class='del'>-</div><div class='del'>-2000-06-15  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (test_recur_LDADD): use libical.a</div><div class='del'>-</div><div class='del'>-2000-06-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (noinst_PROGRAMS): merge the two separate</div><div class='del'>-	noinst_PROGRAMS declarations into one so automake accepts it.</div><div class='del'>-	(INCLUDES): include libical src dir so we don't depend on having</div><div class='del'>-	ical.h already installed</div><div class='del'>-</div><div class='del'>-2000-06-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c: GPtrArray cannot insert stuff in the</div><div class='del'>-	middle of the array (!), so use plain GArray everywhere.  Sigh.</div><div class='del'>-</div><div class='del'>-2000-06-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): Use vCalendar</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_find_in_string): From Seth, make</div><div class='del'>-	it use vCalendar again.</div><div class='del'>-</div><div class='del'>-2000-06-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (obj_updated_cb): Juggle some eggs in</div><div class='del'>-	asynchronous fashion.  Finished implementing.</div><div class='del'>-	(obj_removed_cb): Implemented.  This one needs no juggling.</div><div class='del'>-	(calendar_model_set_cal_client): Only load the objects if we have</div><div class='del'>-	a client.</div><div class='del'>-	(calendar_model_destroy): Disconnect from the client's signals.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added</div><div class='del'>-	calendar-model.[ch] to the list of sources.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects): Doh,</div><div class='del'>-	return the computed value.</div><div class='del'>-</div><div class='del'>-2000-06-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-model.c (CalendarModelPrivate): Added the array of</div><div class='del'>-	objects and the hash table of UID-&gt;array index.</div><div class='del'>-	(calendar_model_row_count): Return the length directly from the</div><div class='del'>-	array instead of asking the Wombat.</div><div class='del'>-	(calendar_model_value_at): Implemented.</div><div class='del'>-	(calendar_model_new): Create an empty model.  We provide a new</div><div class='del'>-	setter function now.</div><div class='del'>-	(calendar_model_construct): Removed function.</div><div class='del'>-	(calendar_model_set_cal_client): New function to set the calendar</div><div class='del'>-	client and object type at any time.  This lets us reuse a calendar</div><div class='del'>-	model object.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.h (iCalObjectField): Just report whether the</div><div class='del'>-	object has alarms; not every single alarm.</div><div class='del'>-</div><div class='del'>-2000-06-13  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SHELL_OBJS): Removed.</div><div class='del'>-	(evolution_calendar_LDADD): Link with</div><div class='del'>-	`$(top_builddir)/shell/libeshell.a'.</div><div class='del'>-</div><div class='del'>-2000-06-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (factory_fn): Pass NULL for the new args</div><div class='del'>-	@create_folder_fn and @remove_folder_fn.</div><div class='del'>-	(create_view): Updated to match the new</div><div class='del'>-	`EvolutionShellComponentCreateViewFn'.  Return</div><div class='del'>-	`EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE' if type is not</div><div class='del'>-	"calendar".</div><div class='del'>-</div><div class='del'>-2000-06-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal): Added a get_n_objects()</div><div class='del'>-	method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_n_objects): New function.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_get_n_objects):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_n_objects): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_uids): Free the ev.</div><div class='del'>-	(cal_client_get_n_objects): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.h (iCalObjectField): New enumeration to identify</div><div class='del'>-	the fields in an iCalObject.</div><div class='del'>-</div><div class='del'>-2000-06-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_destroy): Free the private</div><div class='del'>-	structure.</div><div class='del'>-</div><div class='del'>-2000-06-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_to_vobject): Allow for NULL</div><div class='del'>-	summaries.</div><div class='del'>-</div><div class='del'>-2000-06-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (toolbar): Added missing tooltips.  We still</div><div class='del'>-	need icons, though.</div><div class='del'>-</div><div class='del'>-2000-06-07  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_find_in_string): put this back in,</div><div class='del'>-	it's still used in cal-backend-imc.c:cal_backend_imc_update_object</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_object): instead of</div><div class='del'>-	returning a text representation, decode the text and return an</div><div class='del'>-	iCalObject.  Also added CalClientGetStatus which indicates</div><div class='del'>-	success or type of failure.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_find_in_string): #ifed out</div><div class='del'>-	ical_object_find_in_string since it is unused now.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (list_uids): track get_object change</div><div class='del'>-	* gui/calendar-commands.c (calendar_iterate): same</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event): same</div><div class='del'>-	* gui/e-week-view.c (e_week_view_update_event): same</div><div class='del'>-	* gui/print.c (print_day_details): same</div><div class='del'>-	(print_day_summary): same</div><div class='del'>-	(print_todo_details): same</div><div class='del'>-	* gui/gnome-cal.c (trigger_alarm_cb): same</div><div class='del'>-	* gui/gncal-todo.c (gncal_todo_update): same</div><div class='del'>-</div><div class='del'>-2000-06-06  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/icalendar.c, icalendar-save.c: fixed a bunch of problems</div><div class='del'>-	* cal-util/calobj.c (ical_object_find_in_string): use libical</div><div class='del'>-	instead of libversit</div><div class='del'>-	(ical_object_to_string): same</div><div class='del'>-	(dump_icalobject): prints the contents of an icalobject for debugging</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (LINK_FLAGS): link libical.a instead of libical.la</div><div class='del'>-	so we don't have to modify the build system of the released libical</div><div class='del'>-	* cal-client/Makefile.am (client_test_LDADD): same</div><div class='del'>-	* cal-util/Makefile.am (icalendar_test_LDADD): same</div><div class='del'>-</div><div class='del'>-2000-06-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_destroy): Removed from the public</div><div class='del'>-	header; made static.  Now everyone should use refcounting.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (free_ical_object): Use</div><div class='del'>-	ical_object_unref().</div><div class='del'>-	(remove_object): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (print): New function to call the print</div><div class='del'>-	engine.</div><div class='del'>-	(calendar_toolbar): Added the Print button.</div><div class='del'>-	(calendar_control_activate): Added the File/Print item.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_get_selected_time_range): Allow</div><div class='del'>-	start_time and end_time to be NULL.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_get_selected_time_range):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/print.c (range_selector_new): Show the range selector</div><div class='del'>-	widgets.  Use the correct radio group for all of them!</div><div class='del'>-	(print_calendar): Do the dialog box here.  We may want to split</div><div class='del'>-	this function later into smaller chunks.</div><div class='del'>-</div><div class='del'>-2000-06-05  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_button_press):</div><div class='del'>-	allow the right button to popup the menu, even when the event is</div><div class='del'>-	being edited.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: Set the keyboard focus to the EDayView/EWeekView</div><div class='del'>-	when the right button is clicked, so that any event being edited is</div><div class='del'>-	saved before any action (e.g. opening the Event Editor dialog) is</div><div class='del'>-	started. Note that this won't work if we switch to asynchronous</div><div class='del'>-	notification.</div><div class='del'>-</div><div class='del'>-2000-06-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (tb_save_and_close_cb): Implemented.</div><div class='del'>-	(toolbar): Added an icon for the Save and Close command.</div><div class='del'>-	(save_ical_object): Recompute the title of the window here.  Maybe</div><div class='del'>-	it would be better to do it when we actually get the</div><div class='del'>-	"object_changed" signal from the CalClient.</div><div class='del'>-	(file_close_cb): Implemented.</div><div class='del'>-</div><div class='del'>-2000-06-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (save_ical_object_cb): Implemented.</div><div class='del'>-	(gnome_calendar_add_object): Removed function, since it was</div><div class='del'>-	identical to gnome_calendar_update_object().  Modified the rest</div><div class='del'>-	of the code to use only the latter.</div><div class='del'>-	(gnome_calendar_remove_object): Be more paranoid about the UID.</div><div class='del'>-	(gnome_calendar_update_object): Ditto.  Also, renamed this</div><div class='del'>-	function from gnome_calendar_object_changed(), for consistency</div><div class='del'>-	with the lower-level CalClient interface.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_class_init): New</div><div class='del'>-	"save_ical_object" signal to ask that our parent store the</div><div class='del'>-	calendar object to the backend.</div><div class='del'>-	(save_ical_object): New function to save the calendar object,</div><div class='del'>-	actually if just emits the signal.</div><div class='del'>-	(file_save_cb): Implemented.</div><div class='del'>-	(dialog_to_ical_object): We want priv-&gt;</div><div class='del'>-	alarm_program_run_program_entry (i.e. the entry inside the</div><div class='del'>-	GnomeFileEntry), not the file entry itself.</div><div class='del'>-	(dialog_to_ical_object): Only insert the recurrence ending date if</div><div class='del'>-	the event is recurrent!</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Fixed EXTRA_DIST.</div><div class='del'>-</div><div class='del'>-2000-06-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (editor_closed_cb): Handler for the</div><div class='del'>-	"editor_closed" signal of the event editor; we just destroy it</div><div class='del'>-	then.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (app_delete_event_cb): Callback used when the</div><div class='del'>-	dialog is closed.  Release the iCalObject here instead of the</div><div class='del'>-	event editor's destroy handler, and emit the new "editor_closed"</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-2000-06-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Change of plans.  The toplevel</div><div class='del'>-	GnomeApp is now generated with Glade instead of being created in</div><div class='del'>-	the program code.  Otherwise we can't migrate the accelerators to</div><div class='del'>-	the new toplevel and they won't work.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.[ch]: EventEditor now derives from GtkObject.</div><div class='del'>-	This lets us use the GnomeApp created by libglade and still have</div><div class='del'>-	signals and stuff.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (create_menu): Tell the UI handler that the</div><div class='del'>-	menubar is the GnomeApp's existing one, not to create a new one.</div><div class='del'>-	(create_toolbar): Tell the UI handler to use the GnomeApp's</div><div class='del'>-	existing toolbar.</div><div class='del'>-	(event_editor_focus): New function to raise/focus an event editor.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_edit_object): Use</div><div class='del'>-	event_editor_focus().</div><div class='del'>-</div><div class='del'>-2000-06-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Put the</div><div class='del'>-	toolbar into a frame to make it look like standard GNOME toolbars.</div><div class='del'>-	Also, set `GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL' so that it does not</div><div class='del'>-	do evil things when its moved to the left or the right of the</div><div class='del'>-	window.</div><div class='del'>-</div><div class='del'>-2000-05-31  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendar): Added a hash table to map</div><div class='del'>-	calendar objects to their respective event editors.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_init): Create the</div><div class='del'>-	object_editor_hash.</div><div class='del'>-	(gnome_calendar_destroy): Free the object_editor_hash.</div><div class='del'>-	(gnome_calendar_edit_object): New function to centralize the</div><div class='del'>-	launching of event editors; if one already exists for a particular</div><div class='del'>-	calendar object, we just raise its window.</div><div class='del'>-	(edit): Use gnome_calendar_edit_object().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (display_objedit): Use</div><div class='del'>-	gnome_calendar_edit_object().</div><div class='del'>-	(display_objedit_today): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_new_appointment): Likewise.</div><div class='del'>-	(e_day_view_on_edit_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_new_appointment): Likewise.</div><div class='del'>-	(e_week_view_on_edit_appointment): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_new): Do not take in an</div><div class='del'>-	iCalObject; rather provide an event_editor_set_ical_object()</div><div class='del'>-	function.  We need this because a single editor may be switched</div><div class='del'>-	between different calendar objects.  Also, do not show the event</div><div class='del'>-	editor; leave it up to the client code.</div><div class='del'>-	(event_editor_construct): Likewise.</div><div class='del'>-	(clear_widgets): New function to clear the widgets to default</div><div class='del'>-	values.</div><div class='del'>-	(fill_widgets): New function to fill in the widgets from the</div><div class='del'>-	iCalObject.  We don't do this in init_widgets() anymore.</div><div class='del'>-	(free_exception_clist_data): New function to free the exceptions</div><div class='del'>-	clist data.  We were leaking the row data.</div><div class='del'>-	(init_widgets): Hook to the destroy signal of the exceptions</div><div class='del'>-	clist.</div><div class='del'>-	(event_editor_set_ical_object): New function.  Now it also makes a</div><div class='del'>-	copy of the calendar object for the event editor; clients do not</div><div class='del'>-	need to copy it anymore.</div><div class='del'>-	(event_editor_destroy): Unref the UI handler as well.</div><div class='del'>-	(event_editor_class_init): New "ical_object_released" signal to</div><div class='del'>-	notify the parent that we are no longer editing the calendar</div><div class='del'>-	object.</div><div class='del'>-	(make_title_from_ico): Handle NULL objects.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.h (EventEditor): Removed fields that are no</div><div class='del'>-	longer used.</div><div class='del'>-</div><div class='del'>-2000-05-31  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: added test-recur test program.</div><div class='del'>-</div><div class='del'>-	* cal-util/test-recur.c: new file to test the recurrence code.</div><div class='del'>-</div><div class='del'>-	* cal-util/.cvsignore: added test-recur.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.c: updated.</div><div class='del'>-</div><div class='del'>-2000-05-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (event_editor_construct): Create the UI</div><div class='del'>-	handler after we have constructed the parent GnomeApp.</div><div class='del'>-	(main_menu): Menu template is now in place.</div><div class='del'>-	(toolbar): Tollbar template is now in place.</div><div class='del'>-	(create_toolbar): Turn off labels in the toolbar since it sucks;</div><div class='del'>-	it should support non-homogeneous buttons with horizontal icons</div><div class='del'>-	and text.</div><div class='del'>-</div><div class='del'>-2000-05-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_object_changed): Removed the</div><div class='del'>-	flags argument, since now we just proxy the calendar object to the</div><div class='del'>-	calendar client.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (alarm_unit_get): Moved over from</div><div class='del'>-	event-editor-utils.c.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-utils.[ch]: Removed files, since the two</div><div class='del'>-	functions that were left there (i.e. the ones not present in</div><div class='del'>-	e-dialog-widgets) can simply be moved to event-editor.c.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Removed</div><div class='del'>-	event-editor-utils.[ch] from the list of sources.</div><div class='del'>-</div><div class='del'>-2000-05-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-utils.c: Moved many functions to</div><div class='del'>-	e-util/e-dialog-widgets.c.</div><div class='del'>-</div><div class='del'>-2000-05-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: Put the main notebook directly</div><div class='del'>-	under a simple GtkWindow.  We are going to pull out the notebook</div><div class='del'>-	and slap it into our custom-built GnomeApp, anwyays.</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: Made the EventEditor derive from GnomeApp.</div><div class='del'>-	Added a BonoboUIHandler for its menu and toolbar.</div><div class='del'>-	(make_title_from_ico): Create a nice title for the window.</div><div class='del'>-	(get_widgets): Fetch the Glade widgets here instead of all over</div><div class='del'>-	the place.</div><div class='del'>-	(event_editor_new): Temporary hack to show the dialog here, just</div><div class='del'>-	so that I can test it.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (EXTRA_DIST): Added the Glade messages file.</div><div class='del'>-</div><div class='del'>-2000-05-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (init_bonobo): Do not initialize libglade twice.</div><div class='del'>-</div><div class='del'>-	* gui/component-factory.c (create_view): Set the folder_uri</div><div class='del'>-	property, otherwise the calendar will not get loaded into the</div><div class='del'>-	view.</div><div class='del'>-</div><div class='del'>-2000-05-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c: Make it so that warnings don't crash calendar.</div><div class='del'>-</div><div class='del'>-2000-05-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c: Removed.</div><div class='del'>-</div><div class='del'>-	* gui/main.c: New.</div><div class='del'>-</div><div class='del'>-	* gui/control-factory.c: New.</div><div class='del'>-	* gui/control-factory.h: New.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-component-factory.c: New.</div><div class='del'>-	* gui/calendar-component-factory.c: New.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (calendar_control_factory):</div><div class='del'>-	Renamed from `calendar_factory'.</div><div class='del'>-	(calendar_control_factory_init): Renamed from</div><div class='del'>-	`calendar_factory_init'.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Link with the files from `$(builddir)/shell'.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar.gnorba: New.</div><div class='del'>-	* gui/evolution-calendar.oafinfo: New.</div><div class='del'>-</div><div class='del'>-2000-05-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/print.c (range_selector_new): New function to create the</div><div class='del'>-	custom range selector.</div><div class='del'>-	(print_dialog): New function to show the print dialog.</div><div class='del'>-	(print_calendar): Use the print dialog.</div><div class='del'>-</div><div class='del'>-2000-05-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added libepaned.a.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: Switched from GtkPaned to EPaned.</div><div class='del'>-</div><div class='del'>-2000-05-22  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_get_events_in_range): Removed</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* gui/mark.c (mark_month_item): Use</div><div class='del'>-	cal_client_get_events_in_range().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (show_year_view_clicked): Comment out,</div><div class='del'>-	since we don't have a year view.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (setup_widgets): Removed the year view stuff.</div><div class='del'>-	(gnome_calendar_get_current_view_name): Likewise.</div><div class='del'>-	(gnome_calendar_update_view_times): Likewise.</div><div class='del'>-	(gnome_calendar_direction): Likewise.</div><div class='del'>-	(gnome_calendar_set_view): Likewise.</div><div class='del'>-	(gnome_calendar_update_all): Likewise.</div><div class='del'>-	(gnome_calendar_object_updated_cb): Likewise.</div><div class='del'>-	(gnome_calendar_object_removed_cb): Likewise.</div><div class='del'>-	(gnome_calendar_time_format_changed): Likewise.</div><div class='del'>-	(gnome_calendar_get_current_time_range): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendar): Removed the year view stuff.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Added layout.[ch],</div><div class='del'>-	print.[ch].  Removed quick-view.[ch], year-view.[ch] since they</div><div class='del'>-	are no longer used.  Removed all the old Pilot crap.</div><div class='del'>-</div><div class='del'>-2000-05-20  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-recur.[hc]: new files to implement iCalendar recurrence</div><div class='del'>-	rules. These are only part finished, but people may like to check that</div><div class='del'>-	the architecture seems OK.</div><div class='del'>-</div><div class='del'>-2000-05-17  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_occurrence):</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_delete_occurrence): use a copy of</div><div class='del'>-	the iCalObject so we detect the change in the "update_event" callback.</div><div class='del'>-	Maybe we should just update the view ourselves and then we wouldn't</div><div class='del'>-	need to detect any change in the callback.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_reset_recurrence): new function to</div><div class='del'>-	get rid of any recurrence rules. Used when we 'unrecur' an event.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): don't add a new event if it</div><div class='del'>-	won't fit, or we end up adding a new event for each key press.</div><div class='del'>-	(e_day_view_update_event_label): don't update it if it doesn't have</div><div class='del'>-	an EText item (i.e. it isn't visible).</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c: allow selection of times using this</div><div class='del'>-	column.</div><div class='del'>-</div><div class='del'>-2000-05-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_add_minutes): Fixed warning message.</div><div class='del'>-	(time_add_day): Likewise.</div><div class='del'>-	(time_add_month): Likewise.</div><div class='del'>-	(time_add_year): Likewise.</div><div class='del'>-	(time_from_day): Of all functions, *this* one had to have a bug.</div><div class='del'>-	Set the tm.tm_isdst to -1 to specify that we don't know whether</div><div class='del'>-	the time is in DST or not.  This fixes *many* bugs upstream.</div><div class='del'>-	(time_week_begin): Likewise.  We never noticed this since the week</div><div class='del'>-	functions are never used.</div><div class='del'>-	(time_week_end): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-17  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c: hooked up more widget signals to callbacks</div><div class='del'>-	to the gladified dialog acts more like the original one.</div><div class='del'>-</div><div class='del'>-2000-05-16  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.c (recurrence_toggled): hook the radio buttons</div><div class='del'>-	to the pages of the notebook.</div><div class='del'>-	(append_exception):</div><div class='del'>-	(recurrence_exception_added):</div><div class='del'>-	(recurrence_exception_deleted):</div><div class='del'>-	(recurrence_exception_changed): code to deal with the recurrence</div><div class='del'>-	exception list.</div><div class='del'>-</div><div class='del'>-2000-05-15  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/event-editor.[ch]: gladeified replacement for eventedit.c</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-utils.[ch]: utilities used by event-editor.c</div><div class='del'>-</div><div class='del'>-	* gui/event-editor-dialog.glade: glade file used by event-editor.c</div><div class='del'>-</div><div class='del'>-2000-05-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (display_notification): Use the alarm</div><div class='del'>-	notification dialog.</div><div class='del'>-	(display_notification_cb): New callback for the result of the</div><div class='del'>-	alarm notification dialog.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-notify.glade: New file with the alarm</div><div class='del'>-	notification dialog.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/alarm-notify-dialog.[ch]: New file.</div><div class='del'>-</div><div class='del'>-	* gui/dialogs/Makefile.am: New file.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (SUBDIRS): Added the dialogs directory.</div><div class='del'>-</div><div class='del'>-2000-05-13  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (trigger_alarm_cb): Better error checking, and</div><div class='del'>-	plug leaks of str_ico and ico.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (main): Initialize libglade.</div><div class='del'>-</div><div class='del'>-2000-05-13  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_builddir)/libical/src/libical'.</div><div class='del'>-</div><div class='del'>-2000-05-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (generate): Use a (dtend - dtstart) offset to</div><div class='del'>-	compute the ending time of the occurrence.  This takes care of</div><div class='del'>-	recurring events that span multiple days.  Also, removed the DST</div><div class='del'>-	condition since it did not look right at all:  if you have a daily</div><div class='del'>-	appointment at 18:00, it still should happen at 18:00 even during</div><div class='del'>-	daylight savings.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_tag_calendar): Use the timeutil</div><div class='del'>-	functions instead of calculating the month's times by hand.  Use</div><div class='del'>-	cal_obj_instance_list_free() instead of freeing the list by hand.</div><div class='del'>-	Clip the range we pass to mark_gtk_calendar_day().</div><div class='del'>-	(mark_gtk_calendar_day): Fixed off-by-one error at the end of the</div><div class='del'>-	month by adding real day offsets.</div><div class='del'>-</div><div class='del'>-2000-05-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (add_alarms_for_object): New function to add</div><div class='del'>-	today's alarms for a single object.</div><div class='del'>-	(gnome_calendar_object_updated_cb): Update the object's alarms.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal): Added a</div><div class='del'>-	get_alarms_for_object() method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_alarms_for_object): Implemented method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_alarms_for_object): New</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_for_object):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_alarms_for_object): New</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-2000-05-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Now that we</div><div class='del'>-	depend on current gnome-libs we can make the toolbar detachable</div><div class='del'>-	again.</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar-save.c (timet_to_icaltime): remove unused timezone</div><div class='del'>-	variable to make this compile on BSD systems (where timezone is</div><div class='del'>-	the name of a function)</div><div class='del'>-</div><div class='del'>-2000-05-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_update_all): Removed unused</div><div class='del'>-	arguments.  Load the initial alarms here.</div><div class='del'>-	(load_alarms): New function to load a day's worth of alarms.</div><div class='del'>-	(gnome_calendar_class_init): Eeeek!  This was taking in an</div><div class='del'>-	incorrect argument type.</div><div class='del'>-	(gnome_calendar_init): Now the calendar keeps a hash table of</div><div class='del'>-	UIDs-&gt;queued alarms.  Create the hash table here.</div><div class='del'>-	(gnome_calendar_destroy): Destroy the alarms hash table.</div><div class='del'>-	(gnome_calendar_object_updated_cb): Remove the alarms for the</div><div class='del'>-	object and regenerate them.</div><div class='del'>-	(gnome_calendar_object_removed_cb): Remove the alarms for the</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-	* gui/alarm.c (alarm_add): Do not take in a CalendarAlarm, just</div><div class='del'>-	the trigger time, the callback and the closure data.  Return an</div><div class='del'>-	opaque identifier for the alarm so that it can be removed by the</div><div class='del'>-	client code if needed.  Use the queue_alarm() helper function.</div><div class='del'>-	(queue_alarm): Helper function to actually queue the alarm and set</div><div class='del'>-	up the itimer.  Deal with a nonzero return value from</div><div class='del'>-	setitimer().</div><div class='del'>-	(alarm_remove): New function to remove an alarm based on its ID.</div><div class='del'>-	(pop_alarm): New helper function; pops the first alarm of the</div><div class='del'>-	queue and resets the timer as appropriate.</div><div class='del'>-	(alarm_ready): Simplified a lot by using pop_alarm().</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Cal): Added get_alarms_in_range().</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (build_instance_seq): New function to build a CORBA</div><div class='del'>-	sequence from the internal list of instances.</div><div class='del'>-	(Cal_get_events_in_range): Use build_instance_seq().</div><div class='del'>-	(Cal_get_alarms_in_range): Implemented new method.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_alarms_in_range): New</div><div class='del'>-	function with the get_alarms_in_range() engine.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (cal_backend_imc_get_alarms_in_range):</div><div class='del'>-	Implemented the get_alarms_in_range() method.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_alarms_in_range): New</div><div class='del'>-	client-side function for getting the alarms.</div><div class='del'>-	(build_instance_list): New helper function to build the</div><div class='del'>-	CalObjInstance list from the CORBA sequence.</div><div class='del'>-	(cal_client_get_events_in_range): Use build_instance_list().</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.h: #include &lt;cal-util/calobj.h&gt;.  #include</div><div class='del'>-	"gnome-cal.h".</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c: #include "calendar-commands.h" instead of</div><div class='del'>-	main.h; the latter is an obsolete file and will be killed.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (main): Call init_bonobo()</div><div class='del'>-	before anything else.  We need the GTK+ object system initialized.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (evolution_calendar_SOURCES): Do not use main.h.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_alarm_instance_list_free): New function.</div><div class='del'>-</div><div class='del'>-2000-05-10  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): Move</div><div class='del'>-	"about" menuitem to the help menu.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Added main.h.  Combined the two EXTRA_DIST</div><div class='del'>-	sections.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c: Set the format when creating a new</div><div class='del'>-	calendar.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c: Removed double free of method_string in</div><div class='del'>-	uri-&gt;method_string.</div><div class='del'>-</div><div class='del'>-2000-05-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal.h: Include "calendar/pcs/evolution-calendar.h" instead</div><div class='del'>-	of "evolution-calendar.h".</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h: Include "calendar/pcs/evolution-calendar.h"</div><div class='del'>-	instead of "evolution-calendar.h".</div><div class='del'>-</div><div class='del'>-2000-05-08  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_delete_appointment): call</div><div class='del'>-	e_day_view_stop_editing_event here to avoid a divide by zero</div><div class='del'>-	a bit further on.  i'm not sure if this is the best fix for this.</div><div class='del'>-</div><div class='del'>-2000-05-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.h (CalBackendClass): CalBackendClass now is just</div><div class='del'>-	an interface for calendar backends; this is an abstract class.</div><div class='del'>-	Put in the vtable for the backend methods.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_new): Removed function, since</div><div class='del'>-	CalBackend is not just an abstract class.</div><div class='del'>-	Removed implementation-specific functions and made public</div><div class='del'>-	functions call the virtual methods instead.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.[ch]: New files with the CalBackendIMC</div><div class='del'>-	implementation; this implements a backend for iCalendar and</div><div class='del'>-	vCalendar files.  Moved the implementation-specific stuff from</div><div class='del'>-	cal-backend.[ch] to here.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend-imc.c (CalendarFormat): Moved enumeration to</div><div class='del'>-	here.  Added a CAL_UNKNOWN value for when the backend is not</div><div class='del'>-	loaded yet.</div><div class='del'>-	(cal_backend_imc_init): Initialize priv-&gt;format as CAL_UNKNOWN.</div><div class='del'>-	(save_to_vcal): Use the same VCProdIdProp value as in</div><div class='del'>-	cal-util/calobj.c.  Use "1.0" as the VCVersionProp as per the</div><div class='del'>-	vCalendar spec.</div><div class='del'>-	(ensure_uid): Return nothing, since the result value need not be</div><div class='del'>-	used anymore.</div><div class='del'>-	(add_object): Since we mark the calendar as dirty anyways, we do</div><div class='del'>-	not need to check the result value of ensure_uid() anymore.</div><div class='del'>-	(remove_object): Asssert that we know how to handle the object's</div><div class='del'>-	type.  We do this in add_object() anyways.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (libpcs_a_SOURCES): Added cal-backend-imc.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c: Replaced debugging printf()s with g_message()</div><div class='del'>-	so that we can see the line number where they occur.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_load_cb): Sort of handle the</div><div class='del'>-	LOAD_METHOD_NOT_SUPPORTED result code, and added a default for the</div><div class='del'>-	switch.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.h (CalListenerLoadStatus): Removed</div><div class='del'>-	enumeration; it is stupid to translate all values for the</div><div class='del'>-	CalClient when it is going to translate them again.</div><div class='del'>-	(CalListenerClass::cal_loaded): This signal now passes the</div><div class='del'>-	LoadStatus directly from the CORBA side.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-listener.c (Listener_cal_loaded): Do not</div><div class='del'>-	translate the status value.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h (CalClientLoadStatus): Added the</div><div class='del'>-	CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED error code.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_loaded_cb): Translate the CORBA</div><div class='del'>-	version of the LoadStatus result code.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (CalFactoryPrivate): New methods field for the</div><div class='del'>-	hash table from method strings to the GtkTypes for backend class</div><div class='del'>-	types.</div><div class='del'>-	(cal_factory_init): Create the priv-&gt;methods hash table.</div><div class='del'>-	(cal_factory_destroy): Free the priv-&gt;methods hash table.</div><div class='del'>-	(cal_factory_register_method): New function to register a backend</div><div class='del'>-	class for a particular URI method.</div><div class='del'>-	(launch_backend_for_uri): New function to launch a backend for a</div><div class='del'>-	particular URI's method.</div><div class='del'>-	(load_backend): Use launch_backend_for_uri().  Move the error</div><div class='del'>-	notification code from load_fn() to here.</div><div class='del'>-	(create_backend): Use launch_backend_for_uri().  Move the error</div><div class='del'>-	notification code form create_fn() to here; it is #ifdefed out</div><div class='del'>-	since currently cal_backend_create() does not have any error</div><div class='del'>-	reporting capabilities.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (Listener::LoadStatus): Added a</div><div class='del'>-	PROTOCOL_NOT_SUPPORTED error code.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (cal_factory_load cal_factory_create): Removed</div><div class='del'>-	functions, since they were supposed to be internal only.</div><div class='del'>-	(CalFactory_load): Call queue_load_create_job() directly.</div><div class='del'>-	(CalFactory_create): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-08  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_remove_event_cb):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_remove_event_cb): don't set the ico-&gt;uid</div><div class='del'>-	to NULL or we won't find any other occurrences of the event. Set the</div><div class='del'>-	editing_event_day/num to -1 instead.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): fixed the</div><div class='del'>-	positioning of the icons for long events.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_normalize_summary): forgot to</div><div class='del'>-	terminate the string.</div><div class='del'>-</div><div class='del'>-2000-05-07  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_main_canvas_drag_data_received):</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): show the EText item,</div><div class='del'>-	just in case it hasn't moved, otherwise it won't appear.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.h (E_DAY_VIEW_BAR_WIDTH): increased from 6 to 8 to</div><div class='del'>-	make it easier to drag an event. Also increased E_DAY_VIEW_GAP_WIDTH</div><div class='del'>-	since it must be &gt;= the BAR_WIDTH.</div><div class='del'>-</div><div class='del'>-2000-05-07  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (PROPERTY_CALENDAR_URI):</div><div class='del'>-	Changed to "folder_uri" from "calendar_uri".</div><div class='del'>-	(set_prop): The uri given to us is a directory, so we append a</div><div class='del'>-	filename onto the end before we use it.</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/timeutil.c (time_day_begin):</div><div class='del'>-	(time_day_end): changed these so they just do a simple localtime(),</div><div class='del'>-	update the struct tm, then do a mktime(). I don't know why it used to</div><div class='del'>-	look at the tm_isdst flags etc. From a little test program I wrote</div><div class='del'>-	which steps through testing every hour for a year it wasn't working</div><div class='del'>-	correctly, and the new code does.</div><div class='del'>-	(time_add_day): also got rid of the stuff that looked at tm_isdst here.</div><div class='del'>-	My test program now works better.</div><div class='del'>-</div><div class='del'>-2000-05-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-	* gui/.cvsignore: ignore evolution-calendar.pure</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: add support for building evolution-calendar.pure</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c:</div><div class='del'>-	* gui/e-week-view.c: finish editing event when user hits Return key.</div><div class='del'>-	(e_week_view_on_text_item_event): stop event signals after doing any</div><div class='del'>-	other calls, since otherwise it will also stop any other resulting</div><div class='del'>-	event signals.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-event-item.c (e_week_view_event_item_draw): don't</div><div class='del'>-	draw the start/end times while editing.</div><div class='del'>-</div><div class='del'>-	* gui/eventedit.c: changed the Summary field to a GtkEntry, since we</div><div class='del'>-	now only want a single line of text.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_normalize_summary): new function to</div><div class='del'>-	convert the summary field to a single line of text, by converting any</div><div class='del'>-	sequence of CR &amp; LF characters to a single space.</div><div class='del'>-	(ical_object_create_from_vobject): call the above function. I think</div><div class='del'>-	all functions that load iCalObjects go through this.</div><div class='del'>-	(ical_new): called it here as well just in case.</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/week-view.[hc]: removed.</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gncal-day-panel.[hc]:</div><div class='del'>-	* gui/gncal-day-view.[hc]:</div><div class='del'>-	* gui/gncal-full-day.[hc]:</div><div class='del'>-	* gui/gncal-week-view.[hc]:</div><div class='del'>-	* gui/layout.[hc]:</div><div class='del'>-	* gui/view-utils.[hc]: removed old calendar view files.</div><div class='del'>-</div><div class='del'>-2000-05-06  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.[hc]: added guint ref_count to iCalObject struct,</div><div class='del'>-	and ical_object_ref/unref() functions. I've updated all the gui/</div><div class='del'>-	stuff to use ref_counts but I haven't touched the pcs/ stuff. Maybe</div><div class='del'>-	just using ical_object_destroy() is OK there.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c:</div><div class='del'>-	* gui/calendar-commands.c:</div><div class='del'>-	* gui/eventedit.c:</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: use refcounting for iCalObjects.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-main-item.c:</div><div class='del'>-	* gui/e-day-view-top-item.c:</div><div class='del'>-	* gui/e-day-view.c: try not to ever draw outside the event, even when</div><div class='del'>-	the event is very small.</div><div class='del'>-</div><div class='del'>-2000-05-05  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: don't allow recurring events to be resized or</div><div class='del'>-	dragged, and don't show the resize/drag cursors. Actually it may be</div><div class='del'>-	better to let the user do the resize/drag and then ask them what they</div><div class='del'>-	want to do - change the single occurrence or the entire series.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-time-item.c (e_day_view_time_item_show_popup_menu):</div><div class='del'>-	use e_auto_kill_popup_menu_on_hide() to destroy the popup menu.</div><div class='del'>-</div><div class='del'>-	* gui/popup-menu.c: include e-gui-utils.h</div><div class='del'>-</div><div class='del'>-2000-05-04  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_foreach_event_with_uid): for the long</div><div class='del'>-	events pass E_DAY_VIEW_LONG_EVENT as the day. Fixes SEGV.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: when we switch views, grab the focus.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_tag_calendar):</div><div class='del'>-	(gnome_calendar_mark_gtk_calendar_day): changed this so it uses</div><div class='del'>-	cal_client_get_events_in_range(), and doesn't load any objects.</div><div class='del'>-	Also just return if it isn't visible.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_get_events_in_range): call</div><div class='del'>-	g_list_sort() to sort the list rather than g_list_insert_sorted() for</div><div class='del'>-	each element. It is much more efficient.</div><div class='del'>-	Also changed it so that the co-&gt;ev_start/end fields are copied from</div><div class='del'>-	the CalObjInstance rather than the parameters to the function</div><div class='del'>-	(that is right, isn't it?)</div><div class='del'>-	Also freed the list elements, and finally the list.</div><div class='del'>-	(calendar_iterate): changed this to use cal_client_get_events_in_range</div><div class='del'>-	since that is more efficient than getting all the uids and then loading</div><div class='del'>-	and parsing all the events.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (save): output the '... saved' message before</div><div class='del'>-	freeing the string!</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (gncal_todo_update):</div><div class='del'>-	* gui/e-week-view.c (e_week_view_update_event):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event):</div><div class='del'>-	* gui/calendar-commands.c (calendar_get_events_in_range):</div><div class='del'>-	(calendar_iterate): free obj_string after it is parsed.</div><div class='del'>-</div><div class='del'>-2000-05-02  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): set the active</div><div class='del'>-	radio button here. Oops - it wasn't a Bonobo problem after all.</div><div class='del'>-</div><div class='del'>-	* gui/popup-menu.c (popup_menu): added call to</div><div class='del'>-	e_auto_kill_popup_menu_on_hide() to destroy the menu.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_show_popup_menu):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_event_right_click): ico-&gt;user_data</div><div class='del'>-	isn't useful any more, since the event editor keeps its own iCalObject.</div><div class='del'>-	So for now we make the menu commands available even when the event is</div><div class='del'>-	being edited in the event editor.</div><div class='del'>-	Also corrected misspellings of 'occurance' -&gt; 'occurrence'.</div><div class='del'>-</div><div class='del'>-	* gui/eventedit.c (event_editor_destroy): destroy the iCalObject.</div><div class='del'>-	The event editor now uses its own independent iCalObject.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_unrecur_appointment):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_unrecur_appointment): create a new</div><div class='del'>-	uid for the new single instance. I'm not sure what we should do about</div><div class='del'>-	the creation/last modification times of the objects.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_on_edit_appointment):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_on_edit_appointment): duplicate the</div><div class='del'>-	iCalObject before passing it to the event editor, since it will change</div><div class='del'>-	the fields. If we don't duplicate it we won't know what has changed</div><div class='del'>-	when we get the "update_event" callback.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_key_press):</div><div class='del'>-	* gui/e-day-view.c (e_day_view_key_press): set the created and last_mod</div><div class='del'>-	times of the new iCalObject. We may want to set the default alarm as</div><div class='del'>-	well.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_gen_uid): made this function public so we</div><div class='del'>-	can generate new uids if necessary.</div><div class='del'>-</div><div class='del'>-2000-05-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.[hc] (gnome_calendar_get_current_time_range): new</div><div class='del'>-	function to get the currently seleted time range form the current view.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (display_objedit): use the above function</div><div class='del'>-	to get the time for the new appointment.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: use a shallow copy of the ico when we update the</div><div class='del'>-	times (when resizing/dragging). Otherwise we won't detect that the</div><div class='del'>-	time has changed in the "update_event" callback.</div><div class='del'>-</div><div class='del'>-	Also added functions to get the currently selected time range.</div><div class='del'>-</div><div class='del'>-2000-04-30  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar-save.c (icalcomponent_create_from_ical_object): set</div><div class='del'>-	attendee and contact address correctly.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (icalendar_calendar_load): init priv-&gt;object_hash</div><div class='del'>-	when loading.</div><div class='del'>-	(cal_get_type_from_filename): if file extension is .ical, consider</div><div class='del'>-	the file an ical file.</div><div class='del'>-</div><div class='del'>-2000-05-01  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_compare_dates): new function to see</div><div class='del'>-	if the event dates have changed (including any recurrence rules).</div><div class='del'>-	It is used for optimization when we get the "object_changed" signal.</div><div class='del'>-	We have to do far less work if the dates are unchanged.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c:</div><div class='del'>-	* gui/e-day-view.c: only draw the selection when we have the keyboard</div><div class='del'>-	focus, since the user expects to be able to type in a new event when</div><div class='del'>-	the selection is shown. Also keep the selection when we lose focus,</div><div class='del'>-	but just don't show it.</div><div class='del'>-</div><div class='del'>-	Also quite a few changes to cope with the new client/server</div><div class='del'>-	architecture.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view-top-item.c (e_day_view_top_item_draw):</div><div class='del'>-	* gui/e-day-view-main-item.c (e_day_view_main_item_draw):</div><div class='del'>-	* gui/e-week-view-main-item.c (e_week_view_main_item_draw_day):</div><div class='del'>-	only draw the selection if the widget has the keyboard focus.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (mark_gtk_calendar_day): fixed so it works with</div><div class='del'>-	events longer than one day. And changed the code for updating events</div><div class='del'>-	in the new views.</div><div class='del'>-</div><div class='del'>-2000-04-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c</div><div class='del'>-	(init_bonobo): OAFized.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Initialize with OAF if `USING_OAF'.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c: New #define</div><div class='del'>-	`CONTROL_FACTORY_ID', varying according to whether we are</div><div class='del'>-	`USING_OAF'.</div><div class='del'>-	(calendar_factory_init): Use `CONTROL_FACTORY_ID'.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Updated for OAF.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.h: Explicitly #include</div><div class='del'>-	"calendar/pcs/evolution-calendar.h" instead of just</div><div class='del'>-	"evolution-calendar.h".</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_construct) [USING_OAF]: Use</div><div class='del'>-	OAF.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (init_corba): New function, implemented</div><div class='del'>-	differently depending on `USING_OAF'.</div><div class='del'>-</div><div class='del'>-2000-04-27    &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_load): fix memory leak</div><div class='del'>-	(save_to_vcal): same</div><div class='del'>-	(save): same</div><div class='del'>-	(cal_backend_load): same</div><div class='del'>-</div><div class='del'>-2000-04-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/.cvsignore: Replaced libcal-util.la with *.la</div><div class='del'>-</div><div class='del'>-	* pcs/.cvsignore: Added *.la and *.lo.</div><div class='del'>-</div><div class='del'>-2000-04-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (backend_last_client_gone_cb): Renamed from</div><div class='del'>-	backend_destroy_cb.  Now we use it for the "last_client_gone"</div><div class='del'>-	signal from the backend.  Also, unref the backend to destroy it.</div><div class='del'>-	(add_backend): Connect to the "last_client_gone" signal of the</div><div class='del'>-	backend.</div><div class='del'>-	(cal_factory_get_n_backends): New function to query the number of</div><div class='del'>-	running backends.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_class_init): Register the new</div><div class='del'>-	"last_client_gone" signal.  It is emitted when the last Cal client</div><div class='del'>-	goes away.  It is used to notify the factory when a backend may be</div><div class='del'>-	safely destroyed.</div><div class='del'>-	(cal_destroy_cb): Emit the "last_client_gone" signal when the last</div><div class='del'>-	client disconnects from the backend.</div><div class='del'>-</div><div class='del'>-2000-04-25  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_find_event_from_ico): compare</div><div class='del'>-	iCalObjects by their UIDs instead of by their pointers.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_destroy): don't save on destroy.</div><div class='del'>-</div><div class='del'>-2000-04-25  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Add `$(datadir)/idl'.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (idl_flags): Add `$(datadir)/idl'.</div><div class='del'>-	(INCLUDES): Use `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-</div><div class='del'>-2000-04-25  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_destroy): hook for widget</div><div class='del'>-	destroy -- used to unref the CalClient so wombat knows we are gone.</div><div class='del'>-	(gnome_calendar_class_init): added a class init for this widget.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c (e_day_view_update_event): allow for null ico</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view.c (e_week_view_update_event): allow for null ico</div><div class='del'>-</div><div class='del'>-2000-04-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c (main): The path to the test calendar</div><div class='del'>-	changed when we moved stuff around.  Users will have to tweak this</div><div class='del'>-	for their CVS setup, anyways.</div><div class='del'>-	(create_client): Create or load the calendar as appropriate.</div><div class='del'>-	(client_destroy_cb): Exit the main loop if both clients are gone.</div><div class='del'>-	(main): Connect to the "destroy" signal of the clients so that we</div><div class='del'>-	can terminate the test program.</div><div class='del'>-</div><div class='del'>-2000-04-24  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar.c (parse_person): allow for null CN</div><div class='del'>-	(parse_person): allow for null sent_by</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: build icalendar-test</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar-test.c: a test which loads an ical file and</div><div class='del'>-	converts it to our internal format, and then saves it back out.</div><div class='del'>-</div><div class='del'>-2000-04-24  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: added new source files and pixmaps, and removed</div><div class='del'>-	old source files, which can be deleted.</div><div class='del'>-</div><div class='del'>-	* gui/e-week-view-titles-item.[hc]:</div><div class='del'>-	* gui/e-week-view-main-item.[hc]:</div><div class='del'>-	* gui/e-week-view-event-item.[hc]:</div><div class='del'>-	* gui/e-week-view.[hc]: new files implementing the week/month views.</div><div class='del'>-</div><div class='del'>-	* gui/yearview.xpm:</div><div class='del'>-	* gui/monthview.xpm:</div><div class='del'>-	* gui/weekview.xpm:</div><div class='del'>-	* gui/workweekview.xpm:</div><div class='del'>-	* gui/dayview.xpm: new pixmaps for the toolbar buttons. These aren't</div><div class='del'>-	intended to be the final pixmaps.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: added radio buttons to the toolbar to</div><div class='del'>-	switch between the calendar views, and moved the am_pm_flag here so we</div><div class='del'>-	can get rid of view-utils.c.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.[hc]: made it a subclass of GtkVBox, rearranged the</div><div class='del'>-	widgets into 2 notebooks, and added the	selection_start_time and</div><div class='del'>-	selection_end_time fields.</div><div class='del'>-</div><div class='del'>-	* gui/goto.c: updated to use new selection time range.</div><div class='del'>-</div><div class='del'>-	* gui/quick-view.c: added '#include &lt;gtk/gtkwindow.h&gt;' so it compiles.</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.[hc]: changed the interface to support the new</div><div class='del'>-	selection time range, got rid of a few debugging messages and changed</div><div class='del'>-	a few bits.</div><div class='del'>-</div><div class='del'>-2000-04-21  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar-save.c: start on code to do the opposite of</div><div class='del'>-	icalendar.c (convert from iCalObjects to libical's icalcomponents).</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): moved</div><div class='del'>-	"About Calendar" into the View menu so it shows up.</div><div class='del'>-</div><div class='del'>-2000-04-20  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_changed_cb): new function: callback</div><div class='del'>-	for listener's object updated signal.</div><div class='del'>-	(gnome_calendar_object_removed_cb): new function: callback for</div><div class='del'>-	listener's object removed signal.</div><div class='del'>-	(gnome_calendar_new): hook up listener's "obj_updated" and</div><div class='del'>-	"obj_removed" signals so if evolution is running twice,</div><div class='del'>-	they will both see changes right away.</div><div class='del'>-	(gnome_calendar_object_changed): don't call update_all, since</div><div class='del'>-	it will be called by the listener.</div><div class='del'>-	(gnome_calendar_remove_object): don't call update_all</div><div class='del'>-	(gnome_calendar_add_object): don't call update_all</div><div class='del'>-</div><div class='del'>-	* gui/gncal-full-day.c (child_realize): create fullday's gcs</div><div class='del'>-	even if pixmap_bell has already been created.  this was</div><div class='del'>-	causing crashes if the calendar was run twice.</div><div class='del'>-</div><div class='del'>-2000-04-19  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/eventedit.c (ee_rp_init_rule): changed the order around</div><div class='del'>-	a bit to avoid a Gtk-CRITICAL crash</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (gncal_todo_update): fixed code to populate</div><div class='del'>-	the todo clist</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_uids): don't check</div><div class='del'>-	type against CALOBJ_TYPE_ANY since it will always match.</div><div class='del'>-	(cal_client_get_uids): same (re: CALOBJ_TYPE_ANY)</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (build_uids_list): same (re: CALOBJ_TYPE_ANY)</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_uids): same (re: CALOBJ_TYPE_ANY)</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (remove_object): don't call save from here</div><div class='del'>-	because in all cases the caller of remove_object calls save</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_set_uri): calls gnome_calendar_open</div><div class='del'>-	instead of checking on disk and calling load or create.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_object_changed): fixed to use</div><div class='del'>-	cal_client_update_object -- editing and dragging events works again</div><div class='del'>-	(gnome_calendar_open): collapsed gnome_calendar_load and</div><div class='del'>-	gnome_calendar_create into this function.  added new type</div><div class='del'>-	GnomeCalendarOpenMode which has the value CALENDAR_OPEN or</div><div class='del'>-	CALENDAR_OPEN_OR_CREATE.</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c (calendar_properties_init): create</div><div class='del'>-	a property bag for this control</div><div class='del'>-	(set_prop): callback for property sets</div><div class='del'>-	(get_prop): callback for proprety gets</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_set_uri): new function,</div><div class='del'>-	called when the "calendar_uri" property is set on the calendar-</div><div class='del'>-	control's property bag.</div><div class='del'>-</div><div class='del'>-2000-04-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am (INCLUDES): Fix include path.</div><div class='del'>-</div><div class='del'>-2000-04-16  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.h (CalFactoryClass): We have a new</div><div class='del'>-	"last_calendar_gone" signal that Wombat can use to terminate</div><div class='del'>-	itself properly.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-factory.c (cal_factory_class_init): Register the</div><div class='del'>-	"last_calendar_gone" signal.</div><div class='del'>-	(backend_destroy_cb): Emit the "last_calendar_gone" signal instead</div><div class='del'>-	of killing the factory.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: Added $(CORBA_GENERATED) to BUILT_SOURCES.</div><div class='del'>-	(INCLUDES): Make the log domain be "wombat-pcs".</div><div class='del'>-</div><div class='del'>-2000-04-17  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (add_object): removed implicit save, since</div><div class='del'>-	we don't want to save as we load from disk.</div><div class='del'>-	(cal_backend_update_object): added a call to save, since it</div><div class='del'>-	isn't done by add_object now.</div><div class='del'>-</div><div class='del'>-2000-04-16  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: Renamed library from libcalutil to</div><div class='del'>-	libcal-util, to be consistent with libcal-client.  Install header</div><div class='del'>-	files in $(includedir)/evolution/cal-util.</div><div class='del'>-	(INCLUDES): Add "cal-util" log domain for glib.</div><div class='del'>-	(libcal_clientincludedir): The header files are now installed in</div><div class='del'>-	$(includedir)/evolution/cal-client.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h: Fix includes.</div><div class='del'>-</div><div class='del'>-	* cal-client/client-test.c: Fix includes.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: Create libpcs.a, not a shared library, because</div><div class='del'>-	it is for internal use by Wombat only.  The header files should</div><div class='del'>-	not be installed, either.  Removed all the old Tlacuache stuff.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (EXTRA_DIST): We no longer distribute</div><div class='del'>-	gncal.desktop.</div><div class='del'>-	(evolution_calendar_INCLUDES): Add "calendar-gui" for the glib log</div><div class='del'>-	domain.</div><div class='del'>-</div><div class='del'>-	* gui/*.[ch]: Fix cal-util and cal-client includes.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am (INCLUDES): Added "pcs" log domain for glib.</div><div class='del'>-</div><div class='del'>-	* pcs/*.[ch]: Fix cal-util includes.</div><div class='del'>-</div><div class='del'>-2000-04-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/icalendar.c (icaltime_to_timet): use HAVE_TIMEZONE to switch</div><div class='del'>-	between linux's timezone variable and *bsd's method of getting the</div><div class='del'>-	gmt offset.</div><div class='del'>-</div><div class='del'>-2000-04-10  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (save_to_vcal): create and save an actual</div><div class='del'>-	vcalendar instead of a list of vcal objects.</div><div class='del'>-</div><div class='del'>-2000-04-10  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (INCLUDES): moved srcdir directories to the top so</div><div class='del'>-	we search headers in the evolution tree before installed headers.</div><div class='del'>-	(Otherwise when you do 'make install' lots of files in gui/ get</div><div class='del'>-	rebuilt, since they depend on the installed cal-client.h which has just</div><div class='del'>-	been updated.)</div><div class='del'>-</div><div class='del'>-2000-04-09  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_load): catch cal_loaded signal</div><div class='del'>-	on the cal client.</div><div class='del'>-	(gnome_calendar_load_cb): callback for cal_loaded signal.  moved</div><div class='del'>-	gnome_calendar_update_all from gnome_calendar_load to here.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: minor cleanups</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (save_to_vcal): copied code from gnome-pim</div><div class='del'>-	to write vcal to a file</div><div class='del'>-	(save): filled it with more gnome-pim code</div><div class='del'>-	(add_object): call save () after changing</div><div class='del'>-	(remove_object): same</div><div class='del'>-	(cal_backend_create): same</div><div class='del'>-	(cal_backend_remove_object): same</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Removed linking with libetable and libeminicard</div><div class='del'>-	since they weren't being used.</div><div class='del'>-</div><div class='del'>-2000-04-08  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_create): new function:</div><div class='del'>-	friendly wrapper for cal_client_create_calendar</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (new_calendar): call gnome_calendar_create</div><div class='del'>-	if no filename is provided</div><div class='del'>-</div><div class='del'>-	* gui/prop.c (properties): calendar is a frame</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): sort out the</div><div class='del'>-	menus a bit, more of them show up now.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: don't build library or test, just the bonobo control</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (simple_todo_editor): calendar is a frame instead</div><div class='del'>-	of a window, now.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new): same</div><div class='del'>-</div><div class='del'>-	* gui/goto.c (goto_dialog): same</div><div class='del'>-</div><div class='del'>-2000-04-06  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (calendar_control_activate): removed</div><div class='del'>-	uih from the argument list, added cal.  use cal as user_data</div><div class='del'>-	in callbacks rather than the control.</div><div class='del'>-	(calendar_control_deactivate): removed uih from argument list</div><div class='del'>-</div><div class='del'>-2000-04-05  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c (setup_menu): removed</div><div class='del'>-	(setup_appbar): removed</div><div class='del'>-	(calendar_control_activate): new function -- does the work</div><div class='del'>-	that setup_appbar and setup_menu used to do.</div><div class='del'>-	(calendar_control_deactivate): undoes what calendar_control_activate</div><div class='del'>-	does by removing the toolbar items and menu items.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: build test-calendar-widget and evolution-calendar,</div><div class='del'>-	common stuff is in a library</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_get_type): made the calendar widget</div><div class='del'>-	based on a gtk_frame rather than a gnome_app</div><div class='del'>-</div><div class='del'>-	* gui/calendar-commands.c: split out some of main.c</div><div class='del'>-</div><div class='del'>-	* gui/evolution-calendar-control.c: bonobo bung so evolution</div><div class='del'>-	can use the calendar widget</div><div class='del'>-</div><div class='del'>-2000-04-01  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/.cvsignore: Added *.lo.</div><div class='del'>-</div><div class='del'>-2000-03-30  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-        * gui/main.c (calendar_get_events_in_range):</div><div class='del'>-        cal_client_get_events_in_range returns a list of CalObjInstance *, not</div><div class='del'>-        a list of (char *) uid.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): readded the gui directory</div><div class='del'>-</div><div class='del'>-	* gui/main.c: temporarily added alarm_defaults back in,</div><div class='del'>-	since the calendar doesn't link without it</div><div class='del'>-</div><div class='del'>-2000-03-29  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: remove the gui directory, which doesn't compile.</div><div class='del'>-</div><div class='del'>-2000-03-28  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: create a libpcs.la library, for use in the</div><div class='del'>-	wombat.</div><div class='del'>-</div><div class='del'>-2000-03-28  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am (LINK_FLAGS): added libeutil.la and libetext.a</div><div class='del'>-</div><div class='del'>-	* gui/main.c (calendar_iterate): switch from string_to_ical_object to</div><div class='del'>-	ical_object_find_in_string</div><div class='del'>-	(calendar_get_events_in_range): same</div><div class='del'>-	(session_save_state): commented out references</div><div class='del'>-	to gcal-&gt;client-&gt;filename</div><div class='del'>-</div><div class='del'>-2000-03-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (cal_backend_get_object): Use</div><div class='del'>-	ical_object_to_string().</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_object_to_string): Moved over from</div><div class='del'>-	pcs/cal-backend.c (was string_from_ical_object).</div><div class='del'>-	(get_calendar_base_vobject): Likewise, moved over from</div><div class='del'>-	pcs/cal-backend.c.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c: Removed string_to_ical_object(); the</div><div class='del'>-	correct function is in calobj.[ch], called</div><div class='del'>-	ical_object_find_in_string().  Removed ical_object_to_string,</div><div class='del'>-	since we now implement it in calobj.c.</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c: Removed ical_object_new_from_string(); see</div><div class='del'>-	above.</div><div class='del'>-</div><div class='del'>-	* idl/evolution-calendar.idl (CalObjInstance): Calendar object</div><div class='del'>-	instances now contain only the UID for the object, not the whole</div><div class='del'>-	string representation of the object.  This allows clients to</div><div class='del'>-	implement caching of objects if they wish.</div><div class='del'>-</div><div class='del'>-	* pcs/cal.c (Cal_get_events_in_range): Likewise.</div><div class='del'>-</div><div class='del'>-	* pcs/cal-backend.c (build_event_list): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.c (cal_client_get_events_in_range):</div><div class='del'>-	Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.h (CalObjInstance): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-util/cal-util.c (cal_obj_instance_list_free): Likewise.</div><div class='del'>-	(cal_obj_uid_list_free): Assert that the UIDs in the list are not</div><div class='del'>-	NULL.</div><div class='del'>-</div><div class='del'>-	* pcs/tlacuache.gnorba (repo_id): The calendar factory also</div><div class='del'>-	supports the Unknown interface.</div><div class='del'>-</div><div class='del'>-2000-03-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view.c: Fix includes.</div><div class='del'>-	(e_day_view_on_delete_occurance): Do not call save_default_calendar().</div><div class='del'>-	(e_day_view_on_delete_appointment): Likewise.</div><div class='del'>-	(e_day_view_on_unrecur_appointment): Likewise.</div><div class='del'>-	(e_day_view_finish_long_event_resize): Likewise.</div><div class='del'>-	(e_day_view_finish_resize): Likewise.</div><div class='del'>-	(e_day_view_key_press): Likewise.</div><div class='del'>-	(e_day_view_on_editing_stopped): Likewise.</div><div class='del'>-	(e_day_view_on_top_canvas_drag_data_received): Likewise.</div><div class='del'>-	(e_day_view_on_main_canvas_drag_data_received): Likewise.</div><div class='del'>-</div><div class='del'>-2000-03-13  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/e-day-view*.[hc]: new files for the Day/Work-Week views.</div><div class='del'>-</div><div class='del'>-2000-03-12  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (gnome_calendar_locate): Removed function now that it</div><div class='del'>-	is no CORBA server in the GUI.</div><div class='del'>-	(save_default_calendar): Removed function.  Now the personal</div><div class='del'>-	calendar server will take care of saving modified calendars when</div><div class='del'>-	appropriate.</div><div class='del'>-	(close_cmd): Do not call unregister_calendar_services().</div><div class='del'>-</div><div class='del'>-	* gui/eventedit.c (ee_ok): Do not save the calendar.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-day-panel.c (day_view_range_activated): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-todo.c (ok_button): Likewise.</div><div class='del'>-	(delete_todo): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gncal-full-day.c (delete_occurance): Likewise.</div><div class='del'>-	(delete_appointment): Likewise.</div><div class='del'>-	(unrecur_appointment): Likewise.</div><div class='del'>-	(child_focus_out): Likewise.</div><div class='del'>-	(update_from_drag_info): Likewise.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.c (gnome_calendar_new): Removed obsolete call to</div><div class='del'>-	create the CORBA server.</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h (GnomeCalendar): Renamed `calc' field to</div><div class='del'>-	`client'.</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client.h (CalClient): Removed filename and</div><div class='del'>-	corba_server fields.</div><div class='del'>-</div><div class='del'>-2000-03-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/main.c (main): Do not pass the INIT_SERVER flag to</div><div class='del'>-	gnome_CORBA_init_with_popt_table().  Check for exceptions</div><div class='del'>-	properly.</div><div class='del'>-	(main): Initialize Bonobo.</div><div class='del'>-	(main): Call process_dates() to parse the dates from the command</div><div class='del'>-	line before we dump the events or the TODOs.</div><div class='del'>-	(main): Use bonobo_main() instead of gtk_main().</div><div class='del'>-</div><div class='del'>-	* cal-util/calobj.c (ical_new): Initialize the alarm types here.</div><div class='del'>-	Do not call default_alarm() anymore, since that is a GUI issue.</div><div class='del'>-	(default_alarm): Removed function.</div><div class='del'>-	(alarm_defaults): Removed defaults data.</div><div class='del'>-</div><div class='del'>-	* pcs/tlacuache.c (calendar_notify): Removed stubs for</div><div class='del'>-	alarm_defaults, calendar_notify(), debug_alarms.</div><div class='del'>-</div><div class='del'>-2000-03-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Removed the corba-cal stuff.  Commented out the</div><div class='del'>-	Pilot conduit stuff for now.</div><div class='del'>-</div><div class='del'>-	* gui/calendar.c: Random #ifdefs to make it build, although this</div><div class='del'>-	file is going away.</div><div class='del'>-</div><div class='del'>-	* gui/Makefile.am: Removed referenes to calobj.[ch] and timeutil.[ch].</div><div class='del'>-</div><div class='del'>-	* gui/calendar-conduit.c: Fixup includes.</div><div class='del'>-</div><div class='del'>-	* gui/calendar-conduit.h: Fixup includes.</div><div class='del'>-</div><div class='del'>-2000-03-09  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* gui/gnome-cal.h: replaced "Calendar *cal" with "CalClient *calc"</div><div class='del'>-	in the GnomeCalendar struct.</div><div class='del'>-</div><div class='del'>-	* gui/*.c: tracked change from Calendar * to CalClient</div><div class='del'>-</div><div class='del'>-	* gui/main.c: moved alarm_defaults from here to cal-util/calobj.c</div><div class='del'>-	(calendar_get_events_in_range): pulled this out of calendar.c and</div><div class='del'>-	fixed it up to use cal-client stuff.  i'm not sure where to put it yet.</div><div class='del'>-</div><div class='del'>-	* gui/main.c (calendar_iterate): pulled this one out of calendar.c also</div><div class='del'>-</div><div class='del'>-2000-03-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: Removed cal-client-alarm.[ch] from the</div><div class='del'>-	list of sources.  This was a miscommunication on our part.</div><div class='del'>-</div><div class='del'>-2000-03-05  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client/cal-client-alarm.c: stubs for client side</div><div class='del'>-	access to alarm structures.  this will probably change,</div><div class='del'>-	since i don't know what i'm doing.</div><div class='del'>-</div><div class='del'>-	* cal-util/alarm-enums.h: enums for alarms needed by</div><div class='del'>-	both the client and the server</div><div class='del'>-</div><div class='del'>-	* remaining source files in calendar/... have been moved</div><div class='del'>-	to calendar/gui.</div><div class='del'>-</div><div class='del'>-	* gui/alarm.c: start to decouple the view from the model</div><div class='del'>-	in the alarm editing code</div><div class='del'>-</div><div class='del'>-2000-03-03  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-util/Makefile.am: new file -- things shared between</div><div class='del'>-	the client and server go in this directory</div><div class='del'>-</div><div class='del'>-	*  calobj.c calobj.h icalendar.c icalendar.h</div><div class='del'>-	timeutil.c timeutil.h cal-util.c cal-util.h where moved</div><div class='del'>-	backend stuff went into pcs.  shared stuff went into</div><div class='del'>-	cal-util.</div><div class='del'>-</div><div class='del'>-2000-03-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	At this point the calendar client and personal calendar server</div><div class='del'>-	files were moved to the idl/, cal-client/, and pcs/ directories.</div><div class='del'>-</div><div class='del'>-	* idl/Makefile.am: New file.</div><div class='del'>-</div><div class='del'>-	* cal-client/Makefile.am: New file.  Moved the libcal-client stuff</div><div class='del'>-	from calendar/Makefile.am to here.</div><div class='del'>-</div><div class='del'>-	* pcs/Makefile.am: New file.  Moved the tlacuache stuff from</div><div class='del'>-	calendar/Makefile.am to here.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added the idl and cal-client directories.</div><div class='del'>-</div><div class='del'>-	* calendar.h: Removed the references to cal-backend.h and its</div><div class='del'>-	stuff.  This file is going away soon!</div><div class='del'>-</div><div class='del'>-	* icalendar.c: #include &lt;config.h&gt;.  Also, we don't need to</div><div class='del'>-	include cal-backend.h or gnome.h.</div><div class='del'>-</div><div class='del'>-	* icalendar.h: Protect from multiple inclusions.</div><div class='del'>-</div><div class='del'>-2000-03-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Use the gnome-config flags for orbit-idl.</div><div class='del'>-	Create a libcal-client library with the calendar client object.</div><div class='del'>-</div><div class='del'>-2000-02-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed stale rule for the conduit.</div><div class='del'>-</div><div class='del'>-2000-02-21  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Added *.lo.</div><div class='del'>-</div><div class='del'>-2000-02-19  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Added tlacuache and tl-test.</div><div class='del'>-</div><div class='del'>-2000-02-18  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Use BONOBO_VFS_GNOME_CFLAGS instead of</div><div class='del'>-	GNOMEUI_INCLUDES, as we use Bonobo and VFS.</div><div class='del'>-</div><div class='del'>-2000-02-17  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.h: moved CalendarFormat type def here</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_load): if extension suggests</div><div class='del'>-	an ical file, attempt to load an iCal file.</div><div class='del'>-	(cal_get_type_from_filename): returns CAL_ICAL if file</div><div class='del'>-	extension is 'ics' or 'ifb', else returns CAL_VCAL</div><div class='del'>-	(icalendar_calendar_load): moved this here from</div><div class='del'>-	icalendar.c because it needs to call the static function</div><div class='del'>-	add_object.</div><div class='del'>-</div><div class='del'>-2000-02-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_remove_object): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal.c (cal_notify_remove): Implemented.</div><div class='del'>-	(Cal_remove_object): Implemented.</div><div class='del'>-	(cal_get_epv): Fill in the remove_object field in the epv.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_remove_object): Implemented.</div><div class='del'>-	(notify_remove): New function to notify clients that an object was</div><div class='del'>-	removed.</div><div class='del'>-</div><div class='del'>-2000-02-16  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.[ch], eventedit.c, main.c: Change iCalObject.organizer</div><div class='del'>-	from char* to iCalPerson*</div><div class='del'>-</div><div class='del'>-	* calobj.[ch]: Change iCalObject.related from list of char* to</div><div class='del'>-	list of iCalRelation*; assorted related fixes</div><div class='del'>-</div><div class='del'>-	* icalendar.c: interface between libical and the gnomecal</div><div class='del'>-	internal representation</div><div class='del'>-</div><div class='del'>-2000-02-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_update_object): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal.c (cal_notify_update): New function to notify the listener</div><div class='del'>-	about an updated object.</div><div class='del'>-	(Cal_update_object): Implemented.</div><div class='del'>-	(Cal_get_uids): set_release() the sequence to TRUE.</div><div class='del'>-	(Cal_get_events_in_range): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (remove_object): New function to remove objects</div><div class='del'>-	from a calendar backend.</div><div class='del'>-	(cal_backend_update_object): New public function to update an</div><div class='del'>-	object and notify clients about it.</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (Cal): Added update_object() and</div><div class='del'>-	delete_object() methods.</div><div class='del'>-	(Listener): Removed the obj_changed method and renamed obj_added</div><div class='del'>-	to obj_updated.  We now only have updated and removed notifiers.</div><div class='del'>-</div><div class='del'>-	* cal-listener.[ch]: Removed the "changed" notification code.</div><div class='del'>-	Changed the "added" notification code to the "updated"</div><div class='del'>-	notification.</div><div class='del'>-</div><div class='del'>-	* cal-client.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* tlacuache.c (create_cal_factory): Connect to "destroy" on the</div><div class='del'>-	factory and exit the main loop when the factory is destroyed.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (backend_destroy_cb): New callback used when a</div><div class='del'>-	backend is destroyed.  Removes the backend from the factory's hash</div><div class='del'>-	table and unrefs the factory if all backends go away.</div><div class='del'>-	(add_calendar_client): Free the environment.</div><div class='del'>-</div><div class='del'>-	* cal.c (cal_new): Use bonobo_object_unref() if we fail to</div><div class='del'>-	initialize.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (cal_listener_new): Likewise.</div><div class='del'>-</div><div class='del'>-	* layout.c (layout_events): Plug li.partition memory leak.</div><div class='del'>-</div><div class='del'>-2000-02-10  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_add_cal): Connect to the Cal's</div><div class='del'>-	destroy signal.</div><div class='del'>-	(cal_backend_remove_cal): Killed function now that removal of Cal</div><div class='del'>-	objects is done in their destroy callback.</div><div class='del'>-	(cal_destroy_cb): New callback to remove a Cal from the backend's</div><div class='del'>-	list of clients.  Also, the backend destroys itself when there are</div><div class='del'>-	no more clients connected to it.</div><div class='del'>-	(save): New placeholder function to save a backend.</div><div class='del'>-	(destroy): New function to destroy a backend's data.</div><div class='del'>-	(cal_backend_destroy): Save the calendar and destroy it.</div><div class='del'>-</div><div class='del'>-	* cal.c (cal_destroy): Reset the priv-&gt;backend to NULL.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (add_calendar_client): There is no need to call</div><div class='del'>-	cal_backend_remove_cal(); we can now just destroy the Cal object.</div><div class='del'>-	(create_fn): Make sure we always unref the URI.</div><div class='del'>-	(load_fn): Move the URI unref to the end of the function for</div><div class='del'>-	safety.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (add_calendar_client): Unref the Cal only if</div><div class='del'>-	notification of the listener was unsuccessful.  Otherwise, the</div><div class='del'>-	calendar user agent (Listener side) keeps the reference.</div><div class='del'>-</div><div class='del'>-	* tl-test.c (list_uids): Free the calobj.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_loaded_cb): Use bonobo_object_unref() to get</div><div class='del'>-	rid of the listener.</div><div class='del'>-	(load_or_create): Likewise.</div><div class='del'>-	(destroy_factory): New function to get rid of the factory.</div><div class='del'>-	(destroy_listener): New function to get rid of the listener.</div><div class='del'>-	(destroy_cal): New function to get rid of the calendar client</div><div class='del'>-	interface object.</div><div class='del'>-	(cal_client_destroy): Free all resources.</div><div class='del'>-	(cal_client_get_object): CORBA_free() the calobj string.  Boy, I</div><div class='del'>-	love memprof.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (cal_listener_destroy): Reset the priv-&gt;cal to</div><div class='del'>-	CORBA_OBJECT_NIL.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_remove_cal): Do not unref the Cal,</div><div class='del'>-	since the calendar user agent owns it.</div><div class='del'>-	(cal_backend_add_cal): Do not ref the Cal, since the calendar user</div><div class='del'>-	agent owns it.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (add_calendar_client): Use bonobo_object_unref()</div><div class='del'>-	to get rid of the calendar client interface object.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Duplicate the</div><div class='del'>-	default "PUBLIC" string.</div><div class='del'>-</div><div class='del'>-2000-02-09  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (cal_factory_load): Added documentation comment.</div><div class='del'>-	(load_fn): Do not print a message if the backend could not be</div><div class='del'>-	loaded due to a non-fatal error.</div><div class='del'>-	(queue_load_create_job): Moved the stuff from cal_factory_load()</div><div class='del'>-	to here.  Now this function serves to queue load or create</div><div class='del'>-	requests.</div><div class='del'>-	(cal_factory_load): Use queue_load_create_job().</div><div class='del'>-	(cal_factory_create): Implemented; use queue_load_create_job().</div><div class='del'>-	(create_fn): New job handler for creating new calendars.</div><div class='del'>-	(create_backend): New function to create a new backend with a new</div><div class='del'>-	calendar.</div><div class='del'>-	(add_backend): New helper function to add backends to the</div><div class='del'>-	factory's hash table.</div><div class='del'>-	(load_backend): Use add_backend() instead of adding the backend by</div><div class='del'>-	ourselves.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (load_or_create): Moved the functionality from</div><div class='del'>-	cal_client_load_calendar() to here, and added an option to create</div><div class='del'>-	a new calendar instead of loading an existing one.</div><div class='del'>-	(cal_client_load_calendar): Use load_or_create().</div><div class='del'>-	(cal_client_create_calendar): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_create): Implemented.</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (LoadStatus): Added an IN_USE error for</div><div class='del'>-	create requests.</div><div class='del'>-</div><div class='del'>-	* cal-listener.h (CalListenerLoadStatus): Added CAL_LISTENER_LOAD_IN_USE.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (Listener_cal_loaded): Convert the IN_USE error.</div><div class='del'>-</div><div class='del'>-	* cal-client.h (CalClientLoadStatus): Added CAL_CLIENT_LOAD_IN_USE.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_loaded_cb): Handle CAL_LISTENER_LOAD_IN_USE.</div><div class='del'>-</div><div class='del'>-	* tl-test.c: New test program for the calendar client side; it</div><div class='del'>-	also exercises the server side by sending commands to it.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the tl-test program.</div><div class='del'>-</div><div class='del'>-	* tlacuache.gnorba: Updated.</div><div class='del'>-</div><div class='del'>-	* tlacuache.c (create_cal_factory): Use the right GOAD id.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_construct): Use the right GOAD id.</div><div class='del'>-</div><div class='del'>-2000-02-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (Cal): Added get_uids() method to get a</div><div class='del'>-	list of UIDs based on object types.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_get_uids): Implemented get_uids() in</div><div class='del'>-	the backend.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_uids): Implemented get_uids() method.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_get_uids): Implemented client-side</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* cal-util.c (cal_obj_instance_list_free): Doh.  Free the list,</div><div class='del'>-	not the last link.</div><div class='del'>-	(cal_obj_uid_list_free): New function to free a list of UIDs.</div><div class='del'>-</div><div class='del'>-	* GnomeCal.idl (Repository): Removed unused method</div><div class='del'>-	get_object_by_id_list().  This is just for cleanup purposes and to</div><div class='del'>-	remind me exactly of what needs to be moved over to</div><div class='del'>-	evolution-calendar.idl.</div><div class='del'>-	(Repository): Removed unused get_objects() method.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (init_calendar_repo_class): Removed the unused</div><div class='del'>-	get_objects method.</div><div class='del'>-</div><div class='del'>-	* calobj.h (CalObjFindStatus): New status value enumeration for</div><div class='del'>-	the find function.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_find_in_string): New function to parse a</div><div class='del'>-	complete calendar and find a calendar object in it.  This should</div><div class='del'>-	be used instead ical_object_new_from_string() in the future.</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (CalObjInstance): Added an uid field.</div><div class='del'>-	Now the idea is that whenever calendar object strings are passed</div><div class='del'>-	around, their UIDs are passed along with them so that the actual</div><div class='del'>-	object can be pulled from the whole VCAL object using its UID to</div><div class='del'>-	identify it.</div><div class='del'>-</div><div class='del'>-	* cal-util.h (CalObjInstance): Added uid field.</div><div class='del'>-</div><div class='del'>-	* cal-util.c (cal_obj_instance_list_free): Free the UIDs.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (build_event_list): Store the object's UID in the</div><div class='del'>-	instance structure.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_events_in_range): Copy the UID field to the CORBA</div><div class='del'>-	structure.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_get_events_in_range): Copy the UID</div><div class='del'>-	field from the CORBA structure.</div><div class='del'>-</div><div class='del'>-	* main.c (gnome_cal_file_menu): Removed unfinished html-month stuff.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Removed html-month.c.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c: #include "alarm.h"</div><div class='del'>-	(mail_notify): Made static.</div><div class='del'>-</div><div class='del'>-	* alarm.h: #include "calobj.h"</div><div class='del'>-</div><div class='del'>-	* corba-cal-factory.h (init_corba_server): Fixed prototype.</div><div class='del'>-</div><div class='del'>-	* quick-view.c (create_items_for_event): Made static.</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (column_resized): Made static.</div><div class='del'>-</div><div class='del'>-	* layout.c (find_index): Made static.</div><div class='del'>-</div><div class='del'>-2000-02-08  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (CalObjInstance): New struct to wrap</div><div class='del'>-	instances of calendar objects for recurrencies and alarms.</div><div class='del'>-	(Cal::get_events_in_range): New method to get ocurring and</div><div class='del'>-	recurring events by time range.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_get_events_in_range): New function to</div><div class='del'>-	get a list of event instances in a time range.</div><div class='del'>-	(string_from_ical_object): New internal function.</div><div class='del'>-	(cal_backend_get_object): Use string_from_ical_object() instead of</div><div class='del'>-	doing everything ourselves.</div><div class='del'>-	(cal_backend_get_events_in_range): New function to get a list of</div><div class='del'>-	the events that occur or recur in a specified time range.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_get_events_in_range): Implemented</div><div class='del'>-	client-side function.</div><div class='del'>-</div><div class='del'>-	* cal-util.h:</div><div class='del'>-	* cal-util.c: New files with utilities and types common to the</div><div class='del'>-	client and server parts.</div><div class='del'>-	(CalObjInstance): New structure to hold an instance of an actual</div><div class='del'>-	occurrence, recurrence, or alarm trigger of a calendar object.</div><div class='del'>-	(cal_obj_instance_list_free): New function to free a list of</div><div class='del'>-	calendar object instances.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_events_in_range): Implemented new method.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_get_updated_objects): Free `str' with</div><div class='del'>-	free(), not g_free(), since calendar_get_as_vcal_string() uses</div><div class='del'>-	writeMemVObject(), which uses realloc().  Fixed in gnome-pim as</div><div class='del'>-	well.</div><div class='del'>-</div><div class='del'>-2000-02-04  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (get_calendar_base_vobject): New function to</div><div class='del'>-	create the base VObject for a calendar.</div><div class='del'>-	(cal_backend_get_object): Create the base calendar and add the</div><div class='del'>-	sought object to it, then stringify it.</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (Listener::obj_added</div><div class='del'>-	Listener::obj_changed): Now these pass in just the UIDs, not the</div><div class='del'>-	complete objects.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (Listener_obj_added): Changed to pass in the uid,</div><div class='del'>-	not the object.</div><div class='del'>-	(Listener_obj_changed): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal-client.h (CalClientClass): Made the obj_added and</div><div class='del'>-	obj_changed signals take in the UIDs, not the full objects.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (obj_added_cb): Likewise.</div><div class='del'>-	(obj_changed_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2000-02-04  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (CalBackendPrivate): Renamed the event_hash field</div><div class='del'>-	to object_hash.  Now we hash all the calendar's objects here based</div><div class='del'>-	on their UIDs.</div><div class='del'>-	(ensure_uid): New function to create UIDs for calendar objects</div><div class='del'>-	that don't have them.</div><div class='del'>-	(add_object): Ensure the object has an UID before inserting it in</div><div class='del'>-	the calendar.</div><div class='del'>-	(cal_backend_get_object): New function.</div><div class='del'>-</div><div class='del'>-2000-02-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl (Cal): Added the get_object() method.</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_client_get_object): New function to get a</div><div class='del'>-	calendar object by its UID.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_object): Implemented.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_get_object): New unfinished backend</div><div class='del'>-	function.  We need some reorganizing of how the calendar objects</div><div class='del'>-	are stored.</div><div class='del'>-</div><div class='del'>-2000-02-02  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added the CORBA generated</div><div class='del'>-	sources.</div><div class='del'>-</div><div class='del'>-2000-02-01  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client.c (cal_loaded): Handle the cal_loaded signal from the</div><div class='del'>-	listener.  Store the calendar client interface object, and emit</div><div class='del'>-	our own cal_loaded signal.</div><div class='del'>-	(cal_client_load_calendar): Connect to the listener's signals.</div><div class='del'>-	(cal_client_class_init): Added the "obj_added", "obj_removed",</div><div class='del'>-	öbj_changed" signals.</div><div class='del'>-	(obj_added_cb): Handle the signal from the listener.</div><div class='del'>-	(obj_removed_cb): Likewise.</div><div class='del'>-	(obj_changed_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2000-01-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added cal-client.[ch] and</div><div class='del'>-	cal-listener.[ch].</div><div class='del'>-</div><div class='del'>-2000-01-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-calendar.idl: Changed the namespace from</div><div class='del'>-	GNOME::Calendar to Evolution::Calendar.</div><div class='del'>-	(Listener::LoadStatus): Fixed SUCESSS -&gt; SUCCESS typo.  And I</div><div class='del'>-	never noticed it in the implementation.  Ain't M-/ grand?</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Changed ocurrences of gnome-calendar.idl to</div><div class='del'>-	evolution-calendar.idl.</div><div class='del'>-</div><div class='del'>-	* *.[ch]: Changed GNOME_Calendar_foo identifiers to</div><div class='del'>-	Evolution_Calendar_foo.</div><div class='del'>-</div><div class='del'>-2000-01-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-client.c cal-client.h: New files with the calendar client</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-2000-01-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (CalFactory_load): Check that the listener is not</div><div class='del'>-	nil and emit and exception if it is.</div><div class='del'>-</div><div class='del'>-	* gnome-calendar.idl (CalFactory::load CalFactory::create): Now</div><div class='del'>-	these raise the NilListener exception.</div><div class='del'>-</div><div class='del'>-	* tlacuache.c (calendar_notify): Error stub for alarms.</div><div class='del'>-	(alarm_defaults): Stub array.</div><div class='del'>-	(debug_alarms): Stub variable.</div><div class='del'>-	(main): Initialize gnome-vfs.</div><div class='del'>-</div><div class='del'>-2000-01-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* tlacuache.c: New main module for the Tlacuache personal calendar</div><div class='del'>-	server.</div><div class='del'>-</div><div class='del'>-	* tlacuache.gnorba: New gnorba file for Tlacuache, the GNOME</div><div class='del'>-	personal calendar server.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added the stuff necessary to build Tlacuache.</div><div class='del'>-</div><div class='del'>-	* cal.c (Cal_get_uri): Convert the URI to a string before</div><div class='del'>-	returning it.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (CalFactory_create): Doh, this function is void.</div><div class='del'>-</div><div class='del'>-	* job.c (job_add): Use g_idle_add(), not gtk_idle_add().</div><div class='del'>-</div><div class='del'>-2000-01-24  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_remove_cal): New function to remove a</div><div class='del'>-	calendar client interface object from a backend.</div><div class='del'>-	(cal_backend_load): Convert the URI to string and use</div><div class='del'>-	Parse_MIME_FromFileName().  The conversion is not very smart,</div><div class='del'>-	though.</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (load_backend): Moved most of the error handling</div><div class='del'>-	upstream to load_fn().</div><div class='del'>-	(load_fn): Handle failure in case the backend could not be loaded.</div><div class='del'>-	(cal_factory_destroy): Free the backends and the backend hash</div><div class='del'>-	table.</div><div class='del'>-	(add_calendar_client): Implemented.  We create a Cal client</div><div class='del'>-	interface object and attach it to the backend, and we notify the</div><div class='del'>-	listener.</div><div class='del'>-</div><div class='del'>-2000-01-22  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (lookup_backend): Renamed from lookup_calendar().</div><div class='del'>-	Also, return a backend instead of a Cal client object.</div><div class='del'>-</div><div class='del'>-	* cal-backend.c (cal_backend_load): Take in a GnomeVFSURI, not a</div><div class='del'>-	string.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (Listener_cal_loaded): Pass the load status to</div><div class='del'>-	the signal.</div><div class='del'>-	(cal_listener_destroy): Better error checking.</div><div class='del'>-	(cal_listener_new): Better error checking.</div><div class='del'>-</div><div class='del'>-	* cal-listener.h (CalListenerLoadStatus): New enum for the load</div><div class='del'>-	status of a calendar.</div><div class='del'>-	(CalListenerClass): Added the status argument to the cal_loaded</div><div class='del'>-	signal.</div><div class='del'>-</div><div class='del'>-	* gnome-calendar.idl (cal_loaded): Added a load status code.</div><div class='del'>-</div><div class='del'>-	* cal-backend.h (CalBackendLoadStatus): Renamed from</div><div class='del'>-	CalBackendLoadResult.</div><div class='del'>-</div><div class='del'>-2000-01-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-backend.c cal-backend.h: Moved the calendar backend here.</div><div class='del'>-	This is the actual calendar-handling object.</div><div class='del'>-	(load_from_vobject): Moved over from calendar.c.  Modified to use</div><div class='del'>-	a CalBackend instead of the old Calendar structure.</div><div class='del'>-	(add_object): Likewise.</div><div class='del'>-</div><div class='del'>-	* cal.c: Now the Cal object is just a calendar client interface</div><div class='del'>-	object; we use it as a "viewport" onto a CalBackend.  This also</div><div class='del'>-	lets us do correct resource management.</div><div class='del'>-</div><div class='del'>-	* cal-common.h: New file with common forward declarations; we</div><div class='del'>-	can't have circular dependencies between headers.</div><div class='del'>-</div><div class='del'>-2000-01-18  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal-factory.c (cal_factory_load): Queue a load job.</div><div class='del'>-	(load_fn): Load job handler.  Lookup the calendar by URI, load it</div><div class='del'>-	if it is not loaded, or just report it to the new listener if it is.</div><div class='del'>-</div><div class='del'>-	* job.c job.h: New files with a simple job queue manager.</div><div class='del'>-</div><div class='del'>-	* gnome-calendar.idl (Listener::cal_loaded): Do not return the</div><div class='del'>-	whole calendar object string.  The client will be able to query</div><div class='del'>-	the calendar for the events it needs.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (Listener_cal_loaded): Ref the calendar GNOME</div><div class='del'>-	object.  We unref it when the listener is destroyed.</div><div class='del'>-</div><div class='del'>-2000-01-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	The files from the gncal directory of the gnome-pim module on CVS</div><div class='del'>-	were moved here, to evolution/calendar, in preparation for the</div><div class='del'>-	Evolution work.  The calendar is being split into a model/view</div><div class='del'>-	architecture.  The model is a personal calendar server (PAS):  it</div><div class='del'>-	provides storage, notification, and event generation; the</div><div class='del'>-	views/controllers are the calendar user agents and things like</div><div class='del'>-	Pilot synchronizers.</div><div class='del'>-</div><div class='del'>-2000-01-11  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* cal.c: Removed the CORBA listener methods, adjusted for the new</div><div class='del'>-	IDL.</div><div class='del'>-</div><div class='del'>-	* cal-listener.c (cal_listener_init): Create the private</div><div class='del'>-	structure.  In it we hold a reference to the calendar the listener</div><div class='del'>-	is watching.</div><div class='del'>-	(cal_listener_destroy): Destroy the private structure and unref</div><div class='del'>-	the calendar.</div><div class='del'>-	(Listener_cal_loaded): Stuff the calendar into our private data.</div><div class='del'>-	(Listener_obj_added): Adjusted for new IDL.</div><div class='del'>-	(Listener_obj_removed): Likewise.</div><div class='del'>-</div><div class='del'>-	* gnome-calendar.idl: New IDL for the personal calendar server.</div><div class='del'>-</div><div class='del'>-	* cal.h cal.c: New files with the calendar object.</div><div class='del'>-</div><div class='del'>-	* cal-listener.h cal-listener.c: New files with the calendar</div><div class='del'>-	listener object.</div><div class='del'>-</div><div class='del'>-	* cal-factory.h cal-factory.c: New files with the calendar factory</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-2000-01-09  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Changes to remove todo capplet stuff from distro.</div><div class='del'>-</div><div class='del'>-2000-01-08  Vadim Strizhevsky  &lt;vadim@optonline.net&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c: Added pilotID argument to</div><div class='del'>-	gpilotd_conduit_mgmt_new.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-01-05  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* GnomeCal.idl: Added an argument to get_number_of_objects, so you</div><div class='del'>-	can choose which state the object should have</div><div class='del'>-	(any/new/modified/...). Will also add one to choose type</div><div class='del'>-	(event/journal etc).</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_get_number_of_objects): Implemented the</div><div class='del'>-	new version of get_number_of_objects.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (pre_sync): Calls various</div><div class='del'>- 	gnome_pilot_conduit_standard_abs_set_num_yadayda to get progress bars.</div><div class='del'>-</div><div class='del'>-2000-01-04  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (start_calendar_server): Let's not call</div><div class='del'>-	g_error, but g_warning instead.</div><div class='del'>-	(pre_sync): Get record numbers info, total, new, deleted etc, and</div><div class='del'>-	tell gpilotd.</div><div class='del'>-</div><div class='del'>-1999-12-31  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_end_to_ical): Adds 86400 secs (1</div><div class='del'>-	day) to the date chooses by the user. This ensures the recurrence</div><div class='del'>-	also occurs on that date.</div><div class='del'>-	(ee_rp_init_ending_date): And subtracts 86400 secs when about to</div><div class='del'>-	redisplay the box.</div><div class='del'>-</div><div class='del'>-	* calendar.h: Added an argument to calendar_new, to enable certain</div><div class='del'>-	features, such as initing alarms or nor.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_new): Implemented support for the</div><div class='del'>-	CALENDAR_INIT_ALARMS option to calendar_new.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_get_updated_objects): Added</div><div class='del'>- 	CALENDAR_INIT_ALARMS to calendar_new calls.</div><div class='del'>-</div><div class='del'>-	* main.c: Added CALENDAR_INIT_ALARMS to calendar_new calls. This</div><div class='del'>- 	should probably be CALENDAR_INIT_NIL, but I'm not sure, guess</div><div class='del'>- 	steintr should check it.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c: Added CALENDAR_INIT_ALARMS to calendar_new calls.</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c: Added CALENDAR_INIT_NIL to calendar_new calls.</div><div class='del'>-</div><div class='del'>-1999-12-10  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_create_ae): Fix sensitivity bug when used to</div><div class='del'>-	create default alarm box (widgets in that box should always be</div><div class='del'>-	sensitive, even if the enabled checkbutton is not set)</div><div class='del'>-</div><div class='del'>-1999-12-08  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c (setSettings): Capplets now</div><div class='del'>-	sets first_sync on enable, this should make the conduit copy old</div><div class='del'>-	entries from the pilot to gnomecal.</div><div class='del'>-</div><div class='del'>-1999-12-07  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (pre_sync): Check if local store is</div><div class='del'>-	empty. If, force slow sync.</div><div class='del'>-</div><div class='del'>-	* GnomeCal.idl (GNOME): Added get_number_of_objects.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_get_number_of_objects): implemented the</div><div class='del'>- 	get_number_of_objects.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c (setStateCfg): Fixed bug that</div><div class='del'>-	caused the capplet to always set the sync action to Disable upon start.</div><div class='del'>-</div><div class='del'>-1999-12-05  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (Conduits_second_DATA): Also install .desktop files</div><div class='del'>-	for conduit capplets in the gnome/apps menu dir.</div><div class='del'>-</div><div class='del'>-1999-12-04  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Added .desktop files to EXTRA_DIST.</div><div class='del'>-</div><div class='del'>-1999-10-12  Clifford R. Conover  &lt;rusty@zootweb.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c Todo List improvements.</div><div class='del'>-</div><div class='del'>-	Cleaned up todo item highlighting, added support for highlighting</div><div class='del'>- 	events due today, and events not due yet.  Colors are configurable</div><div class='del'>- 	on the Colors Tab of the properties window.</div><div class='del'>-</div><div class='del'>-	Renamed Frame in Properties window to Colors rather then Month</div><div class='del'>- 	Colors since we are now asking for Todo item colors.</div><div class='del'>-</div><div class='del'>-	Added ability to display time until todo item is due in list, it</div><div class='del'>- 	automatically selects the best denomination of time (up to weeks)</div><div class='del'>- 	and down to seconds to display.  This should be made configurable</div><div class='del'>- 	in a future version.</div><div class='del'>-</div><div class='del'>-	Changed Todo dialog to ask for time that event is due.  This</div><div class='del'>- 	allows more accurate tracking of then the item is due, before the</div><div class='del'>- 	dialog was only asking for the date of the todo item.</div><div class='del'>-</div><div class='del'>-1999-12-03  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: undef DEBUG_CALCONDUT, suppresses debug output.</div><div class='del'>-</div><div class='del'>-1999-12-02  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* alarm.c: Enhanced debug support: can be toggled on and off by</div><div class='del'>-	SIGUSR1, reports alarms which could not be added</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c, main.[ch], prop.c: Add snooze capability for audio</div><div class='del'>-	and display alarms.  Snooze interval can be configured in the</div><div class='del'>-	Properties box.</div><div class='del'>-</div><div class='del'>-1999-11-30  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (compare): Fixed compare bug. Also neated up</div><div class='del'>-	some of the if's in set_status.</div><div class='del'>-</div><div class='del'>-1999-11-22  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Merged todo list coloring patch from stable</div><div class='del'>-	* Added myself to AUTHORS, about box (per Miguel)</div><div class='del'>-</div><div class='del'>-1999-11-22  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (pre_sync): Writes some warning</div><div class='del'>- 	messages when pre_sync fails.</div><div class='del'>-</div><div class='del'>-1999-11-14  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Stupid misplaced endif cause gncal to depend on an</div><div class='del'>-	install gnome-pilot... fixed... sorry.</div><div class='del'>-</div><div class='del'>-1999-11-12  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (extra_pilot_bins): Fixed the if then else problem,</div><div class='del'>-	using solution suggested by James Henstridge, appears to be caused</div><div class='del'>-	by a (by now fixed) bug in my automake.</div><div class='del'>-</div><div class='del'>-1999-11-12  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c: Config code for timeout, make Alarms property page use a</div><div class='del'>-	vbox instead of an hbox so that the propbox stays a reasonable width.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c, main.[ch]: Add timeout for audio alarms, code to load</div><div class='del'>-	from config file</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Give some static functions external linkage so they</div><div class='del'>-	can be used elsewhere (make_spin_button); add some prototypes to</div><div class='del'>-	appease gcc.</div><div class='del'>-</div><div class='del'>-1999-11-11  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_day_change): Add call to</div><div class='del'>-	calendar_init_alarms() to schedule another day change alarm.</div><div class='del'>-</div><div class='del'>-1999-11-09  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: Enabled debug output. Sets a g_log_domain,</div><div class='del'>-	now version 0.8.5. Consistent use of GSList/GList. Implemented</div><div class='del'>-	compare, default uses one that compares the contents of a struct</div><div class='del'>-	Appointment, but also has #ifdeffed code that does a field level</div><div class='del'>-	comparison, not complete, but perhaps educational.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (#todo_conduit_control_applet_SOURCES): Fixed an</div><div class='del'>-	unwanted conditional on libcalendar_conduit_la_LDFLAGS</div><div class='del'>-</div><div class='del'>-1999-11-05  Eskil Heyn Olsen  &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c (readStateCfg): Commented the</div><div class='del'>-	code out, thus the capplet works again.</div><div class='del'>-</div><div class='del'>-1999-11-04  Eskil Olsen   &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Uses the PISOCK_LIBDIR, for people with odd install</div><div class='del'>- 	dirs for their pilot-link. Also install a pretty icon for the</div><div class='del'>- 	calendar-conduit.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.c: Modfied the</div><div class='del'>-	try/revert/ok/cancel scheme to be more intuitive, also uses a</div><div class='del'>-	GtkOptionMenu for the possible sync methods.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit-control-applet.desktop: use the nice icon...</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: Ack, had to define debug_alarms and</div><div class='del'>-	alarm_default, otherwise they are undefined. Is gncal code messy</div><div class='del'>-	or is this considered a way of configuring the cal engine ?</div><div class='del'>-	Implemented delete_all syncabs methods.</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c: also had to declare debug_alarms and</div><div class='del'>- 	alarm_defaults, just as ugly.</div><div class='del'>-</div><div class='del'>-1999-11-02  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c: Add new alarm page to properties box</div><div class='del'>-</div><div class='del'>-	* prop.c, calobj.c, main.[ch] eventedit.c: New support for default</div><div class='del'>-	alarms, configurable in the properties box.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c, prop.c, main.[ch]: add option to beep on Display</div><div class='del'>-	alarms</div><div class='del'>-</div><div class='del'>-1999-10-23  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_new): Correctly initialize calendar_day_end</div><div class='del'>-	and calendar_day_begin *before* installing day-change alarm.</div><div class='del'>-</div><div class='del'>-1999-10-21  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* alarm.c, main.c: Added alarm debugging code</div><div class='del'>-</div><div class='del'>-	* main.c (open_ok): Show an error box if the user tries to open a</div><div class='del'>-	non-existent file; fixes bug #1818</div><div class='del'>-</div><div class='del'>-1999-10-19  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (calendar_notify): Fix typos which were causing</div><div class='del'>-	invalid times in audio notification dialogs; fixes Bug #2561</div><div class='del'>-</div><div class='del'>-1999-10-18  Russell Steinthal  &lt;rms39@columbia.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): Placed the various</div><div class='del'>-	elements of the day view in paned windows so that the user can</div><div class='del'>-	adjust the relative sizes of the daily schedule, monthly calendar,</div><div class='del'>-	and to-do list.</div><div class='del'>-</div><div class='del'>-1999-10-18  Martin Norbäck  &lt;norpan@bigfoot.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.desktop: Added swedish translation</div><div class='del'>-</div><div class='del'>-1999-10-13  Eskil Olsen   &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Hopefully the fixes the much-hated</div><div class='del'>-	gnome-pilot dependency.</div><div class='del'>-</div><div class='del'>-1999-10-07  Eskil Olsen   &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_changed): moved the pilot_status =</div><div class='del'>-	MOD up, so even a CHANGE_SUMMARY will set the modified flag.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: more _free calls, vamped the noise on output.</div><div class='del'>-</div><div class='del'>-1999-10-06  Eskil Olsen   &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* *conduit*[ch]: checks return values from gpilotd_init/connect.</div><div class='del'>-</div><div class='del'>-	* calender.c (vcalendar_create_from_calendar): removed a set</div><div class='del'>- 	of cleanVObject cleanStrTbl, since the freed memory that the</div><div class='del'>-	function returned.</div><div class='del'>-</div><div class='del'>-1999-09-27  Timur Bakeyev  &lt;mc@bat.ru&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_from_isodate): Use tm.gmtoff or timezone to get</div><div class='del'>-	correct offset from UTC, according to HAVE_TM_GMTOFF or HAVE_TIMEZONE.</div><div class='del'>-	See also 1999-07-19  Matt Martin &lt;matt@abacusnet.net&gt;</div><div class='del'>-</div><div class='del'>-1999-09-27  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c (add_event): ditto</div><div class='del'>-	(mark_current_day): ditto</div><div class='del'>-	(month_view_set): ditto</div><div class='del'>-</div><div class='del'>-	* goto.c (goto_dialog): ditto.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_init): ditto.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): ditto.</div><div class='del'>-</div><div class='del'>-	* getdate.c (RelativeDate): ditto.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (set_all_day): ditto.</div><div class='del'>-	(ee_rp_init_rule): ditto.</div><div class='del'>-</div><div class='del'>-	* calendar.c (vcalendar_create_from_calendar): ditto.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c (update_record): ditto.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): Get rid of pointers to</div><div class='del'>-	values returned from localtime, as it uses a static buffer.</div><div class='del'>-</div><div class='del'>-1999-09-26  Eskil Olsen &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* corba-cal.c: the g_free that was commented out since glib said</div><div class='del'>-	was a duplicate free, was supposed to be a free.</div><div class='del'>-</div><div class='del'>-	* GnomeCal.idl/corba-cal.c: added a get_object_id_list and a</div><div class='del'>-	get_objects_by_id_list. Latter is not done.</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: rewrote the way the conduit iterates over</div><div class='del'>-	records. It no longers fetches all entries (since that didn't work</div><div class='del'>-	with more then 285 entries. It now fetches the id list, and gets</div><div class='del'>-	each record. (will be using get_objects_by_id_list to get records</div><div class='del'>-	in amounts of 10 or so later, to reduce amount of corba calls).</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: now sets alarm parameters when transferring</div><div class='del'>-	from gnomecal to pilot.</div><div class='del'>-</div><div class='del'>-1999-09-23  Eskil Olsen &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-conduit.c: better merge of summary/description</div><div class='del'>- 	when doing ical_from_remote (update_record), also handles</div><div class='del'>-	import from gnomecal to pilot better, and on both ways, repeat</div><div class='del'>-	events are much better now.</div><div class='del'>-</div><div class='del'>-1999-09-22  Eskil Olsen &lt;deity@eskil.dk&gt;</div><div class='del'>-</div><div class='del'>-	* corba-cal.c: commented out a g_free that glib reported</div><div class='del'>-	as being a duplicate free.</div><div class='del'>-	* calendar-conduit.c: got gnomecal-&gt;pilot up and runnning.</div><div class='del'>-</div><div class='del'>-1999-02-06  Lauris Kaplinski &lt;lauris@ariman.ee&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.desktop: Added Estonian translations.</div><div class='del'>-</div><div class='del'>-1999-09-14  Federico Mena Quintero  &lt;federico@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_popup_menu): Set the data pointers for</div><div class='del'>-	all the items.</div><div class='del'>-</div><div class='del'>-1999-09-14  Kjartan Maraas  &lt;kmaraas@online.no&gt;</div><div class='del'>-</div><div class='del'>-	* doc/C/gnomecal.sgml: Merge from gnome-pim-1-0. Synced with newest</div><div class='del'>-	user-guide.</div><div class='del'>-</div><div class='del'>-1999-09-01  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_create_buttons): Make the OK button the default</div><div class='del'>-	button per Russell's suggestion.</div><div class='del'>-</div><div class='del'>-1999-08-30  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_changed): Modify the</div><div class='del'>-	object-&gt;last_mod field.</div><div class='del'>-	(calendar_add_object): Ditto.</div><div class='del'>-</div><div class='del'>-	Closes bug #676</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): Fix problem in which we warned the</div><div class='del'>-	user about the calendar being modified the first time the calendar</div><div class='del'>-	was used.</div><div class='del'>-</div><div class='del'>-1999-08-22  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* gnomecal.gnorba: "GenericFactoy" is wrong...</div><div class='del'>-</div><div class='del'>-1999-08-15  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_gen_uid): Fix the hostname part.</div><div class='del'>-</div><div class='del'>-1999-08-07  Peter Teichman  &lt;pat4@acpub.duke.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_pilot): sync correctly for objects</div><div class='del'>-	created on the pilot, but not dirty (because they have been synced</div><div class='del'>-	with some other program in the past)</div><div class='del'>-</div><div class='del'>-1999-07-30  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_init): Release points here.</div><div class='del'>-</div><div class='del'>-1999-08-02  Peter Teichman  &lt;pat4@acpub.duke.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcalendar_conduit_la_LDFLAGS):</div><div class='del'>-	libcalendar_conduit now installs</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_pilot): do deletion of appointments</div><div class='del'>-	correctly, when they are deleted on the pilot</div><div class='del'>-	(conduit_free_Appointment): protect against double-freeing parts</div><div class='del'>-	of the Appointment structure</div><div class='del'>-	(update_record): all-day events from the pilot are handled a bit</div><div class='del'>-	more reasonably</div><div class='del'>-</div><div class='del'>-1999-08-01  Peter Teichman  &lt;pat4@acpub.duke.edu&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_object_to_pilot): The multi-day</div><div class='del'>-	appointment corruption bug is dead. Whoo!</div><div class='del'>-</div><div class='del'>-1999-07-31  Peter Teichman  &lt;pat4@acpub.duke.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: fixed this up slightly with respect to pilot conduits</div><div class='del'>-</div><div class='del'>-1999-07-30  Jonathan Blandford  &lt;jrb@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcalendar_conduit_la_LIBADD): More autoconf-stuff</div><div class='del'>-</div><div class='del'>-1999-07-29  Jonathan Blandford  &lt;jrb@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_widgets): Add scrolling to the yearview.</div><div class='del'>-</div><div class='del'>-1999-07-28  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c: (sync_object_to_pilot): If the enddate is</div><div class='del'>-	not set, set the repeatForever to 1.  This fixes all of the</div><div class='del'>-	birthdays problems I had.</div><div class='del'>-</div><div class='del'>-	Make the code not take arguments</div><div class='del'>-	(sync_cal_to_pilot): Nice event update information</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_new): Add Event UID hash table.</div><div class='del'>-	(calendar_add_object): Add events to the hash table here.</div><div class='del'>-	(calendar_remove_object): Remove events here.</div><div class='del'>-	(calendar_object_find_event): Use the hash table here.</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): The object is already destroyed by</div><div class='del'>-	gnome_dialog_run.</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_object_to_pilot): Do not turn</div><div class='del'>-	archived bit on.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_gen_uid): Use the hostname, not the domain name.</div><div class='del'>-	(ical_gen_uid): Add a serial number.  Isodates can be small.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (cal_repo_update_pilot_id): New method to update the</div><div class='del'>-	pilot status.</div><div class='del'>-	(cal_repo_get_updated_objects): New method.  Returns a list of</div><div class='del'>-	modified and not-sycned objects</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c (sync_cal_to_pilot): New function to sync</div><div class='del'>-	from the GnomeCalendar to the pilot.</div><div class='del'>-	(sync_object_to_pilot): Sync a single event to the pilot.</div><div class='del'>-	(try_alarm): Alarm syncing code.</div><div class='del'>-</div><div class='del'>-1999-07-27  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calendar-pilot-sync.c: New file.  Implements PalmPilot</div><div class='del'>-	syncronization with the Gnome Calendar.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_new_from_string): New function.  Creates</div><div class='del'>-	an iCalObject from a vCalendar string that is supposed to contain</div><div class='del'>-	only one vEvent.</div><div class='del'>-</div><div class='del'>-	* calendar.c:</div><div class='del'>-	(calendar_save): Split this routine in two.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_new): Create the corba server here.</div><div class='del'>-</div><div class='del'>-	* main.c: Include gnorba.h, and corba-cal-factory.h here</div><div class='del'>-	(close_cmd): Kill the calendar server on shutdown.</div><div class='del'>-</div><div class='del'>-	* calobj.c (load_recur_yearly_day): Added a fixme comment.  WE</div><div class='del'>-	need to handle intervals in the years.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_find_in_list, calendar_object_find,</div><div class='del'>-	calendar_object_find_todo, calendar_object_find_event): New</div><div class='del'>-	functions for looking up information.</div><div class='del'>-</div><div class='del'>-	* main.c (gnome_calendar_locate): New function.</div><div class='del'>-</div><div class='del'>-	* corba-cal.c (calendar_create_object): New file.  Implements the</div><div class='del'>-	corba server.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_changed): Flag pilot-status as changed.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): Save pilot information for syncing.</div><div class='del'>-	(ical_object_create_from_vobject): Load syncing information for</div><div class='del'>-	pilot.  Do it in a way compatible with KOrganizer.</div><div class='del'>-</div><div class='del'>-1999-07-26  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs</div><div class='del'>-	on Vevents we load that lack it.  WE need this for the old</div><div class='del'>-	gnome calendar generated files (ie, before now :-).</div><div class='del'>-</div><div class='del'>-	Required to sync with the Palm</div><div class='del'>-</div><div class='del'>-1999-07-26  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Generate unique IDs</div><div class='del'>-	on Vevents we load that lack it.  WE need this for the old</div><div class='del'>-	gnome calendar generated files (ie, before now :-).</div><div class='del'>-</div><div class='del'>-	Required to sync with the Palm</div><div class='del'>-</div><div class='del'>-1999-07-19  Matt Martin &lt;matt@abacusnet.net&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_from_isodate): Handle the 'Z' parameter to the</div><div class='del'>-	ISO date format to convert from GMT time.</div><div class='del'>-</div><div class='del'>-1999-07-17  Nat Friedman  &lt;nat@gnome-support.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_add_object): Copy the new UID into the</div><div class='del'>- 	iCalObject structure.</div><div class='del'>-</div><div class='del'>-1999-07-16  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_set_arg): Merge fix from</div><div class='del'>-	gnome-pim-1-0: Fixed cut&amp;paste bug for day fontsets.</div><div class='del'>-</div><div class='del'>-1999-07-14  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_gen_uid): Returns a UID.</div><div class='del'>-	(ical_object_new): Use a UID when creating an event.  Should get</div><div class='del'>-	syncing done easier.</div><div class='del'>-</div><div class='del'>-1999-07-14  Nicholas J Kreucher &lt;nick@poetic.com&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (skip_numbers): Actually skip over the numbers.</div><div class='del'>-	(ical_object_to_vobject): Test the proper variable for storing the</div><div class='del'>-	proper information.</div><div class='del'>-</div><div class='del'>-1999-07-14  Jean-Noel Guiheneuf &lt;jean-noel.guiheneuf@wanadoo.fr&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_add_month): Fixed the problem with next month</div><div class='del'>-	going from a 31-day to a 30-day by adjusting the date to the</div><div class='del'>-	closest day at the end of the month.</div><div class='del'>-</div><div class='del'>-1999-06-07  Mike McEwan  &lt;mike@lotusland.demon.co.uk&gt;</div><div class='del'>-</div><div class='del'>-        * timeutil.c (time_add_month): Tell ktime' that we don't know</div><div class='del'>-        about daylight saving time so that it does *not* make adjustments</div><div class='del'>-        when we traverse a DST boundary.</div><div class='del'>-        (time_year_begin): ditto.</div><div class='del'>-        (time_year_end): ditto.</div><div class='del'>-        (time_month_begin): ditto.</div><div class='del'>-        (time_month_end): ditto.</div><div class='del'>-</div><div class='del'>-1999-06-16  Anders Carlsson  &lt;anders.carlsson@tordata.se&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (new_calendar): Realize the toplevel widget when</div><div class='del'>-	--hidden is passed to gnomecal. This fixes a segfault.</div><div class='del'>-</div><div class='del'>-1999-06-04  Robert Brady  &lt;rwb197@ecs.soton.ac.uk&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.h, gnome-cal.c: Fix abort() problem with the year view.</div><div class='del'>-	(Bug #1367). Thanks to Owen Cliffe &lt;oc197@ecs.soton.ac.uk&gt; for</div><div class='del'>-	helping track it down.</div><div class='del'>-</div><div class='del'>-1999-06-03  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (daynumberlist): One line bug fix from Sergey I Panov.</div><div class='del'>-</div><div class='del'>-1999-06-02  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* view-utils.c (nicetime): Use %H instead of %k, as %k is a GNU</div><div class='del'>-	extension, not available in other systems.</div><div class='del'>-</div><div class='del'>-1999-06-01  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (daynumberlist): Work around broken software that</div><div class='del'>-	writes a broken month-of-day as "zero".  Use the dtstart date for</div><div class='del'>-	this on this event.</div><div class='del'>-</div><div class='del'>-1999-05-28  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (install-data-local): help files be gone.  They are</div><div class='del'>-	now installed from the Docbook stuff.</div><div class='del'>-</div><div class='del'>-1999-05-26  Russell Steinthal  &lt;steintr@condor.penguinpowered.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c main.c main.h prop.c: Added support for priorities</div><div class='del'>-	for todo items.  Doesn't do much, but you can set them and sort by</div><div class='del'>-	them.  (Use the properties box to enable them; should they be on</div><div class='del'>-	by default?)</div><div class='del'>-</div><div class='del'>-1999-05-25  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (parse_an_arg): Added missing break here.  It was causing</div><div class='del'>-	core dumps when invoked with --userfile.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_set_view): Add some assertions here,</div><div class='del'>-	to pin point the bug reported on gnome-list.</div><div class='del'>-</div><div class='del'>-	* calobj.c (load_recurrence): Make intervals always exist.  a 0</div><div class='del'>-	interval is wrong.</div><div class='del'>-</div><div class='del'>-1999-05-25  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c: Removed unused macro CALENDAR_HEIGHT.</div><div class='del'>-</div><div class='del'>-1999-05-25  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c (idle_handler): Set the canvas scroll region here,</div><div class='del'>-	not in size_allocate().  Also, use the correct width and height</div><div class='del'>-	based on the allocation and the precomputed minimum width/height</div><div class='del'>-	values.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_widgets): Set the scrollbar policy of the</div><div class='del'>-	scrolled window.</div><div class='del'>-</div><div class='del'>-	* main.c (setup_appbar): Use the correct type for the appbar.</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c: Removed unused function switch_to_day().</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (calendar_day_selected): Removed unused variable.</div><div class='del'>-</div><div class='del'>-1999-05-25  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* doc/C/gnomecal.sgml: Fixed a typo.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_widgets): Added a scrolled window widget into</div><div class='del'>- 	which the year view is placed.</div><div class='del'>-</div><div class='del'>-	* year-view.c (CALENDAR_HEIGHT): The height of the total year view</div><div class='del'>- 	inside the scrolled window.</div><div class='del'>-	(idle_handler): Set the height of the year view to</div><div class='del'>- 	CALENDAR_HEIGHT.</div><div class='del'>-	(year_view_size_allocate): Set the scroll region of the year view</div><div class='del'>- 	canvas to allocation-&gt;width, CALENDAR_HEIGHT.</div><div class='del'>-</div><div class='del'>-1999-04-25  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (dump_todo): Add --todo flag to dump the todo contents.</div><div class='del'>-</div><div class='del'>-1999-04-19  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (add_activated): Use same hack used in edit_activated</div><div class='del'>-</div><div class='del'>-1999-04-16  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (edit_activated): Kill all grabs from the CList</div><div class='del'>-	before running the new dialog box.</div><div class='del'>-</div><div class='del'>-	This fixes the problem of button-3/Edit on the todo item blocking</div><div class='del'>-	the GUI (actually, the main window responds, but not the todo</div><div class='del'>-	window).</div><div class='del'>-</div><div class='del'>-1999-04-08  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (gncal_todo_init): Make sure we can get events for</div><div class='del'>-	button3.  The code for the nice popup menu was there but was not</div><div class='del'>-	getting invoked.</div><div class='del'>-</div><div class='del'>-1999-04-01 Steve Murphy &lt;murf@e-tools.com&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (weekdaynum): Added this routine so Monthly recurrences</div><div class='del'>-	use the weekday field as a simple integer for a single weekday.</div><div class='del'>-</div><div class='del'>-	* calobj.c (load_recur_monthly_pos): Call weekdaynum instead of</div><div class='del'>-	weekdaylist. The interface only lets the user input a single value</div><div class='del'>-	anyway.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): instead of code to output day</div><div class='del'>-	names from a bit array, use instead the value as an int and output</div><div class='del'>-	a single dayname.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): first_week_day gets the</div><div class='del'>-	day int instead of the first entry in the bit field. I inserted a</div><div class='del'>-	fair chunk of code to avoid calling generate if the day is out of</div><div class='del'>-	range for a month. It may be unneccessary, because mktime will</div><div class='del'>-	turn the extra days into a valid date the next month. But not all</div><div class='del'>-	mktimes are equal, I fear.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_rule_to_ical): For case 3,</div><div class='del'>-	(Monthly), I added code to set the interval slot of the recur</div><div class='del'>-	struct; without this value, selecting a monthly recursing, by</div><div class='del'>-	date, would lead to an infinite loop broken only by a failure to</div><div class='del'>-	alloc more memory. Also, in the "by position" case, both</div><div class='del'>-	u.month_pos and u.month_day were being assigned values. This is a</div><div class='del'>-	mistake, as they are both part of an union, and the same</div><div class='del'>-	thing. The weekday field should get the recur_rr_month_weekday</div><div class='del'>-	value.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_rule): set default day from the weekday</div><div class='del'>-	field instead of the u.month_day field, which is really the</div><div class='del'>-	month_pos value.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_tag_calendar): Month days start with</div><div class='del'>-	1, not 0; thus, setting tm.tm_mday = 0, and then calling mktime</div><div class='del'>-	will generate a time corresponding to the end of the previous</div><div class='del'>-	month, which may have a mday anywhere from 28 to 31. The end time</div><div class='del'>-	just adds 1 to the month, so your end time may not cover the last</div><div class='del'>-	few days of this month, depending on what the biggest mday of last</div><div class='del'>-	month was. I changed it so tm_mday is set to 1 instead.</div><div class='del'>-</div><div class='del'>-1999-03-30  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (convert_time_t_to_char): Made static.  Make it use</div><div class='del'>-	the full year format for strftime().</div><div class='del'>-</div><div class='del'>-1999-03-27  Nuno Ferreira  &lt;nmrf@rnl.ist.utl.pt&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c: Include &lt;config.h&gt; So that strings get translated.</div><div class='del'>-</div><div class='del'>-1999-03-26  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (build_hours_menu): Made it respect 12/24h settings..</div><div class='del'>-	Doesn't show until next time you open the dialog.. yet..</div><div class='del'>-</div><div class='del'>-1999-03-24  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_set): Did some i18n work</div><div class='del'>-	* eventedit.c (get_exception_string): Did some i18n work</div><div class='del'>-</div><div class='del'>-1999-03-24  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (gncal_todo_init): Made clist titles i18n:able</div><div class='del'>-	* main.c (poptOption): Added which views that are possible for</div><div class='del'>-	--view in the --help text (closes #367)</div><div class='del'>-	* main.c (dump_events): Added (short) month to the strftime and made</div><div class='del'>-	the strings i18n:able</div><div class='del'>-</div><div class='del'>-1999-03-23  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* gncal/calobj.c: Added 2 paranthesis..</div><div class='del'>-	"foobar = d / 60*60" is _NOT_ the same as "foobar = d / (60*60)"</div><div class='del'>-	which caused heavy alarm-corruption with alarms between 2 hrs and</div><div class='del'>-	2 days.</div><div class='del'>-</div><div class='del'>-1999-03-23  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_rule_to_ical): Set the</div><div class='del'>- 	recur-&gt;interval to the value of the recur_rr_month_period spin</div><div class='del'>- 	button if the event is being set "by day."  This closes bug #675</div><div class='del'>- 	as reported by bagfors@hpc2n.umu.se.  Thanks for the report!</div><div class='del'>-</div><div class='del'>-1999-03-10  Clifford R. Conover &lt;rconover@montana.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (simple_todo_editor): Add support for Due Date when</div><div class='del'>-	adding a TODO item here.</div><div class='del'>-	(column_resized): New function</div><div class='del'>-	(init_column_sorting): New function.</div><div class='del'>-	(todo_click_column): New function.</div><div class='del'>-	(convert_time_t_to_char, make_overdue_todo_style): New functions.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_todo_properties_changed): New</div><div class='del'>-	function used to update the TODO when the properties have been</div><div class='del'>-	chagned for it.</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply_todo): Apply TODO properties.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (todo_list_properties_changed): Update the</div><div class='del'>-	TODO display here.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (date_edit_new): Made public</div><div class='del'>-</div><div class='del'>-1999-03-10  Craig A Soules (soules+@andrew.cmu.edu)</div><div class='del'>-</div><div class='del'>-	* timeutil.c, calendar.c, calobj.c, gncal-day-panel.c: Add support</div><div class='del'>-	for daylight time savings.</div><div class='del'>-</div><div class='del'>-1999-02-28  Martin Baulig  &lt;martin@home-of-linux.org&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (recompute_motion): For DRAG_MOVE, DRAG_SIZE_TOP</div><div class='del'>-	and DRAG_SIZE_BOTTOM: call child_focus_out () if the child currently</div><div class='del'>-	has the focus.</div><div class='del'>-</div><div class='del'>-1999-02-27  Changwoo Ryu  &lt;cwryu@adam.kaist.ac.kr&gt;</div><div class='del'>-</div><div class='del'>-	* quick-view.c (QUICK_VIEW_FONTSET): Added Korean font to the</div><div class='del'>-	fontset string.</div><div class='del'>-	* mark.h (*_FONTSET): Likewise.</div><div class='del'>-</div><div class='del'>-1999-02-23  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): Save the owner/organizer of</div><div class='del'>-	the event.</div><div class='del'>-	(ical_object_create_from_vobject): Load the owner/organizer of the event.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (delete_occurance): Assign child to data (fixes</div><div class='del'>-	crash on "delete this occurrance").</div><div class='del'>-</div><div class='del'>-1999-02-22  Timur Bakeyev  &lt;mc@bat.ru&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c: According to configured values, use either tm.tm_zone</div><div class='del'>-	or tzname. In last case, also declare it extern.</div><div class='del'>-</div><div class='del'>-	* prop.c: langinfo.h not available everywhere. Wrapped. BTW, works</div><div class='del'>-	fine without it.</div><div class='del'>-</div><div class='del'>-1999-02-20  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (init_username): Made use of g_get_{user,real}_name() instead</div><div class='del'>-	of our own home-brew...</div><div class='del'>-</div><div class='del'>-1999-02-17  Sergey Panov &lt;sipan@mit.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c,gnome-month-item.h,goto.c,mark.h,</div><div class='del'>-	month-view.c,prop.c,quick-view.c,year-view.c: will define</div><div class='del'>-	fonts via fontset. Friendlier to locales that use iso8859-[^1]</div><div class='del'>-	and koi8-r encodings. Does not solve problem for Asian languiges</div><div class='del'>-	--- better solution is needed (e.g. standart GNOME fontstyles</div><div class='del'>-	defined in gtkrc).</div><div class='del'>-</div><div class='del'>-1999-02-16  Sergey Panov &lt;sipan@mit.edu&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Use N_() macro for color settings labels in</div><div class='del'>-	color_props structure.</div><div class='del'>-</div><div class='del'>-1999-02-15  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c (goto_dialog): Indentation fixes.</div><div class='del'>-</div><div class='del'>-1999-02-15  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c: Made a private copy of what localtime() returns, to be able</div><div class='del'>-	to keep the data after more calls to localtime().</div><div class='del'>-</div><div class='del'>-1999-02-11  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (save_default_calendar): New function.  Saves the</div><div class='del'>-	calendar if it is the user's default calendar</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (unrecur_appointment):</div><div class='del'>-	* gncal-day-panel.c (day_view_range_activated):</div><div class='del'>-	* eventedit.c (ee_ok):</div><div class='del'>-	* gncal-todo.c (ok_button): Added autosave for the default</div><div class='del'>-	calendar.</div><div class='del'>-</div><div class='del'>-1999-02-09  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Removed the gtk_widget_realize call.</div><div class='del'>-</div><div class='del'>-1999-02-06  Changwoo Ryu  &lt;cwryu@adam.kaist.ac.kr&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.desktop: Added Korean translations.</div><div class='del'>-</div><div class='del'>-1999-02-04  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (date_edit_new): New convenience function to create</div><div class='del'>-	a properly-configured date editor widget.</div><div class='del'>-</div><div class='del'>-1999-02-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_new): Make the calendar start</div><div class='del'>-	weeks on Monday if appropriate.</div><div class='del'>-	(gncal_week_view_time_format_changed): New function to notify the</div><div class='del'>-	week view that the time format has changed.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): Make the calendar start</div><div class='del'>-	weeks on Monday if appropriate.</div><div class='del'>-	(gncal_day_panel_time_format_changed): New function to notify the</div><div class='del'>-	day panel that the time format has changed.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_time_format_changed): Tell the day</div><div class='del'>-	and week views that the time format has changed.</div><div class='del'>-</div><div class='del'>-1999-02-01  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_init): Set the title of the event</div><div class='del'>-	editor window.</div><div class='del'>-</div><div class='del'>-1999-01-31  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_expose): Do not remove the</div><div class='del'>-	clipping rectangle here.</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Remove the clipping</div><div class='del'>-	rectangle here, since the user of this function should not know</div><div class='del'>-	about it.</div><div class='del'>-</div><div class='del'>-1999-01-30  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Improve this draw</div><div class='del'>-	routine.  Now it can split the text in lines and fit as many</div><div class='del'>-	events as possible.</div><div class='del'>-	(nicetime): Return strings without spaces at the beginning.</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_expose): Move clip-clear</div><div class='del'>-	operation here.</div><div class='del'>-</div><div class='del'>-1999-01-29 Jason Tackaberry &lt;tack@dok.org&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_popup_menu): if the user clicks on an</div><div class='del'>-        event that is an occurance, the menu will allow the user to delete</div><div class='del'>-        all occurances of this event, or just the selected occurance.</div><div class='del'>-        (delete_occurance): added.</div><div class='del'>-</div><div class='del'>-        * eventedit.c (append_exception): force the clist to select the</div><div class='del'>-        new exception.  (fixes segfault)</div><div class='del'>-        (delete_exception): if the last exception in the clist is deleted,</div><div class='del'>-        move the selection index up. (fixes segfault)</div><div class='del'>-</div><div class='del'>-1999-01-28  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (parse_an_arg): Add --hidden key to hide the calendar at</div><div class='del'>-	startup. Only works with GNOME window managers though :-(</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_day_change): Reschedule alarms for the new day.</div><div class='del'>-</div><div class='del'>-	(calendar_init_alarms): Schedule an alarm for midnight to change</div><div class='del'>-	the calendar_day_begin/calendar_day_end.</div><div class='del'>-</div><div class='del'>-	* alarm.c (alarm_ready): If we reschedule, there is no need to</div><div class='del'>-	activate any pending alarms.</div><div class='del'>-</div><div class='del'>-1999-01-28  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_new): Insert the summary text here.</div><div class='del'>-	(child_focus_in): No need to raise the window, since we have</div><div class='del'>-	Spiffo(tm) layout code.  Boy, this is old code.</div><div class='del'>-	(gncal_full_day_focus_child): Now that GtkText works better, we</div><div class='del'>-	can avoid synthesizing a click which was causing grief, anyway.</div><div class='del'>-	(child_button_press): Grab the focus before popping up the menu.</div><div class='del'>-</div><div class='del'>-	* layout.c (find_index): Added a sanity check.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_destroy): Unmap and unrealize the child</div><div class='del'>-	before unparenting/destroying it.</div><div class='del'>-	(child_unrealize): Unrealize the widget.  What was I thinking?</div><div class='del'>-	(child_new): Save the focus_out_event signal connection id in</div><div class='del'>-	Child structure (in a new field).</div><div class='del'>-	(child_destroy): Disconnect from the focus_out_event signal, since</div><div class='del'>-	we don't want to get such an event when the widget is destroyed.</div><div class='del'>-	(gncal_full_day_destroy): Destroy the children properly; it was</div><div class='del'>-	leaking memory.</div><div class='del'>-</div><div class='del'>-1999-01-27  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): Warn if the calendar file has</div><div class='del'>-	changed.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_load, calendar_save): Keep track of the</div><div class='del'>-	modification time for the calendar file.</div><div class='del'>-</div><div class='del'>-1999-01-20  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_key_press): Only trap printable</div><div class='del'>- 	characters such that hotkeys work.</div><div class='del'>-	(UNSELECT_TIMEOUT): Changed to 0.  Much saner behavior.</div><div class='del'>-</div><div class='del'>-	* prop.c (properties): Connect gnome_help_pbox_display to the</div><div class='del'>- 	GnomePropertyBox help button.</div><div class='del'>-</div><div class='del'>-1999-01-19  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* quick-view.c (quick_view_do_popup): Do not grab the mouse here</div><div class='del'>-	(it was being grabbed incorrectly, anyways).</div><div class='del'>-	(quick_view_map_event): Grab the mouse when the window is mapped.</div><div class='del'>-	This avoids the ugly "while (xGrabPointer () != Success)" hack.</div><div class='del'>-	(quick_view_button_release): Handle button releases here.</div><div class='del'>-</div><div class='del'>-1999-01-19  Tomas Ogren  &lt;stric@ing.umu.se&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: do gtk_widget_realize on the toplevel window..</div><div class='del'>-</div><div class='del'>-1999-01-13  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): Make the little</div><div class='del'>-	calendar start up with the correct date.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_set): Add the month to the</div><div class='del'>-	date range display label.</div><div class='del'>-</div><div class='del'>-1999-01-08  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Converted some more stuff to use the standards.</div><div class='del'>-</div><div class='del'>-1999-01-08  Nat Friedman  &lt;nat@nat.org&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (setup_appbar): New function to create the status bar.</div><div class='del'>-	(setup_menu): Install menu hints.</div><div class='del'>-</div><div class='del'>-	Menu items updated to match the standards.  New Settings menu</div><div class='del'>- 	created.</div><div class='del'>-</div><div class='del'>-1998-12-30  Jeff Garzik  &lt;jgarzik@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal/calendar.c, gncal/gnome-cal.c, gncal/main.c,</div><div class='del'>-	  gncal/quick-view.c:</div><div class='del'>-	s/g_copy_strings/g_strconcat/</div><div class='del'>-</div><div class='del'>-1998-12-16  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	Rewrote the old and broken alarm system.  It never actually</div><div class='del'>-	worked properly.  Now it works properly, and I figured a nice way</div><div class='del'>-	to get the Audio alarm do something nicer (it is now like an alarm</div><div class='del'>-	clock :-).</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (calendar_notify): Now we take a CalendarAlarm to</div><div class='del'>-	actually distinguish which alarm was triggered.</div><div class='del'>-</div><div class='del'>-	* alarm.c (alarm_ready): The code was only activating the first</div><div class='del'>-	alarm.  Reschedule the timer upon delivery of an alarm.</div><div class='del'>-</div><div class='del'>-1998-12-14  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c (idle_handler): Use the allocation size instead of</div><div class='del'>-	the old fields in the canvas structure.</div><div class='del'>-</div><div class='del'>-	* goto.c (create_days): Use gtk_widget_set_usize() instead of</div><div class='del'>-	gnome_canvas_set_size().</div><div class='del'>-	* quick-view.c (setup_event_list): Likewise.</div><div class='del'>-</div><div class='del'>-1998-12-09  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (simple_todo_editor): Use gnome_dialog_set_parent.</div><div class='del'>-	* goto.c (goto_dialog): ditto</div><div class='del'>-	* prop.c (properties): ditto.</div><div class='del'>-</div><div class='del'>-1998-11-23  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_exceptions): Update GtkClist usage.</div><div class='del'>-</div><div class='del'>-1998-11-23  Andrew T. Veliath  &lt;andrewtv@usa.net&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (gncal_day_panel_new): Use</div><div class='del'>-	gtk_scrolled_window_add_with_viewport instead of</div><div class='del'>-	gtk_container_add (gtk changes).</div><div class='del'>-</div><div class='del'>-1998-11-23  Herbert V. Riedel &lt;hvr@hvrlab.ml.org&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c: use GPOINTER_TO_INT</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c: same.</div><div class='del'>-</div><div class='del'>-1998-11-22  Matthew Wilson  &lt;msw@redhat.com&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Fixed the popt event parsing callback to have the</div><div class='del'>-	correct number of arguments.  This stops it from segfaulting.</div><div class='del'>-</div><div class='del'>-1998-11-16  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_classification_widgets): Doh.  Fixed stupid bug</div><div class='del'>-	where the classification buttons were not being set correctly.</div><div class='del'>-	(ee_store_general_values_to_ical): Take into account the fact that</div><div class='del'>-	radio group lists are stored in reverse order of insertion.</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (gncal_todo_init): Use a scrolled window to put the</div><div class='del'>-	clist into.</div><div class='del'>-</div><div class='del'>-1998-11-11  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_save): Backup the old file before saving</div><div class='del'>-	the caledar.</div><div class='del'>-</div><div class='del'>-1998-11-06  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c: Add ctype.h</div><div class='del'>-</div><div class='del'>-1998-10-31  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_direction): Add the offset from the</div><div class='del'>-	beginning of the current time unit (day/month/etc), otherwise it</div><div class='del'>-	does not work right, for example, you are on the 31st day of a</div><div class='del'>-	month and the next month is a 30-day one and you jump to the next</div><div class='del'>-	month.</div><div class='del'>-</div><div class='del'>-1998-10-16  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c: Changed a lot of stuff not to use the layout code</div><div class='del'>-	-- the month view's days are too small to display layout</div><div class='del'>-	usefully.  Now they display a little list of the events in each</div><div class='del'>-	day.  We also have a popup menu for the days in the month view.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_get_objects_in_range): Reverse the list so</div><div class='del'>-	that it is returned in increasing order.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_new_whole_day): New public function to</div><div class='del'>-	create an event for the complete span of day_begin to day_end.</div><div class='del'>-</div><div class='del'>-	* year-view.c (new_appointment): Use event_editor_new_whole_day().</div><div class='del'>-</div><div class='del'>-	* year-view.c (yv_popup_menu): Mark strings for i18n.</div><div class='del'>-</div><div class='del'>-1998-10-12  Ji Lee &lt;g@ucsd.edu&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_rule_to_ical): The interval was</div><div class='del'>-	never being loaded from the spin button.</div><div class='del'>-</div><div class='del'>-1998-10-09  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_update): Create a list of children and</div><div class='del'>-	lay them out nicely.  Lots of functions added for this purpose.</div><div class='del'>-	(adjust_segment): Main event segment adjustment routine.</div><div class='del'>-	(adjust_children): Adjusts all the children in the month view.</div><div class='del'>-	(child_create_segments): Creates the segments for a particular event.</div><div class='del'>-	(layout_children): Uses the generic layout engine to organize the children.</div><div class='del'>-</div><div class='del'>-1998-10-08  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (clist_row_selected): Set the sensitivity of the</div><div class='del'>-	edit/delete buttons.</div><div class='del'>-	(gncal_todo_update): Likewise.  Thanks to Dirk Luetjens for the</div><div class='del'>-	bug report.</div><div class='del'>-</div><div class='del'>-	* layout.c: Do some cleanup; now we pass a struct with the layout</div><div class='del'>-	algorithm's state instead of passing a trillion parameters around.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (layout_children): Use the new generic layout</div><div class='del'>-	engine.</div><div class='del'>-	(child_compare): Sort keys are start time then end time, not just</div><div class='del'>-	start time.  This produces somewhat nicer results for the layout</div><div class='del'>-	algorithm.</div><div class='del'>-</div><div class='del'>-	The new layout code uses a partition of the time range occupied by</div><div class='del'>-	the events, rather than using a fixed time granularity.  This is</div><div class='del'>-	better since the different parts of the program that use the</div><div class='del'>-	layout module will have different semantics regarding snapping the</div><div class='del'>-	event bounds to a fixed "time grid".</div><div class='del'>-</div><div class='del'>-1998-10-07  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* layout.[ch]: New files that abstract the event layout code from</div><div class='del'>-	gncal-full-day.c into something useful for other parts of the</div><div class='del'>-	program.  Now all event layout is done here.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added layout.[ch] to the list of</div><div class='del'>-	sources.</div><div class='del'>-</div><div class='del'>-1998-10-07  Carsten Schaar  &lt;nhadcasc@fs-maphy.uni-hannover.de&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (main): Replaced the 'gnome_client_new_default' call with</div><div class='del'>-	'gnome_master_client'.</div><div class='del'>-</div><div class='del'>-1998-10-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_day_begin): Changed name from</div><div class='del'>-	time_start_of_day() to be consistent with the other begin/end functions.</div><div class='del'>-	(time_day_end): Likewise.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_get_first_weekday): New public function to</div><div class='del'>-	get the first toggled day in a weekday mask.  Since we do not</div><div class='del'>-	support multiple weekdays in a monthly-by-pos rule, we just fetch</div><div class='del'>-	the first toggled one.</div><div class='del'>-	(ical_object_generate_events): Added a missing break statement.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_month_end): Made it consistent with the rest of</div><div class='del'>-	the time begin/end functions -- now it returns the first second of</div><div class='del'>-	the *next* month.</div><div class='del'>-	(time_week_end): Actually implemented this function.  It will be</div><div class='del'>-	used when the week view is rewritten.</div><div class='del'>-</div><div class='del'>-	* calobj.c (time_in_range): Fix off-by-one in the comparison of</div><div class='del'>-	the time against the end time.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (expand_space): Fixed bug where the columns not</div><div class='del'>-	were being expanded due to a missing "slot + j".</div><div class='del'>-</div><div class='del'>-1998-10-01  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_init): Use the font #defines.</div><div class='del'>-	(month_view_new): Set the colors of the month view upon creation.</div><div class='del'>-	(mark_current_day): New function to mark the current day in the</div><div class='del'>-	month view.</div><div class='del'>-	(month_view_set): Mark the current day.</div><div class='del'>-	(month_view_colors_changed): Mark the current day and colorify the</div><div class='del'>-	month item appropriately.</div><div class='del'>-</div><div class='del'>-	* month-view.h: Added year and month fields to the MonthView</div><div class='del'>-	structure.</div><div class='del'>-</div><div class='del'>-	* main.c: Renamed the Appointments color property, since it will</div><div class='del'>-	be used by the month view as well.</div><div class='del'>-</div><div class='del'>-	* goto.c (update): Set the current day's font and color.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_init): Set the fonts of the month items</div><div class='del'>-	when creating them.</div><div class='del'>-</div><div class='del'>-	* mark.h: Added new #defines for HEADING_FONT and TITLE_FONT.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_init): Use the new font #defines.</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply_colors): Fixed to work with the</div><div class='del'>-	I-am-paranoid-and-I-need-to-size-my-ints changes to</div><div class='del'>-	GnomeColorPicker.</div><div class='del'>-	(color_spec_from_picker): Likewise.</div><div class='del'>-</div><div class='del'>-1998-09-30  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c (create_days): Colorify the month item and prepare it for</div><div class='del'>-	prelighting here.</div><div class='del'>-</div><div class='del'>-	* main.c (color_props):  Changed the default colors to something</div><div class='del'>-	not dull.</div><div class='del'>-</div><div class='del'>-	* year-view.c (compute_min_size): New function to compute the</div><div class='del'>-	minimum size of the year view properly.</div><div class='del'>-	(year_view_size_request): Added two new fields to the year view</div><div class='del'>-	structure that contain the minimum size.  Return this in the</div><div class='del'>-	size_request method.</div><div class='del'>-	(year_view_new): Call compute_min_size to save the minimum size</div><div class='del'>-	for later use.</div><div class='del'>-	(idle_handler): Make it resize the items correctly.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_set_arg): Reshape when</div><div class='del'>-	necessary.  This is needed becaues we now actually calculate a</div><div class='del'>-	minimum size for the month item based on the font sizes and paddings.</div><div class='del'>-	(check_heading_sizes): New function to calculate a minimum size</div><div class='del'>-	based on the headings' dimensions.</div><div class='del'>-	(check_day_sizes): New function to calculate a minimum size based</div><div class='del'>-	on the day number labels' dimensions.</div><div class='del'>-	(check_sizes): New function that computes a minimum size for the</div><div class='del'>-	month item.</div><div class='del'>-	(reshape): Now calls check_sizes() to ensure a minimum size for</div><div class='del'>-	the month item.</div><div class='del'>-</div><div class='del'>-	* year-view.c (mark_current_day): New function to mark the current</div><div class='del'>-	day in the year view.</div><div class='del'>-</div><div class='del'>-	* mark.c: Removed mark_current_day from here.</div><div class='del'>-</div><div class='del'>-1998-09-29  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (fetch_color_spec): Changed name from fetch_prelight_spec</div><div class='del'>-	and made it conform to the new prelighting mechanism.</div><div class='del'>-	(fake_mark_days): Set the proper day attributes.</div><div class='del'>-	(reconfigure_month): Use colorify_month_item().</div><div class='del'>-	(fake_mark_days): Use mark_month_item_index().</div><div class='del'>-</div><div class='del'>-	* mark.c (colorify_month_item): New public function to reset the</div><div class='del'>-	colors in a month item.</div><div class='del'>-	(get_attributes): New internal function that creates an array of</div><div class='del'>-	attributes for the days in a month item.  This is the basis of all</div><div class='del'>-	the new optimizations to month item marking.</div><div class='del'>-	(unmark_month_item): Now it uses the attributes array to unmark</div><div class='del'>-	only the days that need unmarking.</div><div class='del'>-	(mark_event_in_month): Update the day attributes array.</div><div class='del'>-	(month_item_prepare_prelight): Changed the definition of the</div><div class='del'>-	prelight color query function.  Use the new function.</div><div class='del'>-	(day_event): Do color changes based on the day attributes array.</div><div class='del'>-	(mark_month_item_index): New public function to mark a single day</div><div class='del'>-	by index.</div><div class='del'>-	(mark_event_in_month): Use mark_month_item_index().</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_num2child): Now takes an</div><div class='del'>-	int, not a GnomeMonthItemChild.</div><div class='del'>-	(gnome_month_item_child2num): Now returns an int, not a</div><div class='del'>-	GnomeMonthItemChild.</div><div class='del'>-	(gnome_month_item_num2day): Now takes an int, not a</div><div class='del'>-	GnomeMonthItemChild.</div><div class='del'>-</div><div class='del'>-	* goto.c (goto_dialog): Create the days before the year spin</div><div class='del'>-	button, because the year_changed callback expects the month item</div><div class='del'>-	to be created.  The new semantics of the spin button cause it to</div><div class='del'>-	emit a value_changed signal on the adjustment upon creation -- is</div><div class='del'>-	this the behavior we want from it?</div><div class='del'>-	(goto_dialog): Use gtk_window_set_modal() instead of the</div><div class='del'>-	deprectaed gnome_dialog_set_modal().</div><div class='del'>-</div><div class='del'>-	* quick-view.c (quick_view_new): Make it look not as crappy by</div><div class='del'>-	putting the title inside the frame.</div><div class='del'>-	(quick_view_do_popup): Fixed the pointer grab and added a cursor.</div><div class='del'>-	(create_items_for_event): Query the text width/height from the</div><div class='del'>-	text item using the new object arguments, so that the size of the</div><div class='del'>-	popup window can be set properly.</div><div class='del'>-</div><div class='del'>-	* year-view.c (do_quick_view_popup): Calculate a nice date string</div><div class='del'>-	for the popup window.</div><div class='del'>-</div><div class='del'>-1998-09-28  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* quick-view.[ch]: New file that presents a quick view of the</div><div class='del'>-	events in a particular day when the mouse is clicked on the year</div><div class='del'>-	view.  Work in progress.</div><div class='del'>-</div><div class='del'>-	* year-view.c (do_quick_view_popup): New function that creates a</div><div class='del'>-	quick view for the events in a day.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added quick-view.[ch] to the</div><div class='del'>-	list of sources.</div><div class='del'>-</div><div class='del'>-1998-09-27  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Hotkey for File/Exit should be C-q, not C-x.</div><div class='del'>-</div><div class='del'>-1998-09-24  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c (do_popup_menu): New function to execute the popup</div><div class='del'>-	menu in the year view.</div><div class='del'>-	(day_event): Invoke the popup menu with the context set to days.</div><div class='del'>-	(new_appointment): New function to create a new appointment from</div><div class='del'>-	the year view.</div><div class='del'>-	(do_jump): New function to do the appropriate view/date jumping</div><div class='del'>-	from the popup menu.</div><div class='del'>-</div><div class='del'>-	* main.c: Fixed two icons in the File menu.</div><div class='del'>-</div><div class='del'>-1998-09-21  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Added underlined shortcuts and accelerators to the main menu.</div><div class='del'>-</div><div class='del'>-1998-09-16  Raja R Harinath  &lt;harinath@cs.umn.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (&lt;gtk/gtklabel.h&gt;): Include.</div><div class='del'>-	* gncal-week-view.h (&lt;gtk/gtkvbox.h&gt;): Include.</div><div class='del'>-</div><div class='del'>-1998-09-06  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (mail_notify): Fixed the bug reported about the mail</div><div class='del'>-	notification not beint sent until the program was terminated.</div><div class='del'>-</div><div class='del'>-1998-09-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_forall): Updated foreach -&gt;</div><div class='del'>-	forall from Gtk changes, bleah.</div><div class='del'>-</div><div class='del'>-	* year-view.c (day_event): New function to handle events from</div><div class='del'>-	days.  Jumps to the day that is clicked.</div><div class='del'>-</div><div class='del'>-	* main.c: Use a watch cursor while the previous/today/next</div><div class='del'>-	functions are doing their job.</div><div class='del'>-</div><div class='del'>-	* mark.c (month_item_prepare_prelight): New public utility</div><div class='del'>-	function to prepare a month item for prelighting.  It will store</div><div class='del'>-	the proper prelight information and attach the appropriate signals.</div><div class='del'>-	(mark_current_day): Make the current day bold as well (useful for</div><div class='del'>-	color-blind people, I guess).</div><div class='del'>-</div><div class='del'>-	* prop.c (set_current_day): Reset the date in the sample calendar</div><div class='del'>-	and mark the current day.</div><div class='del'>-	(fake_mark_days): Mark fake events in the sample calendar.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_set): Use the general prelighting engine.</div><div class='del'>-</div><div class='del'>-	* goto.c (day_event): Just process button presses, as prelighting</div><div class='del'>-	is done behind the scenes now.</div><div class='del'>-	(update): Use the general prelighting engine.</div><div class='del'>-</div><div class='del'>-	* prop.c (create_colors_page): We can now configure the colors of</div><div class='del'>-	the monthly calendars!  Wheeeeee!  There are still some nits to be</div><div class='del'>-	fixed, which are listed in the TODO file.</div><div class='del'>-	(build_color_spec): New function to build color specifications.</div><div class='del'>-	(parse_color_spec): New function to parse color specifications.</div><div class='del'>-</div><div class='del'>-	* mark.c: Modified all functions to use the configured colors.</div><div class='del'>-	* goto.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* main.c (colors_changed): New function that notifies all</div><div class='del'>-	calendars that colors have changed.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_colors_changed): New function that</div><div class='del'>-	notifies all the views that the colors have changed.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_colors_changed): New function that</div><div class='del'>-	notifies the month view that colors have changed.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_colors_changed): New function that</div><div class='del'>-	notifies the year view that colors have changed.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for</div><div class='del'>-	outline and day box colors.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_set_arg): Added</div><div class='del'>-	outline_color, outline_color_gdk, day_box_color, and</div><div class='del'>-	day_box_color_gdk arguments to month items.  These are convenient</div><div class='del'>-	to quickly set the colors of the month item.</div><div class='del'>-	(gnome_month_item_get_arg): Likewise.</div><div class='del'>-</div><div class='del'>-	* main.[ch]: Added a global array of structures for color preferences.</div><div class='del'>-</div><div class='del'>-1998-08-31  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c: Small code cleanup.</div><div class='del'>-	(day_event): Upon receiving a LeaveNotify event, Reset the day's</div><div class='del'>-	background to the correct color.</div><div class='del'>-</div><div class='del'>-1998-08-29  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* mark.[ch]: New files with utility functions to mark calendars</div><div class='del'>-	with their events.</div><div class='del'>-</div><div class='del'>-	* mark.c (mark_month_item): New public function to mark a month</div><div class='del'>-	item with events.</div><div class='del'>-	(unmark_month_item): New public function to unmark all the days in</div><div class='del'>-	a month item to their default appearance.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_set): Use the new unmark_month_item() and</div><div class='del'>-	mark_month_item() to mark the months with events.</div><div class='del'>-</div><div class='del'>-	* goto.c (update): New function that updates the calendar in the</div><div class='del'>-	Go-to dialog by marking the days.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_year_begin): Modified to take a time_t value.</div><div class='del'>-	(time_year_end): Likewise.</div><div class='del'>-	(time_month_begin): Actually implemented this function, which was</div><div class='del'>-	in the header file but not here.</div><div class='del'>-	(time_days_in_month): New public function that returns the number</div><div class='del'>-	of days in a month.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added mark.[ch] to the sources.</div><div class='del'>-</div><div class='del'>-	* year-view.c (unmark_days): Use unmark_month_item().</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_destroy): Fixed crash when</div><div class='del'>-	destroying the full day view.  The full day's destroy method is</div><div class='del'>-	unusual in that it destroys the list of child widgets itself, as</div><div class='del'>-	it does not have a remove method, so it needs to reset the list to</div><div class='del'>-	NULL.</div><div class='del'>-</div><div class='del'>-1998-08-27  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (build_month): Now does the correct thing</div><div class='del'>-	when the user wants weeks to start on Monday.  Now all the Monday</div><div class='del'>-	special casing, as far as day numbering is concerned, is only in</div><div class='del'>-	this function.</div><div class='del'>-</div><div class='del'>-	* year-view.c (mark_days): This function marks the days that have</div><div class='del'>-	events in them.  It also fixes a memory leak in the old</div><div class='del'>-	implementation (it was leaking the whole list).</div><div class='del'>-	(unmark_days): New function used to unmark all the days in the</div><div class='del'>-	year view.</div><div class='del'>-	(mark_event): New function that marks all the days that are</div><div class='del'>-	spanned by a time range.  It also fixes the bug in the old</div><div class='del'>-	implementation where it could possibly mark days past the ends of</div><div class='del'>-	the year (if the event crosses year boundaries, for example).</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_year_begin): Take the year parameter since year</div><div class='del'>-	1, not 1900.</div><div class='del'>-	(time_year_end): Likewise.</div><div class='del'>-</div><div class='del'>-	* year-view.c (year_view_size_allocate): Now changing the size of</div><div class='del'>-	the calendars is done in the idle loop.</div><div class='del'>-	(idle_handler): This function actually does the resizing of the items.</div><div class='del'>-</div><div class='del'>-	* year-view.h (struct _YearView): Added idle_id and need_resize</div><div class='del'>-	fields.</div><div class='del'>-</div><div class='del'>-1998-08-26  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* year-view.c: Beginning of the new year view.  Sizing and event</div><div class='del'>-	marking needs to be finished.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c: Updated for year-view.</div><div class='del'>-	(gnome_calendar_time_format_changed): Use year_view_time_format_changed().</div><div class='del'>-</div><div class='del'>-	* year-view.[ch]: Renamed the gncal-year-view.[ch] files to</div><div class='del'>-	year-view.[ch].</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Updated year-view.[ch] in the</div><div class='del'>-	list of source files.</div><div class='del'>-</div><div class='del'>-1998-08-25  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* goto.c (create_days): Set the heading color of the month item.</div><div class='del'>-</div><div class='del'>-	* main.c: Use GNOME_STOCK_PIXMAP_JUMP_TO, now that it exists,</div><div class='del'>-	instead of goto.xpm.  Also, removed goto.xpm from cvs.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.h (struct _GnomeMonthItem): Added fields for</div><div class='del'>-	the heading and day number fonts.  Added fields for heading and</div><div class='del'>-	day number label colors.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_class_init): ARG_DAY_NAMES</div><div class='del'>-	should be write-only.  Also, added arguments for heading and day</div><div class='del'>-	number fonts.  Added arguments for heading and day number colors.</div><div class='del'>-</div><div class='del'>-1998-08-24  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (build_two_radio_group): Doh.  Set the state of the radio</div><div class='del'>-	buttons properly.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_time_format_changed): New public</div><div class='del'>-	function that notifies the month view of a time format change.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_time_format_changed): New public</div><div class='del'>-	function that notifies the calendar of a time format change.</div><div class='del'>-</div><div class='del'>-	* main.c (time_format_changed): Use gnome_calendar_time_format_changed().</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_update): New public function to update</div><div class='del'>-	the month view when an event changes.  This is still unfinished.</div><div class='del'>-	(month_view_set): New public function to set the month in the</div><div class='del'>-	month view.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_direction): Add case for month view.</div><div class='del'>-	(gnome_calendar_set_view): Likewise.</div><div class='del'>-	(gnome_calendar_update_all): Likewise.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_add_week): Implemented the time_add_week()</div><div class='del'>-	function, which was on the header file.</div><div class='del'>-	(time_add_month): Added public month-adding routine.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_get_current_view_name): Add case for</div><div class='del'>-	month view.</div><div class='del'>-	(gnome_calendar_goto): Likewise, and set the time on the month view.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_new): Now it takes the calendar plus</div><div class='del'>-	the time_t representing the month.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.h: Added documentation on the object arguments</div><div class='del'>-	for the month item.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_init): Added a month/year heading to</div><div class='del'>-	the month view.</div><div class='del'>-</div><div class='del'>-	* TODO: Updated the TODO list a bit.</div><div class='del'>-</div><div class='del'>-	* main.c (gnome_cal_file_menu): The preferences menu option should</div><div class='del'>-	go in the File menu.</div><div class='del'>-	(gnome_cal_edit_menu): Added stock pixmaps to the menu items.</div><div class='del'>-	(gnome_cal_menu): Renamed the Calendar menu to Edit.</div><div class='del'>-	(gnome_cal_help_menu): Use "About Gnomecal", not just "About".</div><div class='del'>-</div><div class='del'>-	* prop.c (hour_activated): Notify the property box that it has changed.</div><div class='del'>-</div><div class='del'>-	* main.c: Changed the Properties menu item to Preferences.  These</div><div class='del'>-	are global application preferences, not a single calendar's</div><div class='del'>-	properties.</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply): Save the week_starts_on_monday flag to the</div><div class='del'>-	configuration file.</div><div class='del'>-	(properties): Added a check button for weeks starting on Monday.</div><div class='del'>-	(properties): Beautified the Preferences dialog.</div><div class='del'>-</div><div class='del'>-	* month-view.c (month_view_init):</div><div class='del'>-	* goto.c (create_days): Set the month item to start weeks on</div><div class='del'>-	Monday if appropriate.</div><div class='del'>-</div><div class='del'>-	* main.c (init_calendar): A boolean is not an hour, so don't</div><div class='del'>-	range_check_hour() on it.</div><div class='del'>-	(init_calendar): Added a global week_starts_on_monday flag.</div><div class='del'>-</div><div class='del'>-	* main.h: Added global week_starts_on_monday flag.</div><div class='del'>-</div><div class='del'>-1998-08-21  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): If mail alarm or</div><div class='del'>-	program alarm are missing the action, then set an empty default.</div><div class='del'>-</div><div class='del'>-1998-08-18  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_day2index): New public</div><div class='del'>-	function to get the displayed day index of the specified date.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_goto_today): New public function to</div><div class='del'>-	jump to the current day.</div><div class='del'>-</div><div class='del'>-	* goto.c (day_event): Jump to the selected day when the user</div><div class='del'>-	clicks the mouse, and prelight days as appropriate.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_from_day): New public function to build a</div><div class='del'>-	time_t from a year/month/day triplet.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_num2child):</div><div class='del'>-	(gnome_month_item_child2num): New public functions to convert an</div><div class='del'>-	index into a child and vice-versa, respectively.</div><div class='del'>-	(gnome_month_item_num2day): New public function to convert a child</div><div class='del'>-	number into a displayed day number.</div><div class='del'>-</div><div class='del'>-	* goto.c (goto_dialog): Doh, use gnome-dialog properly :-)</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (create_items): Use g_strdup()ed day names</div><div class='del'>-	from the start.</div><div class='del'>-</div><div class='del'>-1998-08-17  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (gnome_toolbar): Made it use goto.xpm.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (EXTRA_DIST): Added goto.xpm to the list of files.</div><div class='del'>-</div><div class='del'>-1998-08-13  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.c (gnome_month_item_set_arg): Doh.  Actually</div><div class='del'>-	recalculate the days using the month and year.</div><div class='del'>-</div><div class='del'>-	* main.c: Added "Go to" button to quickly jump to a specific date.</div><div class='del'>-</div><div class='del'>-	* goto.c: New file that defines the quick go-to date dialog.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added goto.c to the sources.</div><div class='del'>-</div><div class='del'>-1998-08-11  Nuno Ferreira  &lt;nmrf@rnl.ist.utl.pt&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (new_calendar): Made title i18n friendly. This was bug</div><div class='del'>-	#215.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_end_to_ical): Set recur-&gt;enddate to</div><div class='del'>-	recur-&gt;_enddate, not to itself, when adding recurring event and</div><div class='del'>-	supplying an end date. This fixes (at least part of) bug #99.</div><div class='del'>-</div><div class='del'>-1998-08-10  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* month-view.[ch]: Start of the month view widget.  This will use</div><div class='del'>-	the generic month item and extend it to have the semantics desired</div><div class='del'>-	for the gnomecal month view.</div><div class='del'>-</div><div class='del'>-	* gnome-month-item.[ch]: New generic canvas item for the month</div><div class='del'>-	view and the "small calendars".  This is intended to be a</div><div class='del'>-	high-level display engine for monthly calendars.  This is a work</div><div class='del'>-	in progress.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.h (GnomeCalendar): Added a month_view field.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_widgets): Create the month view and insert it</div><div class='del'>-	into the notebook.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added month-view.[ch] and gnome-month-item.[ch] to</div><div class='del'>-	the sources.</div><div class='del'>-</div><div class='del'>-1998-08-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (about_calendar_cmd): Use an array of const strings to</div><div class='del'>-	keep gcc happy.</div><div class='del'>-</div><div class='del'>-	* alarm.c (alarm_compare_by_time): Use gconstpointer to keep gcc happy.</div><div class='del'>-	* calendar.c (calendar_object_compare_by_start): Likewise.</div><div class='del'>-	* gncal-full-day.c (child_compare_by_start): Likewise.</div><div class='del'>-</div><div class='del'>-1998-07-07  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: Add support for --view flag.</div><div class='del'>-	(session_save_state): Save the view mode;</div><div class='del'>-	(new_calendar): Now takes a view mode flag.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_get_current_view_name): New</div><div class='del'>-	function for enhancing the session management support for</div><div class='del'>-	gnomecal.</div><div class='del'>-	(gnome_calendar_set_view): New function that makes a given page</div><div class='del'>-	active.</div><div class='del'>-</div><div class='del'>-1998-07-01  Nuno Ferreira  &lt;nmrf@rnl.ist.utl.pt&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.desktop: Added Portuguese translation.</div><div class='del'>-</div><div class='del'>-Mon Jun 22 13:01:16 1998  Havoc Pennington  &lt;hp@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* main.c (session_save_state): Use gnome_geometry_string to get</div><div class='del'>-	the geometry string.</div><div class='del'>-</div><div class='del'>-1998-06-04  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_rule): Do not subtract 1 from</div><div class='del'>-	tm-&gt;tm_mday for the default_day.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_new):</div><div class='del'>-	(gnome_calendar_goto): Use the start of the day -- things expect</div><div class='del'>-	it to be that way.</div><div class='del'>-</div><div class='del'>-1998-05-27  Nuno Ferreira  &lt;nmrf@rnl.ist.utl.pt&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_rule_to_ical): Fill in</div><div class='del'>-	ical-&gt;recur-&gt;interval from value in spin_button. This ixed an</div><div class='del'>-	infinnite loop.</div><div class='del'>-</div><div class='del'>-1998-05-30  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_draw): Paint the decorations correctly.</div><div class='del'>-	(child_draw_decor): Paint the recurrence/bell icons correctly.</div><div class='del'>-</div><div class='del'>-1998-05-25  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_rule): Use the contents of</div><div class='del'>-	ee-&gt;ical-&gt;dtstart for computing the predefined values of the recurrence.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_unrealize): Fix the gc</div><div class='del'>-	destruction in the unrealization code and fix the pixmap unrefing.</div><div class='del'>-</div><div class='del'>-	* main.c (close_cmd): Remove a bad hack that disabled calendar</div><div class='del'>-	widget destruction.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): Fix for the weekly event</div><div class='del'>-	generation.  Was reported on the bug tracking system.</div><div class='del'>-</div><div class='del'>-1998-05-18  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (layout_children): Implemented ultra-cool</div><div class='del'>-	layout for the events that share the same time range.  Gals and</div><div class='del'>-	guys you can now drop Outlook on the recycle bin.</div><div class='del'>-</div><div class='del'>-	Which reminds me.  We do not have a recycle bin.  How could that</div><div class='del'>-	happen in a project as cool as this one?  Someone explain this to</div><div class='del'>-	me.</div><div class='del'>-</div><div class='del'>-1998-05-18  Federico Mena  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (paint_back): Eliminated unnecessary border repainting.</div><div class='del'>-</div><div class='del'>-Sun May 17 17:55:03 1998  Havoc Pennington  &lt;hp@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (simple_todo_editor): Close dialog when return is pressed.</div><div class='del'>-</div><div class='del'>-1998-05-15  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (mark_gtk_calendar_day): Bug free version of the</div><div class='del'>-	range computation in place.</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (year_view_mark_day): Use the same new version</div><div class='del'>-	of the range computation here.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): Fix the begin/end</div><div class='del'>-	condition.</div><div class='del'>-</div><div class='del'>-1998-05-14  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (isodate_from_time_t): Do not add the spurious</div><div class='del'>-	padding.</div><div class='del'>-</div><div class='del'>-	* calobj.c (store_date_list): Bug fix:  I was using the wrong</div><div class='del'>-	pointer when saving the exception date list.</div><div class='del'>-	(set_date_list): Bug fix:  load correctly the complete exception</div><div class='del'>-	date list.</div><div class='del'>-	(set_date_list): Use ',' for the exception date separator as the</div><div class='del'>-	versit people can not get their standard right.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (unrecur_appointment): Support for making an</div><div class='del'>-	existing recurrent event `movable' for a day.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_add_exdate): New routine, used to add</div><div class='del'>-	exception dates.</div><div class='del'>-	(ical_object_duplicate): New routine:  used to do the magic</div><div class='del'>-	recur-&gt;no-recur event.</div><div class='del'>-</div><div class='del'>-1998-05-08  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (new_appointment): Use gtk_calendar freeze/thaw</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (gncal_year_view_set_year): Use gtkcalendar freeze/thaw.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_init): Use gnome_dialog_set_close to</div><div class='del'>-	avoid the ugly warning.</div><div class='del'>-</div><div class='del'>-	* main.c (display_objedit): Default to the day the user is looking</div><div class='del'>-	at.</div><div class='del'>-</div><div class='del'>-1998-05-05  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (full_day_size_allocated): Do not emit a value</div><div class='del'>-	changed signal if the value is the same.</div><div class='del'>-</div><div class='del'>-1998-05-04  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply): Only run the apply code once.</div><div class='del'>-</div><div class='del'>-1998-05-03  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (update): Draw the day at startup.</div><div class='del'>-	(gncal_day_panel_set): Fix selected-day display.</div><div class='del'>-	(gncal_day_panel_new): Switch day on double clicks, not on single</div><div class='del'>-	clicks.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_compute_end): Removed debug messages.</div><div class='del'>-</div><div class='del'>-1998-04-30  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (prop_apply): Do not call prop_cancel, ths is now using</div><div class='del'>-	GnomePropertyDialog.</div><div class='del'>-</div><div class='del'>-1998-04-29  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (sync_week): Use gnome_calendar_tag_calendar.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_tag_calendar): New routine used to</div><div class='del'>-	fill a gtk_calendar with the events on a GnomeCalendar object.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_new): Set the week to the day</div><div class='del'>-	we double clicked.</div><div class='del'>-</div><div class='del'>-1998-04-28  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (calendar_notify): Apply black magic to get mail</div><div class='del'>-	notifications to work.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_focus_out): Temporary optimization, the</div><div class='del'>-	child_focus_out is constantly calling the</div><div class='del'>-	gnome_calendar_object_changed when the property editor has been</div><div class='del'>-	invoked.  This happens every time the mouse moves crosses the main</div><div class='del'>-	window.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_object_changed): Reschedule alarms when a</div><div class='del'>-	calendar object has changed its times.</div><div class='del'>-</div><div class='del'>-Sat Apr 25 22:20:45 1998  Havoc Pennington  &lt;hp@pobox.com&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c, eventedit.h: Descend from GnomeDialog. Took vbox</div><div class='del'>-	out of class structure; use GnomeDialog vbox</div><div class='del'>-	instead. gnome_dialog_set_destroy instead of destroying in button</div><div class='del'>-	callbacks. Don't create buttons, separator, or vbox manually.</div><div class='del'>-	#include &lt;libgnomeui/gnome-dialog.h&gt;.</div><div class='del'>-</div><div class='del'>-1998-04-24  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Fixed alarm loading;</div><div class='del'>-	Load snooze time and snooze count</div><div class='del'>-</div><div class='del'>-1998-04-23  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_save): Actually save the to-do entries.</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c (simple_todo_editor): Now you can add and edit</div><div class='del'>-	to-do entries.</div><div class='del'>-</div><div class='del'>-1998-04-22  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c: Made it use popup_menu().</div><div class='del'>-</div><div class='del'>-	* popup-menu.c: New file with utility functions for creating popup</div><div class='del'>-	menus.  Maybe such a thing would be useful in libgnomeui, a la</div><div class='del'>-	gnome-app-helper?</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added popup-menu.[ch] to the sources.</div><div class='del'>-</div><div class='del'>-1998-04-22  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* prop.c (properties): Added Calendar properties editor.</div><div class='del'>-	(properties): Make the code use a propery box.</div><div class='del'>-</div><div class='del'>-	* main.c: Save/load properties (fix to old commit).</div><div class='del'>-</div><div class='del'>-1998-04-21  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-todo.c: New widget for editing TODO lists.  This will be</div><div class='del'>-	worked on a lot.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added gncal-todo.[ch] to the sources.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c: Make it use the new TODO widget.</div><div class='del'>-</div><div class='del'>-1998-04-21  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (isodate_from_time_t): Do not save with the global</div><div class='del'>-	time flag (Z at the end of the isodate).  When we figure out a way</div><div class='del'>-	to load times in GMT time, we will add this back</div><div class='del'>-</div><div class='del'>-	* view-utils.c (popup_menu): Moved this routine here as there are</div><div class='del'>-	more users of this code.</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_class_init): Add button press</div><div class='del'>-	handler.</div><div class='del'>-	(new_appointment): New routine for creating appointments on a day.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* main.c (save_ok): Added call to gtk_window_set_wmclass.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c (calendar_day_selected): Fix, years for mktime</div><div class='del'>-	should substract 1900 and gtk_calendar stores years relative to</div><div class='del'>-	year 0.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_new): Make the week view</div><div class='del'>-	descend from VBox so that we can add a label to it.</div><div class='del'>-	(gncal_week_view_set): Display the ending day of the week</div><div class='del'>-	correctly.</div><div class='del'>-</div><div class='del'>-	Added a label that displays the week range.</div><div class='del'>-</div><div class='del'>-1998-04-21  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c: Made it use GncalDayPanel.</div><div class='del'>-</div><div class='del'>-	* gncal-day-panel.c: New widget for the day view in the main</div><div class='del'>-	calendar toplevel.  It basically takes care of everything</div><div class='del'>-	gnome-cal did by hand with respect to the day view.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added gncal-day-panel.[ch] to</div><div class='del'>-	the rules.</div><div class='del'>-</div><div class='del'>-	* main.c: Added a separator between the About menu item and the</div><div class='del'>-	help topics.</div><div class='del'>-</div><div class='del'>-1998-04-20  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_ok): Mark the event as non-new after accepting changes.</div><div class='del'>-</div><div class='del'>-1998-04-20  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_get_day_start_yoffset): New</div><div class='del'>-	public function that returns the y offset for the row</div><div class='del'>-	corresponding to the "day begin" time.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_key_press): Now any printable</div><div class='del'>-	keystroke (not just Return) will activate the selected range.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (paint_back): Made it use the new paint_row</div><div class='del'>-	function instead of painting everything directly.  We calculate</div><div class='del'>-	areas in a smarter way so there is even less flicker than before,</div><div class='del'>-	especially when selecting regions.</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Sensitize recurrence widgets properly.</div><div class='del'>-</div><div class='del'>-	* calobj.c (duration_callback): Pass the correct pointer type to</div><div class='del'>-	is_date_in_list().</div><div class='del'>-</div><div class='del'>-1998-04-20  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (duration_callback): Take exception dates into</div><div class='del'>-	account.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (new_appointment): Setup the event editor dates</div><div class='del'>-	to those of the currently displayed day.</div><div class='del'>-	(gncal_full_day_selection_range): Use sensible values in the case</div><div class='del'>-	no range is selected.</div><div class='del'>-	(new_appointment): Events now use the current day for event creation.</div><div class='del'>-</div><div class='del'>-	* view-utils.c: Pretty up the time display.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_compute_end): Initialize</div><div class='del'>-	ico-&gt;recur-&gt;enddate, otherwise we loop forever during final date computation.</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Now recurrence is toggled by a radio button in the</div><div class='del'>-	recurrence page, as the checkbox is confusing.</div><div class='del'>-</div><div class='del'>-	* calobj.c (is_date_in_list): Add support for the exclussion</div><div class='del'>-	dates.</div><div class='del'>-</div><div class='del'>-1998-04-18  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (double_click): Fix this routine as well.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (jump_to_day): Bind the gtkcalendar signals to</div><div class='del'>-	the week.</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (gncal_year_view_set_year): Put things in the</div><div class='del'>-	proper range.  Now the year view actually matches this year.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.html: Added small documentation.</div><div class='del'>-</div><div class='del'>-	* main.c: Add more icons to the menus;  Rename some menubar</div><div class='del'>-	entries;  Add `new' icon to the toolbar.</div><div class='del'>-	(dump_events): Added argument handling and dumping of events from</div><div class='del'>-	the command line.  Extremely cool.</div><div class='del'>-</div><div class='del'>-	* getdate.y: Taken from the CVS source code.  Used for date</div><div class='del'>-	parsing in the command line.</div><div class='del'>-</div><div class='del'>-	Internationalized getdate.y.  Wee!  It even works with spanish.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): Add Quoted printable property</div><div class='del'>-	to items containing new lines.</div><div class='del'>-	(duration): Use unsigned integers, to work around buggy calendar</div><div class='del'>-	files generated by korganizer.</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): Do not ask for file name if we are</div><div class='del'>-	saving.</div><div class='del'>-	(save_as_calendar_cmd): New command.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1998-04-17  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* alarm.c (alarm_kill, alarm_init, alarm_add): Implement the alarm</div><div class='del'>-	management framework.</div><div class='del'>-</div><div class='del'>-1998-04-17  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_new): Added mandatory status property.</div><div class='del'>-	(ical_object_to_vobject): Only store "related" list if it exists.</div><div class='del'>-	(store_list): Add terminating null char and free the correct data.</div><div class='del'>-</div><div class='del'>-	* main.c (save_calendar_cmd): Implemented calendar saving.</div><div class='del'>-	(open_calendar_cmd): Implemented calendar loading.</div><div class='del'>-	(new_calendar_cmd): Implemented calendar creation.</div><div class='del'>-	(new_calendar): Don't load our test calendar by default.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (delete_appointment): Delete appointment implemented.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_recur_values_to_ical): Free/create</div><div class='del'>-	ical's recurrence appropriately.</div><div class='del'>-	(ee_rp_init_rule): Initialize all missing parameters from ical.</div><div class='del'>-	(ee_rp_init_ending_date): Initialize missing fields from ical.</div><div class='del'>-</div><div class='del'>-1998-04-17  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_remove_object): Add support for</div><div class='del'>-	removing objects.</div><div class='del'>-</div><div class='del'>-1998-04-17  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_init_recurrence_page): New function that creates</div><div class='del'>-	the recurrence page in the toplevel notebook.</div><div class='del'>-	(ee_store_recur_values_to_ical): Now we can also store the recurrences.</div><div class='del'>-</div><div class='del'>-1998-04-17  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_generate_events): Implement</div><div class='del'>-	RECUR_MONTHLY_BY_POS implemented.</div><div class='del'>-	(ical_object_create_from_vobject): Fix the alarm</div><div class='del'>-	initialization code.</div><div class='del'>-	(save_alarm): Save alarms.</div><div class='del'>-	(ical_object_generate_events): Fixed the recurrent code to take</div><div class='del'>-	into account the recur-&gt;endate field (if at all specified).</div><div class='del'>-</div><div class='del'>-	(ical_object_to_vobject): Implement recurrence rule saving.</div><div class='del'>-</div><div class='del'>-1998-04-16  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_store_alarm): Use menu_shell-&gt;children, not</div><div class='del'>-	menu-&gt;children.  Why does GtkMenu have a children field in the</div><div class='del'>-	object structure?</div><div class='del'>-	(check_dates): New function that insures that start_date &lt; end_date.</div><div class='del'>-	(check_times): In addition to checking whether the event spans the</div><div class='del'>-	whole day, now it insures that start_time &lt; end_time.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_set_size): Now children get bigger</div><div class='del'>-	temporarily while they are focused.  This allows the handles not</div><div class='del'>-	to "overlap" the rows used by the child and thus allow editing of</div><div class='del'>-	very thin events.</div><div class='del'>-	(recompute_motion): Fix for new child coordinates.</div><div class='del'>-	(gncal_full_day_expose): Make it use find_child_by_window()</div><div class='del'>-	instead of looking for it by hand.</div><div class='del'>-</div><div class='del'>-	* bell.xpm recur.xpm: XPM files for events with alarm and</div><div class='del'>-	recurrence, respectively.</div><div class='del'>-</div><div class='del'>-1998-04-15  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (button_1): Preserve the up/down cursor while dragging.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_draw): Now children have a vertical</div><div class='del'>-	handle as well.  This can be used to move the child anytime, not</div><div class='del'>-	only when it is focused.</div><div class='del'>-	(recompute_motion): Modified for new drag behavior.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_init_general_page): The general_owner may be</div><div class='del'>-	null.  Do the proper thing when creating the label.</div><div class='del'>-	(ee_ok): Update the gnome calendar appropriately.</div><div class='del'>-</div><div class='del'>-	* timeutil.h:</div><div class='del'>-	* gncal-year-view.h: Add some missing prototypes.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_popup_menu): Set the sensitivity of menu</div><div class='del'>-	items according to whether the ical object is being edited or not.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_new): Set the "being edited" flag on</div><div class='del'>-	the ical object (stored as the ical object's user data).</div><div class='del'>-	(event_editor_destroy): Release the flag.</div><div class='del'>-</div><div class='del'>-	* calobj.h: The iCalObject structure now has a generic user_data pointer.</div><div class='del'>-	* calobj.c (ical_object_set_user_data ical_object_get_user_data):</div><div class='del'>-	Functions to set this data.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_button_press): Do child popup menu correctly.</div><div class='del'>-</div><div class='del'>-	* main.c (about_calendar_cmd): Fixed my address and added Arturo</div><div class='del'>-	to the authors in the about box.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (find_child_by_window): Compare child's widget</div><div class='del'>-	windows by user_data (which will be the parent widget, that is,</div><div class='del'>-	the text widget).  We cannot assume that child-&gt;widget-&gt;window</div><div class='del'>-	will be *the* window we are interested on because there may be</div><div class='del'>-	child widgets with multiple windows.</div><div class='del'>-</div><div class='del'>-1998-04-15  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_foreach): Define iterator routine.</div><div class='del'>-</div><div class='del'>-1998-04-15  Arturo Espinosa Aldama  &lt;arturo@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.[hc]: Now using time_t for new and set.</div><div class='del'>-	  Random fixes, as well.</div><div class='del'>-</div><div class='del'>-1998-04-15  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (button_3): New popup menus activated with</div><div class='del'>-	mouse button 3.</div><div class='del'>-	(create_appointment): Create a new appointment from the popup</div><div class='del'>-	menus.  See the FIXME.</div><div class='del'>-</div><div class='del'>-1998-04-15  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (layout_kill_rows): Routine to destory rows</div><div class='del'>-	array properly.</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.c (gncal_year_view_new): Add missing year in</div><div class='del'>-	call to strftime.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Fixed memory leaks</div><div class='del'>-	from the return values of versit's fakeCString.</div><div class='del'>-</div><div class='del'>-1998-04-14  Arturo Espinosa Aldama  &lt;arturo@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-year-view.[hc]: New widget for the year view.</div><div class='del'>-	* Makefile.am: added required compilation of the new files.</div><div class='del'>-</div><div class='del'>-1998-04-14  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_setup_time_frame): Fixed some table</div><div class='del'>-	expansions to make the dialog look nicer when resized.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ignore_space): Fixed compiler warning about unused</div><div class='del'>-	computed value.</div><div class='del'>-	(ocurrencelist): Replace str by p confusion.  Removed unused</div><div class='del'>-	variables value and q.</div><div class='del'>-	(daynumber): Fixed a couple of warnings about unused values.</div><div class='del'>-	(load_recurrence): Removed unused variable c.  Added a default</div><div class='del'>-	clause to the switch(type).</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_frequency): Removed unused variable content.</div><div class='del'>-	Fixed a compiler warning by adding a missing cast.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Make the</div><div class='del'>-	load_recurrence() part work correctly.  Eliminated use of</div><div class='del'>-	syntax_error variable.</div><div class='del'>-</div><div class='del'>-1998-04-13  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_key_press): Unfocus the child and focus</div><div class='del'>-	the parent fullday widget when the user presses Esc.</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_update): Now takes object and</div><div class='del'>-	flags parameters.</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_update): Likewise.</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_update): Likewise.</div><div class='del'>-	(child_focus_in): New function.  In conjunction with</div><div class='del'>-	child_focus_out(), these only display the handles in the child</div><div class='del'>-	when it is focused.  The result is that the user can see more of</div><div class='del'>-	the child's text when nothing is focused, and we can also display</div><div class='del'>-	fatter and nicer drag handles.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_object_changed): Now takes an</div><div class='del'>-	additional flags parameter</div><div class='del'>-	(gnome_calendar_update_all): Made function static.  Now takes</div><div class='del'>-	changed object and flags parameters as well.</div><div class='del'>-	(gnome_calendar_object_changed): Now takes additional flags</div><div class='del'>-	parameter to indicate what changed in the specified object.</div><div class='del'>-</div><div class='del'>-	* calobj.h (CalObjectChange): New enum with flags to describe what</div><div class='del'>-	has been changed in an object.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.h:</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_focus_child): New function to</div><div class='del'>-	let the outside world decide which child to focus.</div><div class='del'>-	(gncal_full_day_focus_child): Bleah.  We have to synthesize a</div><div class='del'>-	click because GtkText will not set the cursor when you focus it.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (day_view_range_activated): Focus the new child in</div><div class='del'>-	the full day widget.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (event_editor_setup_time_frame): Re-aligned some</div><div class='del'>-	widgets to make it look prettier.</div><div class='del'>-	(ee_alarm_widgets): Likewise.</div><div class='del'>-	(ee_init_general_page): Likewise.</div><div class='del'>-	(ee_classification_widgets): Likewise.</div><div class='del'>-	(event_editor_init_widgets): Likewise.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (day_view_range_activated): Create new object and</div><div class='del'>-	add it to the calendar.  You can now select a range in the</div><div class='del'>-	full-day view, hit Return, and a new event will be added at the</div><div class='del'>-	selected range.  I still have to figure out how to focus this new child.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (paint_back): Rewrote function to avoid</div><div class='del'>-	painting an area more than once -- eliminate flicker.</div><div class='del'>-	(paint_back_rows): New function that calls paint_back() only for</div><div class='del'>-	the area of the specified rows.</div><div class='del'>-	(gncal_full_day_button_press):</div><div class='del'>-	(gncal_full_day_button_release):</div><div class='del'>-	(gncal_full_day_motion): Made these functions use</div><div class='del'>-	paint_back_rows() instead of paint_back(), to eliminate flicker.  Wheee!</div><div class='del'>-</div><div class='del'>-1998-04-12  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (setup_day_view): We now connect to the</div><div class='del'>-	range_activated signal of the fullday widget instead of catching</div><div class='del'>-	key presses ourselves.</div><div class='del'>-	(day_view_range_activated): New function that creates a new</div><div class='del'>-	iCalObject and inserts it into the calendar, not finished yet.</div><div class='del'>-</div><div class='del'>-1998-04-11  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (get_time_from_rows): New function, calculates</div><div class='del'>-	a pair of time_t values from the specified start and number of rows.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.h (GncalFullDayClass): New signal</div><div class='del'>-	"range_activated".  It is emitted when a range is selected and the</div><div class='del'>-	user hits Return.</div><div class='del'>-	(gncal_full_day_selection_range): New function, returns the</div><div class='del'>-	selected range.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (struct drag_info): Moved selection information</div><div class='del'>-	to their own fields instead of sharing the child's drag fields.</div><div class='del'>-	This allows us to keep the selection when a child is moved.</div><div class='del'>-	(recompute_motion): Made the case when (row &lt; di-&gt;sel_click_row)</div><div class='del'>-	work correctly.</div><div class='del'>-</div><div class='del'>-1998-04-11  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_goto): Add support for navigating</div><div class='del'>-	on the day view.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_start_of_day, time_end_of_day, time_day_hour):</div><div class='del'>-	New time manipulation functions.</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_rp_init_frequency): Add the different frequency</div><div class='del'>-	editors to a notebook.  Make the notebook startup on the entry</div><div class='del'>-	selected recurrence type;</div><div class='del'>-</div><div class='del'>-1998-04-11  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (recompute_motion): Now we support selecting a</div><div class='del'>-	range in the main window (by clicking+dragging).  It flickers</div><div class='del'>-	horribly and is not perfect, but it is a start.</div><div class='del'>-</div><div class='del'>-1998-04-09  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c: #include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (child_map): Show instead of just map the child</div><div class='del'>-	widget (otherwise the text widget gets confused and will not focus).</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_to_vobject): Quote chars as 'x', not "x".</div><div class='del'>-</div><div class='del'>-	* calobj.h: Added prototype for ical_object_to_vobject().</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_object_changed): New function.  This</div><div class='del'>-	should be called when a calendar object is changed.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (update_from_drag_info): Call</div><div class='del'>-	gnome_calendar_object_changed() instead of updating manually.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_add_object):</div><div class='del'>-	(calendar_remove_object): Set the modified flag to true.</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c (gncal_full_day_draw): Finished implementing</div><div class='del'>-	this function.</div><div class='del'>-</div><div class='del'>-1998-04-08  Raja R Harinath  &lt;harinath@cs.umn.edu&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.c (update_calendar): Say `#if 0', not `#ifdef 0'.</div><div class='del'>-</div><div class='del'>-1998-04-07  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Removed unused global variable parent_class.</div><div class='del'>-</div><div class='del'>-	* eventedit.h: Renamed gtk_window field to window.</div><div class='del'>-	Made the parent_class field in the EventEditorClass structure be a</div><div class='del'>-	GtkWindowClass, not a gnome property box class.</div><div class='del'>-	Added prototype for event_editor_get_type().</div><div class='del'>-</div><div class='del'>-1998-04-06  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.c (gncal_week_view_new): Use the new</div><div class='del'>-	gtk_table_set_homogeneous() instead of setting the variable directly.</div><div class='del'>-</div><div class='del'>-1998-04-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c (ee_create_ae): Make it return void.</div><div class='del'>-	(ee_alarm_widgets): Remove some unused variables.</div><div class='del'>-	(ee_store_alarm): Make it return void.</div><div class='del'>-	#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.h: #include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-	* calobj.c (list_free): Don't use g_free in the g_list_foreach.</div><div class='del'>-</div><div class='del'>-	* calendar.h: Add prototype for calendar_load().</div><div class='del'>-</div><div class='del'>-	* timeutil.h: Add prototypes for time_add_*().</div><div class='del'>-</div><div class='del'>-	* calendar.c:</div><div class='del'>-	* calobj.c:</div><div class='del'>-	* eventedit.c:</div><div class='del'>-	* gnome-cal.c: #include "timeutil.h"</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_size_request): Make the minimum</div><div class='del'>-	width equal or larger to the title width.</div><div class='del'>-</div><div class='del'>-	* main.c: #include "eventedit.h"</div><div class='del'>-	(main): Add a return statement.</div><div class='del'>-	(new_calendar): Show stuff *after* the calendar has been loaded.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c (gnome_calendar_load): Update the day view.</div><div class='del'>-	(setup_widgets): Hackish setup of a day view widget - will fix later.</div><div class='del'>-	(gnome_calendar_init): Initialize all fields.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.h: Added day_view field.  Maybe this should be changed</div><div class='del'>-	when the a complete day view panel is complete.</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_update): Draw after update, not</div><div class='del'>-	before.</div><div class='del'>-</div><div class='del'>-1998-04-06  Carsten Schaar  &lt;nhadcasc@fs-maphy.uni-hannover.de&gt;</div><div class='del'>-</div><div class='del'>-	* versit/.cvsignore: New file.</div><div class='del'>-</div><div class='del'>-Fri Apr  3 22:31:54 1998  Tom Tromey  &lt;tromey@cygnus.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.c: Include &lt;config.h&gt;.</div><div class='del'>-</div><div class='del'>-1998-04-03  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_add_year, time_add_year, time_add_week):</div><div class='del'>-	Routines for time manipulation.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_destroy): Full destruction of the object.</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Finished the main event editor form;  It still</div><div class='del'>-	lacks the details and the recurrence bits.  It now adds events</div><div class='del'>-	and cancels.</div><div class='del'>-</div><div class='del'>-1998-04-03  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): The "better" format</div><div class='del'>-	string for strftime() wasn't better, after all :-(</div><div class='del'>-</div><div class='del'>-1998-04-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-full-day.c: New full-day widget.  It is still a work in</div><div class='del'>-	progress.  It will be similar to M$ Schedule's nifty full day view</div><div class='del'>-	widget, but with Gtk's elegance :-)</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gnomecal_SOURCES): Added gncal-full-day.[ch] to the sources.</div><div class='del'>-</div><div class='del'>-1998-04-02  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* eventedit.c: Object editor widget.  We dropped ObjEdit.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (time_from_isodate): Fix.</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Changed the display</div><div class='del'>-	formats.</div><div class='del'>-</div><div class='del'>-1998-04-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Use better format</div><div class='del'>-	specifier for strftime().</div><div class='del'>-	(view_utils_draw_textured_frame): Ultra-nifty function to draw</div><div class='del'>-	textured "metal" frames, like Netscape's handles.</div><div class='del'>-</div><div class='del'>-1998-04-02  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_update): Day events are now</div><div class='del'>-	cached inside the widget.  They get initialized at this time.</div><div class='del'>-</div><div class='del'>-	* view-utils.c (view_utils_draw_events): Use the list of events.</div><div class='del'>-</div><div class='del'>-1998-04-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c (gncal_day_view_set_shadow): New customization</div><div class='del'>-	function.  We can't decide on a stupid border type :-)</div><div class='del'>-	(gncal_day_view_init): Made GTK_SHADOW_ETCHED_IN be the default</div><div class='del'>-	shadow type.  Looks good.</div><div class='del'>-</div><div class='del'>-1998-04-02  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* main.c: New main program that uses our new datatypes and</div><div class='del'>-	objects.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_load_from_vobject, calendar_load):</div><div class='del'>-	Implement loading of vCalendar objects and vCalendar files.</div><div class='del'>-</div><div class='del'>-	* calobj.c (ical_object_create_from_vobject): Implement loading of</div><div class='del'>-	vCalendar event and todo objects.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (isodate_from_time_t): New function.</div><div class='del'>-</div><div class='del'>-	* gnome-cal.c, gnome-cal.h: Implement a toplevel widget, derived</div><div class='del'>-	from GnomeApp.  It holds all of the day views and arbitrates the</div><div class='del'>-	display.</div><div class='del'>-</div><div class='del'>-1998-04-02  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-week-view.[ch]: New week view composite widget.  This</div><div class='del'>-	provides a full week view (7 day views plus busy time display --</div><div class='del'>-	the latter is currently unimplemented).</div><div class='del'>-</div><div class='del'>-1998-04-01  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal-day-view.c: New day view widget.  It is intended to be a</div><div class='del'>-	child widget of the week view composite widget.</div><div class='del'>-</div><div class='del'>-	* calendar.c (calendar_get_objects_in_range):</div><div class='del'>-	(calendar_get_events_in_range):</div><div class='del'>-	(calendar_get_journal_in_range):</div><div class='del'>-	(calendar_get_journal_in_range): These functions now take a</div><div class='del'>-	sort_func parameter, which is of type GCompareFunc.  If the</div><div class='del'>-	specified value is non-NULL, it will return a sorted list.</div><div class='del'>-	Otherwise, it will return an unordered list.</div><div class='del'>-	(calendar_compare_by_dtstart): Provide a generic sorting routine</div><div class='del'>-	for calendar objects.</div><div class='del'>-</div><div class='del'>-1998-04-01 Miguel de Icaza &lt;miguel@kernel.org&gt;</div><div class='del'>-</div><div class='del'>-	* Start from scratch</div><div class='del'>-</div><div class='del'>-Tue Mar 31 23:46:50 1998  Tom Tromey  &lt;tromey@cygnus.com&gt;</div><div class='del'>-</div><div class='del'>-	* timeutil.c (format_simple_hour): `buf' now static.</div><div class='del'>-</div><div class='del'>-1998-03-31  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.c: Removed #include "gtkcalendar.h", because it now comes</div><div class='del'>-	from libgnomeui.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gncal_SOURCES): Added new source files to the rules.</div><div class='del'>-</div><div class='del'>-	* timeutil.c (format_simple_hour): New function, formats an</div><div class='del'>-	hour/am_pm pair into a string of the form "3am", "12pm", "05h",</div><div class='del'>-	"19h", etc.  It is used by the day view widget for its labels.</div><div class='del'>-</div><div class='del'>-1998-03-31 Craig Small &lt;csmall@small.dropbear.id.au&gt;</div><div class='del'>-</div><div class='del'>-	* Now has (non working) session maangement</div><div class='del'>-	* Uses a clist for the dailylist like gtt</div><div class='del'>-</div><div class='del'>-Sat Mar 21 15:43:20 1998  Tom Tromey  &lt;tromey@cygnus.com&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.c: Use gnome_message_box_*, not gnome_messagebox_*.</div><div class='del'>-</div><div class='del'>-1998-03-12  Craig Small &lt;csmall@small.dropbear.id.au&gt;</div><div class='del'>-</div><div class='del'>-	* Now linked (in some horrible way) to the gtkcalendar widget.</div><div class='del'>-</div><div class='del'>-Sun Mar  8 16:38:10 1998  Tom Tromey  &lt;tromey@cygnus.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Added GNOME_INCLUDEDIR.</div><div class='del'>-	(gncal_LDADD): Don't include libsupport.a.</div><div class='del'>-</div><div class='del'>-	* gncal.c (main): Use new gnome_init.</div><div class='del'>-</div><div class='del'>-1998-02-19  Federico Mena Quintero  &lt;federico@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* gncal.c (main): Added app_id "gncal".</div><div class='del'>-</div><div class='del'>-1998-02-19  Carsten Schaar  &lt;nhadcasc@fs-maphy.uni-hannover.de&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gncal_LDADD): Added '$(INTLLIBS)'</div><div class='del'>-</div><div class='del'>-1998-02-18  Raja R Harinath  &lt;harinath@cs.umn.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (gncal_LDADD): Include `libsupport.a'.</div><div class='del'>-</div><div class='del'>-	* calcs.c (month_atoi): Replace buggy explicit loop string compare</div><div class='del'>-	with strcasecmp.</div><div class='del'>-	(day_atoi): Likewise.</div><div class='del'>-</div><div class='del'>-Sun Jan 25 23:38:30 1998  Miguel de Icaza  &lt;miguel@nuclecu.unam.mx&gt;</div><div class='del'>-</div><div class='del'>-	* menus.c: Replace "Quit" with "Exit".</div><div class='head'>diff --git a/calendar/Makefile.am b/calendar/Makefile.am<br/>deleted file mode 100644<br/>index e17d581184..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-if ENABLE_PILOT_CONDUITS</div><div class='del'>-CONDUIT_DIR = conduits</div><div class='del'>-else</div><div class='del'>-CONDUIT_DIR =</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-SUBDIRS = idl cal-util pcs cal-client gui $(CONDUIT_DIR)</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 e74f322903..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-client/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,17 +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='del'>-libcal-client-static.la</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 dd5f3e60d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-client/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +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=\""$(localedir)"\"		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"cal-client\"			\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(srcdir) -I$(top_srcdir) 			\</div><div class='del'>-	-I. 						\</div><div class='del'>-	-I.. 						\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	$(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'>-# make a static library for use by calendar conduit's shared library</div><div class='del'>-#</div><div class='del'>-noinst_LTLIBRARIES = libcal-client-static.la</div><div class='del'>-libcal_client_static_la_SOURCES = $(libcal_client_la_SOURCES)</div><div class='del'>-libcal_client_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# client-test program</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS = client-test</div><div class='del'>-</div><div class='del'>-client_test_SOURCES =	\</div><div class='del'>-	client-test.c</div><div class='del'>-</div><div class='del'>-client_test_INCLUDES =			\</div><div class='del'>-	$(INCLUDES)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"client-test\"</div><div class='del'>-</div><div class='del'>-client_test_LDADD =						\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)				\</div><div class='del'>-	-lunicode						\</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='del'>-</div><div class='del'>-BUILT_SOURCES = $(CORBA_GENERATED)</div><div class='del'>-CLEANFILES += $(BUILT_SOURCES)</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 3e7daf80c4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-client/cal-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1408 +0,0 @@</div><div class='del'>-</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'>-#include &lt;liboaf/liboaf.h&gt;</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'>-</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'>-struct _CalClientPrivate {</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'>-};</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'>-	client-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signal handlers for the listener's signals */</div><div class='del'>-</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'>-	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'>-</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 Wombat, "</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'>- *</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'>-/**</div><div class='del'>- * cal_client_is_loaded:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar client has been loaded successfully.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the client has been loaded, FALSE if it has not or if</div><div class='del'>- * the loading process is not finished yet.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_is_loaded (CalClient *client)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	return (priv-&gt;load_state == LOAD_STATE_LOADED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts our representation of a calendar component type into its CORBA representation */</div><div class='del'>-static Evolution_Calendar_CalObjType</div><div class='del'>-corba_obj_type (CalObjType type)</div><div class='del'>-{</div><div class='del'>-	return (((type &amp; CALOBJ_TYPE_EVENT) ? 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'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_n_objects:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @type: Type of objects that will be counted.</div><div class='del'>- * </div><div class='del'>- * Counts the number of calendar components of the specified @type.  This can be</div><div class='del'>- * used to count how many events, to-dos, or journals there are, for example.</div><div class='del'>- * </div><div class='del'>- * Return value: Number of components.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-cal_client_get_n_objects (CalClient *client, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	int n;</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), -1);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == LOAD_STATE_LOADED, -1);</div><div class='del'>-</div><div class='del'>-	t = corba_obj_type (type);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	n = 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 component.</div><div class='del'>- * @comp: Return value for the calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for a calendar component object based on its unique</div><div class='del'>- * identifier.</div><div class='del'>- *</div><div class='del'>- * Return value: Result code based on the status of the operation.</div><div class='del'>- **/</div><div class='del'>-CalClientGetStatus</div><div class='del'>-cal_client_get_object (CalClient *client, const char *uid, CalComponent **comp)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Calendar_CalObj calobj_str;</div><div class='del'>-	CalClientGetStatus retval;</div><div class='del'>-	icalcomponent *icalcomp;</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 (comp != NULL, CAL_CLIENT_GET_NOT_FOUND);</div><div class='del'>-</div><div class='del'>-	retval = CAL_CLIENT_GET_NOT_FOUND;</div><div class='del'>-	*comp = NULL;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	calobj_str = Evolution_Calendar_Cal_get_object (priv-&gt;cal, (char *) 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'>-	icalcomp = icalparser_parse_string (calobj_str);</div><div class='del'>-	CORBA_free (calobj_str);</div><div class='del'>-</div><div class='del'>-	if (!icalcomp) {</div><div class='del'>-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*comp = cal_component_new ();</div><div class='del'>-	if (!cal_component_set_icalcomponent (*comp, icalcomp)) {</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (*comp));</div><div class='del'>-		*comp = NULL;</div><div class='del'>-</div><div class='del'>-		retval = CAL_CLIENT_GET_SYNTAX_ERROR;</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = CAL_CLIENT_GET_SUCCESS;</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds an UID list out of a CORBA UID sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_uid_list (Evolution_Calendar_CalObjUIDSeq *seq)</div><div class='del'>-{</div><div class='del'>-	GList *uids;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	uids = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; seq-&gt;_length; i++)</div><div class='del'>-		uids = g_list_prepend (uids, g_strdup (seq-&gt;_buffer[i]));</div><div class='del'>-</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_uids:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for a list of unique identifiers corresponding to calendar</div><div class='del'>- * objects whose type matches one of the types specified in the @type flags.</div><div class='del'>- *</div><div class='del'>- * Return value: A list of strings that are the sought UIDs.</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'>-</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'>-</div><div class='del'>-	t = corba_obj_type (type);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	seq = 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'>-	uids = build_uid_list (seq);</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a GList of CalObjChange structures from the CORBA sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_change_list (Evolution_Calendar_CalObjChangeSeq *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'>-	list = NULL;</div><div class='del'>-	for (i = 0; i &lt; seq-&gt;_length; i++) {</div><div class='del'>-		Evolution_Calendar_CalObjChange *corba_coc;</div><div class='del'>-		CalObjChange *coc;</div><div class='del'>-</div><div class='del'>-		corba_coc = &amp;seq-&gt;_buffer[i];</div><div class='del'>-		coc = g_new (CalObjChange, 1);</div><div class='del'>-</div><div class='del'>-		coc-&gt;uid = g_strdup (corba_coc-&gt;uid);</div><div class='del'>-		coc-&gt;type = corba_coc-&gt;type;</div><div class='del'>-</div><div class='del'>-		list = g_list_prepend (list, coc);</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_changed_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_changed_uids (CalClient *client, CalObjType type, time_t since)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Calendar_CalObjChangeSeq *seq;</div><div class='del'>-	int t;</div><div class='del'>-	GList *changes;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == LOAD_STATE_LOADED, NULL);</div><div class='del'>-</div><div class='del'>-	t = corba_obj_type (type);</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	seq = Evolution_Calendar_Cal_get_changed_uids (priv-&gt;cal, t, since, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("cal_client_get_changed_uids(): could not get the list of changes");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	changes = build_change_list (seq);</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-</div><div class='del'>-	return changes;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: Not used? */</div><div class='del'>-#if 0</div><div class='del'>-/* Builds a GList of CalObjInstance structures from the CORBA sequence */</div><div class='del'>-static GList *</div><div class='del'>-build_object_instance_list (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'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_get_objects_in_range:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- *</div><div class='del'>- * Queries a calendar for the objects that occur or recur in the specified range</div><div class='del'>- * of time.</div><div class='del'>- *</div><div class='del'>- * Return value: A list of UID strings.  This should be freed using the</div><div class='del'>- * cal_obj_uid_list_free() function.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_client_get_objects_in_range (CalClient *client, CalObjType type, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	GList *uids;</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (client != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_CLIENT (client), NULL);</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;load_state == LOAD_STATE_LOADED, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	t = corba_obj_type (type);</div><div class='del'>-</div><div class='del'>-	seq = Evolution_Calendar_Cal_get_objects_in_range (priv-&gt;cal, t, start, end, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_message ("cal_client_get_objects_in_range(): could not get the objects");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	uids = build_uid_list (seq);</div><div class='del'>-	CORBA_free (seq);</div><div class='del'>-</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an object is updated and we must update the copy we have */</div><div class='del'>-static void</div><div class='del'>-generate_instances_obj_updated_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GHashTable *uid_comp_hash;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	const char *comp_uid;</div><div class='del'>-</div><div class='del'>-	uid_comp_hash = data;</div><div class='del'>-</div><div class='del'>-	comp = g_hash_table_lookup (uid_comp_hash, uid);</div><div class='del'>-	if (!comp)</div><div class='del'>-		/* OK, so we don't care about new objects that may indeed be in</div><div class='del'>-		 * the requested time range.  We only care about the ones that</div><div class='del'>-		 * were returned by the first query to</div><div class='del'>-		 * cal_client_get_objects_in_range().</div><div class='del'>-		 */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (uid_comp_hash, uid);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* The hash key comes from the component's internal data */</div><div class='del'>-		cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-		g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* No longer in the server, too bad */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("obj_updated_cb(): Syntax error when getting "</div><div class='del'>-			   "object `%s'; ignoring...", uid);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when an object is removed and we must delete the copy we have */</div><div class='del'>-static void</div><div class='del'>-generate_instances_obj_removed_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GHashTable *uid_comp_hash;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	uid_comp_hash = data;</div><div class='del'>-</div><div class='del'>-	comp = g_hash_table_lookup (uid_comp_hash, uid);</div><div class='del'>-	if (!comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (uid_comp_hash, uid);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Adds a component to the list; called from g_hash_table_foreach() */</div><div class='del'>-static void</div><div class='del'>-add_component (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	GList **list;</div><div class='del'>-</div><div class='del'>-	comp = CAL_COMPONENT (value);</div><div class='del'>-	list = data;</div><div class='del'>-</div><div class='del'>-	*list = g_list_prepend (*list, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a list of components that recur within the specified range of time.  It</div><div class='del'>- * ensures that the resulting list of CalComponent objects contains only objects</div><div class='del'>- * that are actually in the server at the time the initial</div><div class='del'>- * cal_client_get_objects_in_range() query ends.</div><div class='del'>- */</div><div class='del'>-static GList *</div><div class='del'>-get_objects_atomically (CalClient *client, CalObjType type, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	GList *uids;</div><div class='del'>-	GHashTable *uid_comp_hash;</div><div class='del'>-	GList *objects;</div><div class='del'>-	guint obj_updated_id;</div><div class='del'>-	guint obj_removed_id;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	uids = cal_client_get_objects_in_range (client, type, start, end);</div><div class='del'>-</div><div class='del'>-	uid_comp_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	/* While we are getting the actual object data, keep track of changes */</div><div class='del'>-</div><div class='del'>-	obj_updated_id = gtk_signal_connect (GTK_OBJECT (client), "obj_updated",</div><div class='del'>-					     GTK_SIGNAL_FUNC (generate_instances_obj_updated_cb),</div><div class='del'>-					     uid_comp_hash);</div><div class='del'>-</div><div class='del'>-	obj_removed_id = gtk_signal_connect (GTK_OBJECT (client), "obj_removed",</div><div class='del'>-					     GTK_SIGNAL_FUNC (generate_instances_obj_removed_cb),</div><div class='del'>-					     uid_comp_hash);</div><div class='del'>-</div><div class='del'>-	/* Get the objects */</div><div class='del'>-</div><div class='del'>-	for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		char *uid;</div><div class='del'>-		const char *comp_uid;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		status = cal_client_get_object (client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-			/* The hash key comes from the component's internal data</div><div class='del'>-			 * instead of the duped UID from the list of UIDS.</div><div class='del'>-			 */</div><div class='del'>-			cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-			g_hash_table_insert (uid_comp_hash, (char *) comp_uid, comp);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-			/* Object disappeared from the server, so don't log it */</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-			g_message ("get_objects_atomically(): Syntax error when getting "</div><div class='del'>-				   "object `%s'; ignoring...", uid);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	/* Now our state is consistent with the server, so disconnect from the</div><div class='del'>-	 * notification signals and generate the final list of components.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect (GTK_OBJECT (client), obj_updated_id);</div><div class='del'>-	gtk_signal_disconnect (GTK_OBJECT (client), obj_removed_id);</div><div class='del'>-</div><div class='del'>-	objects = NULL;</div><div class='del'>-	g_hash_table_foreach (uid_comp_hash, add_component, &amp;objects);</div><div class='del'>-	g_hash_table_destroy (uid_comp_hash);</div><div class='del'>-</div><div class='del'>-	return objects;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct comp_instance {</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Called from cal_recur_generate_instances(); adds an instance to the list */</div><div class='del'>-static gboolean</div><div class='del'>-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GList **list;</div><div class='del'>-	struct comp_instance *ci;</div><div class='del'>-</div><div class='del'>-	list = data;</div><div class='del'>-</div><div class='del'>-	ci = g_new (struct comp_instance, 1);</div><div class='del'>-</div><div class='del'>-	ci-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (ci-&gt;comp));</div><div class='del'>-	</div><div class='del'>-	ci-&gt;start = start;</div><div class='del'>-	ci-&gt;end = end;</div><div class='del'>-</div><div class='del'>-	*list = g_list_prepend (*list, ci);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_list_sort(); compares two struct comp_instance structures */</div><div class='del'>-static gint</div><div class='del'>-compare_comp_instance (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const struct comp_instance *cia, *cib;</div><div class='del'>-	time_t diff;</div><div class='del'>-</div><div class='del'>-	cia = a;</div><div class='del'>-	cib = b;</div><div class='del'>-</div><div class='del'>-	diff = cia-&gt;start - cib-&gt;start;</div><div class='del'>-	return (diff &lt; 0) ? -1 : (diff &gt; 0) ? 1 : 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_client_generate_instances:</div><div class='del'>- * @client: A calendar client.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- * @cb: Callback for each generated instance.</div><div class='del'>- * @cb_data: Closure data for the callback.</div><div class='del'>- * </div><div class='del'>- * Does a combination of cal_client_get_objects_in_range() and</div><div class='del'>- * cal_recur_generate_instances().  It fetches the list of objects in an atomic</div><div class='del'>- * way so that the generated instances are actually in the server at the time</div><div class='del'>- * the initial cal_client_get_objects_in_range() query ends.</div><div class='del'>- *</div><div class='del'>- * The callback function should do a gtk_object_ref() of the calendar component</div><div class='del'>- * it gets passed if it intends to keep it around.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_client_generate_instances (CalClient *client, CalObjType type,</div><div class='del'>-			       time_t start, time_t end,</div><div class='del'>-			       CalRecurInstanceFn cb, gpointer cb_data)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	GList *objects;</div><div class='del'>-	GList *instances;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	priv = client-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;load_state == LOAD_STATE_LOADED);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (start != -1 &amp;&amp; end != -1);</div><div class='del'>-	g_return_if_fail (start &lt;= end);</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-</div><div class='del'>-	/* Generate objects */</div><div class='del'>-</div><div class='del'>-	objects = get_objects_atomically (client, type, start, end);</div><div class='del'>-	instances = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = objects; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-</div><div class='del'>-		comp = l-&gt;data;</div><div class='del'>-		cal_recur_generate_instances (comp, start, end, add_instance, &amp;instances);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (objects);</div><div class='del'>-</div><div class='del'>-	/* Generate instances and spew them out */</div><div class='del'>-</div><div class='del'>-	instances = g_list_sort (instances, compare_comp_instance);</div><div class='del'>-</div><div class='del'>-	for (l = instances; l; l = l-&gt;next) {</div><div class='del'>-		struct comp_instance *ci;</div><div class='del'>-		gboolean result;</div><div class='del'>-		</div><div class='del'>-		ci = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		result = (* cb) (ci-&gt;comp, ci-&gt;start, ci-&gt;end, cb_data);</div><div class='del'>-</div><div class='del'>-		if (!result)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-</div><div class='del'>-	for (l = instances; l; l = l-&gt;next) {</div><div class='del'>-		struct comp_instance *ci;</div><div class='del'>-</div><div class='del'>-		ci = l-&gt;data;</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (ci-&gt;comp));</div><div class='del'>-		g_free (ci);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (instances);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 0</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'>-#endif</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'>-#if 0</div><div class='del'>-		ai-&gt;type = uncorba_alarm_type (corba_ai-&gt;type);</div><div class='del'>-#endif</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'>-	g_return_val_if_fail (priv-&gt;load_state == LOAD_STATE_LOADED, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	seq = 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'>-	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'>-	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, (char *) 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'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Asks a calendar to update a component.  Any existing component with the</div><div class='del'>- * specified component's UID will be replaced.  The client program should not</div><div class='del'>- * assume that the object is actually in the server's storage until it has</div><div class='del'>- * received the "obj_updated" notification signal.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE on specifying an invalid component.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_client_update_object (CalClient *client, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalClientPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	gboolean retval;</div><div class='del'>-	char *obj_string;</div><div class='del'>-	const char *uid;</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 (comp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-	obj_string = cal_component_get_as_string (comp);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</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, (char *) 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, (char *) 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 fd40c424d9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-client.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-client/cal-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +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-recur.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'>-typedef struct _CalClientPrivate CalClientPrivate;</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'>-	CalClientPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalClientClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Notification signals */</div><div class='del'>-</div><div class='del'>-	void (* cal_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'>-gboolean cal_client_is_loaded (CalClient *client);</div><div class='del'>-</div><div class='del'>-int cal_client_get_n_objects (CalClient *client, CalObjType type);</div><div class='del'>-</div><div class='del'>-CalClientGetStatus cal_client_get_object (CalClient *client,</div><div class='del'>-					  const char *uid,</div><div class='del'>-					  CalComponent **comp);</div><div class='del'>-</div><div class='del'>-GList *cal_client_get_uids (CalClient *client, CalObjType type);</div><div class='del'>-GList *cal_client_get_changed_uids (CalClient *client, CalObjType type, time_t since);</div><div class='del'>-</div><div class='del'>-GList *cal_client_get_objects_in_range (CalClient *client, CalObjType type,</div><div class='del'>-					time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-void cal_client_generate_instances (CalClient *client, CalObjType type,</div><div class='del'>-				    time_t start, time_t end,</div><div class='del'>-				    CalRecurInstanceFn cb, gpointer cb_data);</div><div class='del'>-</div><div class='del'>-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, CalComponent *comp);</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 c5626fee9d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-listener.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-client/cal-listener.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,403 +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'>-struct _CalListenerPrivate {</div><div class='del'>-	/* The calendar this listener refers to */</div><div class='del'>-	Evolution_Calendar_Cal cal;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	CAL_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'>-	listener-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* 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 b4eda6c2d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/cal-listener.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-client/cal-listener.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +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'>-typedef struct _CalListenerPrivate CalListenerPrivate;</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'>-	CalListenerPrivate *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 c28e3f5696..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/client-test.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-client/client-test.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,213 +0,0 @@</div><div class='del'>-/* Evolution calendar client - test program</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;bonobo.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.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'>-</div><div class='del'>-static CalClient *client1;</div><div class='del'>-static CalClient *client2;</div><div class='del'>-</div><div class='del'>-/* Prints a message with a client identifier */</div><div class='del'>-static void</div><div class='del'>-cl_printf (CalClient *client, const char *format, ...)</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-</div><div class='del'>-	va_start (args, format);</div><div class='del'>-	printf ("Client %s: ",</div><div class='del'>-		client == client1 ? "1" :</div><div class='del'>-		client == client2 ? "2" :</div><div class='del'>-		"UNKNOWN");</div><div class='del'>-	vprintf (format, args);</div><div class='del'>-	va_end (args);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Dumps some interesting data from a component */</div><div class='del'>-static void</div><div class='del'>-dump_component (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	printf ("UID %s\n", uid);</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-	if (summary.value)</div><div class='del'>-		printf ("\tSummary: `%s', altrep `%s'\n",</div><div class='del'>-			summary.value,</div><div class='del'>-			summary.altrep ? summary.altrep : "NONE");</div><div class='del'>-	else</div><div class='del'>-		printf ("\tNo summary\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Lists the UIDs of objects in a calendar, called as an idle handler */</div><div class='del'>-static gboolean</div><div class='del'>-list_uids (gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	client = CAL_CLIENT (data);</div><div class='del'>-</div><div class='del'>-	uids = cal_client_get_uids (client, CALOBJ_TYPE_ANY);</div><div class='del'>-</div><div class='del'>-	cl_printf (client, "UIDs: ");</div><div class='del'>-</div><div class='del'>-	if (!uids)</div><div class='del'>-		printf ("none\n");</div><div class='del'>-	else {</div><div class='del'>-		for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-			char *uid;</div><div class='del'>-</div><div class='del'>-			uid = l-&gt;data;</div><div class='del'>-			printf ("`%s' ", uid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		printf ("\n");</div><div class='del'>-</div><div class='del'>-		for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-			char *uid;</div><div class='del'>-			CalComponent *comp;</div><div class='del'>-			CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-			uid = l-&gt;data;</div><div class='del'>-			status = cal_client_get_object (client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-			if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-				printf ("------------------------------\n");</div><div class='del'>-				dump_component (comp);</div><div class='del'>-				printf ("------------------------------\n");</div><div class='del'>-				gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			} else {</div><div class='del'>-				printf ("FAILED: %d\n", status);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when a calendar is 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'>-/* Callback used when a client is destroyed */</div><div class='del'>-static void</div><div class='del'>-client_destroy_cb (GtkObject *object, gpointer data)</div><div class='del'>-{</div><div class='del'>-	if (CAL_CLIENT (object) == client1)</div><div class='del'>-		client1 = NULL;</div><div class='del'>-	else if (CAL_CLIENT (object) == client2)</div><div class='del'>-		client2 = NULL;</div><div class='del'>-	else</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	if (!client1 &amp;&amp; !client2)</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a calendar client and tries to load the specified URI into it */</div><div class='del'>-static void</div><div class='del'>-create_client (CalClient **client, const char *uri, gboolean load)</div><div class='del'>-{</div><div class='del'>-	gboolean result;</div><div class='del'>-</div><div class='del'>-	*client = cal_client_new ();</div><div class='del'>-	if (!*client) {</div><div class='del'>-		g_message ("create_client(): could not create the client");</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (*client), "destroy",</div><div class='del'>-			    client_destroy_cb,</div><div class='del'>-			    NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (*client), "cal_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'>-</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'>-	gnome_init ("tl-test", VERSION, argc, argv);</div><div class='del'>-	oaf_init (argc, argv);</div><div class='del'>-</div><div class='del'>-	if (!bonobo_init (CORBA_OBJECT_NIL, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL)) {</div><div class='del'>-		g_message ("main(): could not initialize Bonobo");</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	create_client (&amp;client1, "/cvs/evolution/calendar/cal-client/test.ics", TRUE);</div><div class='del'>-	create_client (&amp;client2, "/cvs/evolution/calendar/cal-client/test.ics", FALSE);</div><div class='del'>-</div><div class='del'>-	bonobo_main ();</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-client/test.ics b/calendar/cal-client/test.ics<br/>deleted file mode 100644<br/>index 128251ee11..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-client/test.ics?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-client/test.ics</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,318 +0,0 @@</div><div class='del'>-BEGIN:VCALENDAR</div><div class='del'>-VERSION:2.0</div><div class='del'>-PRODID:-//hacksw/handcal//NONSGML v1.0//EN</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-DTSTART:19970714T170000Z</div><div class='del'>-DTEND:19970715T035959Z</div><div class='del'>-SUMMARY:Bastille Day Party</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:19970901T130000Z-123401@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART:19970903T163000Z</div><div class='del'>-DTEND:19970903T190000Z</div><div class='del'>-SUMMARY:Annual Employee Review</div><div class='del'>-CLASS:PRIVATE</div><div class='del'>-CATEGORIES:BUSINESS,HUMAN RESOURCES</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:19970901T130000Z-123402@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART:19970401T163000Z</div><div class='del'>-DTEND:19970402T010000Z</div><div class='del'>-SUMMARY:Laurel is in sensitivity awareness class.</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-CATEGORIES:BUSINESS,HUMAN RESOURCES</div><div class='del'>-TRANSP:TRANSPARENT</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-UID:19970901T130000Z-123403@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART:19971102</div><div class='del'>-SUMMARY:Our Blissful Anniversary</div><div class='del'>-CLASS:CONFIDENTIAL</div><div class='del'>-CATEGORIES:ANNIVERSARY,PERSONAL,SPECIAL OCCASION</div><div class='del'>-RRULE:FREQ=YEARLY</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-UID:19970901T130000Z-123404@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART:19970415T133000Z</div><div class='del'>-DUE:19970416T045959Z</div><div class='del'>-SUMMARY:1996 Income Tax Preparation</div><div class='del'>-CLASS:CONFIDENTIAL</div><div class='del'>-CATEGORIES:FAMILY,FINANCE</div><div class='del'>-PRIORITY:1</div><div class='del'>-STATUS:NEEDS-ACTION</div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-BEGIN:VJOURNAL</div><div class='del'>-UID:19970901T130000Z-123405@host.com</div><div class='del'>-DTSTAMP:19970901T1300Z</div><div class='del'>-DTSTART;VALUE=DATE:19970317</div><div class='del'>-SUMMARY:Staff meeting minutes</div><div class='del'>-DESCRIPTION:1. Staff meeting: Participants include Joe\, Lisa</div><div class='del'>-  and Bob. Aurora project plans were reviewed. There is currently</div><div class='del'>-  no budget reserves for this project. Lisa will escalate to</div><div class='del'>-  management. Next meeting on Tuesday.\n</div><div class='del'>-  2. Telephone Conference: ABC Corp. sales representative called</div><div class='del'>-  to discuss new printer. Promised to get us a demo by Friday.\n</div><div class='del'>-  3. Henry Miller (Handsoff Insurance): Car was totaled by tree.</div><div class='del'>-  Is looking into a loaner car. 654-2323 (tel).</div><div class='del'>-END:VJOURNAL</div><div class='del'>-</div><div class='del'>-BEGIN:VFREEBUSY</div><div class='del'>-ORGANIZER:MAILTO:jane_doe@host1.com</div><div class='del'>-ATTENDEE:MAILTO:john_public@host2.com</div><div class='del'>-DTSTART:19971015T050000Z</div><div class='del'>-DTEND:19971016T050000Z</div><div class='del'>-DTSTAMP:19970901T083000Z</div><div class='del'>-END:VFREEBUSY</div><div class='del'>-</div><div class='del'>-BEGIN:VFREEBUSY</div><div class='del'>-ORGANIZER:MAILTO:jane_doe@host1.com</div><div class='del'>-ATTENDEE:MAILTO:john_public@host2.com</div><div class='del'>-DTSTAMP:19970901T100000Z</div><div class='del'>-FREEBUSY;VALUE=PERIOD:19971015T050000Z/PT8H30M,</div><div class='del'>- 19971015T160000Z/PT5H30M,19971015T223000Z/PT6H30M</div><div class='del'>-URL:http://host2.com/pub/busy/jpublic-01.ifb</div><div class='del'>-COMMENT:This iCalendar file contains busy time information for</div><div class='del'>-  the next three months.</div><div class='del'>-END:VFREEBUSY</div><div class='del'>-</div><div class='del'>-BEGIN:VFREEBUSY</div><div class='del'>-ORGANIZER:jsmith@host.com</div><div class='del'>-DTSTART:19980313T141711Z</div><div class='del'>-DTEND:19980410T141711Z</div><div class='del'>-FREEBUSY:19980314T233000Z/19980315T003000Z</div><div class='del'>-FREEBUSY:19980316T153000Z/19980316T163000Z</div><div class='del'>-FREEBUSY:19980318T030000Z/19980318T040000Z</div><div class='del'>-URL:http://www.host.com/calendar/busytime/jsmith.ifb</div><div class='del'>-END:VFREEBUSY</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US-Eastern</div><div class='del'>-LAST-MODIFIED:19870101T000000Z</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19971026T020000</div><div class='del'>-RDATE:19971026T020000</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19971026T020000</div><div class='del'>-RDATE:19970406T020000</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US-Eastern</div><div class='del'>-LAST-MODIFIED:19870101T000000Z</div><div class='del'>-TZURL:http://zones.stds_r_us.net/tz/US-Eastern</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19671029T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19870405T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US--Fictitious-Eastern</div><div class='del'>-LAST-MODIFIED:19870101T000000Z</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19671029T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19870405T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US--Fictitious-Eastern</div><div class='del'>-LAST-MODIFIED:19870101T000000Z</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19671029T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19870405T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4;UNTIL=19980404T070000Z</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19990424T020000</div><div class='del'>-RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=4</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-TRIGGER;VALUE=DATE-TIME:19970317T133000Z</div><div class='del'>-REPEAT:4</div><div class='del'>-DURATION:PT15M</div><div class='del'>-ACTION:AUDIO</div><div class='del'>-ATTACH;FMTTYPE=audio/basic:ftp://host.com/pub/sounds/bell-01.aud</div><div class='del'>-END:VALARM</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-TRIGGER:-PT30M</div><div class='del'>-REPEAT:2</div><div class='del'>-DURATION:PT15M</div><div class='del'>-ACTION:DISPLAY</div><div class='del'>-DESCRIPTION:Breakfast meeting with executive\n</div><div class='del'>- team at 8:30 AM EST.</div><div class='del'>-END:VALARM</div><div class='del'>-</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-TRIGGER:-P2D</div><div class='del'>-ACTION:EMAIL</div><div class='del'>-ATTENDEE:MAILTO:john_doe@host.com</div><div class='del'>-SUMMARY:*** REMINDER: SEND AGENDA FOR WEEKLY STAFF MEETING ***</div><div class='del'>-DESCRIPTION:A draft agenda needs to be sent out to the attendees</div><div class='del'>-  to the weekly managers meeting (MGR-LIST). Attached is a</div><div class='del'>-  pointer the document template for the agenda file.</div><div class='del'>-ATTACH;FMTTYPE=application/binary:http://host.com/templates/agen</div><div class='del'>- da.doc</div><div class='del'>-END:VALARM</div><div class='del'>-</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-TRIGGER;VALUE=DATE-TIME:19980101T050000Z</div><div class='del'>-REPEAT:23</div><div class='del'>-DURATION:PT1H</div><div class='del'>-ACTION:PROCEDURE</div><div class='del'>-ATTACH;FMTTYPE=application/binary:ftp://host.com/novo-</div><div class='del'>- procs/felizano.exe</div><div class='del'>-END:VALARM</div><div class='del'>-</div><div class='del'>-BEGIN:VTIMEZONE</div><div class='del'>-TZID:US-Eastern</div><div class='del'>-BEGIN:STANDARD</div><div class='del'>-DTSTART:19981025T020000</div><div class='del'>-RDATE:19981025T020000</div><div class='del'>-TZOFFSETFROM:-0400</div><div class='del'>-TZOFFSETTO:-0500</div><div class='del'>-TZNAME:EST</div><div class='del'>-END:STANDARD</div><div class='del'>-BEGIN:DAYLIGHT</div><div class='del'>-DTSTART:19990404T020000</div><div class='del'>-RDATE:19990404T020000</div><div class='del'>-TZOFFSETFROM:-0500</div><div class='del'>-TZOFFSETTO:-0400</div><div class='del'>-TZNAME:EDT</div><div class='del'>-END:DAYLIGHT</div><div class='del'>-END:VTIMEZONE</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-DTSTAMP:19980309T231000Z</div><div class='del'>-UID:guid-1.host1.com</div><div class='del'>-ORGANIZER;ROLE=CHAIR:MAILTO:mrbig@host.com</div><div class='del'>-ATTENDEE;RSVP=TRUE;ROLE=REQ-PARTICIPANT;CUTYPE=GROUP:</div><div class='del'>- MAILTO:employee-A@host.com</div><div class='del'>-DESCRIPTION:Project XYZ Review Meeting</div><div class='del'>-CATEGORIES:MEETING</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-CREATED:19980309T130000Z</div><div class='del'>-SUMMARY:XYZ Project Review</div><div class='del'>-DTSTART;TZID=US-Eastern:19980312T083000</div><div class='del'>-DTEND;TZID=US-Eastern:19980312T093000</div><div class='del'>-LOCATION:1CP Conference Room 4350</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VEVENT</div><div class='del'>-DTSTAMP:19970324T1200Z</div><div class='del'>-SEQUENCE:0</div><div class='del'>-UID:uid3@host1.com</div><div class='del'>-ORGANIZER:MAILTO:jdoe@host1.com</div><div class='del'>-DTSTART:19970324T123000Z</div><div class='del'>-DTEND:19970324T210000Z</div><div class='del'>-CATEGORIES:MEETING,PROJECT</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-SUMMARY:Calendaring Interoperability Planning Meeting</div><div class='del'>-DESCRIPTION:Discuss how we can test c&amp;s interoperability\n</div><div class='del'>- using iCalendar and other IETF standards.</div><div class='del'>-LOCATION:LDB Lobby</div><div class='del'>-ATTACH;FMTTYPE=application/postscript:ftp://xyzCorp.com/pub/</div><div class='del'>- conf/bkgrnd.ps</div><div class='del'>-END:VEVENT</div><div class='del'>-</div><div class='del'>-BEGIN:VTODO</div><div class='del'>-DTSTAMP:19980130T134500Z</div><div class='del'>-SEQUENCE:2</div><div class='del'>-UID:uid4@host1.com</div><div class='del'>-ORGANIZER:MAILTO:unclesam@us.gov</div><div class='del'>-ATTENDEE;PARTSTAT=ACCEPTED:MAILTO:jqpublic@host.com</div><div class='del'>-DUE:19980415T235959</div><div class='del'>-STATUS:NEEDS-ACTION</div><div class='del'>-SUMMARY:Submit Income Taxes</div><div class='del'>-BEGIN:VALARM</div><div class='del'>-ACTION:AUDIO</div><div class='del'>-TRIGGER:19980403T120000</div><div class='del'>-ATTACH;FMTTYPE=audio/basic:http://host.com/pub/audio-</div><div class='del'>- files/ssbanner.aud</div><div class='del'>-REPEAT:4</div><div class='del'>-DURATION:PT1H</div><div class='del'>-END:VALARM</div><div class='del'>-END:VTODO</div><div class='del'>-</div><div class='del'>-BEGIN:VJOURNAL</div><div class='del'>-DTSTAMP:19970324T120000Z</div><div class='del'>-UID:uid5@host1.com</div><div class='del'>-ORGANIZER:MAILTO:jsmith@host.com</div><div class='del'>-STATUS:DRAFT</div><div class='del'>-CLASS:PUBLIC</div><div class='del'>-CATEGORIES:Project Report, XYZ, Weekly Meeting</div><div class='del'>-DESCRIPTION:Project xyz Review Meeting Minutes\n</div><div class='del'>- Agenda\n1. Review of project version 1.0 requirements.\n2.</div><div class='del'>- Definition</div><div class='del'>- of project processes.\n3. Review of project schedule.\n</div><div class='del'>- Participants: John Smith\, Jane Doe\, Jim Dandy\n-It was</div><div class='del'>-  decided that the requirements need to be signed off by</div><div class='del'>-  product marketing.\n-Project processes were accepted.\n</div><div class='del'>- -Project schedule needs to account for scheduled holidays</div><div class='del'>-  and employee vacation time. Check with HR for specific</div><div class='del'>-  dates.\n-New schedule will be distributed by Friday.\n-</div><div class='del'>- Next weeks meeting is cancelled. No meeting until 3/23.</div><div class='del'>-END:VJOURNAL</div><div class='del'>-</div><div class='del'>-BEGIN:VFREEBUSY</div><div class='del'>-ORGANIZER:MAILTO:jsmith@host.com</div><div class='del'>-DTSTART:19980313T141711Z</div><div class='del'>-DTEND:19980410T141711Z</div><div class='del'>-FREEBUSY:19980314T233000Z/19980315T003000Z</div><div class='del'>-FREEBUSY:19980316T153000Z/19980316T163000Z</div><div class='del'>-FREEBUSY:19980318T030000Z/19980318T040000Z</div><div class='del'>-URL:http://www.host.com/calendar/busytime/jsmith.ifb</div><div class='del'>-END:VFREEBUSY</div><div class='del'>-END:VCALENDAR</div><div class='head'>diff --git a/calendar/cal-util/.cvsignore b/calendar/cal-util/.cvsignore<br/>deleted file mode 100644<br/>index 9f93120f8a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-.libs</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-test-recur</div><div class='head'>diff --git a/calendar/cal-util/Makefile.am b/calendar/cal-util/Makefile.am<br/>deleted file mode 100644<br/>index 9a1b677e9b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-noinst_PROGRAMS = test-recur</div><div class='del'>-</div><div class='del'>-INCLUDES =						\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"		\</div><div class='del'>-	-DG_LOG_DOMAIN=\"cal-util\"			\</div><div class='del'>-	-I$(top_srcdir) 				\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I. 						\</div><div class='del'>-	-I.. 						\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-        $(GNOME_INCLUDEDIR)</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# cal util library</div><div class='del'>-#</div><div class='del'>-</div><div class='del'>-lib_LTLIBRARIES = libcal-util.la</div><div class='del'>-</div><div class='del'>-libcal_util_la_SOURCES = 	\</div><div class='del'>-	cal-component.c		\</div><div class='del'>-	cal-recur.c		\</div><div class='del'>-	cal-util.c		\</div><div class='del'>-	timeutil.c</div><div class='del'>-</div><div class='del'>-libcal_utilincludedir = $(includedir)/evolution/cal-util</div><div class='del'>-</div><div class='del'>-libcal_utilinclude_HEADERS =	\</div><div class='del'>-	cal-component.h		\</div><div class='del'>-	cal-recur.h		\</div><div class='del'>-	cal-util.h		\</div><div class='del'>-	timeutil.h</div><div class='del'>-</div><div class='del'>-#</div><div class='del'>-# static library for use in conduits' shared libraries</div><div class='del'>-#</div><div class='del'>-noinst_LTLIBRARIES = libcal-util-static.la</div><div class='del'>-libcal_util_static_la_SOURCES = $(libcal_util_la_SOURCES)</div><div class='del'>-libcal_util_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-test_recur_SOURCES = 	\</div><div class='del'>-	 test-recur.c</div><div class='del'>-</div><div class='del'>-test_recur_LDADD = 	\</div><div class='del'>-	 libcal-util.la	\</div><div class='del'>-	 $(top_builddir)/libversit/libversit.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-component.c b/calendar/cal-util/cal-component.c<br/>deleted file mode 100644<br/>index 4f813cbdee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-component.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/cal-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3662 +0,0 @@</div><div class='del'>-/* Evolution calendar - iCalendar component 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 &lt;string.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include "cal-component.h"</div><div class='del'>-#include "timeutil.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CalComponent structure */</div><div class='del'>-struct _CalComponentPrivate {</div><div class='del'>-	/* The icalcomponent we wrap */</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	/* Properties */</div><div class='del'>-</div><div class='del'>-	icalproperty *uid;</div><div class='del'>-</div><div class='del'>-	icalproperty *status;</div><div class='del'>-</div><div class='del'>-	struct categories {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-	};</div><div class='del'>-	GSList *categories_list; /* list of struct categories */</div><div class='del'>-</div><div class='del'>-	icalproperty *classification;</div><div class='del'>-</div><div class='del'>-	struct text {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *altrep_param;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	GSList *comment_list; /* list of struct text */</div><div class='del'>-</div><div class='del'>-	icalproperty *completed;</div><div class='del'>-	icalproperty *created;</div><div class='del'>-</div><div class='del'>-	GSList *description_list; /* list of struct text */</div><div class='del'>-</div><div class='del'>-	struct datetime {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *tzid_param;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	struct datetime dtstart;</div><div class='del'>-	struct datetime dtend;</div><div class='del'>-</div><div class='del'>-	icalproperty *dtstamp;</div><div class='del'>-</div><div class='del'>-	struct datetime due;</div><div class='del'>-</div><div class='del'>-	GSList *exdate_list; /* list of icalproperty objects */</div><div class='del'>-	GSList *exrule_list; /* list of icalproperty objects */</div><div class='del'>-</div><div class='del'>-	icalproperty *geo;</div><div class='del'>-	icalproperty *last_modified;</div><div class='del'>-	icalproperty *percent;</div><div class='del'>-	icalproperty *priority;</div><div class='del'>-</div><div class='del'>-	struct period {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *value_param;</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	GSList *rdate_list; /* list of struct period */</div><div class='del'>-</div><div class='del'>-	GSList *rrule_list; /* list of icalproperty objects */</div><div class='del'>-</div><div class='del'>-	icalproperty *sequence;</div><div class='del'>-</div><div class='del'>-	struct {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalparameter *altrep_param;</div><div class='del'>-	} summary;</div><div class='del'>-</div><div class='del'>-	icalproperty *transparency;</div><div class='del'>-	icalproperty *url;</div><div class='del'>-</div><div class='del'>-	/* Whether we should increment the sequence number when piping the</div><div class='del'>-	 * object over the wire.</div><div class='del'>-	 */</div><div class='del'>-	guint need_sequence_inc : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Private structure for alarms */</div><div class='del'>-struct _CalComponentAlarm {</div><div class='del'>-	/* Our parent component */</div><div class='del'>-	CalComponent *parent;</div><div class='del'>-</div><div class='del'>-	/* Alarm icalcomponent we wrap */</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	/* Properties */</div><div class='del'>-</div><div class='del'>-	icalproperty *action;</div><div class='del'>-	icalproperty *trigger;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_component_class_init (CalComponentClass *class);</div><div class='del'>-static void cal_component_init (CalComponent *comp);</div><div class='del'>-static void cal_component_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalComponent class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #CalComponent class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_component_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_component_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_component_type) {</div><div class='del'>-		static const GtkTypeInfo cal_component_info = {</div><div class='del'>-			"CalComponent",</div><div class='del'>-			sizeof (CalComponent),</div><div class='del'>-			sizeof (CalComponentClass),</div><div class='del'>-			(GtkClassInitFunc) cal_component_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_component_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cal_component_type = gtk_type_unique (GTK_TYPE_OBJECT, &amp;cal_component_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_component_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar component object */</div><div class='del'>-static void</div><div class='del'>-cal_component_class_init (CalComponentClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_component_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the calendar component object */</div><div class='del'>-static void</div><div class='del'>-cal_component_init (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalComponentPrivate, 1);</div><div class='del'>-	comp-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Does a simple g_free() of the elements of a GSList and then frees the list</div><div class='del'>- * itself.  Returns NULL.</div><div class='del'>- */</div><div class='del'>-static GSList *</div><div class='del'>-free_slist (GSList *slist)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = slist; l; l = l-&gt;next)</div><div class='del'>-		g_free (l-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_slist_free (slist);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees the internal icalcomponent only if it does not have a parent.  If it</div><div class='del'>- * does, it means we don't own it and we shouldn't free it.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-free_icalcomponent (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;icalcomp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Free the icalcomponent */</div><div class='del'>-</div><div class='del'>-	if (icalcomponent_get_parent (priv-&gt;icalcomp) != NULL)</div><div class='del'>-		icalcomponent_free (priv-&gt;icalcomp);</div><div class='del'>-</div><div class='del'>-	priv-&gt;icalcomp = NULL;</div><div class='del'>-</div><div class='del'>-	/* Free the mappings */</div><div class='del'>-</div><div class='del'>-	priv-&gt;uid = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;status = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;categories_list = free_slist (priv-&gt;categories_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;classification = NULL;</div><div class='del'>-	priv-&gt;comment_list = NULL;</div><div class='del'>-	priv-&gt;completed = NULL;</div><div class='del'>-	priv-&gt;created = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;description_list = free_slist (priv-&gt;description_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;dtend.prop = NULL;</div><div class='del'>-	priv-&gt;dtend.tzid_param = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;dtstamp = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;dtstart.prop = NULL;</div><div class='del'>-	priv-&gt;dtstart.tzid_param = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;due.prop = NULL;</div><div class='del'>-	priv-&gt;due.tzid_param = NULL;</div><div class='del'>-</div><div class='del'>-	g_slist_free (priv-&gt;exdate_list);</div><div class='del'>-	priv-&gt;exdate_list = NULL;</div><div class='del'>-</div><div class='del'>-	g_slist_free (priv-&gt;exrule_list);</div><div class='del'>-	priv-&gt;exrule_list = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;geo = NULL;</div><div class='del'>-	priv-&gt;last_modified = NULL;</div><div class='del'>-	priv-&gt;percent = NULL;</div><div class='del'>-	priv-&gt;priority = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;rdate_list = free_slist (priv-&gt;rdate_list);</div><div class='del'>-</div><div class='del'>-	g_slist_free (priv-&gt;rrule_list);</div><div class='del'>-	priv-&gt;rrule_list = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;sequence = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary.prop = NULL;</div><div class='del'>-	priv-&gt;summary.altrep_param = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;transparency = NULL;</div><div class='del'>-	priv-&gt;url = NULL;</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the calendar component object */</div><div class='del'>-static void</div><div class='del'>-cal_component_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (object));</div><div class='del'>-</div><div class='del'>-	comp = CAL_COMPONENT (object);</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	free_icalcomponent (comp);</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	comp-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_gen_uid:</div><div class='del'>- *</div><div class='del'>- * Generates a unique identifier suitable for calendar components.</div><div class='del'>- *</div><div class='del'>- * Return value: A unique identifier string.  Every time this function is called</div><div class='del'>- * a different string is returned.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-cal_component_gen_uid (void)</div><div class='del'>-{</div><div class='del'>-	static char *hostname;</div><div class='del'>-	time_t t = time (NULL);</div><div class='del'>-	static int serial;</div><div class='del'>-</div><div class='del'>-	if (!hostname) {</div><div class='del'>-		static char buffer [512];</div><div class='del'>-</div><div class='del'>-		if ((gethostname (buffer, sizeof (buffer) - 1) == 0) &amp;&amp;</div><div class='del'>-		    (buffer [0] != 0))</div><div class='del'>-			hostname = buffer;</div><div class='del'>-		else</div><div class='del'>-			hostname = "localhost";</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	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'>-/**</div><div class='del'>- * cal_component_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new empty calendar component object.  You should set it from an</div><div class='del'>- * #icalcomponent structure by using cal_component_set_icalcomponent() or with a</div><div class='del'>- * new empty component type by using cal_component_set_new_vtype().</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created calendar component object.</div><div class='del'>- **/</div><div class='del'>-CalComponent *</div><div class='del'>-cal_component_new (void)</div><div class='del'>-{</div><div class='del'>-	return CAL_COMPONENT (gtk_type_new (CAL_COMPONENT_TYPE));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_clone:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * </div><div class='del'>- * Creates a new calendar component object by copying the information from</div><div class='del'>- * another one.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created calendar component with the same values as the</div><div class='del'>- * original one.</div><div class='del'>- **/</div><div class='del'>-CalComponent *</div><div class='del'>-cal_component_clone (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	CalComponent *new_comp;</div><div class='del'>-	icalcomponent *new_icalcomp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;need_sequence_inc == FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	new_comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;icalcomp) {</div><div class='del'>-		new_icalcomp = icalcomponent_new_clone (priv-&gt;icalcomp);</div><div class='del'>-		cal_component_set_icalcomponent (new_comp, new_icalcomp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new_comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans the categories property */</div><div class='del'>-static void</div><div class='del'>-scan_categories (CalComponent *comp, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	struct categories *categ;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	categ = g_new (struct categories, 1);</div><div class='del'>-	categ-&gt;prop = prop;</div><div class='del'>-</div><div class='del'>-	priv-&gt;categories_list = g_slist_append (priv-&gt;categories_list, categ);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans a date/time and timezone pair property */</div><div class='del'>-static void</div><div class='del'>-scan_datetime (CalComponent *comp, struct datetime *datetime, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	datetime-&gt;prop = prop;</div><div class='del'>-	datetime-&gt;tzid_param = icalproperty_get_first_parameter (prop, ICAL_TZID_PARAMETER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an exception date property */</div><div class='del'>-static void</div><div class='del'>-scan_exdate (CalComponent *comp, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	priv-&gt;exdate_list = g_slist_append (priv-&gt;exdate_list, prop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalperiodtype property */</div><div class='del'>-static void</div><div class='del'>-scan_period (CalComponent *comp, GSList **list, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	struct period *period;</div><div class='del'>-</div><div class='del'>-	period = g_new (struct period, 1);</div><div class='del'>-	period-&gt;prop = prop;</div><div class='del'>-	period-&gt;value_param = icalproperty_get_first_parameter (prop, ICAL_VALUE_PARAMETER);</div><div class='del'>-</div><div class='del'>-	*list = g_slist_append (*list, period);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalrecurtype property */</div><div class='del'>-static void</div><div class='del'>-scan_recur (CalComponent *comp, GSList **list, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	*list = g_slist_append (*list, prop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans the summary property */</div><div class='del'>-static void</div><div class='del'>-scan_summary (CalComponent *comp, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary.prop = prop;</div><div class='del'>-	priv-&gt;summary.altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans a text (i.e. text + altrep) property */</div><div class='del'>-static void</div><div class='del'>-scan_text (CalComponent *comp, GSList **text_list, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	struct text *text;</div><div class='del'>-</div><div class='del'>-	text = g_new (struct text, 1);</div><div class='del'>-	text-&gt;prop = prop;</div><div class='del'>-	text-&gt;altrep_param = icalproperty_get_first_parameter (prop, ICAL_ALTREP_PARAMETER);</div><div class='del'>-</div><div class='del'>-	*text_list = g_slist_append (*text_list, text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalproperty and adds its mapping to the component */</div><div class='del'>-static void</div><div class='del'>-scan_property (CalComponent *comp, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalproperty_kind kind;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	kind = icalproperty_isa (prop);</div><div class='del'>-</div><div class='del'>-	switch (kind) {</div><div class='del'>-	case ICAL_STATUS_PROPERTY:</div><div class='del'>-		priv-&gt;status = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_CATEGORIES_PROPERTY:</div><div class='del'>-		scan_categories (comp, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_CLASS_PROPERTY:</div><div class='del'>-		priv-&gt;classification = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_COMMENT_PROPERTY:</div><div class='del'>-		scan_text (comp, &amp;priv-&gt;comment_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_COMPLETED_PROPERTY:</div><div class='del'>-		priv-&gt;completed = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_CREATED_PROPERTY:</div><div class='del'>-		priv-&gt;created = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DESCRIPTION_PROPERTY:</div><div class='del'>-		scan_text (comp, &amp;priv-&gt;description_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DTEND_PROPERTY:</div><div class='del'>-		scan_datetime (comp, &amp;priv-&gt;dtend, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DTSTAMP_PROPERTY:</div><div class='del'>-		priv-&gt;dtstamp = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DTSTART_PROPERTY:</div><div class='del'>-		scan_datetime (comp, &amp;priv-&gt;dtstart, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_DUE_PROPERTY:</div><div class='del'>-		scan_datetime (comp, &amp;priv-&gt;due, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_EXDATE_PROPERTY:</div><div class='del'>-		scan_exdate (comp, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_EXRULE_PROPERTY:</div><div class='del'>-		scan_recur (comp, &amp;priv-&gt;exrule_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_GEO_PROPERTY:</div><div class='del'>-		priv-&gt;geo = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_LASTMODIFIED_PROPERTY:</div><div class='del'>-		priv-&gt;last_modified = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_PERCENTCOMPLETE_PROPERTY:</div><div class='del'>-		priv-&gt;percent = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_PRIORITY_PROPERTY:</div><div class='del'>-		priv-&gt;priority = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_RDATE_PROPERTY:</div><div class='del'>-		scan_period (comp, &amp;priv-&gt;rdate_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_RRULE_PROPERTY:</div><div class='del'>-		scan_recur (comp, &amp;priv-&gt;rrule_list, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_SEQUENCE_PROPERTY:</div><div class='del'>-		priv-&gt;sequence = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_SUMMARY_PROPERTY:</div><div class='del'>-		scan_summary (comp, prop);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_TRANSP_PROPERTY:</div><div class='del'>-		priv-&gt;transparency = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_UID_PROPERTY:</div><div class='del'>-		priv-&gt;uid = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_URL_PROPERTY:</div><div class='del'>-		priv-&gt;url = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalcomponent for its properties so that we can provide</div><div class='del'>- * random-access to them.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-scan_icalcomponent (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (priv-&gt;icalcomp, ICAL_ANY_PROPERTY);</div><div class='del'>-	     prop;</div><div class='del'>-	     prop = icalcomponent_get_next_property (priv-&gt;icalcomp, ICAL_ANY_PROPERTY))</div><div class='del'>-		scan_property (comp, prop);</div><div class='del'>-</div><div class='del'>-	/* We don't scan for alarm subcomponents since they can be iterated</div><div class='del'>-	 * through using cal_component_get_{first,next}_alarm().</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensures that the mandatory calendar component properties (uid, dtstamp) do</div><div class='del'>- * exist.  If they don't exist, it creates them automatically.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-ensure_mandatory_properties (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;uid) {</div><div class='del'>-		char *uid;</div><div class='del'>-</div><div class='del'>-		uid = cal_component_gen_uid ();</div><div class='del'>-		priv-&gt;uid = icalproperty_new_uid (uid);</div><div class='del'>-		g_free (uid);</div><div class='del'>-</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;dtstamp) {</div><div class='del'>-		time_t tim;</div><div class='del'>-		struct icaltimetype t;</div><div class='del'>-</div><div class='del'>-		tim = time (NULL);</div><div class='del'>-		t = icaltime_from_timet (tim, FALSE, FALSE);</div><div class='del'>-</div><div class='del'>-		priv-&gt;dtstamp = icalproperty_new_dtstamp (t);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;dtstamp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_new_vtype:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @type: Type of calendar component to create.</div><div class='del'>- *</div><div class='del'>- * Clears any existing component data from a calendar component object and</div><div class='del'>- * creates a new #icalcomponent of the specified type for it.  The only property</div><div class='del'>- * that will be set in the new component will be its unique identifier.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	free_icalcomponent (comp);</div><div class='del'>-</div><div class='del'>-	if (type == CAL_COMPONENT_NO_TYPE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Figure out the kind and create the icalcomponent */</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		kind = ICAL_VEVENT_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		kind = ICAL_VTODO_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		kind = ICAL_VJOURNAL_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FREEBUSY:</div><div class='del'>-		kind = ICAL_VFREEBUSY_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TIMEZONE:</div><div class='del'>-		kind = ICAL_VTIMEZONE_COMPONENT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		kind = ICAL_NO_COMPONENT;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	icalcomp = icalcomponent_new (kind);</div><div class='del'>-	if (!icalcomp) {</div><div class='del'>-		g_message ("cal_component_set_new_vtype(): Could not create the icalcomponent!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Scan the component to build our mapping table */</div><div class='del'>-</div><div class='del'>-	priv-&gt;icalcomp = icalcomp;</div><div class='del'>-	scan_icalcomponent (comp);</div><div class='del'>-</div><div class='del'>-	/* Add missing stuff */</div><div class='del'>-</div><div class='del'>-	ensure_mandatory_properties (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_icalcomponent:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @icalcomp: An #icalcomponent.</div><div class='del'>- *</div><div class='del'>- * Sets the contents of a calendar component object from an #icalcomponent</div><div class='del'>- * structure.  If the @comp already had an #icalcomponent set into it, it will</div><div class='del'>- * will be freed automatically if the #icalcomponent does not have a parent</div><div class='del'>- * component itself.</div><div class='del'>- *</div><div class='del'>- * Supported component types are VEVENT, VTODO, VJOURNAL, VFREEBUSY, and VTIMEZONE.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE on success, FALSE if @icalcomp is an unsupported component</div><div class='del'>- * type.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;icalcomp == icalcomp)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	free_icalcomponent (comp);</div><div class='del'>-</div><div class='del'>-	if (!icalcomp) {</div><div class='del'>-		priv-&gt;icalcomp = NULL;</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	kind = icalcomponent_isa (icalcomp);</div><div class='del'>-</div><div class='del'>-	if (!(kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-	      || kind == ICAL_VTODO_COMPONENT</div><div class='del'>-	      || kind == ICAL_VJOURNAL_COMPONENT</div><div class='del'>-	      || kind == ICAL_VFREEBUSY_COMPONENT</div><div class='del'>-	      || kind == ICAL_VTIMEZONE_COMPONENT))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;icalcomp = icalcomp;</div><div class='del'>-</div><div class='del'>-	scan_icalcomponent (comp);</div><div class='del'>-	ensure_mandatory_properties (comp);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_icalcomponent:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries the #icalcomponent structure that a calendar component object is</div><div class='del'>- * wrapping.</div><div class='del'>- *</div><div class='del'>- * Return value: An #icalcomponent structure, or NULL if the @comp has no</div><div class='del'>- * #icalcomponent set to it.</div><div class='del'>- **/</div><div class='del'>-icalcomponent *</div><div class='del'>-cal_component_get_icalcomponent (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;need_sequence_inc == FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	return priv-&gt;icalcomp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_vtype:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Queries the type of a calendar component object.</div><div class='del'>- *</div><div class='del'>- * Return value: The type of the component, as defined by RFC 2445.</div><div class='del'>- **/</div><div class='del'>-CalComponentVType</div><div class='del'>-cal_component_get_vtype (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, CAL_COMPONENT_NO_TYPE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), CAL_COMPONENT_NO_TYPE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, CAL_COMPONENT_NO_TYPE);</div><div class='del'>-</div><div class='del'>-	kind = icalcomponent_isa (priv-&gt;icalcomp);</div><div class='del'>-	switch (kind) {</div><div class='del'>-	case ICAL_VEVENT_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_EVENT;</div><div class='del'>-</div><div class='del'>-	case ICAL_VTODO_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_TODO;</div><div class='del'>-</div><div class='del'>-	case ICAL_VJOURNAL_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_JOURNAL;</div><div class='del'>-</div><div class='del'>-	case ICAL_VFREEBUSY_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_FREEBUSY;</div><div class='del'>-</div><div class='del'>-	case ICAL_VTIMEZONE_COMPONENT:</div><div class='del'>-		return CAL_COMPONENT_TIMEZONE;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		/* We should have been loaded with a supported type! */</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return CAL_COMPONENT_NO_TYPE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_as_string:</div><div class='del'>- * @comp: A calendar component.</div><div class='del'>- *</div><div class='del'>- * Gets the iCalendar string representation of a calendar component.  You should</div><div class='del'>- * call cal_component_commit_sequence() before this function to ensure that the</div><div class='del'>- * component's sequence number is consistent with the state of the object.</div><div class='del'>- *</div><div class='del'>- * Return value: String representation of the calendar component according to</div><div class='del'>- * RFC 2445.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-cal_component_get_as_string (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	char *str, *buf;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	/* Ensure that the user has committed the new SEQUENCE */</div><div class='del'>-	g_return_val_if_fail (priv-&gt;need_sequence_inc == FALSE, NULL);</div><div class='del'>-</div><div class='del'>-	/* We dup the string; libical owns that memory */</div><div class='del'>-</div><div class='del'>-	str = icalcomponent_as_ical_string (priv-&gt;icalcomp);</div><div class='del'>-</div><div class='del'>-	if (str)</div><div class='del'>-		buf = g_strdup (str);</div><div class='del'>-	else</div><div class='del'>-		buf = NULL;</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_commit_sequence:</div><div class='del'>- * @comp: </div><div class='del'>- * </div><div class='del'>- * Increments the sequence number property in a calendar component object if it</div><div class='del'>- * needs it.  This needs to be done when any of a number of properties listed in</div><div class='del'>- * RFC 2445 change values, such as the start and end dates of a component.</div><div class='del'>- *</div><div class='del'>- * This function must be called before calling cal_component_get_as_string() to</div><div class='del'>- * ensure that the component is fully consistent.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_commit_sequence (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;need_sequence_inc)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sequence) {</div><div class='del'>-		int seq;</div><div class='del'>-</div><div class='del'>-		seq = icalproperty_get_sequence (priv-&gt;sequence);</div><div class='del'>-		icalproperty_set_sequence (priv-&gt;sequence, seq + 1);</div><div class='del'>-	} else {</div><div class='del'>-		/* The component had no SEQUENCE property, so assume that the</div><div class='del'>-		 * default would have been zero.  Since it needed incrementing</div><div class='del'>-		 * anyways, we use a value of 1 here.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;sequence = icalproperty_new_sequence (1);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;sequence);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_uid:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @uid: Return value for the UID string.</div><div class='del'>- *</div><div class='del'>- * Queries the unique identifier of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_uid (CalComponent *comp, const char **uid)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* This MUST exist, since we ensured that it did */</div><div class='del'>-	g_assert (priv-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	*uid = icalproperty_get_uid (priv-&gt;uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_uid:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @uid: Unique identifier.</div><div class='del'>- *</div><div class='del'>- * Sets the unique identifier string of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_uid (CalComponent *comp, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* This MUST exist, since we ensured that it did */</div><div class='del'>-	g_assert (priv-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-	icalproperty_set_uid (priv-&gt;uid, (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_status:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @status: Return value for the status string.</div><div class='del'>- *</div><div class='del'>- * Queries the status property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_status (CalComponent *comp, const char **status)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (status != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;status) {</div><div class='del'>-		*status = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*status = icalproperty_get_status (priv-&gt;status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_status:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @status: a status string, e.g. "IN-PROCESS", "NEEDS-ACTION". See the RFC.</div><div class='del'>- *</div><div class='del'>- * Sets the status string property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_status (CalComponent *comp, const char *status)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (status != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-</div><div class='del'>-	if (status == NULL) {</div><div class='del'>-		if (priv-&gt;status) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;status);</div><div class='del'>-			icalproperty_free (priv-&gt;status);</div><div class='del'>-			priv-&gt;status = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;status) {</div><div class='del'>-		icalproperty_set_status (priv-&gt;status, (char *) status);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;status = icalproperty_new_status ((char *) status);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp,</div><div class='del'>-					    priv-&gt;status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_categories_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @categ_list: Return value for the list of strings, where each string is a</div><div class='del'>- * category.  This should be freed using cal_component_free_categories_list().</div><div class='del'>- *</div><div class='del'>- * Queries the list of categories of a calendar component object.  Each element</div><div class='del'>- * in the returned categ_list is a string with the corresponding category.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_categories_list (CalComponent *comp, GSList **categ_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	const char *categories;</div><div class='del'>-	const char *p;</div><div class='del'>-	const char *cat_start;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (categ_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;categories_list) {</div><div class='del'>-		*categ_list = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	categories = icalproperty_get_categories (priv-&gt;categories_list);</div><div class='del'>-	g_assert (categories != NULL);</div><div class='del'>-</div><div class='del'>-	cat_start = categories;</div><div class='del'>-</div><div class='del'>-	*categ_list = NULL;</div><div class='del'>-</div><div class='del'>-	for (p = categories; *p; p++)</div><div class='del'>-		if (*p == ',') {</div><div class='del'>-			str = g_strndup (cat_start, p - cat_start);</div><div class='del'>-			*categ_list = g_slist_prepend (*categ_list, str);</div><div class='del'>-</div><div class='del'>-			cat_start = p + 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	str = g_strndup (cat_start, p - cat_start);</div><div class='del'>-	*categ_list = g_slist_prepend (*categ_list, str);</div><div class='del'>-</div><div class='del'>-	*categ_list = g_slist_reverse (*categ_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a comma-delimited string of categories */</div><div class='del'>-static char *</div><div class='del'>-stringify_categories (GSList *categ_list)</div><div class='del'>-{</div><div class='del'>-	GString *s;</div><div class='del'>-	GSList *l;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	s = g_string_new (NULL);</div><div class='del'>-</div><div class='del'>-	for (l = categ_list; l; l = l-&gt;next) {</div><div class='del'>-		g_string_append (s, l-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (l-&gt;next != NULL)</div><div class='del'>-			g_string_append (s, ",");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	str = s-&gt;str;</div><div class='del'>-	g_string_free (s, FALSE);</div><div class='del'>-</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_categories_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @categ_list: List of strings, one for each category.</div><div class='del'>- *</div><div class='del'>- * Sets the list of categories of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_categories_list (CalComponent *comp, GSList *categ_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	struct categories *cat;</div><div class='del'>-	char *categories_str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Free the old list */</div><div class='del'>-</div><div class='del'>-	if (!categ_list) {</div><div class='del'>-		if (priv-&gt;categories_list) {</div><div class='del'>-			GSList *l;</div><div class='del'>-</div><div class='del'>-			for (l = priv-&gt;categories_list; l; l = l-&gt;next) {</div><div class='del'>-				struct categories *c;</div><div class='del'>-</div><div class='del'>-				c = l-&gt;data;</div><div class='del'>-				icalcomponent_remove_property (priv-&gt;icalcomp, c-&gt;prop);</div><div class='del'>-				icalproperty_free (c-&gt;prop);</div><div class='del'>-</div><div class='del'>-				g_free (c);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			g_slist_free (priv-&gt;categories_list);</div><div class='del'>-			priv-&gt;categories_list = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create a single string of categories */</div><div class='del'>-</div><div class='del'>-	categories_str = stringify_categories (categ_list);</div><div class='del'>-</div><div class='del'>-	/* Set the categories */</div><div class='del'>-</div><div class='del'>-	cat = g_new (struct categories, 1);</div><div class='del'>-	cat-&gt;prop = icalproperty_new_categories (categories_str);</div><div class='del'>-	g_free (categories_str);</div><div class='del'>-</div><div class='del'>-	icalcomponent_add_property (priv-&gt;icalcomp, cat-&gt;prop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_classification:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @classif: Return value for the classification.</div><div class='del'>- *</div><div class='del'>- * Queries the classification of a calendar component object.  If the</div><div class='del'>- * classification property is not set on this component, this function returns</div><div class='del'>- * #CAL_COMPONENT_CLASS_NONE.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	const char *class;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (classif != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;classification) {</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_NONE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	class = icalproperty_get_class (priv-&gt;classification);</div><div class='del'>-</div><div class='del'>-	if (strcasecmp (class, "PUBLIC") == 0)</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_PUBLIC;</div><div class='del'>-	else if (strcasecmp (class, "PRIVATE") == 0)</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_PRIVATE;</div><div class='del'>-	else if (strcasecmp (class, "CONFIDENTIAL") == 0)</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_CONFIDENTIAL;</div><div class='del'>-	else</div><div class='del'>-		*classif = CAL_COMPONENT_CLASS_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_classification:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @classif: Classification to use.</div><div class='del'>- *</div><div class='del'>- * Sets the classification property of a calendar component object.  To unset</div><div class='del'>- * the property, specify CAL_COMPONENT_CLASS_NONE for @classif.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_classification (CalComponent *comp, CalComponentClassification classif)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (classif != CAL_COMPONENT_CLASS_UNKNOWN);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (classif == CAL_COMPONENT_CLASS_NONE) {</div><div class='del'>-		if (priv-&gt;classification) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;classification);</div><div class='del'>-			icalproperty_free (priv-&gt;classification);</div><div class='del'>-			priv-&gt;classification = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (classif) {</div><div class='del'>-	case CAL_COMPONENT_CLASS_PUBLIC:</div><div class='del'>-		str = "PUBLIC";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_PRIVATE:</div><div class='del'>-		str = "PRIVATE";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:</div><div class='del'>-		str = "CONFIDENTIAL";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		str = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;classification)</div><div class='del'>-		icalproperty_set_class (priv-&gt;classification, str);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;classification = icalproperty_new_class (str);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;classification);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a text list value */</div><div class='del'>-static void</div><div class='del'>-get_text_list (GSList *text_list,</div><div class='del'>-	       char *(* get_prop_func) (icalproperty *prop),</div><div class='del'>-	       GSList **tl)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	*tl = NULL;</div><div class='del'>-</div><div class='del'>-	if (!text_list)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (l = text_list; l; l = l-&gt;next) {</div><div class='del'>-		struct text *text;</div><div class='del'>-		CalComponentText *t;</div><div class='del'>-</div><div class='del'>-		text = l-&gt;data;</div><div class='del'>-		g_assert (text-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		t = g_new (CalComponentText, 1);</div><div class='del'>-		t-&gt;value = (* get_prop_func) (text-&gt;prop);</div><div class='del'>-</div><div class='del'>-		if (text-&gt;altrep_param)</div><div class='del'>-			t-&gt;altrep = icalparameter_get_altrep (text-&gt;altrep_param);</div><div class='del'>-		else</div><div class='del'>-			t-&gt;altrep = NULL;</div><div class='del'>-</div><div class='del'>-		*tl = g_slist_prepend (*tl, t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*tl = g_slist_reverse (*tl);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a text list value */</div><div class='del'>-static void</div><div class='del'>-set_text_list (CalComponent *comp,</div><div class='del'>-	       icalproperty *(* new_prop_func) (char *value),</div><div class='del'>-	       GSList **text_list,</div><div class='del'>-	       GSList *tl)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove old texts */</div><div class='del'>-</div><div class='del'>-	for (l = *text_list; l; l = l-&gt;next) {</div><div class='del'>-		struct text *text;</div><div class='del'>-</div><div class='del'>-		text = l-&gt;data;</div><div class='del'>-		g_assert (text-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, text-&gt;prop);</div><div class='del'>-		icalproperty_free (text-&gt;prop);</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (*text_list);</div><div class='del'>-	*text_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new texts */</div><div class='del'>-</div><div class='del'>-	for (l = tl; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentText *t;</div><div class='del'>-		struct text *text;</div><div class='del'>-</div><div class='del'>-		t = l-&gt;data;</div><div class='del'>-		g_return_if_fail (t-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-		text = g_new (struct text, 1);</div><div class='del'>-</div><div class='del'>-		text-&gt;prop = (* new_prop_func) ((char *) t-&gt;value);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, text-&gt;prop);</div><div class='del'>-</div><div class='del'>-		if (t-&gt;altrep) {</div><div class='del'>-			text-&gt;altrep_param = icalparameter_new_altrep ((char *) t-&gt;altrep);</div><div class='del'>-			icalproperty_add_parameter (text-&gt;prop, text-&gt;altrep_param);</div><div class='del'>-		} else</div><div class='del'>-			text-&gt;altrep_param = NULL;</div><div class='del'>-</div><div class='del'>-		*text_list = g_slist_prepend (*text_list, text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*text_list = g_slist_reverse (*text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_comment_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: Return value for the comment properties and their parameters, as</div><div class='del'>- * a list of #CalComponentText structures.  This should be freed using the</div><div class='del'>- * cal_component_free_text_list() function.</div><div class='del'>- *</div><div class='del'>- * Queries the comment of a calendar component object.  The comment property can</div><div class='del'>- * appear several times inside a calendar component, and so a list of</div><div class='del'>- * #CalComponentText is returned.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_comment_list (CalComponent *comp, GSList **text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (text_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_text_list (priv-&gt;comment_list, icalproperty_get_comment, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_comment_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: List of #CalComponentText structures.</div><div class='del'>- *</div><div class='del'>- * Sets the comment of a calendar component object.  The comment property can</div><div class='del'>- * appear several times inside a calendar component, and so a list of</div><div class='del'>- * #CalComponentText structures is used.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_comment_list (CalComponent *comp, GSList *text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_text_list (comp, icalproperty_new_comment, &amp;priv-&gt;comment_list, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a struct icaltimetype value */</div><div class='del'>-static void</div><div class='del'>-get_icaltimetype (icalproperty *prop,</div><div class='del'>-		  struct icaltimetype (* get_prop_func) (icalproperty *prop),</div><div class='del'>-		  struct icaltimetype **t)</div><div class='del'>-{</div><div class='del'>-	if (!prop) {</div><div class='del'>-		*t = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*t = g_new (struct icaltimetype, 1);</div><div class='del'>-	**t = (* get_prop_func) (prop);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a struct icaltimetype value */</div><div class='del'>-static void</div><div class='del'>-set_icaltimetype (CalComponent *comp, icalproperty **prop,</div><div class='del'>-		  icalproperty *(* prop_new_func) (struct icaltimetype v),</div><div class='del'>-		  void (* prop_set_func) (icalproperty *prop, struct icaltimetype v),</div><div class='del'>-		  struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!t) {</div><div class='del'>-		if (*prop) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, *prop);</div><div class='del'>-			icalproperty_free (*prop);</div><div class='del'>-			*prop = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (*prop)</div><div class='del'>-		(* prop_set_func) (*prop, *t);</div><div class='del'>-	else {</div><div class='del'>-		*prop = (* prop_new_func) (*t);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, *prop);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_completed:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Return value for the completion date.  This should be freed using the</div><div class='del'>- * cal_component_free_icaltimetype() function.</div><div class='del'>- *</div><div class='del'>- * Queries the date at which a calendar compoment object was completed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_completed (CalComponent *comp, struct icaltimetype **t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_icaltimetype (priv-&gt;completed, icalproperty_get_completed, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_completed:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Value for the completion date.</div><div class='del'>- *</div><div class='del'>- * Sets the date at which a calendar component object was completed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_completed (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_icaltimetype (comp, &amp;priv-&gt;completed,</div><div class='del'>-			  icalproperty_new_completed,</div><div class='del'>-			  icalproperty_set_completed,</div><div class='del'>-			  t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_created:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Return value for the creation date.  This should be freed using the</div><div class='del'>- * cal_component_free_icaltimetype() function.</div><div class='del'>- *</div><div class='del'>- * Queries the date in which a calendar component object was created in the</div><div class='del'>- * calendar store.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_created (CalComponent *comp, struct icaltimetype **t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_icaltimetype (priv-&gt;created, icalproperty_get_created, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_created:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Value for the creation date.</div><div class='del'>- *</div><div class='del'>- * Sets the date in which a calendar component object is created in the calendar</div><div class='del'>- * store.  This should only be used inside a calendar store application, i.e.</div><div class='del'>- * not by calendar user agents.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_created (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_icaltimetype (comp, &amp;priv-&gt;created,</div><div class='del'>-			  icalproperty_new_created,</div><div class='del'>-			  icalproperty_set_created,</div><div class='del'>-			  t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_description_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: Return value for the description properties and their parameters,</div><div class='del'>- * as a list of #CalComponentText structures.  This should be freed using the</div><div class='del'>- * cal_component_free_text_list() function.</div><div class='del'>- *</div><div class='del'>- * Queries the description of a calendar component object.  Journal components</div><div class='del'>- * may have more than one description, and as such this function returns a list</div><div class='del'>- * of #CalComponentText structures.  All other types of components can have at</div><div class='del'>- * most one description.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_description_list (CalComponent *comp, GSList **text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (text_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_text_list (priv-&gt;description_list, icalproperty_get_description, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_description_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @text_list: List of #CalComponentSummary structures.</div><div class='del'>- *</div><div class='del'>- * Sets the description of a calendar component object.  Journal components may</div><div class='del'>- * have more than one description, and as such this function takes in a list of</div><div class='del'>- * #CalComponentDescription structures.  All other types of components can have</div><div class='del'>- * at most one description.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_description_list (CalComponent *comp, GSList *text_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_text_list (comp, icalproperty_new_description, &amp;priv-&gt;description_list, text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a date/time and timezone pair */</div><div class='del'>-static void</div><div class='del'>-get_datetime (struct datetime *datetime,</div><div class='del'>-	      struct icaltimetype (* get_prop_func) (icalproperty *prop),</div><div class='del'>-	      CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	if (datetime-&gt;prop) {</div><div class='del'>-		dt-&gt;value = g_new (struct icaltimetype, 1);</div><div class='del'>-		*dt-&gt;value = (* get_prop_func) (datetime-&gt;prop);</div><div class='del'>-	} else</div><div class='del'>-		dt-&gt;value = NULL;</div><div class='del'>-</div><div class='del'>-	if (datetime-&gt;tzid_param)</div><div class='del'>-		dt-&gt;tzid = icalparameter_get_tzid (datetime-&gt;tzid_param);</div><div class='del'>-	else</div><div class='del'>-		dt-&gt;tzid = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a date/time and timezone pair */</div><div class='del'>-static void</div><div class='del'>-set_datetime (CalComponent *comp, struct datetime *datetime,</div><div class='del'>-	      icalproperty *(* prop_new_func) (struct icaltimetype v),</div><div class='del'>-	      void (* prop_set_func) (icalproperty * prop, struct icaltimetype v),</div><div class='del'>-	      CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!dt) {</div><div class='del'>-		if (datetime-&gt;prop) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, datetime-&gt;prop);</div><div class='del'>-			icalproperty_free (datetime-&gt;prop);</div><div class='del'>-</div><div class='del'>-			datetime-&gt;prop = NULL;</div><div class='del'>-			datetime-&gt;tzid_param = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (dt-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-	if (datetime-&gt;prop)</div><div class='del'>-		(* prop_set_func) (datetime-&gt;prop, *dt-&gt;value);</div><div class='del'>-	else {</div><div class='del'>-		datetime-&gt;prop = (* prop_new_func) (*dt-&gt;value);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, datetime-&gt;prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (dt-&gt;tzid) {</div><div class='del'>-		g_assert (datetime-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		if (datetime-&gt;tzid_param)</div><div class='del'>-			icalparameter_set_tzid (datetime-&gt;tzid_param, (char *) dt-&gt;tzid);</div><div class='del'>-		else {</div><div class='del'>-			datetime-&gt;tzid_param = icalparameter_new_tzid ((char *) dt-&gt;tzid);</div><div class='del'>-			icalproperty_add_parameter (datetime-&gt;prop, datetime-&gt;tzid_param);</div><div class='del'>-		}</div><div class='del'>-	} else if (datetime-&gt;tzid_param) {</div><div class='del'>-		icalproperty_remove_parameter (datetime-&gt;prop, ICAL_TZID_PARAMETER);</div><div class='del'>-		icalparameter_free (datetime-&gt;tzid_param);</div><div class='del'>-		datetime-&gt;tzid_param = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_dtend:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: Return value for the date/time end.  This should be freed with the</div><div class='del'>- * cal_component_free_datetime() function.</div><div class='del'>- *</div><div class='del'>- * Queries the date/time end of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (dt != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_datetime (&amp;priv-&gt;dtend, icalproperty_get_dtend, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_dtend:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: End date/time.</div><div class='del'>- *</div><div class='del'>- * Sets the date/time end property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_datetime (comp, &amp;priv-&gt;dtend,</div><div class='del'>-		      icalproperty_new_dtend,</div><div class='del'>-		      icalproperty_set_dtend,</div><div class='del'>-		      dt);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_dtstamp:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Return value for the date/timestamp.</div><div class='del'>- *</div><div class='del'>- * Queries the date/timestamp property of a calendar component object, which is</div><div class='del'>- * the last time at which the object was modified by a calendar user agent.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* This MUST exist, since we ensured that it did */</div><div class='del'>-	g_assert (priv-&gt;dtstamp != NULL);</div><div class='del'>-</div><div class='del'>-	*t = icalproperty_get_dtstamp (priv-&gt;dtstamp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_dtstamp:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Date/timestamp value.</div><div class='del'>- *</div><div class='del'>- * Sets the date/timestamp of a calendar component object.  This should be</div><div class='del'>- * called whenever a calendar user agent makes a change to a component's</div><div class='del'>- * properties.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* This MUST exist, since we ensured that it did */</div><div class='del'>-	g_assert (priv-&gt;dtstamp != NULL);</div><div class='del'>-</div><div class='del'>-	icalproperty_set_dtstamp (priv-&gt;dtstamp, *t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_dtstart:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: Return value for the date/time start.  This should be freed with the</div><div class='del'>- * cal_component_free_datetime() function.</div><div class='del'>- *</div><div class='del'>- * Queries the date/time start of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (dt != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_datetime (&amp;priv-&gt;dtstart, icalproperty_get_dtstart, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_dtstart:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: Start date/time.</div><div class='del'>- *</div><div class='del'>- * Sets the date/time start property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_datetime (comp, &amp;priv-&gt;dtstart,</div><div class='del'>-		      icalproperty_new_dtstart,</div><div class='del'>-		      icalproperty_set_dtstart,</div><div class='del'>-		      dt);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_due:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: Return value for the due date/time.  This should be freed with the</div><div class='del'>- * cal_component_free_datetime() function.</div><div class='del'>- *</div><div class='del'>- * Queries the due date/time of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (dt != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_datetime (&amp;priv-&gt;due, icalproperty_get_due, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_due:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @dt: End date/time.</div><div class='del'>- *</div><div class='del'>- * Sets the due date/time property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_datetime (comp, &amp;priv-&gt;due,</div><div class='del'>-		      icalproperty_new_due,</div><div class='del'>-		      icalproperty_set_due,</div><div class='del'>-		      dt);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of CalComponentPeriod structures based on a list of icalproperties */</div><div class='del'>-static void</div><div class='del'>-get_period_list (GSList *period_list,</div><div class='del'>-		 struct icalperiodtype (* get_prop_func) (icalproperty *prop),</div><div class='del'>-		 GSList **list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	*list = NULL;</div><div class='del'>-</div><div class='del'>-	if (!period_list)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	for (l = period_list; l; l = l-&gt;next) {</div><div class='del'>-		struct period *period;</div><div class='del'>-		CalComponentPeriod *p;</div><div class='del'>-		struct icalperiodtype ip;</div><div class='del'>-</div><div class='del'>-		period = l-&gt;data;</div><div class='del'>-		g_assert (period-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		p = g_new (CalComponentPeriod, 1);</div><div class='del'>-</div><div class='del'>-		/* Get value parameter */</div><div class='del'>-</div><div class='del'>-		if (period-&gt;value_param) {</div><div class='del'>-			icalparameter_value value_type;</div><div class='del'>-</div><div class='del'>-			value_type = icalparameter_get_value (period-&gt;value_param);</div><div class='del'>-</div><div class='del'>-			if (value_type == ICAL_VALUE_DATE || value_type == ICAL_VALUE_DATETIME)</div><div class='del'>-				p-&gt;type = CAL_COMPONENT_PERIOD_DATETIME;</div><div class='del'>-			else if (value_type == ICAL_VALUE_DURATION)</div><div class='del'>-				p-&gt;type = CAL_COMPONENT_PERIOD_DURATION;</div><div class='del'>-			else {</div><div class='del'>-				g_message ("get_period_list(): Unknown value for period %d; "</div><div class='del'>-					   "using DATETIME", value_type);</div><div class='del'>-				p-&gt;type = CAL_COMPONENT_PERIOD_DATETIME;</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			p-&gt;type = CAL_COMPONENT_PERIOD_DATETIME;</div><div class='del'>-</div><div class='del'>-		/* Get start and end/duration */</div><div class='del'>-</div><div class='del'>-		ip = (* get_prop_func) (period-&gt;prop);</div><div class='del'>-</div><div class='del'>-		p-&gt;start = ip.start;</div><div class='del'>-</div><div class='del'>-		if (p-&gt;type == CAL_COMPONENT_PERIOD_DATETIME)</div><div class='del'>-			p-&gt;u.end = ip.end;</div><div class='del'>-		else if (p-&gt;type == CAL_COMPONENT_PERIOD_DURATION)</div><div class='del'>-			p-&gt;u.duration = ip.duration;</div><div class='del'>-		else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-		/* Put in list */</div><div class='del'>-</div><div class='del'>-		*list = g_slist_prepend (*list, p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*list = g_slist_reverse (*list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a period list value */</div><div class='del'>-static void</div><div class='del'>-set_period_list (CalComponent *comp,</div><div class='del'>-		 icalproperty *(* new_prop_func) (struct icalperiodtype period),</div><div class='del'>-		 GSList **period_list,</div><div class='del'>-		 GSList *pl)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove old periods */</div><div class='del'>-</div><div class='del'>-	for (l = *period_list; l; l = l-&gt;next) {</div><div class='del'>-		struct period *period;</div><div class='del'>-</div><div class='del'>-		period = l-&gt;data;</div><div class='del'>-		g_assert (period-&gt;prop != NULL);</div><div class='del'>-</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, period-&gt;prop);</div><div class='del'>-		icalproperty_free (period-&gt;prop);</div><div class='del'>-		g_free (period);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (*period_list);</div><div class='del'>-	*period_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new periods */</div><div class='del'>-</div><div class='del'>-	for (l = pl; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentPeriod *p;</div><div class='del'>-		struct period *period;</div><div class='del'>-		struct icalperiodtype ip;</div><div class='del'>-		icalparameter_value value_type;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		p = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		/* Create libical value */</div><div class='del'>-</div><div class='del'>-		ip.start = p-&gt;start;</div><div class='del'>-</div><div class='del'>-		if (p-&gt;type == CAL_COMPONENT_PERIOD_DATETIME) {</div><div class='del'>-			value_type = ICAL_VALUE_DATETIME;</div><div class='del'>-			ip.end = p-&gt;u.end;</div><div class='del'>-		} else if (p-&gt;type == CAL_COMPONENT_PERIOD_DURATION) {</div><div class='del'>-			value_type = ICAL_VALUE_DURATION;</div><div class='del'>-			ip.duration = p-&gt;u.duration;</div><div class='del'>-		} else {</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Create property */</div><div class='del'>-</div><div class='del'>-		period = g_new (struct period, 1);</div><div class='del'>-</div><div class='del'>-		period-&gt;prop = (* new_prop_func) (ip);</div><div class='del'>-		period-&gt;value_param = icalparameter_new_value (value_type);</div><div class='del'>-		icalproperty_add_parameter (period-&gt;prop, period-&gt;value_param);</div><div class='del'>-</div><div class='del'>-		/* Add to list */</div><div class='del'>-</div><div class='del'>-		*period_list = g_slist_prepend (*period_list, period);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*period_list = g_slist_reverse (*period_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_exdate_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @exdate_list: Return value for the list of exception dates, as a list of</div><div class='del'>- * struct #icaltimetype structures.  This should be freed using the</div><div class='del'>- * cal_component_free_exdate_list() function.</div><div class='del'>- * </div><div class='del'>- * Queries the list of exception date properties in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (exdate_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	*exdate_list = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;exdate_list; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		struct icaltimetype *t;</div><div class='del'>-</div><div class='del'>-		prop = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		t = g_new (struct icaltimetype, 1);</div><div class='del'>-		*t = icalproperty_get_exdate (prop);</div><div class='del'>-</div><div class='del'>-		*exdate_list = g_slist_prepend (*exdate_list, t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*exdate_list = g_slist_reverse (*exdate_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_exdate_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @exdate_list: List of struct #icaltimetype structures.</div><div class='del'>- * </div><div class='del'>- * Sets the list of exception dates in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Remove old exception dates */</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;exdate_list; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-</div><div class='del'>-		prop = l-&gt;data;</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, prop);</div><div class='del'>-		icalproperty_free (prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (priv-&gt;exdate_list);</div><div class='del'>-	priv-&gt;exdate_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new exception dates */</div><div class='del'>-</div><div class='del'>-	for (l = exdate_list; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		struct icaltimetype *t;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		t = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		prop = icalproperty_new_exdate (*t);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, prop);</div><div class='del'>-</div><div class='del'>-		priv-&gt;exdate_list = g_slist_prepend (priv-&gt;exdate_list, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;exdate_list = g_slist_reverse (priv-&gt;exdate_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_exdates:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar component object has any exception dates defined</div><div class='del'>- * for it.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the component has exception dates, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_exdates (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;exdate_list != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets a list of recurrence rules */</div><div class='del'>-static void</div><div class='del'>-get_recur_list (GSList *recur_list,</div><div class='del'>-		struct icalrecurrencetype (* get_prop_func) (icalproperty *prop),</div><div class='del'>-		GSList **list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	*list = NULL;</div><div class='del'>-</div><div class='del'>-	for (l = recur_list; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		struct icalrecurrencetype *r;</div><div class='del'>-</div><div class='del'>-		prop = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		r = g_new (struct icalrecurrencetype, 1);</div><div class='del'>-		*r = (* get_prop_func) (prop);</div><div class='del'>-</div><div class='del'>-		*list = g_slist_prepend (*list, r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*list = g_slist_reverse (*list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a list of recurrence rules */</div><div class='del'>-static void</div><div class='del'>-set_recur_list (CalComponent *comp,</div><div class='del'>-		icalproperty *(* new_prop_func) (struct icalrecurrencetype recur),</div><div class='del'>-		GSList **recur_list,</div><div class='del'>-		GSList *rl)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove old recurrences */</div><div class='del'>-</div><div class='del'>-	for (l = *recur_list; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-</div><div class='del'>-		prop = l-&gt;data;</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;icalcomp, prop);</div><div class='del'>-		icalproperty_free (prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (*recur_list);</div><div class='del'>-	*recur_list = NULL;</div><div class='del'>-</div><div class='del'>-	/* Add in new recurrences */</div><div class='del'>-</div><div class='del'>-	for (l = rl; l; l = l-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		struct icalrecurrencetype *recur;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		recur = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		prop = (* new_prop_func) (*recur);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, prop);</div><div class='del'>-</div><div class='del'>-		*recur_list = g_slist_prepend (*recur_list, prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*recur_list = g_slist_reverse (*recur_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_exrule_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: List of exception rules as struct #icalrecurrencetype</div><div class='del'>- * structures.  This should be freed using the cal_component_free_recur_list()</div><div class='del'>- * function.</div><div class='del'>- * </div><div class='del'>- * Queries the list of exception rule properties of a calendar component</div><div class='del'>- * object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_recur_list (priv-&gt;exrule_list, icalproperty_get_exrule, recur_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_exrule_property_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: Returns a list of exception rule properties.</div><div class='del'>- * </div><div class='del'>- * Returns a list of exception rule properties of a calendar component</div><div class='del'>- * object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	*recur_list = priv-&gt;exrule_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_exrule_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: List of struct #icalrecurrencetype structures.</div><div class='del'>- * </div><div class='del'>- * Sets the list of exception rules in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_recur_list (comp, icalproperty_new_exrule, &amp;priv-&gt;exrule_list, recur_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_exrules:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar component object has any exception rules defined</div><div class='del'>- * for it.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the component has exception rules, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_exrules (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;exrule_list != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_exceptions:</div><div class='del'>- * @comp: A calendar component object</div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar component object has any exception dates</div><div class='del'>- * or exception rules.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the component has exceptions, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean </div><div class='del'>-cal_component_has_exceptions (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	return cal_component_has_exdates (comp) || cal_component_has_exrules (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_geo:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @geo: Return value for the geographic position property.  This should be</div><div class='del'>- * freed using the cal_component_free_geo() function.</div><div class='del'>- * </div><div class='del'>- * Sets the geographic position property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (geo != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;geo) {</div><div class='del'>-		*geo = g_new (struct icalgeotype, 1);</div><div class='del'>-		**geo = icalproperty_get_geo (priv-&gt;geo);</div><div class='del'>-	} else</div><div class='del'>-		*geo = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_geo:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @geo: Value for the geographic position property.</div><div class='del'>- * </div><div class='del'>- * Sets the geographic position property on a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!geo) {</div><div class='del'>-		if (priv-&gt;geo) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;geo);</div><div class='del'>-			icalproperty_free (priv-&gt;geo);</div><div class='del'>-			priv-&gt;geo = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;geo)</div><div class='del'>-		icalproperty_set_geo (priv-&gt;geo, *geo);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;geo = icalproperty_new_geo (*geo);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;geo);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_last_modified:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Return value for the last modified time value.</div><div class='del'>- *</div><div class='del'>- * Queries the time at which a calendar component object was last modified in</div><div class='del'>- * the calendar store.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_icaltimetype (priv-&gt;last_modified, icalproperty_get_lastmodified, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_last_modified:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @t: Value for the last time modified.</div><div class='del'>- *</div><div class='del'>- * Sets the time at which a calendar component object was last stored in the</div><div class='del'>- * calendar store.  This should not be called by plain calendar user agents.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_icaltimetype (comp, &amp;priv-&gt;last_modified,</div><div class='del'>-			  icalproperty_new_lastmodified,</div><div class='del'>-			  icalproperty_set_lastmodified,</div><div class='del'>-			  t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_percent:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @percent: Return value for the percent-complete property.  This should be</div><div class='del'>- * freed using the cal_component_free_percent() function.</div><div class='del'>- * </div><div class='del'>- * Queries the percent-complete property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_percent (CalComponent *comp, int **percent)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (percent != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;percent) {</div><div class='del'>-		*percent = g_new (int, 1);</div><div class='del'>-		**percent = icalproperty_get_percentcomplete (priv-&gt;percent);</div><div class='del'>-	} else</div><div class='del'>-		*percent = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_percent:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @percent: Value for the percent-complete property.</div><div class='del'>- * </div><div class='del'>- * Sets the percent-complete property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_percent (CalComponent *comp, int *percent)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!percent) {</div><div class='del'>-		if (priv-&gt;percent) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;percent);</div><div class='del'>-			icalproperty_free (priv-&gt;percent);</div><div class='del'>-			priv-&gt;percent = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (*percent &gt;= 0 &amp;&amp; *percent &lt;= 100);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;percent)</div><div class='del'>-		icalproperty_set_percentcomplete (priv-&gt;percent, *percent);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;percent = icalproperty_new_percentcomplete (*percent);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;percent);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_priority:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @priority: Return value for the priority property.  This should be freed using</div><div class='del'>- * the cal_component_free_priority() function.</div><div class='del'>- * </div><div class='del'>- * Queries the priority property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_priority (CalComponent *comp, int **priority)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (priority != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;priority) {</div><div class='del'>-		*priority = g_new (int, 1);</div><div class='del'>-		**priority = icalproperty_get_priority (priv-&gt;priority);</div><div class='del'>-	} else</div><div class='del'>-		*priority = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_priority:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @priority: Value for the priority property.</div><div class='del'>- * </div><div class='del'>- * Sets the priority property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_priority (CalComponent *comp, int *priority)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priority) {</div><div class='del'>-		if (priv-&gt;priority) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;priority);</div><div class='del'>-			icalproperty_free (priv-&gt;priority);</div><div class='del'>-			priv-&gt;priority = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (*priority &gt;= 0 &amp;&amp; *priority &lt;= 9);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;priority)</div><div class='del'>-		icalproperty_set_priority (priv-&gt;priority, *priority);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;priority = icalproperty_new_priority (*priority);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;priority);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_rdate_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @period_list: Return value for the list of recurrence dates, as a list of</div><div class='del'>- * #CalComponentPeriod structures.  This should be freed using the</div><div class='del'>- * cal_component_free_period_list() function.</div><div class='del'>- * </div><div class='del'>- * Queries the list of recurrence date properties in a calendar component</div><div class='del'>- * object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_rdate_list (CalComponent *comp, GSList **period_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (period_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_period_list (priv-&gt;rdate_list, icalproperty_get_rdate, period_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_rdate_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @period_list: List of #CalComponentPeriod structures.</div><div class='del'>- * </div><div class='del'>- * Sets the list of recurrence dates in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_rdate_list (CalComponent *comp, GSList *period_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_period_list (comp, icalproperty_new_rdate, &amp;priv-&gt;rdate_list, period_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_rdates:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar component object has any recurrence dates defined</div><div class='del'>- * for it.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the component has recurrence dates, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_rdates (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;rdate_list != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_rrule_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: List of recurrence rules as struct #icalrecurrencetype</div><div class='del'>- * structures.  This should be freed using the cal_component_free_recur_list()</div><div class='del'>- * function.</div><div class='del'>- * </div><div class='del'>- * Queries the list of recurrence rule properties of a calendar component</div><div class='del'>- * object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	get_recur_list (priv-&gt;rrule_list, icalproperty_get_rrule, recur_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_rrule_property_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: Returns a list of recurrence rule properties.</div><div class='del'>- * </div><div class='del'>- * Returns a list of recurrence rule properties of a calendar component</div><div class='del'>- * object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (recur_list != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	*recur_list = priv-&gt;rrule_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_rrule_list:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @recur_list: List of struct #icalrecurrencetype structures.</div><div class='del'>- * </div><div class='del'>- * Sets the list of recurrence rules in a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	set_recur_list (comp, icalproperty_new_rrule, &amp;priv-&gt;rrule_list, recur_list);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_rrules:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar component object has any recurrence rules defined</div><div class='del'>- * for it.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the component has recurrence rules, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_rrules (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;rrule_list != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_recurrences:</div><div class='del'>- * @comp: A calendar component object</div><div class='del'>- * </div><div class='del'>- * Queries whether a calendar component object has any recurrence dates or</div><div class='del'>- * recurrence rules.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the component has recurrences, FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean </div><div class='del'>-cal_component_has_recurrences (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	return cal_component_has_rdates (comp) || cal_component_has_rrules (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_sequence:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @sequence: Return value for the sequence number.  This should be freed using</div><div class='del'>- * cal_component_free_sequence().</div><div class='del'>- *</div><div class='del'>- * Queries the sequence number of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_sequence (CalComponent *comp, int **sequence)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (sequence != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;sequence) {</div><div class='del'>-		*sequence = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*sequence = g_new (int, 1);</div><div class='del'>-	**sequence = icalproperty_get_sequence (priv-&gt;sequence);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_sequence:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @sequence: Sequence number value.</div><div class='del'>- *</div><div class='del'>- * Sets the sequence number of a calendar component object.  Normally this</div><div class='del'>- * function should not be called, since the sequence number is incremented</div><div class='del'>- * automatically at the proper times.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_sequence (CalComponent *comp, int *sequence)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;need_sequence_inc = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!sequence) {</div><div class='del'>-		if (priv-&gt;sequence) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;sequence);</div><div class='del'>-			icalproperty_free (priv-&gt;sequence);</div><div class='del'>-			priv-&gt;sequence = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sequence)</div><div class='del'>-		icalproperty_set_sequence (priv-&gt;sequence, *sequence);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;sequence = icalproperty_new_sequence (*sequence);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;sequence);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_summary:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @summary: Return value for the summary property and its parameters.</div><div class='del'>- *</div><div class='del'>- * Queries the summary of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_summary (CalComponent *comp, CalComponentText *summary)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (summary != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;summary.prop)</div><div class='del'>-		summary-&gt;value = icalproperty_get_summary (priv-&gt;summary.prop);</div><div class='del'>-	else</div><div class='del'>-		summary-&gt;value = NULL;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;summary.altrep_param)</div><div class='del'>-		summary-&gt;altrep = icalparameter_get_altrep (priv-&gt;summary.altrep_param);</div><div class='del'>-	else</div><div class='del'>-		summary-&gt;altrep = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_summary:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @summary: Summary property and its parameters.</div><div class='del'>- *</div><div class='del'>- * Sets the summary of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_summary (CalComponent *comp, CalComponentText *summary)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!summary) {</div><div class='del'>-		if (priv-&gt;summary.prop) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;summary.prop);</div><div class='del'>-			icalproperty_free (priv-&gt;summary.prop);</div><div class='del'>-</div><div class='del'>-			priv-&gt;summary.prop = NULL;</div><div class='del'>-			priv-&gt;summary.altrep_param = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (summary-&gt;value != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;summary.prop)</div><div class='del'>-		icalproperty_set_summary (priv-&gt;summary.prop, (char *) summary-&gt;value);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;summary.prop = icalproperty_new_summary ((char *) summary-&gt;value);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;summary.prop);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (summary-&gt;altrep) {</div><div class='del'>-		g_assert (priv-&gt;summary.prop != NULL);</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;summary.altrep_param)</div><div class='del'>-			icalparameter_set_altrep (priv-&gt;summary.altrep_param,</div><div class='del'>-						  (char *) summary-&gt;altrep);</div><div class='del'>-		else {</div><div class='del'>-			priv-&gt;summary.altrep_param = icalparameter_new_altrep (</div><div class='del'>-				(char *) summary-&gt;altrep);</div><div class='del'>-			icalproperty_add_parameter (priv-&gt;summary.prop,</div><div class='del'>-						    priv-&gt;summary.altrep_param);</div><div class='del'>-		}</div><div class='del'>-	} else if (priv-&gt;summary.altrep_param) {</div><div class='del'>-		icalproperty_remove_parameter (priv-&gt;summary.prop, ICAL_ALTREP_PARAMETER);</div><div class='del'>-		icalparameter_free (priv-&gt;summary.altrep_param);</div><div class='del'>-		priv-&gt;summary.altrep_param = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_transparency:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @transp: Return value for the time transparency.</div><div class='del'>- *</div><div class='del'>- * Queries the time transparency of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	const char *val;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (transp != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;transparency) {</div><div class='del'>-		*transp = CAL_COMPONENT_TRANSP_NONE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	val = icalproperty_get_transp (priv-&gt;transparency);</div><div class='del'>-</div><div class='del'>-	if (strcasecmp (val, "TRANSPARENT"))</div><div class='del'>-		*transp = CAL_COMPONENT_TRANSP_TRANSPARENT;</div><div class='del'>-	else if (strcasecmp (val, "OPAQUE"))</div><div class='del'>-		*transp = CAL_COMPONENT_TRANSP_OPAQUE;</div><div class='del'>-	else</div><div class='del'>-		*transp = CAL_COMPONENT_TRANSP_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_transparency:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @transp: Time transparency value.</div><div class='del'>- *</div><div class='del'>- * Sets the time transparency of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (transp != CAL_COMPONENT_TRANSP_UNKNOWN);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (transp == CAL_COMPONENT_TRANSP_NONE) {</div><div class='del'>-		if (priv-&gt;transparency) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;transparency);</div><div class='del'>-			icalproperty_free (priv-&gt;transparency);</div><div class='del'>-			priv-&gt;transparency = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (transp) {</div><div class='del'>-	case CAL_COMPONENT_TRANSP_TRANSPARENT:</div><div class='del'>-		str = "TRANSPARENT";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TRANSP_OPAQUE:</div><div class='del'>-		str = "OPAQUE";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		str = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;transparency)</div><div class='del'>-		icalproperty_set_transp (priv-&gt;transparency, str);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;transparency = icalproperty_new_transp (str);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;transparency);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_url:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @url: Return value for the URL.</div><div class='del'>- *</div><div class='del'>- * Queries the uniform resource locator property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_get_url (CalComponent *comp, const char **url)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-	g_return_if_fail (url != NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;url)</div><div class='del'>-		*url = icalproperty_get_url (priv-&gt;url);</div><div class='del'>-	else</div><div class='del'>-		*url = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_set_url:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * @url: URL value.</div><div class='del'>- *</div><div class='del'>- * Sets the uniform resource locator property of a calendar component object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_set_url (CalComponent *comp, const char *url)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_COMPONENT (comp));</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!url) {</div><div class='del'>-		if (priv-&gt;url) {</div><div class='del'>-			icalcomponent_remove_property (priv-&gt;icalcomp, priv-&gt;url);</div><div class='del'>-			icalproperty_free (priv-&gt;url);</div><div class='del'>-			priv-&gt;url = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;url)</div><div class='del'>-		icalproperty_set_url (priv-&gt;url, (char *) url);</div><div class='del'>-	else {</div><div class='del'>-		priv-&gt;url = icalproperty_new_url ((char *) url);</div><div class='del'>-		icalcomponent_add_property (priv-&gt;icalcomp, priv-&gt;url);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_categories_list:</div><div class='del'>- * @categ_list: List of category strings.</div><div class='del'>- *</div><div class='del'>- * Frees a list of category strings.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_categories_list (GSList *categ_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = categ_list; l; l = l-&gt;next)</div><div class='del'>-		g_free (l-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_slist_free (categ_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_datetime:</div><div class='del'>- * @dt: A date/time structure.</div><div class='del'>- *</div><div class='del'>- * Frees a date/time structure.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_datetime (CalComponentDateTime *dt)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (dt != NULL);</div><div class='del'>-</div><div class='del'>-	if (dt-&gt;value)</div><div class='del'>-		g_free (dt-&gt;value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_exdate_list:</div><div class='del'>- * @exdate_list: List of struct #icaltimetype structures.</div><div class='del'>- * </div><div class='del'>- * Frees a list of struct #icaltimetype structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_exdate_list (GSList *exdate_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = exdate_list; l; l = l-&gt;next) {</div><div class='del'>-		struct icaltimetype *t;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		t = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_free (t);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (exdate_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_geo:</div><div class='del'>- * @geo: An #icalgeotype structure.</div><div class='del'>- * </div><div class='del'>- * Frees a struct #icalgeotype structure as returned by the calendar component</div><div class='del'>- * functions.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_geo (struct icalgeotype *geo)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (geo != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (geo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_icaltimetype:</div><div class='del'>- * @t: An #icaltimetype structure.</div><div class='del'>- *</div><div class='del'>- * Frees a struct #icaltimetype value as returned by the calendar component</div><div class='del'>- * functions.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_icaltimetype (struct icaltimetype *t)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (t != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_percent:</div><div class='del'>- * @percent: Percent value.</div><div class='del'>- * </div><div class='del'>- * Frees a percent value as returned by the cal_component_get_percent()</div><div class='del'>- * function.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_percent (int *percent)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (percent != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (percent);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_priority:</div><div class='del'>- * @priority: Priority value.</div><div class='del'>- * </div><div class='del'>- * Frees a priority value as returned by the cal_component_get_priority()</div><div class='del'>- * function.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_priority (int *priority)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (priority != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (priority);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_period_list:</div><div class='del'>- * @period_list: List of #CalComponentPeriod structures.</div><div class='del'>- *</div><div class='del'>- * Frees a list of #CalComponentPeriod structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_period_list (GSList *period_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = period_list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentPeriod *period;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-</div><div class='del'>-		period = l-&gt;data;</div><div class='del'>-		g_free (period);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (period_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_recur_list:</div><div class='del'>- * @recur_list: List of struct #icalrecurrencetype structures.</div><div class='del'>- * </div><div class='del'>- * Frees a list of struct #icalrecurrencetype structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_recur_list (GSList *recur_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = recur_list; l; l = l-&gt;next) {</div><div class='del'>-		struct icalrecurrencetype *r;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-		r = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_free (r);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (recur_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_sequence:</div><div class='del'>- * @sequence: Sequence number value.</div><div class='del'>- *</div><div class='del'>- * Frees a sequence number value.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_sequence (int *sequence)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (sequence != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (sequence);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_pilot_id:</div><div class='del'>- * @sequence: Sequence number value.</div><div class='del'>- *</div><div class='del'>- * Frees a sequence number value.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_pilot_id (unsigned long *pilot_id)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (pilot_id != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (pilot_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_pilot_status:</div><div class='del'>- * @sequence: Sequence number value.</div><div class='del'>- *</div><div class='del'>- * Frees a sequence number value.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_pilot_status (unsigned long *pilot_status)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (pilot_status != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (pilot_status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_free_text_list:</div><div class='del'>- * @text_list: List of #CalComponentText structures.</div><div class='del'>- *</div><div class='del'>- * Frees a list of #CalComponentText structures.  This function should only be</div><div class='del'>- * used to free lists of text values as returned by the other getter functions</div><div class='del'>- * of #CalComponent.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_free_text_list (GSList *text_list)</div><div class='del'>-{</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	for (l = text_list; l; l = l-&gt;next) {</div><div class='del'>-		CalComponentText *text;</div><div class='del'>-</div><div class='del'>-		g_assert (l-&gt;data != NULL);</div><div class='del'>-</div><div class='del'>-		text = l-&gt;data;</div><div class='del'>-		g_return_if_fail (text != NULL);</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (text_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_has_alarms:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Checks whether the component has any alarms.</div><div class='del'>- *</div><div class='del'>- * Return value: TRUE if the component has any alarms.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_component_has_alarms (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	subcomp = icalcomponent_get_first_component (priv-&gt;icalcomp, ICAL_VALARM_COMPONENT);</div><div class='del'>-</div><div class='del'>-	return subcomp != NULL ? TRUE : FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans an icalproperty from a calendar component and adds its mapping to our</div><div class='del'>- * own alarm structure.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-scan_alarm_property (CalComponentAlarm *alarm, icalproperty *prop)</div><div class='del'>-{</div><div class='del'>-	icalproperty_kind kind;</div><div class='del'>-</div><div class='del'>-	kind = icalproperty_isa (prop);</div><div class='del'>-</div><div class='del'>-	switch (kind) {</div><div class='del'>-	case ICAL_ACTION_PROPERTY:</div><div class='del'>-		alarm-&gt;action = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_TRIGGER_PROPERTY:</div><div class='del'>-		alarm-&gt;trigger = prop;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a CalComponentAlarm from a libical alarm subcomponent */</div><div class='del'>-static CalComponentAlarm *</div><div class='del'>-make_alarm (CalComponent *comp, icalcomponent *subcomp)</div><div class='del'>-{</div><div class='del'>-	CalComponentAlarm *alarm;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	alarm = g_new (CalComponentAlarm, 1);</div><div class='del'>-</div><div class='del'>-	alarm-&gt;parent = comp;</div><div class='del'>-	alarm-&gt;icalcomp = subcomp;</div><div class='del'>-</div><div class='del'>-	for (prop = icalcomponent_get_first_property (subcomp, ICAL_ANY_PROPERTY);</div><div class='del'>-	     prop;</div><div class='del'>-	     prop = icalcomponent_get_next_property (subcomp, ICAL_ANY_PROPERTY))</div><div class='del'>-		scan_alarm_property (alarm, prop);</div><div class='del'>-</div><div class='del'>-	return alarm;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_first_alarm:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- *</div><div class='del'>- * Starts an iterator for the alarms in a calendar component object.  Subsequent</div><div class='del'>- * alarms can be obtained with the cal_component_get_next_alarm() function.</div><div class='del'>- *</div><div class='del'>- * Return value: The first alarm in the component, or NULL if the component has</div><div class='del'>- * no alarms.  This should be freed using the cal_component_alarm_free()</div><div class='del'>- * function.</div><div class='del'>- **/</div><div class='del'>-CalComponentAlarm *</div><div class='del'>-cal_component_get_first_alarm (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	subcomp = icalcomponent_get_first_component (priv-&gt;icalcomp, ICAL_VALARM_COMPONENT);</div><div class='del'>-	if (!subcomp)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return make_alarm (comp, subcomp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_get_next_alarm:</div><div class='del'>- * @comp: A calendar component object.</div><div class='del'>- * </div><div class='del'>- * Gets the next alarm on a calendar component object.  This should be used as</div><div class='del'>- * an iterator function after calling cal_component_get_first_alarm().</div><div class='del'>- * </div><div class='del'>- * Return value: The next alarm in the component, or NULL if the component has</div><div class='del'>- * no more alarms.  This should be freed using the cal_component_alarm_free()</div><div class='del'>- * function.</div><div class='del'>- **/</div><div class='del'>-CalComponentAlarm *</div><div class='del'>-cal_component_get_next_alarm (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-	icalcomponent *subcomp;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (comp != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), NULL);</div><div class='del'>-</div><div class='del'>-	priv = comp-&gt;priv;</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	subcomp = icalcomponent_get_next_component (priv-&gt;icalcomp, ICAL_VALARM_COMPONENT);</div><div class='del'>-	if (!subcomp)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return make_alarm (comp, subcomp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_free:</div><div class='del'>- * @alarm: A calendar alarm.</div><div class='del'>- *</div><div class='del'>- * Frees an alarm structure.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_free (CalComponentAlarm *alarm)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (icalcomponent_get_parent (alarm-&gt;icalcomp) != NULL)</div><div class='del'>-		icalcomponent_free (alarm-&gt;icalcomp);</div><div class='del'>-</div><div class='del'>-	alarm-&gt;icalcomp = NULL;</div><div class='del'>-</div><div class='del'>-	alarm-&gt;parent = NULL;</div><div class='del'>-	alarm-&gt;action = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (alarm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_get_action:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @action: Return value for the alarm's action type.</div><div class='del'>- *</div><div class='del'>- * Queries the action type of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_get_action (CalComponentAlarm *alarm, CalComponentAlarmAction *action)</div><div class='del'>-{</div><div class='del'>-	const char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (action != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!alarm-&gt;action) {</div><div class='del'>-		*action = CAL_COMPONENT_ALARM_NONE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	str = icalproperty_get_action (alarm-&gt;action);</div><div class='del'>-</div><div class='del'>-	if (strcasecmp (str, "AUDIO") == 0)</div><div class='del'>-		*action = CAL_COMPONENT_ALARM_AUDIO;</div><div class='del'>-	else if (strcasecmp (str, "DISPLAY") == 0)</div><div class='del'>-		*action = CAL_COMPONENT_ALARM_DISPLAY;</div><div class='del'>-	else if (strcasecmp (str, "EMAIL") == 0)</div><div class='del'>-		*action = CAL_COMPONENT_ALARM_EMAIL;</div><div class='del'>-	else if (strcasecmp (str, "PROCEDURE") == 0)</div><div class='del'>-		*action = CAL_COMPONENT_ALARM_PROCEDURE;</div><div class='del'>-	else</div><div class='del'>-		*action = CAL_COMPONENT_ALARM_UNKNOWN;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_set_action:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @action: Action type.</div><div class='del'>- *</div><div class='del'>- * Sets the action type for an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_set_action (CalComponentAlarm *alarm, CalComponentAlarmAction action)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (action != CAL_COMPONENT_ALARM_NONE);</div><div class='del'>-	g_return_if_fail (action != CAL_COMPONENT_ALARM_UNKNOWN);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	switch (action) {</div><div class='del'>-	case CAL_COMPONENT_ALARM_AUDIO:</div><div class='del'>-		str = "AUDIO";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_ALARM_DISPLAY:</div><div class='del'>-		str = "DISPLAY";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_ALARM_EMAIL:</div><div class='del'>-		str = "EMAIL";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_ALARM_PROCEDURE:</div><div class='del'>-		str = "PROCEDURE";</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		str = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;action)</div><div class='del'>-		icalproperty_set_action (alarm-&gt;action, str);</div><div class='del'>-	else {</div><div class='del'>-		alarm-&gt;action = icalproperty_new_action (str);</div><div class='del'>-		icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;action);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_get_trigger:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @trigger: Return value for the trigger time.  This should be freed using the</div><div class='del'>- * cal_component_alarm_free_trigger() function.</div><div class='del'>- *</div><div class='del'>- * Queries the trigger time for an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	union icaltriggertype t;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (trigger != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	if (!alarm-&gt;trigger) {</div><div class='del'>-		*trigger = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*trigger = g_new (CalComponentAlarmTrigger, 1);</div><div class='del'>-</div><div class='del'>-	/* Get trigger type */</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (alarm-&gt;trigger, ICAL_VALUE_PARAMETER);</div><div class='del'>-</div><div class='del'>-	if (param) {</div><div class='del'>-		icalparameter_value value;</div><div class='del'>-</div><div class='del'>-		value = icalparameter_get_value (param);</div><div class='del'>-</div><div class='del'>-		switch (value) {</div><div class='del'>-		case ICAL_VALUE_DURATION:</div><div class='del'>-			(*trigger)-&gt;type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case ICAL_VALUE_DATETIME:</div><div class='del'>-			(*trigger)-&gt;type = CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_message ("cal_component_alarm_get_trigger(): Unknown value for trigger "</div><div class='del'>-				   "value %d; using RELATIVE", value);</div><div class='del'>-</div><div class='del'>-			(*trigger)-&gt;type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else</div><div class='del'>-		(*trigger)-&gt;type = CAL_COMPONENT_ALARM_TRIGGER_RELATIVE;</div><div class='del'>-</div><div class='del'>-	/* Get trigger value and the RELATED parameter */</div><div class='del'>-</div><div class='del'>-	t = icalproperty_get_trigger (alarm-&gt;trigger);</div><div class='del'>-</div><div class='del'>-	switch ((*trigger)-&gt;type) {</div><div class='del'>-	case CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:</div><div class='del'>-		(*trigger)-&gt;u.relative.duration = t.duration;</div><div class='del'>-</div><div class='del'>-		param = icalproperty_get_first_parameter (alarm-&gt;trigger, ICAL_RELATED_PARAMETER);</div><div class='del'>-		if (param) {</div><div class='del'>-			icalparameter_related rel;</div><div class='del'>-</div><div class='del'>-			rel = icalparameter_get_related (param);</div><div class='del'>-</div><div class='del'>-			switch (rel) {</div><div class='del'>-			case ICAL_RELATED_START:</div><div class='del'>-				(*trigger)-&gt;u.relative.related =</div><div class='del'>-					CAL_COMPONENT_ALARM_TRIGGER_RELATED_START;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_RELATED_END:</div><div class='del'>-				(*trigger)-&gt;u.relative.related =</div><div class='del'>-					CAL_COMPONENT_ALARM_TRIGGER_RELATED_END;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				g_assert_not_reached ();</div><div class='del'>-			}</div><div class='del'>-		} else</div><div class='del'>-			(*trigger)-&gt;u.relative.related = CAL_COMPONENT_ALARM_TRIGGER_RELATED_START;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:</div><div class='del'>-		(*trigger)-&gt;u.absolute = t.time;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_set_trigger:</div><div class='del'>- * @alarm: An alarm.</div><div class='del'>- * @trigger: Trigger time structure.</div><div class='del'>- *</div><div class='del'>- * Sets the trigger time of an alarm.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger)</div><div class='del'>-{</div><div class='del'>-	union icaltriggertype t;</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	icalparameter_value value_type;</div><div class='del'>-	icalparameter_related related;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (alarm != NULL);</div><div class='del'>-	g_return_if_fail (trigger != NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (alarm-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Delete old trigger */</div><div class='del'>-</div><div class='del'>-	if (alarm-&gt;trigger) {</div><div class='del'>-		icalcomponent_remove_property (alarm-&gt;icalcomp, alarm-&gt;trigger);</div><div class='del'>-		icalproperty_free (alarm-&gt;trigger);</div><div class='del'>-		alarm-&gt;trigger = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value_type = ICAL_DURATION_VALUE; /* Keep GCC happy */</div><div class='del'>-	related = ICAL_RELATED_START; /* Ditto */</div><div class='del'>-</div><div class='del'>-	switch (trigger-&gt;type) {</div><div class='del'>-	case CAL_COMPONENT_ALARM_TRIGGER_RELATIVE:</div><div class='del'>-		t.duration = trigger-&gt;u.relative.duration;</div><div class='del'>-		value_type = ICAL_DURATION_VALUE;</div><div class='del'>-</div><div class='del'>-		switch (trigger-&gt;u.relative.related) {</div><div class='del'>-		case CAL_COMPONENT_ALARM_TRIGGER_RELATED_START:</div><div class='del'>-			related = ICAL_RELATED_START;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case CAL_COMPONENT_ALARM_TRIGGER_RELATED_END:</div><div class='del'>-			related = ICAL_RELATED_END;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE:</div><div class='del'>-		t.time = trigger-&gt;u.absolute;</div><div class='del'>-		value_type = ICAL_DATETIME_VALUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	alarm-&gt;trigger = icalproperty_new_trigger (t);</div><div class='del'>-	icalcomponent_add_property (alarm-&gt;icalcomp, alarm-&gt;trigger);</div><div class='del'>-</div><div class='del'>-	/* Value parameters */</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (alarm-&gt;trigger, ICAL_VALUE_PARAMETER);</div><div class='del'>-	if (param)</div><div class='del'>-		icalparameter_set_value (param, value_type);</div><div class='del'>-	else {</div><div class='del'>-		param = icalparameter_new_value (value_type);</div><div class='del'>-		icalproperty_add_parameter (alarm-&gt;trigger, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Related parameter */</div><div class='del'>-</div><div class='del'>-	if (trigger-&gt;type == CAL_COMPONENT_ALARM_TRIGGER_RELATIVE) {</div><div class='del'>-		param = icalproperty_get_first_parameter (alarm-&gt;trigger, ICAL_RELATED_PARAMETER);</div><div class='del'>-</div><div class='del'>-		if (param)</div><div class='del'>-			icalparameter_set_related (param, related);</div><div class='del'>-		else {</div><div class='del'>-			param = icalparameter_new_related (related);</div><div class='del'>-			icalproperty_add_parameter (alarm-&gt;trigger, param);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_component_alarm_free_trigger:</div><div class='del'>- * @trigger: A #CalComponentAlarmTrigger structure.</div><div class='del'>- *</div><div class='del'>- * Frees a #CalComponentAlarmTrigger structure.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_component_alarm_free_trigger (CalComponentAlarmTrigger *trigger)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (trigger != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (trigger);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-util/cal-component.h b/calendar/cal-util/cal-component.h<br/>deleted file mode 100644<br/>index 32c3449b55..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-component.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/cal-component.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,314 +0,0 @@</div><div class='del'>-/* Evolution calendar - iCalendar component 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_COMPONENT_H</div><div class='del'>-#define CAL_COMPONENT_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())</div><div class='del'>-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))</div><div class='del'>-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\</div><div class='del'>-				       CalComponentClass))</div><div class='del'>-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))</div><div class='del'>-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))</div><div class='del'>-</div><div class='del'>-/* Types of calendar components to be stored by a CalComponent, as per RFC 2445.</div><div class='del'>- * We don't put the alarm component type here since we store alarms as separate</div><div class='del'>- * structures inside the other "real" components.</div><div class='del'>- */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_NO_TYPE,</div><div class='del'>-	CAL_COMPONENT_EVENT,</div><div class='del'>-	CAL_COMPONENT_TODO,</div><div class='del'>-	CAL_COMPONENT_JOURNAL,</div><div class='del'>-	CAL_COMPONENT_FREEBUSY,</div><div class='del'>-	CAL_COMPONENT_TIMEZONE</div><div class='del'>-} CalComponentVType;</div><div class='del'>-</div><div class='del'>-/* Field identifiers for a calendar component */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */</div><div class='del'>-	CAL_COMPONENT_FIELD_CLASSIFICATION,</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPLETED,</div><div class='del'>-	CAL_COMPONENT_FIELD_DTEND,</div><div class='del'>-	CAL_COMPONENT_FIELD_DTSTART,</div><div class='del'>-	CAL_COMPONENT_FIELD_DUE,</div><div class='del'>-	CAL_COMPONENT_FIELD_GEO,</div><div class='del'>-	CAL_COMPONENT_FIELD_PERCENT,</div><div class='del'>-	CAL_COMPONENT_FIELD_PRIORITY,</div><div class='del'>-	CAL_COMPONENT_FIELD_SUMMARY,</div><div class='del'>-	CAL_COMPONENT_FIELD_TRANSPARENCY,</div><div class='del'>-	CAL_COMPONENT_FIELD_URL,</div><div class='del'>-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_NUM_FIELDS</div><div class='del'>-} CalComponentField;</div><div class='del'>-</div><div class='del'>-/* Structures to return properties and their parameters */</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_CLASS_NONE,</div><div class='del'>-	CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-	CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-	CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-	CAL_COMPONENT_CLASS_UNKNOWN</div><div class='del'>-} CalComponentClassification;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Actual date/time value */</div><div class='del'>-	struct icaltimetype *value;</div><div class='del'>-</div><div class='del'>-	/* Timezone ID */</div><div class='del'>-	const char *tzid;</div><div class='del'>-} CalComponentDateTime;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_PERIOD_DATETIME,</div><div class='del'>-	CAL_COMPONENT_PERIOD_DURATION</div><div class='del'>-} CalComponentPeriodType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentPeriodType type;</div><div class='del'>-</div><div class='del'>-	struct icaltimetype start;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct icaltimetype end;</div><div class='del'>-		struct icaldurationtype duration;</div><div class='del'>-	} u;</div><div class='del'>-} CalComponentPeriod;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Description string */</div><div class='del'>-	const char *value;</div><div class='del'>-</div><div class='del'>-	/* Alternate representation URI */</div><div class='del'>-	const char *altrep;</div><div class='del'>-} CalComponentText;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_TRANSP_NONE,</div><div class='del'>-	CAL_COMPONENT_TRANSP_TRANSPARENT,</div><div class='del'>-	CAL_COMPONENT_TRANSP_OPAQUE,</div><div class='del'>-	CAL_COMPONENT_TRANSP_UNKNOWN</div><div class='del'>-} CalComponentTransparency;</div><div class='del'>-</div><div class='del'>-typedef struct _CalComponentAlarm CalComponentAlarm;</div><div class='del'>-</div><div class='del'>-typedef struct _CalComponent CalComponent;</div><div class='del'>-typedef struct _CalComponentClass CalComponentClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CalComponentPrivate CalComponentPrivate;</div><div class='del'>-</div><div class='del'>-struct _CalComponent {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalComponentClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Calendar component */</div><div class='del'>-</div><div class='del'>-GtkType cal_component_get_type (void);</div><div class='del'>-</div><div class='del'>-char *cal_component_gen_uid (void);</div><div class='del'>-</div><div class='del'>-CalComponent *cal_component_new (void);</div><div class='del'>-</div><div class='del'>-CalComponent *cal_component_clone (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_set_new_vtype (CalComponent *comp, CalComponentVType type);</div><div class='del'>-</div><div class='del'>-gboolean cal_component_set_icalcomponent (CalComponent *comp, icalcomponent *icalcomp);</div><div class='del'>-icalcomponent *cal_component_get_icalcomponent (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-CalComponentVType cal_component_get_vtype (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-char *cal_component_get_as_string (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_commit_sequence (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_uid (CalComponent *comp, const char **uid);</div><div class='del'>-void cal_component_set_uid (CalComponent *comp, const char *uid);</div><div class='del'>-</div><div class='del'>-void cal_component_get_status (CalComponent *comp, const char **status);</div><div class='del'>-void cal_component_set_status (CalComponent *comp, const char *status);</div><div class='del'>-</div><div class='del'>-void cal_component_get_categories_list (CalComponent *comp, GSList **categ_list);</div><div class='del'>-void cal_component_set_categories_list (CalComponent *comp, GSList *categ_list);</div><div class='del'>-</div><div class='del'>-void cal_component_get_classification (CalComponent *comp, CalComponentClassification *classif);</div><div class='del'>-void cal_component_set_classification (CalComponent *comp, CalComponentClassification classif);</div><div class='del'>-</div><div class='del'>-void cal_component_get_comment_list (CalComponent *comp, GSList **text_list);</div><div class='del'>-void cal_component_set_comment_list (CalComponent *comp, GSList *text_list);</div><div class='del'>-</div><div class='del'>-void cal_component_get_completed (CalComponent *comp, struct icaltimetype **t);</div><div class='del'>-void cal_component_set_completed (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-</div><div class='del'>-void cal_component_get_created (CalComponent *comp, struct icaltimetype **t);</div><div class='del'>-void cal_component_set_created (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-</div><div class='del'>-void cal_component_get_description_list (CalComponent *comp, GSList **text_list);</div><div class='del'>-void cal_component_set_description_list (CalComponent *comp, GSList *text_list);</div><div class='del'>-</div><div class='del'>-void cal_component_get_dtend (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-void cal_component_set_dtend (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-</div><div class='del'>-void cal_component_get_dtstamp (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-void cal_component_set_dtstamp (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-</div><div class='del'>-void cal_component_get_dtstart (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-void cal_component_set_dtstart (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-</div><div class='del'>-void cal_component_get_due (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-void cal_component_set_due (CalComponent *comp, CalComponentDateTime *dt);</div><div class='del'>-</div><div class='del'>-void cal_component_get_exdate_list (CalComponent *comp, GSList **exdate_list);</div><div class='del'>-void cal_component_set_exdate_list (CalComponent *comp, GSList *exdate_list);</div><div class='del'>-gboolean cal_component_has_exdates (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_exrule_list (CalComponent *comp, GSList **recur_list);</div><div class='del'>-void cal_component_get_exrule_property_list (CalComponent *comp, GSList **recur_list);</div><div class='del'>-void cal_component_set_exrule_list (CalComponent *comp, GSList *recur_list);</div><div class='del'>-gboolean cal_component_has_exrules (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-gboolean cal_component_has_exceptions (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_geo (CalComponent *comp, struct icalgeotype **geo);</div><div class='del'>-void cal_component_set_geo (CalComponent *comp, struct icalgeotype *geo);</div><div class='del'>-</div><div class='del'>-void cal_component_get_last_modified (CalComponent *comp, struct icaltimetype **t);</div><div class='del'>-void cal_component_set_last_modified (CalComponent *comp, struct icaltimetype *t);</div><div class='del'>-</div><div class='del'>-void cal_component_get_percent (CalComponent *comp, int **percent);</div><div class='del'>-void cal_component_set_percent (CalComponent *comp, int *percent);</div><div class='del'>-</div><div class='del'>-void cal_component_get_priority (CalComponent *comp, int **priority);</div><div class='del'>-void cal_component_set_priority (CalComponent *comp, int *priority);</div><div class='del'>-</div><div class='del'>-void cal_component_get_rdate_list (CalComponent *comp, GSList **period_list);</div><div class='del'>-void cal_component_set_rdate_list (CalComponent *comp, GSList *period_list);</div><div class='del'>-gboolean cal_component_has_rdates (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_rrule_list (CalComponent *comp, GSList **recur_list);</div><div class='del'>-void cal_component_get_rrule_property_list (CalComponent *comp, GSList **recur_list);</div><div class='del'>-void cal_component_set_rrule_list (CalComponent *comp, GSList *recur_list);</div><div class='del'>-gboolean cal_component_has_rrules (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-gboolean cal_component_has_recurrences (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_sequence (CalComponent *comp, int **sequence);</div><div class='del'>-void cal_component_set_sequence (CalComponent *comp, int *sequence);</div><div class='del'>-</div><div class='del'>-void cal_component_get_summary (CalComponent *comp, CalComponentText *summary);</div><div class='del'>-void cal_component_set_summary (CalComponent *comp, CalComponentText *summary);</div><div class='del'>-</div><div class='del'>-void cal_component_get_transparency (CalComponent *comp, CalComponentTransparency *transp);</div><div class='del'>-void cal_component_set_transparency (CalComponent *comp, CalComponentTransparency transp);</div><div class='del'>-</div><div class='del'>-void cal_component_get_url (CalComponent *comp, const char **url);</div><div class='del'>-void cal_component_set_url (CalComponent *comp, const char *url);</div><div class='del'>-</div><div class='del'>-/* Functions to free returned values */</div><div class='del'>-</div><div class='del'>-void cal_component_free_categories_list (GSList *categ_list);</div><div class='del'>-void cal_component_free_datetime (CalComponentDateTime *dt);</div><div class='del'>-void cal_component_free_exdate_list (GSList *exdate_list);</div><div class='del'>-void cal_component_free_geo (struct icalgeotype *geo);</div><div class='del'>-void cal_component_free_icaltimetype (struct icaltimetype *t);</div><div class='del'>-void cal_component_free_percent (int *percent);</div><div class='del'>-void cal_component_free_priority (int *priority);</div><div class='del'>-void cal_component_free_period_list (GSList *period_list);</div><div class='del'>-void cal_component_free_recur_list (GSList *recur_list);</div><div class='del'>-void cal_component_free_sequence (int *sequence);</div><div class='del'>-void cal_component_free_pilot_id (unsigned long *pilot_status);</div><div class='del'>-void cal_component_free_pilot_status (unsigned long *pilot_status);</div><div class='del'>-void cal_component_free_text_list (GSList *text_list);</div><div class='del'>-</div><div class='del'>-/* Alarms */</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_ALARM_NONE,</div><div class='del'>-	CAL_COMPONENT_ALARM_AUDIO,</div><div class='del'>-	CAL_COMPONENT_ALARM_DISPLAY,</div><div class='del'>-	CAL_COMPONENT_ALARM_EMAIL,</div><div class='del'>-	CAL_COMPONENT_ALARM_PROCEDURE,</div><div class='del'>-	CAL_COMPONENT_ALARM_UNKNOWN</div><div class='del'>-} CalComponentAlarmAction;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_ALARM_TRIGGER_RELATIVE,</div><div class='del'>-	CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE</div><div class='del'>-} CalComponentAlarmTriggerType;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_START,</div><div class='del'>-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_END</div><div class='del'>-} CalComponentAlarmTriggerRelated;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentAlarmTriggerType type;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			struct icaldurationtype duration;</div><div class='del'>-			CalComponentAlarmTriggerRelated related;</div><div class='del'>-		} relative;</div><div class='del'>-</div><div class='del'>-		struct icaltimetype absolute;</div><div class='del'>-	} u;</div><div class='del'>-} CalComponentAlarmTrigger;</div><div class='del'>-</div><div class='del'>-gboolean cal_component_has_alarms (CalComponent *comp);</div><div class='del'>-CalComponentAlarm *cal_component_get_first_alarm (CalComponent *comp);</div><div class='del'>-CalComponentAlarm *cal_component_get_next_alarm (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void cal_component_alarm_free (CalComponentAlarm *alarm);</div><div class='del'>-</div><div class='del'>-void cal_component_alarm_get_action (CalComponentAlarm *alarm, CalComponentAlarmAction *action);</div><div class='del'>-void cal_component_alarm_set_action (CalComponentAlarm *alarm, CalComponentAlarmAction action);</div><div class='del'>-</div><div class='del'>-void cal_component_alarm_get_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger);</div><div class='del'>-void cal_component_alarm_set_trigger (CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger);</div><div class='del'>-void cal_component_alarm_free_trigger (CalComponentAlarmTrigger *trigger);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/cal-util/cal-recur.c b/calendar/cal-util/cal-recur.c<br/>deleted file mode 100644<br/>index 057bde1368..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-recur.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/cal-recur.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3662 +0,0 @@</div><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/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'>-/* Define this for some debugging output. */</div><div class='del'>-#if 0</div><div class='del'>-#define CAL_OBJ_DEBUG	1</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* We will use icalrecurrencetype instead of this eventually. */</div><div class='del'>-typedef struct {</div><div class='del'>-	icalrecurrencetype_frequency freq;</div><div class='del'>-</div><div class='del'>-	int            interval;</div><div class='del'>-</div><div class='del'>-	/* Specifies the end of the recurrence. 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'>-} CalRecurrence;</div><div class='del'>-</div><div class='del'>-/* This is what we use to pass to all the filter functions. */</div><div class='del'>-typedef struct _RecurData RecurData;</div><div class='del'>-struct _RecurData {</div><div class='del'>-	CalRecurrence *recur;</div><div class='del'>-</div><div class='del'>-	/* This is used for the WEEKLY frequency. */</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[62];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is what we use to represent a date &amp; time. */</div><div class='del'>-typedef struct _CalObjTime CalObjTime;</div><div class='del'>-struct _CalObjTime {</div><div class='del'>-	guint16 year;</div><div class='del'>-	guint8 month;		/* 0 - 11 */</div><div class='del'>-	guint8 day;		/* 1 - 31 */</div><div class='del'>-	guint8 hour;		/* 0 - 23 */</div><div class='del'>-	guint8 minute;		/* 0 - 59 */</div><div class='del'>-	guint8 second;		/* 0 - 59 (maybe up to 61 for leap seconds) */</div><div class='del'>-	guint8 is_rdate;	/* TRUE if this is an RDATE, which may have an</div><div class='del'>-				   end or duration set. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is what we use to represent specific recurrence dates.</div><div class='del'>-   Note that we assume it starts with a CalObjTime when sorting. */</div><div class='del'>-typedef struct _CalObjRecurrenceDate CalObjRecurrenceDate;</div><div class='del'>-struct _CalObjRecurrenceDate {</div><div class='del'>-	CalObjTime start;</div><div class='del'>-	CalComponentPeriod *period;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* The paramter we use to store the enddate in RRULE and EXRULE properties. */</div><div class='del'>-#define EVOLUTION_END_DATE_PARAMETER	"X-EVOLUTION-ENDDATE"</div><div class='del'>-</div><div class='del'>-typedef gboolean (*CalObjFindStartFn) (CalObjTime *event_start,</div><div class='del'>-				       CalObjTime *event_end,</div><div class='del'>-				       RecurData  *recur_data,</div><div class='del'>-				       CalObjTime *interval_start,</div><div class='del'>-				       CalObjTime *interval_end,</div><div class='del'>-				       CalObjTime *cotime);</div><div class='del'>-typedef gboolean (*CalObjFindNextFn)  (CalObjTime *cotime,</div><div class='del'>-				       CalObjTime *event_end,</div><div class='del'>-				       RecurData  *recur_data,</div><div class='del'>-				       CalObjTime *interval_end);</div><div class='del'>-typedef GArray*	 (*CalObjFilterFn)    (RecurData  *recur_data,</div><div class='del'>-				       GArray     *occs);</div><div class='del'>-</div><div class='del'>-typedef struct _CalRecurVTable CalRecurVTable;</div><div class='del'>-struct _CalRecurVTable {</div><div class='del'>-	CalObjFindStartFn find_start_position;</div><div class='del'>-	CalObjFindNextFn find_next_position;</div><div class='del'>-</div><div class='del'>-	CalObjFilterFn bymonth_filter;</div><div class='del'>-	CalObjFilterFn byweekno_filter;</div><div class='del'>-	CalObjFilterFn byyearday_filter;</div><div class='del'>-	CalObjFilterFn bymonthday_filter;</div><div class='del'>-	CalObjFilterFn byday_filter;</div><div class='del'>-	CalObjFilterFn byhour_filter;</div><div class='del'>-	CalObjFilterFn byminute_filter;</div><div class='del'>-	CalObjFilterFn bysecond_filter;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is used to specify which parts of the CalObjTime to compare in</div><div class='del'>-   cal_obj_time_compare(). */</div><div class='del'>-typedef enum {</div><div class='del'>-	CALOBJ_YEAR,</div><div class='del'>-	CALOBJ_MONTH,</div><div class='del'>-	CALOBJ_DAY,</div><div class='del'>-	CALOBJ_HOUR,</div><div class='del'>-	CALOBJ_MINUTE,</div><div class='del'>-	CALOBJ_SECOND</div><div class='del'>-} CalObjTimeComparison;</div><div class='del'>-</div><div class='del'>-static void cal_recur_generate_instances_of_rule (CalComponent	*comp,</div><div class='del'>-						  icalproperty	*prop,</div><div class='del'>-						  time_t	 start,</div><div class='del'>-						  time_t	 end,</div><div class='del'>-						  CalRecurInstanceFn cb,</div><div class='del'>-						  gpointer       cb_data);</div><div class='del'>-</div><div class='del'>-static CalRecurrence * cal_recur_from_icalproperty (icalproperty *prop,</div><div class='del'>-						    gboolean exception);</div><div class='del'>-static gint cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day);</div><div class='del'>-static void	cal_recur_free			(CalRecurrence	*r);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean cal_object_get_rdate_end	(CalObjTime	*occ,</div><div class='del'>-						 GArray		*rdate_periods);</div><div class='del'>-static void	cal_object_compute_duration	(CalObjTime	*start,</div><div class='del'>-						 CalObjTime	*end,</div><div class='del'>-						 gint		*days,</div><div class='del'>-						 gint		*seconds);</div><div class='del'>-</div><div class='del'>-static gboolean generate_instances_for_chunk	(CalComponent		*comp,</div><div class='del'>-						 time_t			 comp_dtstart,</div><div class='del'>-						 GSList			*rrules,</div><div class='del'>-						 GSList			*rdates,</div><div class='del'>-						 GSList			*exrules,</div><div class='del'>-						 GSList			*exdates,</div><div class='del'>-						 CalObjTime		*event_start,</div><div class='del'>-						 CalObjTime		*chunk_start,</div><div class='del'>-						 CalObjTime		*chunk_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'>-						 CalRecurInstanceFn	 cb,</div><div class='del'>-						 gpointer		 cb_data);</div><div class='del'>-</div><div class='del'>-static GArray* cal_obj_expand_recurrence	(CalObjTime	  *event_start,</div><div class='del'>-						 CalRecurrence	  *recur,</div><div class='del'>-						 CalObjTime	  *interval_start,</div><div class='del'>-						 CalObjTime	  *interval_end,</div><div class='del'>-						 gboolean	  *finished);</div><div class='del'>-</div><div class='del'>-static GArray*	cal_obj_generate_set_yearly	(RecurData	*recur_data,</div><div class='del'>-						 CalRecurVTable *vtable,</div><div class='del'>-						 CalObjTime	*occ);</div><div class='del'>-static GArray*	cal_obj_generate_set_monthly	(RecurData	*recur_data,</div><div class='del'>-						 CalRecurVTable *vtable,</div><div class='del'>-						 CalObjTime	*occ);</div><div class='del'>-static GArray*	cal_obj_generate_set_default	(RecurData	*recur_data,</div><div class='del'>-						 CalRecurVTable *vtable,</div><div class='del'>-						 CalObjTime	*occ);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CalRecurVTable* cal_obj_get_vtable	(icalrecurrencetype_frequency recur_type);</div><div class='del'>-static void	cal_obj_initialize_recur_data	(RecurData	*recur_data,</div><div class='del'>-						 CalRecurrence	*recur,</div><div class='del'>-						 CalObjTime	*event_start);</div><div class='del'>-static void	cal_obj_sort_occurrences	(GArray		*occs);</div><div class='del'>-static gint	cal_obj_time_compare_func	(const void	*arg1,</div><div class='del'>-						 const void	*arg2);</div><div class='del'>-static void	cal_obj_remove_duplicates_and_invalid_dates (GArray	*occs);</div><div class='del'>-static void	cal_obj_remove_exceptions	(GArray		*occs,</div><div class='del'>-						 GArray		*ex_occs);</div><div class='del'>-static GArray*	cal_obj_bysetpos_filter		(CalRecurrence	*recur,</div><div class='del'>-						 GArray		*occs);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_yearly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_start,</div><div class='del'>-						    CalObjTime *interval_end,</div><div class='del'>-						    CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_yearly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_monthly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						     CalObjTime *event_end,</div><div class='del'>-						     RecurData  *recur_data,</div><div class='del'>-						     CalObjTime *interval_start,</div><div class='del'>-						     CalObjTime *interval_end,</div><div class='del'>-						     CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_monthly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						     CalObjTime *event_end,</div><div class='del'>-						     RecurData  *recur_data,</div><div class='del'>-						     CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_weekly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_start,</div><div class='del'>-						    CalObjTime *interval_end,</div><div class='del'>-						    CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_weekly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_daily_find_start_position  (CalObjTime *event_start,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_start,</div><div class='del'>-						    CalObjTime *interval_end,</div><div class='del'>-						    CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_daily_find_next_position   (CalObjTime *cotime,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_hourly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_start,</div><div class='del'>-						    CalObjTime *interval_end,</div><div class='del'>-						    CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_hourly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						    CalObjTime *event_end,</div><div class='del'>-						    RecurData  *recur_data,</div><div class='del'>-						    CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_minutely_find_start_position (CalObjTime *event_start,</div><div class='del'>-						      CalObjTime *event_end,</div><div class='del'>-						      RecurData  *recur_data,</div><div class='del'>-						      CalObjTime *interval_start,</div><div class='del'>-						      CalObjTime *interval_end,</div><div class='del'>-						      CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_minutely_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						      CalObjTime *event_end,</div><div class='del'>-						      RecurData  *recur_data,</div><div class='del'>-						      CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static gboolean cal_obj_secondly_find_start_position (CalObjTime *event_start,</div><div class='del'>-						      CalObjTime *event_end,</div><div class='del'>-						      RecurData  *recur_data,</div><div class='del'>-						      CalObjTime *interval_start,</div><div class='del'>-						      CalObjTime *interval_end,</div><div class='del'>-						      CalObjTime *cotime);</div><div class='del'>-static gboolean cal_obj_secondly_find_next_position  (CalObjTime *cotime,</div><div class='del'>-						      CalObjTime *event_end,</div><div class='del'>-						      RecurData  *recur_data,</div><div class='del'>-						      CalObjTime *interval_end);</div><div class='del'>-</div><div class='del'>-static GArray* cal_obj_bymonth_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bymonth_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byweekno_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-#if 0</div><div class='del'>-/* This isn't used at present. */</div><div class='del'>-static GArray* cal_obj_byweekno_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-#endif</div><div class='del'>-static GArray* cal_obj_byyearday_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byyearday_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bymonthday_expand	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bymonthday_filter	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byday_expand_yearly	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byday_expand_monthly	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byday_expand_weekly	(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byday_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byhour_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byhour_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byminute_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_byminute_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bysecond_expand		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-static GArray* cal_obj_bysecond_filter		(RecurData  *recur_data,</div><div class='del'>-						 GArray     *occs);</div><div class='del'>-</div><div class='del'>-static void cal_obj_time_add_months		(CalObjTime *cotime,</div><div class='del'>-						 gint	     months);</div><div class='del'>-static void cal_obj_time_add_days		(CalObjTime *cotime,</div><div class='del'>-						 gint	     days);</div><div class='del'>-static void cal_obj_time_add_hours		(CalObjTime *cotime,</div><div class='del'>-						 gint	     hours);</div><div class='del'>-static void cal_obj_time_add_minutes		(CalObjTime *cotime,</div><div class='del'>-						 gint	     minutes);</div><div class='del'>-static void cal_obj_time_add_seconds		(CalObjTime *cotime,</div><div class='del'>-						 gint	     seconds);</div><div class='del'>-static gint cal_obj_time_compare		(CalObjTime *cotime1,</div><div class='del'>-						 CalObjTime *cotime2,</div><div class='del'>-						 CalObjTimeComparison type);</div><div class='del'>-static gint cal_obj_time_weekday		(CalObjTime *cotime,</div><div class='del'>-						 CalRecurrence *recur);</div><div class='del'>-static gint cal_obj_time_day_of_year		(CalObjTime *cotime);</div><div class='del'>-static void cal_obj_time_find_first_week	(CalObjTime *cotime,</div><div class='del'>-						 RecurData  *recur_data);</div><div class='del'>-static void cal_object_time_from_time		(CalObjTime *cotime,</div><div class='del'>-						 time_t      t);</div><div class='del'>-static gint cal_obj_date_only_compare_func (const void *arg1,</div><div class='del'>-					    const void *arg2);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean cal_recur_ensure_end_dates	(CalComponent	*comp,</div><div class='del'>-						 gboolean	 refresh);</div><div class='del'>-static gboolean cal_recur_ensure_rule_end_date	(CalComponent	*comp,</div><div class='del'>-						 icalproperty	*prop,</div><div class='del'>-						 gboolean	 exception,</div><div class='del'>-						 gboolean	 refresh);</div><div class='del'>-static gboolean cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,</div><div class='del'>-							 time_t		 instance_start,</div><div class='del'>-							 time_t		 instance_end,</div><div class='del'>-							 gpointer	 data);</div><div class='del'>-static time_t cal_recur_get_rule_end_date	(icalproperty	*prop);</div><div class='del'>-static void cal_recur_set_rule_end_date		(icalproperty	*prop,</div><div class='del'>-						 time_t		 end_date);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef CAL_OBJ_DEBUG</div><div class='del'>-static char* cal_obj_time_to_string	(CalObjTime *cotime);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_yearly_vtable = {</div><div class='del'>-	cal_obj_yearly_find_start_position,</div><div class='del'>-	cal_obj_yearly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_expand,</div><div class='del'>-	cal_obj_byweekno_expand,</div><div class='del'>-	cal_obj_byyearday_expand,</div><div class='del'>-	cal_obj_bymonthday_expand,</div><div class='del'>-	cal_obj_byday_expand_yearly,</div><div class='del'>-	cal_obj_byhour_expand,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_monthly_vtable = {</div><div class='del'>-	cal_obj_monthly_find_start_position,</div><div class='del'>-	cal_obj_monthly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	NULL, /* BYYEARDAY is not useful in a MONTHLY frequency. */</div><div class='del'>-	cal_obj_bymonthday_expand,</div><div class='del'>-	cal_obj_byday_expand_monthly,</div><div class='del'>-	cal_obj_byhour_expand,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_weekly_vtable = {</div><div class='del'>-	cal_obj_weekly_find_start_position,</div><div class='del'>-	cal_obj_weekly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	NULL, /* BYYEARDAY is not useful in a WEEKLY frequency. */</div><div class='del'>-	NULL, /* BYMONTHDAY is not useful in a WEEKLY frequency. */</div><div class='del'>-	cal_obj_byday_expand_weekly,</div><div class='del'>-	cal_obj_byhour_expand,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_daily_vtable = {</div><div class='del'>-	cal_obj_daily_find_start_position,</div><div class='del'>-	cal_obj_daily_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	cal_obj_byyearday_filter,</div><div class='del'>-	cal_obj_bymonthday_filter,</div><div class='del'>-	cal_obj_byday_filter,</div><div class='del'>-	cal_obj_byhour_expand,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_hourly_vtable = {</div><div class='del'>-	cal_obj_hourly_find_start_position,</div><div class='del'>-	cal_obj_hourly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	cal_obj_byyearday_filter,</div><div class='del'>-	cal_obj_bymonthday_filter,</div><div class='del'>-	cal_obj_byday_filter,</div><div class='del'>-	cal_obj_byhour_filter,</div><div class='del'>-	cal_obj_byminute_expand,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_minutely_vtable = {</div><div class='del'>-	cal_obj_minutely_find_start_position,</div><div class='del'>-	cal_obj_minutely_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	cal_obj_byyearday_filter,</div><div class='del'>-	cal_obj_bymonthday_filter,</div><div class='del'>-	cal_obj_byday_filter,</div><div class='del'>-	cal_obj_byhour_filter,</div><div class='del'>-	cal_obj_byminute_filter,</div><div class='del'>-	cal_obj_bysecond_expand</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CalRecurVTable cal_obj_secondly_vtable = {</div><div class='del'>-	cal_obj_secondly_find_start_position,</div><div class='del'>-	cal_obj_secondly_find_next_position,</div><div class='del'>-</div><div class='del'>-	cal_obj_bymonth_filter,</div><div class='del'>-	NULL, /* BYWEEKNO is only applicable to YEARLY frequency. */</div><div class='del'>-	cal_obj_byyearday_filter,</div><div class='del'>-	cal_obj_bymonthday_filter,</div><div class='del'>-	cal_obj_byday_filter,</div><div class='del'>-	cal_obj_byhour_filter,</div><div class='del'>-	cal_obj_byminute_filter,</div><div class='del'>-	cal_obj_bysecond_filter</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calls the given callback function for each occurrence of the event that</div><div class='del'>- * intersects the range between the given start and end times (the end time is</div><div class='del'>- * not included). Note that the occurrences may start before the given start</div><div class='del'>- * time.</div><div class='del'>- *</div><div class='del'>- * If the callback routine returns FALSE the occurrence generation stops.</div><div class='del'>- *</div><div class='del'>- * Both start and end can be -1, in which case we start at the events first</div><div class='del'>- * instance and continue until it ends, or forever if it has no enddate.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-cal_recur_generate_instances (CalComponent		*comp,</div><div class='del'>-			      time_t			 start,</div><div class='del'>-			      time_t			 end,</div><div class='del'>-			      CalRecurInstanceFn	 cb,</div><div class='del'>-			      gpointer                   cb_data)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In cal_recur_generate_instances comp: %p\n", comp);</div><div class='del'>-	g_print ("  start: %li - %s", start, ctime (&amp;start));</div><div class='del'>-	g_print ("  end  : %li - %s", end, ctime (&amp;end));</div><div class='del'>-#endif</div><div class='del'>-	cal_recur_generate_instances_of_rule (comp, NULL, start, end,</div><div class='del'>-					      cb, cb_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calls the given callback function for each occurrence of the given</div><div class='del'>- * recurrence rule between the given start and end times. If the rule is NULL</div><div class='del'>- * it uses all the rules from the component.</div><div class='del'>- *</div><div class='del'>- * If the callback routine returns FALSE the occurrence generation stops.</div><div class='del'>- *</div><div class='del'>- * The use of the specific rule is for determining the end of a rule when</div><div class='del'>- * COUNT is set. The callback will count instances and store the enddata</div><div class='del'>- * when COUNT is reached.</div><div class='del'>- *</div><div class='del'>- * Both start and end can be -1, in which case we start at the events first</div><div class='del'>- * instance and continue until it ends, or forever if it has no enddate.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-cal_recur_generate_instances_of_rule (CalComponent	 *comp,</div><div class='del'>-				      icalproperty	 *prop,</div><div class='del'>-				      time_t		  start,</div><div class='del'>-				      time_t		  end,</div><div class='del'>-				      CalRecurInstanceFn  cb,</div><div class='del'>-				      gpointer            cb_data)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dtstart, dtend;</div><div class='del'>-	time_t dtstart_time, dtend_time;</div><div class='del'>-	GSList *rrules = NULL, *rdates = NULL, elem;</div><div class='del'>-	GSList *exrules = NULL, *exdates = NULL;</div><div class='del'>-	CalObjTime interval_start, interval_end, event_start, event_end;</div><div class='del'>-	CalObjTime chunk_start, chunk_end;</div><div class='del'>-	gint days, seconds, year;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-	g_return_if_fail (cb != NULL);</div><div class='del'>-</div><div class='del'>-	/* Get dtstart, dtend, recurrences, and exceptions */</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;dtstart);</div><div class='del'>-	cal_component_get_dtend (comp, &amp;dtend);</div><div class='del'>-</div><div class='del'>-	if (!dtstart.value) {</div><div class='del'>-		g_message ("cal_recur_generate_instances_of_rule(): bogus "</div><div class='del'>-			   "component, does not have DTSTART.  Skipping...");</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dtstart_time = icaltime_as_timet (*dtstart.value);</div><div class='del'>-	if (start == -1)</div><div class='del'>-		start = dtstart_time;</div><div class='del'>-</div><div class='del'>-	/* FIXME: DURATION could be used instead, couldn't it? - Damon */</div><div class='del'>-	if (dtend.value)</div><div class='del'>-		dtend_time = icaltime_as_timet (*dtend.value);</div><div class='del'>-	else</div><div class='del'>-		dtend_time = time_day_end (dtstart_time);</div><div class='del'>-</div><div class='del'>-	/* If there is no recurrence, just call the callback if the event</div><div class='del'>-	   intersects the given interval. */</div><div class='del'>-	if (!(cal_component_has_recurrences (comp)</div><div class='del'>-	      || cal_component_has_exceptions (comp))) {</div><div class='del'>-		if ((end == -1 || dtstart_time &lt; end) &amp;&amp; dtend_time &gt; start) {</div><div class='del'>-			(* cb) (comp, dtstart_time, dtend_time, cb_data);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If a specific recurrence rule is being used, set up a simple list,</div><div class='del'>-	   else get the recurrence rules from the component. */</div><div class='del'>-	if (prop) {</div><div class='del'>-		elem.data = prop;</div><div class='del'>-		elem.next = NULL;</div><div class='del'>-		rrules = &amp;elem;</div><div class='del'>-	} else {</div><div class='del'>-		/* Make sure all the enddates for the rules are set. */</div><div class='del'>-		cal_recur_ensure_end_dates (comp, FALSE);</div><div class='del'>-</div><div class='del'>-		cal_component_get_rrule_property_list (comp, &amp;rrules);</div><div class='del'>-		cal_component_get_rdate_list (comp, &amp;rdates);</div><div class='del'>-		cal_component_get_exrule_property_list (comp, &amp;exrules);</div><div class='del'>-		cal_component_get_exdate_list (comp, &amp;exdates);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert the interval start &amp; end to CalObjTime. Note that if end</div><div class='del'>-	   is -1 interval_end won't be set, so don't use it!</div><div class='del'>-	   Also note that we use end - 1 since we want the interval to be</div><div class='del'>-	   inclusive as it makes the code simpler. */</div><div class='del'>-	cal_object_time_from_time (&amp;interval_start, start);</div><div class='del'>-	if (end != -1)</div><div class='del'>-		cal_object_time_from_time (&amp;interval_end, end - 1);</div><div class='del'>-</div><div class='del'>-	cal_object_time_from_time (&amp;event_start, dtstart_time);</div><div class='del'>-	cal_object_time_from_time (&amp;event_end, dtend_time);</div><div class='del'>-	</div><div class='del'>-	/* Calculate the duration of the event, which we use for all</div><div class='del'>-	   occurrences. We can't just subtract start from end since that may</div><div class='del'>-	   be affected by daylight-saving time. So we want a value of days</div><div class='del'>-	   + seconds. */</div><div class='del'>-	cal_object_compute_duration (&amp;event_start, &amp;event_end,</div><div class='del'>-				     &amp;days, &amp;seconds);</div><div class='del'>-</div><div class='del'>-	/* Take off the duration from interval_start, so we get occurrences</div><div class='del'>-	   that start just before the start time but overlap it. But only do</div><div class='del'>-	   that if the interval is after the event's start time. */</div><div class='del'>-	if (start &gt; dtstart_time) {</div><div class='del'>-		cal_obj_time_add_days (&amp;interval_start, -days);</div><div class='del'>-		cal_obj_time_add_seconds (&amp;interval_start, -seconds);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Expand the recurrence for each year between start &amp; end, or until</div><div class='del'>-	   the callback returns 0 if end is 0. We do a year at a time to</div><div class='del'>-	   give the callback function a chance to break out of the loop, and</div><div class='del'>-	   so we don't get into problems with infinite recurrences. Since we</div><div class='del'>-	   have to work on complete sets of occurrences, if there is a yearly</div><div class='del'>-	   frequency it wouldn't make sense to break it into smaller chunks,</div><div class='del'>-	   since we would then be calculating the same sets several times.</div><div class='del'>-	   Though this does mean that we sometimes do a lot more work than</div><div class='del'>-	   is necessary, e.g. if COUNT is set to something quite low. */</div><div class='del'>-	for (year = interval_start.year;</div><div class='del'>-	     end == -1 || year &lt;= interval_end.year;</div><div class='del'>-	     year++) {</div><div class='del'>-		chunk_start = interval_start;</div><div class='del'>-		chunk_start.year = year;</div><div class='del'>-		if (end != -1)</div><div class='del'>-			chunk_end = interval_end;</div><div class='del'>-		chunk_end.year = year;</div><div class='del'>-</div><div class='del'>-		if (year != interval_start.year) {</div><div class='del'>-			chunk_start.month  = 0;</div><div class='del'>-			chunk_start.day    = 1;</div><div class='del'>-			chunk_start.hour   = 0;</div><div class='del'>-			chunk_start.minute = 0;</div><div class='del'>-			chunk_start.second = 0;</div><div class='del'>-		}</div><div class='del'>-		if (end == -1 || year != interval_end.year) {</div><div class='del'>-			chunk_end.month  = 11;</div><div class='del'>-			chunk_end.day    = 31;</div><div class='del'>-			chunk_end.hour   = 23;</div><div class='del'>-			chunk_end.minute = 59;</div><div class='del'>-			chunk_end.second = 61;</div><div class='del'>-			chunk_end.is_rdate = FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!generate_instances_for_chunk (comp, dtstart_time,</div><div class='del'>-						   rrules, rdates,</div><div class='del'>-						   exrules, exdates,</div><div class='del'>-						   &amp;event_start,</div><div class='del'>-						   &amp;chunk_start, &amp;chunk_end,</div><div class='del'>-						   start, end,</div><div class='del'>-						   days, seconds,</div><div class='del'>-						   cb, cb_data))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!prop) {</div><div class='del'>-		cal_component_free_period_list (rdates);</div><div class='del'>-		cal_component_free_exdate_list (exdates);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	cal_component_free_datetime (&amp;dtstart);</div><div class='del'>-	cal_component_free_datetime (&amp;dtend);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of GINT_TO_POINTER() elements out of a short array from a</div><div class='del'>- * struct icalrecurrencetype.</div><div class='del'>- */</div><div class='del'>-static GList *</div><div class='del'>-array_to_list (short *array, int max_elements)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	l = NULL;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_elements &amp;&amp; array[i] != ICAL_RECURRENCE_ARRAY_MAX; i++)</div><div class='del'>-		l = g_list_prepend (l, GINT_TO_POINTER ((int) (array[i])));</div><div class='del'>-	return g_list_reverse (l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_recur_from_icalproperty:</div><div class='del'>- * @ir: An RRULE or EXRULE #icalproperty.</div><div class='del'>- * </div><div class='del'>- * Converts an #icalproperty to a #CalRecurrence.  This should be</div><div class='del'>- * freed using the cal_recur_free() function.</div><div class='del'>- * </div><div class='del'>- * Return value: #CalRecurrence structure.</div><div class='del'>- **/</div><div class='del'>-static CalRecurrence *</div><div class='del'>-cal_recur_from_icalproperty (icalproperty *prop, gboolean exception)</div><div class='del'>-{</div><div class='del'>-	struct icalrecurrencetype ir;</div><div class='del'>-	CalRecurrence *r;</div><div class='del'>-	gint max_elements, i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (prop != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	r = g_new (CalRecurrence, 1);</div><div class='del'>-</div><div class='del'>-	if (exception)</div><div class='del'>-		ir = icalproperty_get_exrule (prop);</div><div class='del'>-	else</div><div class='del'>-		ir = icalproperty_get_rrule (prop);</div><div class='del'>-</div><div class='del'>-	r-&gt;freq = ir.freq;</div><div class='del'>-	r-&gt;interval = ir.interval;</div><div class='del'>-</div><div class='del'>-	if (ir.count != 0) {</div><div class='del'>-		r-&gt;enddate = cal_recur_get_rule_end_date (prop);</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: icaltime_as_timet() seems to return -1 if UNTIL isn't</div><div class='del'>-		   set, but a simpler test would be better. */</div><div class='del'>-		r-&gt;enddate = icaltime_as_timet (ir.until);</div><div class='del'>-		if (r-&gt;enddate == -1)</div><div class='del'>-			r-&gt;enddate = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r-&gt;week_start_day = cal_recur_ical_weekday_to_weekday (ir.week_start);</div><div class='del'>-</div><div class='del'>-	r-&gt;bymonth = array_to_list (ir.by_month,</div><div class='del'>-				    sizeof (ir.by_month) / sizeof (ir.by_month[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;byweekno = array_to_list (ir.by_week_no,</div><div class='del'>-				     sizeof (ir.by_week_no) / sizeof (ir.by_week_no[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;byyearday = array_to_list (ir.by_year_day,</div><div class='del'>-				      sizeof (ir.by_year_day) / sizeof (ir.by_year_day[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;bymonthday = array_to_list (ir.by_month_day,</div><div class='del'>-				       sizeof (ir.by_month_day) / sizeof (ir.by_month_day[0]));</div><div class='del'>-</div><div class='del'>-	/* FIXME: libical only supports 8 values, out of possible 107 * 7. */</div><div class='del'>-	r-&gt;byday = NULL;</div><div class='del'>-	max_elements = sizeof (ir.by_day) / sizeof (ir.by_day[0]);</div><div class='del'>-	for (i = 0; i &lt; max_elements &amp;&amp; ir.by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {</div><div class='del'>-		enum icalrecurrencetype_weekday day;</div><div class='del'>-		gint weeknum, weekday;</div><div class='del'>-</div><div class='del'>-		day = icalrecurrencetype_day_day_of_week (ir.by_day[i]);</div><div class='del'>-		weeknum = icalrecurrencetype_day_position (ir.by_day[i]);</div><div class='del'>-</div><div class='del'>-		weekday = cal_recur_ical_weekday_to_weekday (day);</div><div class='del'>-</div><div class='del'>-		r-&gt;byday = g_list_prepend (r-&gt;byday,</div><div class='del'>-					   GINT_TO_POINTER (weeknum));</div><div class='del'>-		r-&gt;byday = g_list_prepend (r-&gt;byday,</div><div class='del'>-					   GINT_TO_POINTER (weekday));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r-&gt;byhour = array_to_list (ir.by_hour,</div><div class='del'>-				   sizeof (ir.by_hour) / sizeof (ir.by_hour[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;byminute = array_to_list (ir.by_minute,</div><div class='del'>-				     sizeof (ir.by_minute) / sizeof (ir.by_minute[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;bysecond = array_to_list (ir.by_second,</div><div class='del'>-				     sizeof (ir.by_second) / sizeof (ir.by_second[0]));</div><div class='del'>-</div><div class='del'>-	r-&gt;bysetpos = array_to_list (ir.by_set_pos,</div><div class='del'>-				     sizeof (ir.by_set_pos) / sizeof (ir.by_set_pos[0]));</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-cal_recur_ical_weekday_to_weekday	(enum icalrecurrencetype_weekday day)</div><div class='del'>-{</div><div class='del'>-	gint weekday;</div><div class='del'>-</div><div class='del'>-	switch (day) {</div><div class='del'>-	case ICAL_NO_WEEKDAY:		/* Monday is the default in RFC2445. */</div><div class='del'>-	case ICAL_MONDAY_WEEKDAY:</div><div class='del'>-		weekday = 0;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_TUESDAY_WEEKDAY:</div><div class='del'>-		weekday = 1;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_WEDNESDAY_WEEKDAY:</div><div class='del'>-		weekday = 2;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_THURSDAY_WEEKDAY:</div><div class='del'>-		weekday = 3;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_FRIDAY_WEEKDAY:</div><div class='del'>-		weekday = 4;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_SATURDAY_WEEKDAY:</div><div class='del'>-		weekday = 5;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_SUNDAY_WEEKDAY:</div><div class='del'>-		weekday = 6;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("cal_recur_ical_weekday_to_weekday(): Unknown week day %d",</div><div class='del'>-			   day);</div><div class='del'>-		weekday = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return weekday;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_recur_free:</div><div class='del'>- * @r: A #CalRecurrence structure.</div><div class='del'>- * </div><div class='del'>- * Frees a #CalRecurrence structure.</div><div class='del'>- **/</div><div class='del'>-static void</div><div class='del'>-cal_recur_free (CalRecurrence *r)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (r != NULL);</div><div class='del'>-</div><div class='del'>-	g_list_free (r-&gt;bymonth);</div><div class='del'>-	g_list_free (r-&gt;byweekno);</div><div class='del'>-	g_list_free (r-&gt;byyearday);</div><div class='del'>-	g_list_free (r-&gt;bymonthday);</div><div class='del'>-	g_list_free (r-&gt;byday);</div><div class='del'>-	g_list_free (r-&gt;byhour);</div><div class='del'>-	g_list_free (r-&gt;byminute);</div><div class='del'>-	g_list_free (r-&gt;bysecond);</div><div class='del'>-	g_list_free (r-&gt;bysetpos);</div><div class='del'>-</div><div class='del'>-	g_free (r);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Generates one year's worth of recurrence instances.  Returns TRUE if all the</div><div class='del'>- * callback invocations returned TRUE, or FALSE when any one of them returns</div><div class='del'>- * FALSE, i.e. meaning that the instance generation should be stopped.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-generate_instances_for_chunk (CalComponent	*comp,</div><div class='del'>-			      time_t             comp_dtstart,</div><div class='del'>-			      GSList		*rrules,</div><div class='del'>-			      GSList		*rdates,</div><div class='del'>-			      GSList		*exrules,</div><div class='del'>-			      GSList		*exdates,</div><div class='del'>-			      CalObjTime	*event_start,</div><div class='del'>-			      CalObjTime	*chunk_start,</div><div class='del'>-			      CalObjTime	*chunk_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'>-			      CalRecurInstanceFn cb,</div><div class='del'>-			      gpointer           cb_data)</div><div class='del'>-{</div><div class='del'>-	GArray *occs, *ex_occs, *tmp_occs, *rdate_periods;</div><div class='del'>-	CalObjTime cotime, *occ;</div><div class='del'>-	GSList *elem;</div><div class='del'>-	gint i;</div><div class='del'>-	time_t start_time, end_time;</div><div class='del'>-	struct tm start_tm, end_tm;</div><div class='del'>-	gboolean cb_status = TRUE, rule_finished, finished = TRUE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In generate_instances_for_chunk rrules: %p\n"</div><div class='del'>-		 "  %i/%i/%i %02i:%02i:%02i - %i/%i/%i %02i:%02i:%02i\n",</div><div class='del'>-		 rrules,</div><div class='del'>-		 chunk_start-&gt;day, chunk_start-&gt;month + 1,</div><div class='del'>-		 chunk_start-&gt;year, chunk_start-&gt;hour,</div><div class='del'>-		 chunk_start-&gt;minute, chunk_start-&gt;second,</div><div class='del'>-		 chunk_end-&gt;day, chunk_end-&gt;month + 1,</div><div class='del'>-		 chunk_end-&gt;year, chunk_end-&gt;hour,</div><div class='del'>-		 chunk_end-&gt;minute, chunk_end-&gt;second);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-	ex_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-	rdate_periods = g_array_new (FALSE, FALSE,</div><div class='del'>-				     sizeof (CalObjRecurrenceDate));</div><div class='del'>-</div><div class='del'>-	/* The original DTSTART property is included in the occurrence set.</div><div class='del'>-	   So we add it if it is in this chunk. If it is after this chunk</div><div class='del'>-	   we set finished to FALSE. */</div><div class='del'>-	if (cal_obj_time_compare_func (event_start, chunk_end) &gt;= 0)</div><div class='del'>-		finished = FALSE;</div><div class='del'>-	else if (cal_obj_time_compare_func (event_start, chunk_start) &gt;= 0)</div><div class='del'>-		g_array_append_vals (occs, event_start, 1);</div><div class='del'>-	</div><div class='del'>-	/* Expand each of the recurrence rules. */</div><div class='del'>-	for (elem = rrules; elem; elem = elem-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		CalRecurrence *r;</div><div class='del'>-</div><div class='del'>-		prop = elem-&gt;data;</div><div class='del'>-		r = cal_recur_from_icalproperty (prop, FALSE);</div><div class='del'>-</div><div class='del'>-		tmp_occs = cal_obj_expand_recurrence (event_start, r,</div><div class='del'>-						      chunk_start,</div><div class='del'>-						      chunk_end,</div><div class='del'>-						      &amp;rule_finished);</div><div class='del'>-		cal_recur_free (r);</div><div class='del'>-</div><div class='del'>-		/* If any of the rules return FALSE for finished, we know we</div><div class='del'>-		   have to carry on so we set finished to FALSE. */</div><div class='del'>-		if (!rule_finished)</div><div class='del'>-			finished = FALSE;</div><div class='del'>-</div><div class='del'>-		g_array_append_vals (occs, tmp_occs-&gt;data, tmp_occs-&gt;len);</div><div class='del'>-		g_array_free (tmp_occs, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add on specific occurrence dates, flag them as RDATEs, and store</div><div class='del'>-	   a pointer to the period in the rdate_periods array. */</div><div class='del'>-	for (elem = rdates; elem; elem = elem-&gt;next) {</div><div class='del'>-		CalComponentPeriod *p;</div><div class='del'>-		CalObjRecurrenceDate rdate;</div><div class='del'>-		time_t t;</div><div class='del'>-</div><div class='del'>-		p = elem-&gt;data;</div><div class='del'>-		t = icaltime_as_timet (p-&gt;start);</div><div class='del'>-		cal_object_time_from_time (&amp;cotime, t);</div><div class='del'>-</div><div class='del'>-		/* If the rdate is after the current chunk we set finished</div><div class='del'>-		   to FALSE, and we skip it. */</div><div class='del'>-		if (cal_obj_time_compare_func (&amp;cotime, chunk_end) &gt;= 0) {</div><div class='del'>-			finished = FALSE;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Check if the end date or duration is set. If it is we need</div><div class='del'>-		   to store it so we can get it later. (libical seems to set</div><div class='del'>-		   second to -1 to denote an unset time. See icalvalue.c) */</div><div class='del'>-		if (p-&gt;type != CAL_COMPONENT_PERIOD_DATETIME</div><div class='del'>-		    || p-&gt;u.end.second != -1) {</div><div class='del'>-			cotime.is_rdate = TRUE;</div><div class='del'>-</div><div class='del'>-			rdate.start = cotime;</div><div class='del'>-			rdate.period = p;</div><div class='del'>-			g_array_append_val (rdate_periods, rdate);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_array_append_val (occs, cotime);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Expand each of the exception rules. */</div><div class='del'>-	for (elem = exrules; elem; elem = elem-&gt;next) {</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		CalRecurrence *r;</div><div class='del'>-</div><div class='del'>-		prop = elem-&gt;data;</div><div class='del'>-		r = cal_recur_from_icalproperty (prop, FALSE);</div><div class='del'>-</div><div class='del'>-		tmp_occs = cal_obj_expand_recurrence (event_start, r,</div><div class='del'>-						      chunk_start,</div><div class='del'>-						      chunk_end,</div><div class='del'>-						      &amp;rule_finished);</div><div class='del'>-		cal_recur_free (r);</div><div class='del'>-</div><div class='del'>-		g_array_append_vals (ex_occs, tmp_occs-&gt;data, tmp_occs-&gt;len);</div><div class='del'>-		g_array_free (tmp_occs, TRUE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add on specific exception dates. */</div><div class='del'>-	for (elem = exdates; elem; elem = elem-&gt;next) {</div><div class='del'>-		struct icaltimetype *it;</div><div class='del'>-		time_t t;</div><div class='del'>-</div><div class='del'>-		/* FIXME we should only be dealing with dates, not times too.</div><div class='del'>-</div><div class='del'>-		   No, I think it is supposed to be dates &amp; times - Damon.</div><div class='del'>-		   I'm not sure what the semantics of just a date would be,</div><div class='del'>-		   since the event could recur several times each day. */</div><div class='del'>-		it = elem-&gt;data;</div><div class='del'>-		t = icaltime_as_timet (*it);</div><div class='del'>-		cal_object_time_from_time (&amp;cotime, t);</div><div class='del'>-</div><div class='del'>-		g_array_append_val (ex_occs, cotime);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Sort all the arrays. */</div><div class='del'>-	cal_obj_sort_occurrences (occs);</div><div class='del'>-	cal_obj_sort_occurrences (ex_occs);</div><div class='del'>-</div><div class='del'>-	qsort (rdate_periods-&gt;data, rdate_periods-&gt;len,</div><div class='del'>-	       sizeof (CalObjRecurrenceDate), cal_obj_time_compare_func);</div><div class='del'>-</div><div class='del'>-	/* Create the final array, by removing the exceptions from the</div><div class='del'>-	   occurrences, and removing any duplicates. */</div><div class='del'>-	cal_obj_remove_exceptions (occs, ex_occs);</div><div class='del'>-</div><div class='del'>-	/* Call the callback for each occurrence. If it returns 0 we break</div><div class='del'>-	   out of the loop. */</div><div class='del'>-	for (i = 0; i &lt; occs-&gt;len; i++) {</div><div class='del'>-		/* Convert each CalObjTime into a start &amp; end time_t, and</div><div class='del'>-		   check it is within the bounds of the event &amp; interval. */</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</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_tm.tm_isdst = -1;</div><div class='del'>-		start_time = mktime (&amp;start_tm);</div><div class='del'>-</div><div class='del'>-		if (start_time == -1) {</div><div class='del'>-			g_warning ("mktime failed - time_t out of range?");</div><div class='del'>-			finished = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (start_time &lt; comp_dtstart</div><div class='del'>-		    || (interval_end_time != -1</div><div class='del'>-			&amp;&amp; start_time &gt;= interval_end_time))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (occ-&gt;is_rdate) {</div><div class='del'>-			if (!cal_object_get_rdate_end (occ, rdate_periods)) {</div><div class='del'>-				cal_obj_time_add_days (occ, duration_days);</div><div class='del'>-				cal_obj_time_add_seconds (occ,</div><div class='del'>-							  duration_seconds);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			cal_obj_time_add_days (occ, duration_days);</div><div class='del'>-			cal_obj_time_add_seconds (occ, duration_seconds);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		end_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_tm.tm_isdst = -1;</div><div class='del'>-		end_time = mktime (&amp;end_tm);</div><div class='del'>-</div><div class='del'>-		if (end_time == -1) {</div><div class='del'>-			g_warning ("mktime failed - time_t out of range?");</div><div class='del'>-			finished = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (end_time &lt;= interval_start_time)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		cb_status = (*cb) (comp, start_time, end_time, cb_data);</div><div class='del'>-		if (!cb_status)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-	g_array_free (ex_occs, TRUE);</div><div class='del'>-	g_array_free (rdate_periods, TRUE);</div><div class='del'>-</div><div class='del'>-	/* We return TRUE (i.e. carry on) only if the callback has always</div><div class='del'>-	   returned TRUE and we know that we have more occurrences to generate</div><div class='del'>-	   (i.e. finished is FALSE). */</div><div class='del'>-	return cb_status &amp;&amp; !finished;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This looks up the occurrence time in the sorted rdate_periods array, and</div><div class='del'>-   tries to compute the end time of the occurrence. If no end time or duration</div><div class='del'>-   is set it returns FALSE and the default duration will be used. */</div><div class='del'>-static gboolean</div><div class='del'>-cal_object_get_rdate_end	(CalObjTime	*occ,</div><div class='del'>-				 GArray		*rdate_periods)</div><div class='del'>-{</div><div class='del'>-	CalObjRecurrenceDate *rdate;</div><div class='del'>-	CalComponentPeriod *p;</div><div class='del'>-	gint lower, upper, middle, cmp = 0;</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	lower = 0;</div><div class='del'>-	upper = rdate_periods-&gt;len;</div><div class='del'>-</div><div class='del'>-	while (lower &lt; upper) {</div><div class='del'>-		middle = (lower + upper) &gt;&gt; 1;</div><div class='del'>-	  </div><div class='del'>-		rdate = &amp;g_array_index (rdate_periods, CalObjRecurrenceDate,</div><div class='del'>-					middle);</div><div class='del'>-</div><div class='del'>-		cmp = cal_obj_time_compare_func (occ, &amp;rdate-&gt;start);</div><div class='del'>-	  </div><div class='del'>-		if (cmp == 0)</div><div class='del'>-			break;</div><div class='del'>-		else if (cmp &lt; 0)</div><div class='del'>-			upper = middle;</div><div class='del'>-		else</div><div class='del'>-			lower = middle + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This should never happen. */</div><div class='del'>-	if (cmp == 0) {</div><div class='del'>-		g_warning ("Recurrence date not found");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p = rdate-&gt;period;</div><div class='del'>-	if (p-&gt;type == CAL_COMPONENT_PERIOD_DATETIME) {</div><div class='del'>-		t = icaltime_as_timet (p-&gt;u.end);</div><div class='del'>-		cal_object_time_from_time (occ, t);</div><div class='del'>-	} else {</div><div class='del'>-		cal_obj_time_add_days (occ, p-&gt;u.duration.weeks * 7</div><div class='del'>-				       + p-&gt;u.duration.days);</div><div class='del'>-		cal_obj_time_add_hours (occ, p-&gt;u.duration.hours);</div><div class='del'>-		cal_obj_time_add_minutes (occ, p-&gt;u.duration.minutes);</div><div class='del'>-		cal_obj_time_add_seconds (occ, p-&gt;u.duration.seconds);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_object_compute_duration (CalObjTime *start,</div><div class='del'>-			     CalObjTime *end,</div><div class='del'>-			     gint	*days,</div><div class='del'>-			     gint	*seconds)</div><div class='del'>-{</div><div class='del'>-	GDate start_date, end_date;</div><div class='del'>-	gint start_seconds, end_seconds;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;start_date, 1);</div><div class='del'>-	g_date_clear (&amp;end_date, 1);</div><div class='del'>-	g_date_set_dmy (&amp;start_date, start-&gt;day, start-&gt;month + 1,</div><div class='del'>-			start-&gt;year);</div><div class='del'>-	g_date_set_dmy (&amp;end_date, end-&gt;day, end-&gt;month + 1,</div><div class='del'>-			end-&gt;year);</div><div class='del'>-</div><div class='del'>-	*days = g_date_julian (&amp;end_date) - g_date_julian (&amp;start_date);</div><div class='del'>-	start_seconds = start-&gt;hour * 3600 + start-&gt;minute * 60</div><div class='del'>-		+ start-&gt;second;</div><div class='del'>-	end_seconds = end-&gt;hour * 3600 + end-&gt;minute * 60 + end-&gt;second;</div><div class='del'>-</div><div class='del'>-	*seconds = end_seconds - start_seconds;</div><div class='del'>-	if (*seconds &lt; 0) {</div><div class='del'>-		*days = *days - 1;</div><div class='del'>-		*seconds += 24 * 60 * 60;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns an unsorted GArray of CalObjTime's resulting from expanding the</div><div class='del'>-   given recurrence rule within the given interval. Note that it doesn't</div><div class='del'>-   clip the generated occurrences to the interval, i.e. if the interval</div><div class='del'>-   starts part way through the year this function still returns all the</div><div class='del'>-   occurrences for the year. Clipping is done later.</div><div class='del'>-   The finished flag is set to FALSE if there are more occurrences to generate</div><div class='del'>-   after the given interval.*/</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_expand_recurrence		(CalObjTime	  *event_start,</div><div class='del'>-					 CalRecurrence	  *recur,</div><div class='del'>-					 CalObjTime	  *interval_start,</div><div class='del'>-					 CalObjTime	  *interval_end,</div><div class='del'>-					 gboolean	  *finished)</div><div class='del'>-{</div><div class='del'>-	CalRecurVTable *vtable;</div><div class='del'>-	CalObjTime *event_end = NULL, event_end_cotime;</div><div class='del'>-	RecurData recur_data;</div><div class='del'>-	CalObjTime occ, *cotime;</div><div class='del'>-	GArray *all_occs, *occs;</div><div class='del'>-	gint len;</div><div class='del'>-</div><div class='del'>-	/* This is the resulting array of CalObjTime elements. */</div><div class='del'>-	all_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	*finished = TRUE;</div><div class='del'>-</div><div class='del'>-	vtable = cal_obj_get_vtable (recur-&gt;freq);</div><div class='del'>-	if (!vtable)</div><div class='del'>-		return all_occs;</div><div class='del'>-</div><div class='del'>-	/* Calculate some useful data such as some fast lookup tables. */</div><div class='del'>-	cal_obj_initialize_recur_data (&amp;recur_data, recur, event_start);</div><div class='del'>-</div><div class='del'>-	/* Compute the event_end, if the recur's enddate is set. */</div><div class='del'>-	if (recur-&gt;enddate &gt; 0) {</div><div class='del'>-		cal_object_time_from_time (&amp;event_end_cotime,</div><div class='del'>-					   recur-&gt;enddate);</div><div class='del'>-		event_end = &amp;event_end_cotime;</div><div class='del'>-</div><div class='del'>-		/* If the enddate is before the requested interval return. */</div><div class='del'>-		if (cal_obj_time_compare_func (event_end, interval_start) &lt; 0)</div><div class='del'>-			return all_occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set finished to FALSE if we know there will be more occurrences to</div><div class='del'>-	   do after this interval. */</div><div class='del'>-	if (!interval_end || !event_end</div><div class='del'>-	    || cal_obj_time_compare_func (event_end, interval_end) &gt; 0)</div><div class='del'>-		*finished = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Get the first period based on the frequency and the interval that</div><div class='del'>-	   intersects the interval between start and end. */</div><div class='del'>-	if ((*vtable-&gt;find_start_position) (event_start, event_end,</div><div class='del'>-					    &amp;recur_data,</div><div class='del'>-					    interval_start, interval_end,</div><div class='del'>-					    &amp;occ))</div><div class='del'>-		return all_occs;</div><div class='del'>-</div><div class='del'>-	/* Loop until the event ends or we go past the end of the required</div><div class='del'>-	   interval. */</div><div class='del'>-	for (;;) {</div><div class='del'>-		/* Generate the set of occurrences for this period. */</div><div class='del'>-		switch (recur-&gt;freq) {</div><div class='del'>-		case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-			occs = cal_obj_generate_set_yearly (&amp;recur_data,</div><div class='del'>-							    vtable, &amp;occ);</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-			occs = cal_obj_generate_set_monthly (&amp;recur_data,</div><div class='del'>-							     vtable, &amp;occ);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			occs = cal_obj_generate_set_default (&amp;recur_data,</div><div class='del'>-							     vtable, &amp;occ);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Sort the occurrences and remove duplicates. */</div><div class='del'>-		cal_obj_sort_occurrences (occs);</div><div class='del'>-		cal_obj_remove_duplicates_and_invalid_dates (occs);</div><div class='del'>-</div><div class='del'>-		/* Apply the BYSETPOS property. */</div><div class='del'>-		occs = cal_obj_bysetpos_filter (recur, occs);</div><div class='del'>-</div><div class='del'>-		/* Remove any occs after event_end. */</div><div class='del'>-		len = occs-&gt;len - 1;</div><div class='del'>-		if (event_end) {</div><div class='del'>-			while (len &gt;= 0) {</div><div class='del'>-				cotime = &amp;g_array_index (occs, CalObjTime,</div><div class='del'>-							 len);</div><div class='del'>-				if (cal_obj_time_compare_func (cotime,</div><div class='del'>-							       event_end) &lt;= 0)</div><div class='del'>-					break;</div><div class='del'>-				len--;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Add the occurrences onto the main array. */</div><div class='del'>-		if (len &gt;= 0)</div><div class='del'>-			g_array_append_vals (all_occs, occs-&gt;data, len + 1);</div><div class='del'>-</div><div class='del'>- 		g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-		/* Skip to the next period, or exit the loop if finished. */</div><div class='del'>-		if ((*vtable-&gt;find_next_position) (&amp;occ, event_end,</div><div class='del'>-						   &amp;recur_data, interval_end))</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return all_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_generate_set_yearly	(RecurData *recur_data,</div><div class='del'>-				 CalRecurVTable *vtable,</div><div class='del'>-				 CalObjTime *occ)</div><div class='del'>-{</div><div class='del'>-	CalRecurrence *recur = recur_data-&gt;recur;</div><div class='del'>-	GArray *occs_arrays[4], *occs, *occs2;</div><div class='del'>-	gint num_occs_arrays = 0, i;</div><div class='del'>-</div><div class='del'>-	/* This is a bit complicated, since the iCalendar spec says that</div><div class='del'>-	   several BYxxx modifiers can be used simultaneously. So we have to</div><div class='del'>-	   be quite careful when determining the days of the occurrences.</div><div class='del'>-	   The BYHOUR, BYMINUTE &amp; BYSECOND modifiers are no problem at all.</div><div class='del'>-</div><div class='del'>-	   The modifiers we have to worry about are: BYMONTH, BYWEEKNO,</div><div class='del'>-	   BYYEARDAY, BYMONTHDAY &amp; BYDAY. We can't do these sequentially</div><div class='del'>-	   since each filter will mess up the results of the previous one.</div><div class='del'>-	   But they aren't all completely independant, e.g. BYMONTHDAY and</div><div class='del'>-	   BYDAY are related to BYMONTH, and BYDAY is related to BYWEEKNO.</div><div class='del'>-</div><div class='del'>-	   BYDAY &amp; BYMONTHDAY can also be applied independently, which makes</div><div class='del'>-	   it worse. So we assume that if BYMONTH or BYWEEKNO is used, then</div><div class='del'>-	   the BYDAY modifier applies to those, else it is applied</div><div class='del'>-	   independantly.</div><div class='del'>-</div><div class='del'>-	   We expand the occurrences in parallel into the occs_arrays[] array,</div><div class='del'>-	   and then merge them all into one GArray before expanding BYHOUR,</div><div class='del'>-	   BYMINUTE &amp; BYSECOND. */</div><div class='del'>-</div><div class='del'>-	if (recur-&gt;bymonth) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;bymonth_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		/* If BYMONTHDAY &amp; BYDAY are both set we need to expand them</div><div class='del'>-		   in parallel and add the results. */</div><div class='del'>-		if (recur-&gt;bymonthday &amp;&amp; recur-&gt;byday) {</div><div class='del'>-			/* Copy the occs array. */</div><div class='del'>-			occs2 = g_array_new (FALSE, FALSE,</div><div class='del'>-					     sizeof (CalObjTime));</div><div class='del'>-			g_array_append_vals (occs2, occs-&gt;data, occs-&gt;len);</div><div class='del'>-</div><div class='del'>-			occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-			/* Note that we explicitly call the monthly version</div><div class='del'>-			   of the BYDAY expansion filter. */</div><div class='del'>-			occs2 = cal_obj_byday_expand_monthly (recur_data,</div><div class='del'>-							      occs2);</div><div class='del'>-</div><div class='del'>-			/* Add the 2 resulting arrays together. */</div><div class='del'>-			g_array_append_vals (occs, occs2-&gt;data, occs2-&gt;len);</div><div class='del'>-			g_array_free (occs2, TRUE);</div><div class='del'>-		} else {</div><div class='del'>-			occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-			/* Note that we explicitly call the monthly version</div><div class='del'>-			   of the BYDAY expansion filter. */</div><div class='del'>-			occs = cal_obj_byday_expand_monthly (recur_data, occs);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (recur-&gt;byweekno) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;byweekno_filter) (recur_data, occs);</div><div class='del'>-		/* Note that we explicitly call the weekly version of the</div><div class='del'>-		   BYDAY expansion filter. */</div><div class='del'>-		occs = cal_obj_byday_expand_weekly (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (recur-&gt;byyearday) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;byyearday_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If BYMONTHDAY is set, and BYMONTH is not set, we need to</div><div class='del'>-	   expand BYMONTHDAY independantly. */</div><div class='del'>-	if (recur-&gt;bymonthday &amp;&amp; !recur-&gt;bymonth) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If BYDAY is set, and BYMONTH and BYWEEKNO are not set, we need to</div><div class='del'>-	   expand BYDAY independantly. */</div><div class='del'>-	if (recur-&gt;byday &amp;&amp; !recur-&gt;bymonth &amp;&amp; !recur-&gt;byweekno) {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;byday_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-		occs_arrays[num_occs_arrays++] = occs;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add all the arrays together. If no filters were used we just</div><div class='del'>-	   create an array with one element. */</div><div class='del'>-	if (num_occs_arrays &gt; 0) {</div><div class='del'>-		occs = occs_arrays[0];</div><div class='del'>-		for (i = 1; i &lt; num_occs_arrays; i++) {</div><div class='del'>-			occs2 = occs_arrays[i];</div><div class='del'>-			g_array_append_vals (occs, occs2-&gt;data, occs2-&gt;len);</div><div class='del'>-			g_array_free (occs2, TRUE);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs, occ, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now expand BYHOUR, BYMINUTE &amp; BYSECOND. */</div><div class='del'>-	occs = (*vtable-&gt;byhour_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;byminute_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;bysecond_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	return occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_generate_set_monthly	(RecurData *recur_data,</div><div class='del'>-				 CalRecurVTable *vtable,</div><div class='del'>-				 CalObjTime *occ)</div><div class='del'>-{</div><div class='del'>-	GArray *occs, *occs2;</div><div class='del'>-</div><div class='del'>-	/* We start with just the one time in each set. */</div><div class='del'>-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-	g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-	occs = (*vtable-&gt;bymonth_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	/* We need to combine the output of BYMONTHDAY &amp; BYDAY, by doing them</div><div class='del'>-	   in parallel rather than sequentially. If we did them sequentially</div><div class='del'>-	   then we would lose the occurrences generated by BYMONTHDAY, and</div><div class='del'>-	   instead have repetitions of the occurrences from BYDAY. */</div><div class='del'>-	if (recur_data-&gt;recur-&gt;bymonthday &amp;&amp; recur_data-&gt;recur-&gt;byday) {</div><div class='del'>-		occs2 = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-		g_array_append_vals (occs2, occs-&gt;data, occs-&gt;len);</div><div class='del'>-</div><div class='del'>-		occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-		occs2 = (*vtable-&gt;byday_filter) (recur_data, occs2);</div><div class='del'>-</div><div class='del'>-		g_array_append_vals (occs, occs2-&gt;data, occs2-&gt;len);</div><div class='del'>-		g_array_free (occs2, TRUE);</div><div class='del'>-	} else {</div><div class='del'>-		occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-		occs = (*vtable-&gt;byday_filter) (recur_data, occs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	occs = (*vtable-&gt;byhour_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;byminute_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;bysecond_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	return occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_generate_set_default	(RecurData *recur_data,</div><div class='del'>-				 CalRecurVTable *vtable,</div><div class='del'>-				 CalObjTime *occ)</div><div class='del'>-{</div><div class='del'>-	GArray *occs;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Generating set for %i/%i/%i %02i:%02i:%02i\n",</div><div class='del'>-		 occ-&gt;day, occ-&gt;month + 1, occ-&gt;year, occ-&gt;hour, occ-&gt;minute,</div><div class='del'>-		 occ-&gt;second);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* We start with just the one time in the set. */</div><div class='del'>-	occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-	g_array_append_vals (occs, occ, 1);</div><div class='del'>-</div><div class='del'>-	occs = (*vtable-&gt;bymonth_filter) (recur_data, occs);</div><div class='del'>-	if (vtable-&gt;byweekno_filter)</div><div class='del'>-		occs = (*vtable-&gt;byweekno_filter) (recur_data, occs);</div><div class='del'>-	if (vtable-&gt;byyearday_filter)</div><div class='del'>-		occs = (*vtable-&gt;byyearday_filter) (recur_data, occs);</div><div class='del'>-	if (vtable-&gt;bymonthday_filter)</div><div class='del'>-		occs = (*vtable-&gt;bymonthday_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;byday_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	occs = (*vtable-&gt;byhour_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;byminute_filter) (recur_data, occs);</div><div class='del'>-	occs = (*vtable-&gt;bysecond_filter) (recur_data, occs);</div><div class='del'>-</div><div class='del'>-	return occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the function table corresponding to the recurrence frequency. */</div><div class='del'>-static CalRecurVTable* cal_obj_get_vtable (icalrecurrencetype_frequency recur_type)</div><div class='del'>-{</div><div class='del'>-	CalRecurVTable* vtable;</div><div class='del'>-</div><div class='del'>-	switch (recur_type) {</div><div class='del'>-	case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_yearly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_monthly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_WEEKLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_weekly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_DAILY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_daily_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_HOURLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_hourly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_MINUTELY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_minutely_vtable;</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_SECONDLY_RECURRENCE:</div><div class='del'>-		vtable = &amp;cal_obj_secondly_vtable;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning ("Unknown recurrence frequenct");</div><div class='del'>-		vtable = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return vtable;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This creates a number of fast lookup tables used when filtering with the</div><div class='del'>-   modifier properties BYMONTH, BYYEARDAY etc. */</div><div class='del'>-static void</div><div class='del'>-cal_obj_initialize_recur_data (RecurData  *recur_data,</div><div class='del'>-			       CalRecurrence *recur,</div><div class='del'>-			       CalObjTime *event_start)</div><div class='del'>-{</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint month, yearday, monthday, weekday, week_num, hour, minute, second;</div><div class='del'>-</div><div class='del'>-	/* Clear the entire RecurData. */</div><div class='del'>-	memset (recur_data, 0, sizeof (RecurData));</div><div class='del'>-</div><div class='del'>-	recur_data-&gt;recur = recur;</div><div class='del'>-</div><div class='del'>-	/* Set the weekday, used for the WEEKLY frequency and the BYWEEKNO</div><div class='del'>-	   modifier. */</div><div class='del'>-	recur_data-&gt;weekday = 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 = NULL, *last_occ_kept;</div><div class='del'>-	gint i, j = 0, cmp, ex_index, occs_len, ex_occs_len;</div><div class='del'>-	gboolean keep_occ, current_time_is_exception = FALSE;</div><div class='del'>-</div><div class='del'>-	if (occs-&gt;len == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	ex_index = 0;</div><div class='del'>-	occs_len = occs-&gt;len;</div><div class='del'>-	ex_occs_len = ex_occs-&gt;len;</div><div class='del'>-</div><div class='del'>-	if (ex_occs_len &gt; 0)</div><div class='del'>-		ex_occ = &amp;g_array_index (ex_occs, CalObjTime, ex_index);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; occs_len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		keep_occ = TRUE;</div><div class='del'>-</div><div class='del'>-		/* If the occurrence is a duplicate of the previous one, skip</div><div class='del'>-		   it. */</div><div class='del'>-		if (prev_occ</div><div class='del'>-		    &amp;&amp; cal_obj_time_compare_func (occ, prev_occ) == 0) {</div><div class='del'>-			keep_occ = FALSE;</div><div class='del'>-</div><div class='del'>-			/* If this occurrence is an RDATE, and the previous</div><div class='del'>-			   occurrence in the array was kept, set the RDATE flag</div><div class='del'>-			   of the last one, so we still use the end date</div><div class='del'>-			   or duration. */</div><div class='del'>-			if (occ-&gt;is_rdate &amp;&amp; !current_time_is_exception) {</div><div class='del'>-				last_occ_kept = &amp;g_array_index (occs,</div><div class='del'>-								CalObjTime,</div><div class='del'>-								j - 1);</div><div class='del'>-				last_occ_kept-&gt;is_rdate = TRUE;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* We've found a new occurrence time. Reset the flag</div><div class='del'>-			   to indicate that it hasn't been found in the</div><div class='del'>-			   exceptions array (yet). */</div><div class='del'>-			current_time_is_exception = FALSE;</div><div class='del'>-</div><div class='del'>-			if (ex_occ) {</div><div class='del'>-				/* Step through the exceptions until we come</div><div class='del'>-				   to one that matches or follows this</div><div class='del'>-				   occurrence. */</div><div class='del'>-				while (ex_occ) {</div><div class='del'>-					cmp = cal_obj_time_compare_func (ex_occ, occ);</div><div class='del'>-					/* I'm pretty sure this is wrong. */</div><div class='del'>-					/*cmp = cal_obj_date_only_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</div><div class='del'>-					   ex_occ to NULL when we reach the</div><div class='del'>-					   end of array. */</div><div class='del'>-					ex_index++;</div><div class='del'>-					if (ex_index &lt; ex_occs_len)</div><div class='del'>-						ex_occ = &amp;g_array_index (ex_occs, CalObjTime, ex_index);</div><div class='del'>-					else</div><div class='del'>-						ex_occ = NULL;</div><div class='del'>-</div><div class='del'>-					/* If the exception did match this</div><div class='del'>-					   occurrence we remove it, and set the</div><div class='del'>-					   flag to indicate that the current</div><div class='del'>-					   time is an exception. */</div><div class='del'>-					if (cmp == 0) {</div><div class='del'>-						current_time_is_exception = TRUE;</div><div class='del'>-						keep_occ = FALSE;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (keep_occ) {</div><div class='del'>-			if (i != j)</div><div class='del'>-				g_array_index (occs, CalObjTime, j)</div><div class='del'>-					= g_array_index (occs, CalObjTime, i);</div><div class='del'>-			j++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prev_occ = occ;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (occs, j);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bysetpos_filter (CalRecurrence *recur,</div><div class='del'>-			 GArray	    *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, pos;</div><div class='del'>-</div><div class='del'>-	/* If BYSETPOS has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	elem = recur-&gt;bysetpos;</div><div class='del'>-	if (!elem || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	/* Iterate over the indices given in bysetpos, adding the corresponding</div><div class='del'>-	   element from occs to new_occs. */</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	while (elem) {</div><div class='del'>-		pos = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-</div><div class='del'>-		/* Negative values count back from the end of the array. */</div><div class='del'>-		if (pos &lt; 0)</div><div class='del'>-			pos += len;</div><div class='del'>-</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_add_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_add_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_add_days (&amp;cotime, weekno * 7);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Skip occurrences if they fall outside the year. */</div><div class='del'>-			if (cotime.year == occ-&gt;year)</div><div class='del'>-				g_array_append_val (new_occs, cotime);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-/* This isn't used at present. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byweekno_filter		(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	return occs;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byyearday_expand	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ, year_start_cotime, year_end_cotime, cotime;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, dayno;</div><div class='del'>-</div><div class='del'>-	/* If BYYEARDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byyearday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to day 1. */</div><div class='del'>-		year_start_cotime = *occ;</div><div class='del'>-		year_start_cotime.month = 0;</div><div class='del'>-		year_start_cotime.day = 1;</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to day 1 of the next</div><div class='del'>-		   year, which we use for -ve day numbers. */</div><div class='del'>-		year_end_cotime = *occ;</div><div class='del'>-		year_end_cotime.year++;</div><div class='del'>-		year_end_cotime.month = 0;</div><div class='del'>-		year_end_cotime.day = 1;</div><div class='del'>-</div><div class='del'>-		/* Now iterate over the day numbers in byyearday, generating a</div><div class='del'>-		   new occurrence for each one. */</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byyearday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			dayno = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			if (dayno &gt; 0) {</div><div class='del'>-				cotime = year_start_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, dayno - 1);</div><div class='del'>-			} else {</div><div class='del'>-				cotime = year_end_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, dayno);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Skip occurrences if they fall outside the year. */</div><div class='del'>-			if (cotime.year == occ-&gt;year)</div><div class='del'>-				g_array_append_val (new_occs, cotime);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note: occs must not contain invalid dates, e.g. 31st September. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byyearday_filter	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint yearday, len, i, days_in_year;</div><div class='del'>-</div><div class='del'>-	/* If BYYEARDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byyearday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		yearday = cal_obj_time_day_of_year (occ);</div><div class='del'>-		if (recur_data-&gt;yeardays[yearday]) {</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		} else {</div><div class='del'>-			days_in_year = g_date_is_leap_year (occ-&gt;year)</div><div class='del'>-				? 366 : 365;</div><div class='del'>-			if (recur_data-&gt;neg_yeardays[days_in_year + 1</div><div class='del'>-						    - yearday])</div><div class='del'>-				g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bymonthday_expand	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ, month_start_cotime, month_end_cotime, cotime;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, dayno;</div><div class='del'>-</div><div class='del'>-	/* If BYMONTHDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;bymonthday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to day 1. */</div><div class='del'>-		month_start_cotime = *occ;</div><div class='del'>-		month_start_cotime.day = 1;</div><div class='del'>-</div><div class='del'>-		/* Find the day that would correspond to day 1 of the next</div><div class='del'>-		   month, which we use for -ve day numbers. */</div><div class='del'>-		month_end_cotime = *occ;</div><div class='del'>-		month_end_cotime.month++;</div><div class='del'>-		month_end_cotime.day = 1;</div><div class='del'>-</div><div class='del'>-		/* Now iterate over the day numbers in bymonthday, generating a</div><div class='del'>-		   new occurrence for each one. */</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;bymonthday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			dayno = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			if (dayno &gt; 0) {</div><div class='del'>-				cotime = month_start_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, dayno - 1);</div><div class='del'>-			} else {</div><div class='del'>-				cotime = month_end_cotime;</div><div class='del'>-				cal_obj_time_add_days (&amp;cotime, dayno);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Skip occurrences if they fall outside the month. */</div><div class='del'>-			if (cotime.month == occ-&gt;month)</div><div class='del'>-				g_array_append_val (new_occs, cotime);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_bymonthday_filter	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	gint len, i, days_in_month;</div><div class='del'>-</div><div class='del'>-	/* If BYMONTHDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;bymonthday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-		if (recur_data-&gt;monthdays[occ-&gt;day]) {</div><div class='del'>-			g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		} else {</div><div class='del'>-			days_in_month = time_days_in_month (occ-&gt;year,</div><div class='del'>-							    occ-&gt;month);</div><div class='del'>-			if (recur_data-&gt;neg_monthdays[days_in_month + 1</div><div class='del'>-						     - occ-&gt;day])</div><div class='del'>-				g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byday_expand_yearly	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, weekday, week_num;</div><div class='del'>-	gint first_weekday, last_weekday, offset;</div><div class='del'>-	guint16 year;</div><div class='del'>-</div><div class='del'>-	/* If BYDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			weekday = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-			week_num = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-</div><div class='del'>-			year = occ-&gt;year;</div><div class='del'>-			if (week_num == 0) {</div><div class='del'>-				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_add_days (occ, -offset);</div><div class='del'>-				if (occ-&gt;year == year)</div><div class='del'>-					g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Reset the year, as we may have gone past the end. */</div><div class='del'>-			occ-&gt;year = year;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byday_expand_monthly	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, weekday, week_num;</div><div class='del'>-	gint first_weekday, last_weekday, offset;</div><div class='del'>-	guint16 year;</div><div class='del'>-	guint8 month;</div><div class='del'>-</div><div class='del'>-	/* If BYDAY has not been specified, or the array is empty, just</div><div class='del'>-	   return the array. */</div><div class='del'>-	if (!recur_data-&gt;recur-&gt;byday || occs-&gt;len == 0)</div><div class='del'>-		return occs;</div><div class='del'>-</div><div class='del'>-	new_occs = g_array_new (FALSE, FALSE, sizeof (CalObjTime));</div><div class='del'>-</div><div class='del'>-	len = occs-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		occ = &amp;g_array_index (occs, CalObjTime, i);</div><div class='del'>-</div><div class='del'>-		elem = recur_data-&gt;recur-&gt;byday;</div><div class='del'>-		while (elem) {</div><div class='del'>-			weekday = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-			week_num = GPOINTER_TO_INT (elem-&gt;data);</div><div class='del'>-			elem = elem-&gt;next;</div><div class='del'>-</div><div class='del'>-			year = occ-&gt;year;</div><div class='del'>-			month = occ-&gt;month;</div><div class='del'>-			if (week_num == 0) {</div><div class='del'>-				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_add_days (occ, -offset);</div><div class='del'>-				if (occ-&gt;year == year &amp;&amp; occ-&gt;month == month)</div><div class='del'>-					g_array_append_vals (new_occs, occ, 1);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Reset the year &amp; month, as we may have gone past</div><div class='del'>-			   the end. */</div><div class='del'>-			occ-&gt;year = year;</div><div class='del'>-			occ-&gt;month = month;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_free (occs, TRUE);</div><div class='del'>-</div><div class='del'>-	return new_occs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note: occs must not contain invalid dates, e.g. 31st September. */</div><div class='del'>-static GArray*</div><div class='del'>-cal_obj_byday_expand_weekly	(RecurData  *recur_data,</div><div class='del'>-				 GArray     *occs)</div><div class='del'>-{</div><div class='del'>-	GArray *new_occs;</div><div class='del'>-	CalObjTime *occ;</div><div class='del'>-	GList *elem;</div><div class='del'>-	gint len, i, weekday, week_num;</div><div class='del'>-	gint 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'>-			cal_obj_time_add_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'>-	if (days &gt;= 0) {</div><div class='del'>-		for (;;) {</div><div class='del'>-			days_in_month = time_days_in_month (cotime-&gt;year,</div><div class='del'>-							    cotime-&gt;month);</div><div class='del'>-			if (day &lt;= days_in_month)</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			cotime-&gt;month++;</div><div class='del'>-			if (cotime-&gt;month &gt;= 12) {</div><div class='del'>-				cotime-&gt;year++;</div><div class='del'>-				cotime-&gt;month = 0;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			day -= days_in_month;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cotime-&gt;day = (guint8) day;</div><div class='del'>-	} else {</div><div class='del'>-		while (day &lt;= 0) {</div><div class='del'>-			if (cotime-&gt;month == 0) {</div><div class='del'>-				cotime-&gt;year--;</div><div class='del'>-				cotime-&gt;month = 11;</div><div class='del'>-			} else {</div><div class='del'>-				cotime-&gt;month--;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			days_in_month = time_days_in_month (cotime-&gt;year,</div><div class='del'>-							    cotime-&gt;month);</div><div class='del'>-</div><div class='del'>-			day += days_in_month;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cotime-&gt;day = (guint8) day;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive 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'>-	gint hour, days;</div><div class='del'>-</div><div class='del'>-	/* We use a gint to avoid overflow on the guint8. */</div><div class='del'>-	hour = cotime-&gt;hour + hours;</div><div class='del'>-	cotime-&gt;hour = hour % 24;</div><div class='del'>-	if (hour &gt;= 0) {</div><div class='del'>-		if (hour &gt;= 24)</div><div class='del'>-			cal_obj_time_add_days (cotime, hour / 24);</div><div class='del'>-	} else {</div><div class='del'>-		days = hour / 24;</div><div class='del'>-		if (cotime-&gt;hour != 0) {</div><div class='del'>-			cotime-&gt;hour += 24;</div><div class='del'>-			days -= 1;</div><div class='del'>-		}</div><div class='del'>-		cal_obj_time_add_days (cotime, days);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive 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'>-	gint minute, hours;</div><div class='del'>-</div><div class='del'>-	/* We use a gint to avoid overflow on the guint8. */</div><div class='del'>-	minute = cotime-&gt;minute + minutes;</div><div class='del'>-	cotime-&gt;minute = minute % 60;</div><div class='del'>-	if (minute &gt;= 0) {</div><div class='del'>-		if (minute &gt;= 60)</div><div class='del'>-			cal_obj_time_add_hours (cotime, minute / 60);</div><div class='del'>-	} else {</div><div class='del'>-		hours = minute / 60;</div><div class='del'>-		if (cotime-&gt;minute != 0) {</div><div class='del'>-			cotime-&gt;minute += 60;</div><div class='del'>-			hours -= 1;</div><div class='del'>-		}</div><div class='del'>-		cal_obj_time_add_hours (cotime, hours);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Adds a positive 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'>-	gint second, minutes;</div><div class='del'>-</div><div class='del'>-	/* We use a gint to avoid overflow on the guint8. */</div><div class='del'>-	second = cotime-&gt;second + seconds;</div><div class='del'>-	cotime-&gt;second = second % 60;</div><div class='del'>-	if (second &gt;= 0) {</div><div class='del'>-		if (second &gt;= 60)</div><div class='del'>-			cal_obj_time_add_minutes (cotime, second / 60);</div><div class='del'>-	} else {</div><div class='del'>-		minutes = second / 60;</div><div class='del'>-		if (cotime-&gt;second != 0) {</div><div class='del'>-			cotime-&gt;second += 60;</div><div class='del'>-			minutes -= 1;</div><div class='del'>-		}</div><div class='del'>-		cal_obj_time_add_minutes (cotime, minutes);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Compares 2 CalObjTimes. Returns -1 if the cotime1 is before cotime2, 0 if</div><div class='del'>-   they are the same, or 1 if cotime1 is after cotime2. The comparison type</div><div class='del'>-   specifies which parts of the times we are interested in, e.g. if CALOBJ_DAY</div><div class='del'>-   is used we only want to know if the days are different. */</div><div class='del'>-static gint</div><div class='del'>-cal_obj_time_compare		(CalObjTime *cotime1,</div><div class='del'>-				 CalObjTime *cotime2,</div><div class='del'>-				 CalObjTimeComparison type)</div><div class='del'>-{</div><div class='del'>-	if (cotime1-&gt;year &lt; cotime2-&gt;year)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;year &gt; cotime2-&gt;year)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_YEAR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;month &lt; cotime2-&gt;month)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;month &gt; cotime2-&gt;month)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_MONTH)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;day &lt; cotime2-&gt;day)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;day &gt; cotime2-&gt;day)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_DAY)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;hour &lt; cotime2-&gt;hour)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;hour &gt; cotime2-&gt;hour)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_HOUR)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;minute &lt; cotime2-&gt;minute)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;minute &gt; cotime2-&gt;minute)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (type == CALOBJ_MINUTE)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;second &lt; cotime2-&gt;second)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;second &gt; cotime2-&gt;second)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This is the same as the above function, but without the comparison type.</div><div class='del'>-   It is used for qsort(). */</div><div class='del'>-static gint</div><div class='del'>-cal_obj_time_compare_func (const void *arg1,</div><div class='del'>-			   const void *arg2)</div><div class='del'>-{</div><div class='del'>-	CalObjTime *cotime1, *cotime2;</div><div class='del'>-	gint retval;</div><div class='del'>-</div><div class='del'>-	cotime1 = (CalObjTime*) arg1;</div><div class='del'>-	cotime2 = (CalObjTime*) arg2;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;year &lt; cotime2-&gt;year)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;year &gt; cotime2-&gt;year)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;month &lt; cotime2-&gt;month)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;month &gt; cotime2-&gt;month)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;day &lt; cotime2-&gt;day)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;day &gt; cotime2-&gt;day)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;hour &lt; cotime2-&gt;hour)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;hour &gt; cotime2-&gt;hour)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;minute &lt; cotime2-&gt;minute)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;minute &gt; cotime2-&gt;minute)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else if (cotime1-&gt;second &lt; cotime2-&gt;second)</div><div class='del'>-		retval = -1;</div><div class='del'>-	else if (cotime1-&gt;second &gt; cotime2-&gt;second)</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	else</div><div class='del'>-		retval = 0;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("%s - ", cal_obj_time_to_string (cotime1));</div><div class='del'>-	g_print ("%s : %i\n", cal_obj_time_to_string (cotime2), retval);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-cal_obj_date_only_compare_func (const void *arg1,</div><div class='del'>-				const void *arg2)</div><div class='del'>-{</div><div class='del'>-	CalObjTime *cotime1, *cotime2;</div><div class='del'>-</div><div class='del'>-	cotime1 = (CalObjTime*) arg1;</div><div class='del'>-	cotime2 = (CalObjTime*) arg2;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;year &lt; cotime2-&gt;year)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;year &gt; cotime2-&gt;year)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;month &lt; cotime2-&gt;month)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;month &gt; cotime2-&gt;month)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	if (cotime1-&gt;day &lt; cotime2-&gt;day)</div><div class='del'>-		return -1;</div><div class='del'>-	if (cotime1-&gt;day &gt; cotime2-&gt;day)</div><div class='del'>-		return 1;</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 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'>-				 CalRecurrence *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'>-	cal_obj_time_add_days (cotime, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_object_time_from_time (CalObjTime *cotime,</div><div class='del'>-			   time_t      t)</div><div class='del'>-{</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'>-	cotime-&gt;is_rdate = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Debugging function to convert a CalObjTime to a string. It uses a static</div><div class='del'>-   buffer so beware. */</div><div class='del'>-#ifdef CAL_OBJ_DEBUG</div><div class='del'>-static char*</div><div class='del'>-cal_obj_time_to_string	(CalObjTime *cotime)</div><div class='del'>-{</div><div class='del'>-	static char buffer[20];</div><div class='del'>-</div><div class='del'>-	sprintf (buffer, "%02i/%02i/%04i %02i:%02i:%02i",</div><div class='del'>-		 cotime-&gt;day, cotime-&gt;month + 1, cotime-&gt;year,</div><div class='del'>-		 cotime-&gt;hour, cotime-&gt;minute, cotime-&gt;second);</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This recalculates the end dates for recurrence &amp; exception rules which use</div><div class='del'>-   the COUNT property. If refresh is TRUE it will recalculate all enddates</div><div class='del'>-   for rules which use COUNT. If refresh is FALSE, it will only calculate</div><div class='del'>-   the enddate if it hasn't already been set. It returns TRUE if the component</div><div class='del'>-   was changed, i.e. if the component should be saved at some point.</div><div class='del'>-   We store the enddate in the "X-EVOLUTION-ENDDATE" parameter of the RRULE</div><div class='del'>-   or EXRULE. */</div><div class='del'>-static gboolean</div><div class='del'>-cal_recur_ensure_end_dates (CalComponent	*comp,</div><div class='del'>-			    gboolean		 refresh)</div><div class='del'>-{</div><div class='del'>-	GSList *rrules, *exrules, *elem;</div><div class='del'>-	gboolean changed = FALSE;</div><div class='del'>-</div><div class='del'>-	/* Do the RRULEs. */</div><div class='del'>-	cal_component_get_rrule_property_list (comp, &amp;rrules);</div><div class='del'>-	for (elem = rrules; elem; elem = elem-&gt;next) {</div><div class='del'>-		changed |= cal_recur_ensure_rule_end_date (comp, elem-&gt;data,</div><div class='del'>-							   FALSE, refresh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Do the EXRULEs. */</div><div class='del'>-	cal_component_get_exrule_property_list (comp, &amp;exrules);</div><div class='del'>-	for (elem = exrules; elem; elem = elem-&gt;next) {</div><div class='del'>-		changed |= cal_recur_ensure_rule_end_date (comp, elem-&gt;data,</div><div class='del'>-							   TRUE, refresh);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CalRecurEnsureEndDateData CalRecurEnsureEndDateData;</div><div class='del'>-struct _CalRecurEnsureEndDateData {</div><div class='del'>-	gint count;</div><div class='del'>-	gint instances;</div><div class='del'>-	time_t end_date;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_recur_ensure_rule_end_date (CalComponent			*comp,</div><div class='del'>-				icalproperty			*prop,</div><div class='del'>-				gboolean			 exception,</div><div class='del'>-				gboolean			 refresh)</div><div class='del'>-{</div><div class='del'>-	struct icalrecurrencetype rule;</div><div class='del'>-	CalRecurEnsureEndDateData cb_data;</div><div class='del'>-</div><div class='del'>-	if (exception)</div><div class='del'>-		rule = icalproperty_get_exrule (prop);</div><div class='del'>-	else</div><div class='del'>-		rule = icalproperty_get_rrule (prop);</div><div class='del'>-</div><div class='del'>-	/* If the rule doesn't use COUNT just return. */</div><div class='del'>-	if (rule.count == 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* If refresh is FALSE, we check if the enddate is already set, and</div><div class='del'>-	   if it is we just return. */</div><div class='del'>-	if (!refresh) {</div><div class='del'>-		if (cal_recur_get_rule_end_date (prop) != -1)</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the end date. */</div><div class='del'>-	cb_data.count = rule.count;</div><div class='del'>-	cb_data.instances = 0;</div><div class='del'>-	cal_recur_generate_instances_of_rule (comp, prop, -1, -1,</div><div class='del'>-					      cal_recur_ensure_rule_end_date_cb,</div><div class='del'>-					      &amp;cb_data);</div><div class='del'>-</div><div class='del'>-	/* Store the end date in the "X-EVOLUTION-ENDDATE" parameter of the</div><div class='del'>-	   rule. */</div><div class='del'>-	cal_recur_set_rule_end_date (prop, cb_data.end_date);</div><div class='del'>-		</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_recur_ensure_rule_end_date_cb	(CalComponent	*comp,</div><div class='del'>-					 time_t		 instance_start,</div><div class='del'>-					 time_t		 instance_end,</div><div class='del'>-					 gpointer	 data)</div><div class='del'>-{</div><div class='del'>-	CalRecurEnsureEndDateData *cb_data;</div><div class='del'>-</div><div class='del'>-	cb_data = (CalRecurEnsureEndDateData*) data;</div><div class='del'>-</div><div class='del'>-	cb_data-&gt;instances++;</div><div class='del'>-</div><div class='del'>-	if (cb_data-&gt;instances == cb_data-&gt;count) {</div><div class='del'>-		cb_data-&gt;end_date = instance_start;</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static time_t</div><div class='del'>-cal_recur_get_rule_end_date	(icalproperty	*prop)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	char *xname, *xvalue;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	struct icaltimetype icaltime;</div><div class='del'>-</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);</div><div class='del'>-	while (param) {</div><div class='del'>-		xname = icalparameter_get_xname (param);</div><div class='del'>-		if (xname &amp;&amp; !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {</div><div class='del'>-			xvalue = icalparameter_get_x (param);</div><div class='del'>-			value = icalvalue_new_from_string (ICAL_DATETIME_VALUE,</div><div class='del'>-							   xvalue);</div><div class='del'>-			if (value) {</div><div class='del'>-				icaltime = icalvalue_get_datetime (value);</div><div class='del'>-				icalvalue_free (value);</div><div class='del'>-</div><div class='del'>-				return icaltime_as_timet (icaltime);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		param = icalproperty_get_next_parameter (prop,</div><div class='del'>-							 ICAL_X_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_recur_set_rule_end_date	(icalproperty	*prop,</div><div class='del'>-				 time_t		 end_date)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	struct icaltimetype icaltime;</div><div class='del'>-	char *end_date_string, *xname;</div><div class='del'>-</div><div class='del'>-	icaltime = icaltime_from_timet (end_date, FALSE, FALSE);</div><div class='del'>-	value = icalvalue_new_datetime (icaltime);</div><div class='del'>-	end_date_string = icalvalue_as_ical_string (value);</div><div class='del'>-	icalvalue_free (value);</div><div class='del'>-</div><div class='del'>-	/* If we already have an X-EVOLUTION-ENDDATE parameter, set the value</div><div class='del'>-	   to the new date-time. */</div><div class='del'>-	param = icalproperty_get_first_parameter (prop, ICAL_X_PARAMETER);</div><div class='del'>-	while (param) {</div><div class='del'>-		xname = icalparameter_get_xname (param);</div><div class='del'>-		if (xname &amp;&amp; !strcmp (xname, EVOLUTION_END_DATE_PARAMETER)) {</div><div class='del'>-			icalparameter_set_x (param, end_date_string);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		param = icalproperty_get_next_parameter (prop, ICAL_X_PARAMETER);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create a new X-EVOLUTION-ENDDATE and add it to the property. */</div><div class='del'>-	param = icalparameter_new_x (end_date_string);</div><div class='del'>-	icalparameter_set_xname (param, EVOLUTION_END_DATE_PARAMETER);</div><div class='del'>-	icalproperty_add_parameter (prop, param);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/cal-util/cal-recur.h b/calendar/cal-util/cal-recur.h<br/>deleted file mode 100644<br/>index de5a139f78..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-recur.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/cal-recur.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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 &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-typedef gboolean (* CalRecurInstanceFn) (CalComponent *comp,</div><div class='del'>-					 time_t        instance_start,</div><div class='del'>-					 time_t        instance_end,</div><div class='del'>-					 gpointer      data);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calls the given callback function for each occurrence of the event that</div><div class='del'>- * intersects the range between the given start and end times (the end time is</div><div class='del'>- * not included). Note that the occurrences may start before the given start</div><div class='del'>- * time.</div><div class='del'>- *</div><div class='del'>- * If the callback routine returns FALSE the occurrence generation stops.</div><div class='del'>- *</div><div class='del'>- * Both start and end can be -1, in which case we start at the events first</div><div class='del'>- * instance and continue until it ends, or forever if it has no enddate.</div><div class='del'>- */</div><div class='del'>-void	cal_recur_generate_instances	(CalComponent		*comp,</div><div class='del'>-					 time_t			 start,</div><div class='del'>-					 time_t			 end,</div><div class='del'>-					 CalRecurInstanceFn	 cb,</div><div class='del'>-					 gpointer                cb_data);</div><div class='del'>-</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 bfb9c88fff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-util.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/cal-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,124 +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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_obj_instance_list_free:</div><div class='del'>- * @list: List of #CalObjInstance structures.</div><div class='del'>- * </div><div class='del'>- * Frees a list of #CalObjInstance structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_obj_instance_list_free (GList *list)</div><div class='del'>-{</div><div class='del'>-	CalObjInstance *i;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		i = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_assert (i != NULL);</div><div class='del'>-		g_assert (i-&gt;uid != NULL);</div><div class='del'>-</div><div class='del'>-		g_free (i-&gt;uid);</div><div class='del'>-		g_free (i);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_obj_change_list_free:</div><div class='del'>- * @list: List of #CalObjChange structures.</div><div class='del'>- * </div><div class='del'>- * Frees a list of #CalObjChange structures.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_obj_change_list_free (GList *list)</div><div class='del'>-{</div><div class='del'>-	CalObjChange *c;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		c = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_assert (c != NULL);</div><div class='del'>-		g_assert (c-&gt;uid != NULL);</div><div class='del'>-</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'>-	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 243cc34105..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/cal-util.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/cal-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +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'>-</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'>-typedef enum {</div><div class='del'>-	CALOBJ_UPDATED = 1 &lt;&lt; 0,</div><div class='del'>-	CALOBJ_REMOVED = 1 &lt;&lt; 1</div><div class='del'>-} CalObjChangeType;</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	char *uid;</div><div class='del'>-	CalObjChangeType type;</div><div class='del'>-} CalObjChange;</div><div class='del'>-</div><div class='del'>-void cal_obj_change_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'>-#if 0</div><div class='del'>-	enum AlarmType type;		/* Type of alarm */</div><div class='del'>-#endif</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_ANY     = 0x07</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='del'>-</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 bcb1b9bb88..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/calobj.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/calobj.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2008 +0,0 @@</div><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 ((unsigned char) **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 ((unsigned char) **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'>-		/* There seems to be a problem with the URL property. For some</div><div class='del'>-		   reason an empty property gets saved, vObjectUStringZValue</div><div class='del'>-		   returns NULL and fakeCString crashes. So we check for NULL.</div><div class='del'>-		*/</div><div class='del'>-		const wchar_t *zval;</div><div class='del'>-</div><div class='del'>-		zval = vObjectUStringZValue (o);</div><div class='del'>-		if (zval) {</div><div class='del'>-			the_str = fakeCString (zval);</div><div class='del'>-			ical-&gt;url = g_strdup (the_str);</div><div class='del'>-			free (the_str);</div><div class='del'>-		}</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 3caef945e2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/calobj.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/calobj.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,312 +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. These are also used to</div><div class='del'>-   identify columns in ECalendarTable, so be careful when reordering them. */</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_ICON,	      /* not a real field */</div><div class='del'>-	ICAL_OBJECT_FIELD_COMPLETE,   /* not a real field */</div><div class='del'>-	ICAL_OBJECT_FIELD_RECURRING,  /* not a real field */</div><div class='del'>-	ICAL_OBJECT_FIELD_OVERDUE,    /* not a real field */</div><div class='del'>-	ICAL_OBJECT_FIELD_COLOR,      /* 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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 c43d0fba77..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/icalendar.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/icalendar.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,673 +0,0 @@</div><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 (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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 6ec214b18b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/test-recur.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/test-recur.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,173 +0,0 @@</div><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'>- * FIXME: Needs to be updated to just use the public interface.</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;gtk/gtk.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-recur.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Since events can recur infinitely, we set a limit to the number of</div><div class='del'>-   occurrences we output. */</div><div class='del'>-#define MAX_OCCURRENCES	1000</div><div class='del'>-</div><div class='del'>-static void usage			(void);</div><div class='del'>-static icalcomponent* scan_ics_file	(char		*filename);</div><div class='del'>-static char* get_line			(char		*s,</div><div class='del'>-					 size_t		 size,</div><div class='del'>-					 void		*data);</div><div class='del'>-static void generate_occurrences	(icalcomponent	*comp);</div><div class='del'>-static gboolean occurrence_cb		(CalComponent	*comp,</div><div class='del'>-					 time_t		 instance_start,</div><div class='del'>-					 time_t		 instance_end,</div><div class='del'>-					 gpointer	 data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main			(int		 argc,</div><div class='del'>-			 char		*argv[])</div><div class='del'>-{</div><div class='del'>-	gchar *filename;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	gtk_init (&amp;argc, &amp;argv);</div><div class='del'>-</div><div class='del'>-	if (argc != 2)</div><div class='del'>-		usage ();</div><div class='del'>-</div><div class='del'>-	filename = argv[1];</div><div class='del'>-</div><div class='del'>-	icalcomp = scan_ics_file (filename);</div><div class='del'>-	if (icalcomp)</div><div class='del'>-		generate_occurrences	(icalcomp);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-usage			(void)</div><div class='del'>-{</div><div class='del'>-	g_print ("Usage: test-recur &lt;filename&gt;\n");</div><div class='del'>-	exit (1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static icalcomponent*</div><div class='del'>-scan_ics_file		(char		*filename)</div><div class='del'>-{</div><div class='del'>-	FILE *fp;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	icalparser *parser;</div><div class='del'>-</div><div class='del'>-	g_print ("Opening file: %s\n", filename);</div><div class='del'>-	fp = fopen (filename, "r");</div><div class='del'>-</div><div class='del'>-	if (!fp) {</div><div class='del'>-		g_print ("Can't open file: %s\n", filename);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parser = icalparser_new ();</div><div class='del'>-	icalparser_set_gen_data (parser, fp);</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse (parser, get_line);</div><div class='del'>-	icalparser_free (parser);</div><div class='del'>-</div><div class='del'>-	return icalcomp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used from icalparser_parse() */</div><div class='del'>-static char *</div><div class='del'>-get_line		(char		*s,</div><div class='del'>-			 size_t		 size,</div><div class='del'>-			 void		*data)</div><div class='del'>-{</div><div class='del'>-	return fgets (s, size, (FILE*) data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-generate_occurrences	(icalcomponent	*icalcomp)</div><div class='del'>-{</div><div class='del'>-	icalcomponent *tmp_icalcomp;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gint occurrences;</div><div class='del'>-</div><div class='del'>-	for (tmp_icalcomp = icalcomponent_get_first_component (icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-	     tmp_icalcomp;</div><div class='del'>-	     tmp_icalcomp = icalcomponent_get_next_component (icalcomp, ICAL_ANY_COMPONENT)) {</div><div class='del'>-		icalcomponent_kind kind;</div><div class='del'>-</div><div class='del'>-		kind = icalcomponent_isa (tmp_icalcomp);</div><div class='del'>-</div><div class='del'>-		if (!(kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-		      || kind == ICAL_VTODO_COMPONENT</div><div class='del'>-		      || kind == ICAL_VJOURNAL_COMPONENT))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-		if (!cal_component_set_icalcomponent (comp, tmp_icalcomp))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		g_print ("#############################################################################\n");</div><div class='del'>-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));</div><div class='del'>-</div><div class='del'>-		occurrences = 0;</div><div class='del'>-		cal_recur_generate_instances (comp, -1, -1,</div><div class='del'>-					      occurrence_cb, &amp;occurrences);</div><div class='del'>-</div><div class='del'>-		g_print ("%s\n\n", icalcomponent_as_ical_string (tmp_icalcomp));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-occurrence_cb		(CalComponent	*comp,</div><div class='del'>-			 time_t		 instance_start,</div><div class='del'>-			 time_t		 instance_end,</div><div class='del'>-			 gpointer	 data)</div><div class='del'>-{</div><div class='del'>-	char start[32], finish[32];</div><div class='del'>-	gint *occurrences;</div><div class='del'>-</div><div class='del'>-	occurrences = (gint*) data;</div><div class='del'>-</div><div class='del'>-	strcpy (start, ctime (&amp;instance_start));</div><div class='del'>-	start[24] = '\0';</div><div class='del'>-	strcpy (finish, ctime (&amp;instance_end));</div><div class='del'>-	finish[24] = '\0';</div><div class='del'>-</div><div class='del'>-	g_print ("%s - %s\n", start, finish);</div><div class='del'>-</div><div class='del'>-	(*occurrences)++;</div><div class='del'>-	return (*occurrences == MAX_OCCURRENCES) ? FALSE : TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/cal-util/timeutil.c b/calendar/cal-util/timeutil.c<br/>deleted file mode 100644<br/>index a509bd3cba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/timeutil.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/cal-util/timeutil.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,560 +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'>-</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'>-	tm-&gt;tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	if ((new_time = mktime (tm)) == -1){</div><div class='del'>-		g_message ("time_add_day(): mktime() could not handling adding %d days with\n",</div><div class='del'>-			   days);</div><div class='del'>-		print_time_t (time);</div><div class='del'>-		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 b8fa6400d2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/cal-util/timeutil.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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'>-#include &lt;icaltypes.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'>-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/.cvsignore b/calendar/conduits/.cvsignore<br/>deleted file mode 100644<br/>index b840c21800..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile
\ No newline at end of file</div><div class='head'>diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am<br/>deleted file mode 100644<br/>index 906ea61971..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = calendar todo</div><div class='head'>diff --git a/calendar/conduits/calendar/.cvsignore b/calendar/conduits/calendar/.cvsignore<br/>deleted file mode 100644<br/>index 83c86fa189..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-e-calendar.conduit</div><div class='del'>-*.lo</div><div class='del'>-.libs</div><div class='del'>-libecalendar_conduit.la</div><div class='del'>-e-calendar-conduit-control-applet</div><div class='head'>diff --git a/calendar/conduits/calendar/Makefile.am b/calendar/conduits/calendar/Makefile.am<br/>deleted file mode 100644<br/>index d421a710b0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-INCLUDES = 					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/calendar		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical	\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical	\</div><div class='del'>-	-I$(top_builddir)/e-util		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)		\</div><div class='del'>-	$(GNOME_PILOT_CFLAGS)</div><div class='del'>-</div><div class='del'>-# Calendar Capplet</div><div class='del'>-bin_PROGRAMS = e-calendar-conduit-control-applet</div><div class='del'>-</div><div class='del'>-e_calendar_conduit_control_applet_SOURCES = calendar-conduit-control-applet.c</div><div class='del'>-</div><div class='del'>-e_calendar_conduit_control_applet_LDADD = \</div><div class='del'>-		$(CAPPLET_LIBS)  \</div><div class='del'>-		$(GNOME_LIBDIR) \</div><div class='del'>-		$(GNOME_PILOT_LIBS) \</div><div class='del'>-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \</div><div class='del'>-		$(GNOME_CAPPLET_LIBS) \</div><div class='del'>-		$(BONOBO_VFS_GNOME_LIBS) \</div><div class='del'>-		$(GNOME_XML_LIB) \</div><div class='del'>-	        $(GNOMEUI_LIBS) \</div><div class='del'>-                $(INTLLIBS)</div><div class='del'>-</div><div class='del'>-# Calendar Conduit</div><div class='del'>-e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits</div><div class='del'>-e_calendar_conduits_LTLIBRARIES = libecalendar_conduit.la</div><div class='del'>-</div><div class='del'>-libecalendar_conduit_la_SOURCES = 	\</div><div class='del'>-	calendar-conduit.c		\</div><div class='del'>-	calendar-conduit.h		\</div><div class='del'>-	calendar-conduit-config.h</div><div class='del'>-</div><div class='del'>-libecalendar_conduit_la_LIBADD = 					\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la				\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical-static.la		\</div><div class='del'>-	$(top_builddir)/e-util/libeconduit-static.la	 		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)					\</div><div class='del'>-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\</div><div class='del'>-	$(GNOME_LIBDIR) 						\</div><div class='del'>-	$(GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-e-calendar.conduit: e-calendar.conduit.in Makefile</div><div class='del'>-	sed -e 's^\@prefix\@^$(prefix)^g' &lt; $(srcdir)/e-calendar.conduit.in &gt; e-calendar.conduit.tmp \</div><div class='del'>-	&amp;&amp; mv e-calendar.conduit.tmp e-calendar.conduit</div><div class='del'>-</div><div class='del'>-ccenterdir = $(datadir)/control-center</div><div class='del'>-ccenterPalmPilotdir = $(ccenterdir)/Peripherals</div><div class='del'>-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits</div><div class='del'>-ccenterConduits_DATA = e-calendar-conduit-control-applet.desktop </div><div class='del'>-</div><div class='del'>-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits</div><div class='del'>-panelConduits_DATA = $(ccenterConduits_DATA)</div><div class='del'>-</div><div class='del'>-Conduitdir = $(datadir)/gnome-pilot/conduits/</div><div class='del'>-Conduit_DATA = e-calendar.conduit</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	e-calendar.conduit.in \</div><div class='del'>-        $(ccenterConduits_DATA)</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(ccenterConduitsdir)</div><div class='del'>-	$(mkinstalldirs) $(Conduitdir)</div><div class='head'>diff --git a/calendar/conduits/calendar/calendar-conduit-config.h b/calendar/conduits/calendar/calendar-conduit-config.h<br/>deleted file mode 100644<br/>index d0ba28dbb1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit-config.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/calendar-conduit-config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,120 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Calendar Conduit Configuration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</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'>- *          JP Rosevear &lt;jpr@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_CONDUIT_CONFIG_H__</div><div class='del'>-#define __CAL_CONDUIT_CONFIG_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-management.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-config.h&gt;</div><div class='del'>-</div><div class='del'>-/* Configuration info */</div><div class='del'>-typedef struct _ECalConduitCfg ECalConduitCfg;</div><div class='del'>-struct _ECalConduitCfg {</div><div class='del'>-	gboolean open_secret;</div><div class='del'>-	guint32 pilot_id;</div><div class='del'>-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef CAL_CONFIG_LOAD</div><div class='del'>-/* Loads the configuration data */</div><div class='del'>-static void </div><div class='del'>-calconduit_load_configuration (ECalConduitCfg **c, guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",</div><div class='del'>-		    pilot_id);</div><div class='del'>-	</div><div class='del'>-	*c = g_new0 (ECalConduitCfg,1);</div><div class='del'>-	g_assert (*c != NULL);</div><div class='del'>-</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'>-</div><div class='del'>-        /* set in capplets main */</div><div class='del'>-	(*c)-&gt;sync_type = GnomePilotConduitSyncTypeCustom; </div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-	</div><div class='del'>-	(*c)-&gt;pilot_id = pilot_id;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CAL_CONFIG_SAVE</div><div class='del'>-/* Saves the configuration data. */</div><div class='del'>-static void</div><div class='del'>-calconduit_save_configuration (ECalConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",</div><div class='del'>-		    c-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	gnome_config_set_bool ("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'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CAL_CONFIG_DUPE</div><div class='del'>-/* Creates a duplicate of the configuration data */</div><div class='del'>-static ECalConduitCfg*</div><div class='del'>-calconduit_dupe_configuration (ECalConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	ECalConduitCfg *retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (c != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	retval = g_new0 (ECalConduitCfg, 1);</div><div class='del'>-	retval-&gt;sync_type = c-&gt;sync_type;</div><div class='del'>-	retval-&gt;open_secret = c-&gt;open_secret;</div><div class='del'>-	retval-&gt;pilot_id = c-&gt;pilot_id;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef CAL_CONFIG_DESTROY</div><div class='del'>-/* Destroy a configuration */</div><div class='del'>-static void </div><div class='del'>-calconduit_destroy_configuration (ECalConduitCfg **c) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (c != NULL);</div><div class='del'>-	g_return_if_fail (*c != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (*c);</div><div class='del'>-	*c = NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif __CAL_CONDUIT_CONFIG_H__ </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='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 ecd8d84e65..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit-control-applet.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/calendar-conduit-control-applet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,342 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Calendar Conduit Capplet</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</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'>- *          JP Rosevear &lt;jpr@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;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/gnome-pilot-client.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAL_CONFIG_LOAD 1</div><div class='del'>-#define CAL_CONFIG_SAVE 1</div><div class='del'>-#define CAL_CONFIG_DUPE 1</div><div class='del'>-#define CAL_CONFIG_DESTROY 1</div><div class='del'>-#include &lt;calendar-conduit-config.h&gt;</div><div class='del'>-#undef CAL_CONFIG_LOAD</div><div class='del'>-#undef CAL_CONFIG_SAVE</div><div class='del'>-#undef CAL_CONFIG_DUPE</div><div class='del'>-#undef CAL_CONFIG_DESTROY</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'>-GnomePilotConduitManagement *conduit;</div><div class='del'>-GnomePilotConduitConfig *conduit_config;</div><div class='del'>-ECalConduitCfg *origState = NULL;</div><div class='del'>-ECalConduitCfg *curState = NULL;</div><div class='del'>-</div><div class='del'>-static void doTrySettings(GtkWidget *widget, ECalConduitCfg *c);</div><div class='del'>-static void doRevertSettings(GtkWidget *widget, ECalConduitCfg *c);</div><div class='del'>-static void doSaveSettings(GtkWidget *widget, ECalConduitCfg *c);</div><div class='del'>-</div><div class='del'>-static void setStateCfg (GtkWidget *w, ECalConduitCfg *c);</div><div class='del'>-</div><div class='del'>-gint pilotId;</div><div class='del'>-static GnomePilotClient *gpc;</div><div class='del'>-</div><div class='del'>-</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'>-doTrySettings (GtkWidget *widget, ECalConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;sync_type != GnomePilotConduitSyncTypeCustom)</div><div class='del'>-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,</div><div class='del'>-								   c-&gt;sync_type,</div><div class='del'>-								   c-&gt;sync_type,</div><div class='del'>-								   TRUE);</div><div class='del'>-	else</div><div class='del'>-		gnome_pilot_conduit_config_disable (conduit_config);</div><div class='del'>-</div><div class='del'>-	calconduit_save_configuration (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doRevertSettings (GtkWidget *widget, ECalConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	activated = org_activation_state;</div><div class='del'>-	*c = *origState;</div><div class='del'>-	setStateCfg (cfgStateWindow, c);</div><div class='del'>-	doTrySettings (widget, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doSaveSettings (GtkWidget *widget, ECalConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	*origState = *c;</div><div class='del'>-	doTrySettings (widget, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-doHelp (GtkWidget *widget, gpointer data) </div><div class='del'>-{</div><div class='del'>-	GtkWidget *about;</div><div class='del'>-	const gchar *authors[] = {</div><div class='del'>-		_("JP Rosevear &lt;jpr@helixcode.com&gt;"),</div><div class='del'>-		"", _("Original Author:"), </div><div class='del'>-		_("Eskil Heyn Olsen &lt;deity@eskil.dk&gt;"), </div><div class='del'>-		NULL};</div><div class='del'>-  </div><div class='del'>-	about = gnome_about_new (</div><div class='del'>-		_("Evolution Calendar Conduit"), VERSION,</div><div class='del'>-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),</div><div class='del'>-		authors,</div><div class='del'>-		_("Configuration utility for the evolution calendar 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'>-</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'>-</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_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'>-</div><div class='del'>-static void</div><div class='del'>-setStateCfg (GtkWidget *w, ECalConduitCfg *c)</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(w), "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'>-	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) c-&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'>-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), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "help",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doHelp), 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'>-</div><div class='del'>-static void </div><div class='del'>-run_error_dialog(gchar *mesg,...) </div><div class='del'>-{</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'>-</div><div class='del'>-static gint </div><div class='del'>-get_pilot_id_from_gpilotd() </div><div class='del'>-{</div><div class='del'>-	GList *pilots=NULL;</div><div class='del'>-	gint pilot;</div><div class='del'>-	int i,err;</div><div class='del'>-  </div><div class='del'>-	i=0;</div><div class='del'>-	/* we don't worry about leaking here, so pilots isn't freed */</div><div class='del'>-	switch(err = gnome_pilot_client_get_pilots(gpc,&amp;pilots)) {</div><div class='del'>-	case GPILOTD_OK: {</div><div class='del'>-		if(pilots) {</div><div class='del'>-			for(i=0;i&lt;g_list_length(pilots);i++) {</div><div class='del'>-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)-&gt;data); </div><div class='del'>-			}</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'>-				gnome_pilot_client_get_pilot_id_by_name(gpc,</div><div class='del'>-									pilots-&gt;data,  /* this is the first pilot */</div><div class='del'>-									&amp;pilot);</div><div class='del'>-				if(i&gt;1) {</div><div class='del'>-					g_message("too many pilots...");</div><div class='del'>-					/* need a choose here */</div><div class='del'>-				}</div><div class='del'>-				return pilot;</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'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case GPILOTD_ERR_NOT_CONNECTED:</div><div class='del'>-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));</div><div class='del'>-		return -1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);</div><div class='del'>-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));</div><div class='del'>-		return -1;</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'>-int</div><div class='del'>-main (int argc, char *argv[])</div><div class='del'>-{</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'>-	/* Init capplet */</div><div class='del'>-	gnome_capplet_init ("Evolution Calendar conduit control applet", </div><div class='del'>-			    NULL, argc, argv, </div><div class='del'>-			    NULL, 0, NULL);</div><div class='del'>-   </div><div class='del'>-	/* Setup Client */</div><div class='del'>-	gpc = gnome_pilot_client_new ();</div><div class='del'>-	gnome_pilot_client_connect_to_daemon (gpc);</div><div class='del'>-	pilotId = get_pilot_id_from_gpilotd ();</div><div class='del'>-	if (!pilotId) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	/* Put all code to set things up in here */</div><div class='del'>-	conduit = gnome_pilot_conduit_management_new ("e_calendar_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);</div><div class='del'>-	if (conduit == NULL) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	calconduit_load_configuration (&amp;origState, pilotId);</div><div class='del'>-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);</div><div class='del'>-	org_activation_state = activated =</div><div class='del'>-		gnome_pilot_conduit_config_is_enabled (conduit_config,</div><div class='del'>-						       &amp;origState-&gt;sync_type);</div><div class='del'>-</div><div class='del'>-	curState = calconduit_dupe_configuration (origState);</div><div class='del'>-    </div><div class='del'>-	pilot_capplet_setup ();</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'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-	gnome_pilot_conduit_management_destroy (conduit);</div><div class='del'>-	calconduit_destroy_configuration (&amp;origState);</div><div class='del'>-	calconduit_destroy_configuration (&amp;curState);</div><div class='del'>-	</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 b15e8f940c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit-control-applet.desktop?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/calendar-conduit-control-applet.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Calendar conduit</div><div class='del'>-Name[pt_BR]=Conduit calendário</div><div class='del'>-Name[da]=Gnome kalender</div><div class='del'>-Name[es]=Enlace de calendario</div><div class='del'>-Name[fr]=Conduit Calendrier</div><div class='del'>-Name[no]=GNOME kalender</div><div class='del'>-Name[sv]=Kalenderkanal</div><div class='del'>-Name[tr]=Takvim parçasý</div><div class='del'>-Comment=Configure the GnomeCal conduit</div><div class='del'>-Comment[pt_BR]=Configurar o conduit GnomeCal</div><div class='del'>-Comment[da]=Konfigurér GnomeCal-komponent</div><div class='del'>-Comment[es]=Configurar el enlace de calendario</div><div class='del'>-Comment[fr]=Configuration du conduit calendrier</div><div class='del'>-Comment[no]=Konfigurér GnomeCal-komponent</div><div class='del'>-Comment[sv]=Konfigurera GnomeCal-kanalen</div><div class='del'>-Comment[tr]=GnomeCal takvim parçasý ayarlarý</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 90bcb5e685..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/calendar-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1140 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Calendar Conduit</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Eskil Heyn Olsen &lt;deity@eskil.dk&gt; </div><div class='del'>- *          JP Rosevear &lt;jpr@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;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'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;pi-source.h&gt;</div><div class='del'>-#include &lt;pi-socket.h&gt;</div><div class='del'>-#include &lt;pi-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'>-#include &lt;libical/src/libical/icaltypes.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAL_CONFIG_LOAD 1</div><div class='del'>-#define CAL_CONFIG_DESTROY 1</div><div class='del'>-#include &lt;calendar-conduit-config.h&gt;</div><div class='del'>-#undef CAL_CONFIG_LOAD</div><div class='del'>-#undef CAL_CONFIG_DESTROY</div><div class='del'>-</div><div class='del'>-#include &lt;calendar-conduit.h&gt;</div><div class='del'>-</div><div class='del'>-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);</div><div class='del'>-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);</div><div class='del'>-</div><div class='del'>-#define CONDUIT_VERSION "0.1.0"</div><div class='del'>-#ifdef G_LOG_DOMAIN</div><div class='del'>-#undef G_LOG_DOMAIN</div><div class='del'>-#endif</div><div class='del'>-#define G_LOG_DOMAIN "ecalconduit"</div><div class='del'>-</div><div class='del'>-#define DEBUG_CALCONDUIT 1</div><div class='del'>-/* #undef DEBUG_CALCONDUIT */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_CALCONDUIT</div><div class='del'>-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-#else</div><div class='del'>-#define LOG(e...)</div><div class='del'>-#endif </div><div class='del'>-</div><div class='del'>-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)</div><div class='del'>-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-</div><div class='del'>-/* debug spew DELETE ME */</div><div class='del'>-static char *</div><div class='del'>-print_local (ECalLocalRecord *local)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-</div><div class='del'>-	if (local == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;appt &amp;&amp; local-&gt;appt-&gt;description) {</div><div class='del'>-		sprintf (buff, "[%ld %ld '%s' '%s']",</div><div class='del'>-			 mktime (&amp;local-&gt;appt-&gt;begin),</div><div class='del'>-			 mktime (&amp;local-&gt;appt-&gt;end),</div><div class='del'>-			 local-&gt;appt-&gt;description,</div><div class='del'>-			 local-&gt;appt-&gt;note);</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "";</div><div class='del'>-	</div><div class='del'>-	return cal_component_get_as_string (local-&gt;comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* debug spew DELETE ME */</div><div class='del'>-static char *print_remote (GnomePilotRecord *remote)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-	struct Appointment appt;</div><div class='del'>-</div><div class='del'>-	if (remote == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset (&amp;appt, 0, sizeof (struct Appointment));</div><div class='del'>-	unpack_Appointment (&amp;appt, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	sprintf (buff, "[%ld %ld '%s' '%s']",</div><div class='del'>-		 mktime (&amp;appt.begin),</div><div class='del'>-		 mktime (&amp;appt.end),</div><div class='del'>-		 appt.description,</div><div class='del'>-		 appt.note);</div><div class='del'>-</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Context Routines */</div><div class='del'>-static void</div><div class='del'>-e_calendar_context_new (ECalConduitContext **ctxt, guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	*ctxt = g_new0 (ECalConduitContext,1);</div><div class='del'>-	g_assert (ctxt!=NULL);</div><div class='del'>-</div><div class='del'>-	calconduit_load_configuration (&amp;(*ctxt)-&gt;cfg, pilot_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_context_destroy (ECalConduitContext **ctxt)</div><div class='del'>-{</div><div class='del'>-	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;client != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT ((*ctxt)-&gt;client));</div><div class='del'>-</div><div class='del'>-	if ((*ctxt)-&gt;cfg != NULL)</div><div class='del'>-		calconduit_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'>-</div><div class='del'>-/* Calendar Server routines */</div><div class='del'>-static void</div><div class='del'>-start_calendar_server_cb (GtkWidget *cal_client,</div><div class='del'>-			  CalClientLoadStatus status,</div><div class='del'>-			  ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalClient *client = CAL_CLIENT (cal_client);</div><div class='del'>-</div><div class='del'>-	LOG ("  entering start_calendar_server_load_cb, tried=%d\n",</div><div class='del'>-		ctxt-&gt;calendar_load_tried);</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_LOAD_SUCCESS) {</div><div class='del'>-		ctxt-&gt;calendar_load_success = TRUE;</div><div class='del'>-		LOG ("    success\n");</div><div class='del'>-		gtk_main_quit (); /* end the sub event loop */</div><div class='del'>-	} else {</div><div class='del'>-		if (ctxt-&gt;calendar_load_tried) {</div><div class='del'>-			LOG ("    load and create of calendar failed\n");</div><div class='del'>-			gtk_main_quit (); /* end the sub event loop */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cal_client_create_calendar (client, ctxt-&gt;calendar_file);</div><div class='del'>-		ctxt-&gt;calendar_load_tried = TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-start_calendar_server (ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (ctxt != NULL, -2);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	/* FIX ME */</div><div class='del'>-	ctxt-&gt;calendar_file = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-			       "evolution/local/Calendar/calendar.ics");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ctxt-&gt;client), "cal_loaded",</div><div class='del'>-			    start_calendar_server_cb, ctxt);</div><div class='del'>-</div><div class='del'>-	LOG ("    calling cal_client_load_calendar\n");</div><div class='del'>-	cal_client_load_calendar (ctxt-&gt;client, ctxt-&gt;calendar_file);</div><div class='del'>-</div><div class='del'>-	/* run a sub event loop to turn cal-client's async load</div><div class='del'>-	   notification into a synchronous call */</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;calendar_load_success)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Utility routines */</div><div class='del'>-static char *</div><div class='del'>-map_name (ECalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-%d.xml", g_get_home_dir (), ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static icalrecurrencetype_weekday</div><div class='del'>-get_ical_day (int day) </div><div class='del'>-{</div><div class='del'>-	switch (day) {</div><div class='del'>-	case 0:</div><div class='del'>-		return ICAL_MONDAY_WEEKDAY;</div><div class='del'>-	case 1:</div><div class='del'>-		return ICAL_TUESDAY_WEEKDAY;</div><div class='del'>-	case 2:</div><div class='del'>-		return ICAL_WEDNESDAY_WEEKDAY;</div><div class='del'>-	case 3:</div><div class='del'>-		return ICAL_THURSDAY_WEEKDAY;</div><div class='del'>-	case 4:</div><div class='del'>-		return ICAL_FRIDAY_WEEKDAY;</div><div class='del'>-	case 5:</div><div class='del'>-		return ICAL_SATURDAY_WEEKDAY;</div><div class='del'>-	case 6:</div><div class='del'>-		return ICAL_SUNDAY_WEEKDAY;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ICAL_NO_WEEKDAY;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-next_changed_item (ECalConduitContext *ctxt, GList *changes) </div><div class='del'>-{</div><div class='del'>-	CalObjChange *coc;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	for (l = changes; l != NULL; l = l-&gt;next) {</div><div class='del'>-		coc = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		if (g_hash_table_lookup (ctxt-&gt;changed_hash, coc-&gt;uid))</div><div class='del'>-			return l;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-compute_status (ECalConduitContext *ctxt, ECalLocalRecord *local, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalObjChange *coc;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = FALSE;</div><div class='del'>-	local-&gt;local.secret = FALSE;</div><div class='del'>-</div><div class='del'>-	coc = g_hash_table_lookup (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-	if (coc == NULL) {</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNothing;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (coc-&gt;type) {</div><div class='del'>-	case CALOBJ_UPDATED:</div><div class='del'>-		if (e_pilot_map_lookup_pid (ctxt-&gt;map, coc-&gt;uid) &gt; 0)</div><div class='del'>-			local-&gt;local.attr = GnomePilotRecordModified;</div><div class='del'>-		else</div><div class='del'>-			local-&gt;local.attr = GnomePilotRecordNew;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case CALOBJ_REMOVED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordDeleted;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomePilotRecord *</div><div class='del'>-local_record_to_pilot_record (ECalLocalRecord *local,</div><div class='del'>-			      ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotRecord *p = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, NULL);</div><div class='del'>-	g_assert (local-&gt;comp != NULL);</div><div class='del'>-	g_assert (local-&gt;appt != NULL );</div><div class='del'>-	</div><div class='del'>-	LOG ("local_record_to_remote_record\n");</div><div class='del'>-</div><div class='del'>-	p = g_new0 (GnomePilotRecord, 1);</div><div class='del'>-</div><div class='del'>-	p-&gt;ID = local-&gt;local.ID;</div><div class='del'>-	p-&gt;category = 0;</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'>-	/* 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;appt, p-&gt;record, 0xffff);</div><div class='del'>-</div><div class='del'>-	return p;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * converts a CalComponent object to a ECalLocalRecord</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-local_record_from_comp (ECalLocalRecord *local, CalComponent *comp, ECalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-	GSList *d_list = NULL;</div><div class='del'>-	CalComponentText *description;</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	time_t dt_time;</div><div class='del'>-	CalComponentClassification classif;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	LOG ("local_record_from_comp\n");</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (local != NULL);</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;comp = comp;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	local-&gt;local.ID = e_pilot_map_lookup_pid (ctxt-&gt;map, uid);</div><div class='del'>-	compute_status (ctxt, local, uid);</div><div class='del'>-</div><div class='del'>-	local-&gt;appt = g_new0 (struct Appointment,1);</div><div class='del'>-</div><div class='del'>-	/* STOP: don't replace these with g_strdup, since free_Appointment</div><div class='del'>-	   uses free to deallocate */</div><div class='del'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-	if (summary.value) </div><div class='del'>-		local-&gt;appt-&gt;description = strdup ((char *) summary.value);</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (comp, &amp;d_list);</div><div class='del'>-	if (d_list) {</div><div class='del'>-		description = (CalComponentText *) d_list-&gt;data;</div><div class='del'>-		if (description &amp;&amp; description-&gt;value)</div><div class='del'>-			local-&gt;appt-&gt;note = strdup (description-&gt;value);</div><div class='del'>-		else</div><div class='del'>-			local-&gt;appt-&gt;note = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;appt-&gt;note = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;dt);	</div><div class='del'>-	if (dt.value) {</div><div class='del'>-		dt_time = icaltime_as_timet (*dt.value);</div><div class='del'>-		</div><div class='del'>-		local-&gt;appt-&gt;begin = *localtime (&amp;dt_time);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtend (comp, &amp;dt);	</div><div class='del'>-	if (dt.value &amp;&amp; time_add_day (dt_time, 1) != icaltime_as_timet (*dt.value)) {</div><div class='del'>-		dt_time = icaltime_as_timet (*dt.value);</div><div class='del'>-		</div><div class='del'>-		local-&gt;appt-&gt;end = *localtime (&amp;dt_time);</div><div class='del'>-		local-&gt;appt-&gt;event = 0;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;appt-&gt;event = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Recurrence Rules */</div><div class='del'>-	local-&gt;appt-&gt;repeatType = repeatNone;</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_rrules (comp)) {</div><div class='del'>-		GSList *list;</div><div class='del'>-		struct icalrecurrencetype *recur;</div><div class='del'>-		</div><div class='del'>-		cal_component_get_rrule_list (comp, &amp;list);</div><div class='del'>-		recur = list-&gt;data;</div><div class='del'>-		</div><div class='del'>-		switch (recur-&gt;freq) {</div><div class='del'>-		case ICAL_DAILY_RECURRENCE:</div><div class='del'>-			local-&gt;appt-&gt;repeatType = repeatDaily;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_WEEKLY_RECURRENCE:</div><div class='del'>-			local-&gt;appt-&gt;repeatType = repeatWeekly;</div><div class='del'>-			for (i = 0; i&lt;= 7 &amp;&amp; recur-&gt;by_day[i] != SHRT_MAX; i++)</div><div class='del'>-				local-&gt;appt-&gt;repeatDays[0] = 0;</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-			if (recur-&gt;by_month_day[0] != SHRT_MAX) {</div><div class='del'>-				local-&gt;appt-&gt;repeatType = repeatMonthlyByDate;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-			local-&gt;appt-&gt;repeatType = repeatYearly;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (local-&gt;appt-&gt;repeatType != repeatNone) {</div><div class='del'>-			local-&gt;appt-&gt;repeatFrequency = recur-&gt;interval;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		cal_component_free_recur_list (list);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_classification (comp, &amp;classif);</div><div class='del'>-</div><div class='del'>-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)</div><div class='del'>-		local-&gt;local.secret = 1;</div><div class='del'>-	else</div><div class='del'>-		local-&gt;local.secret = 0;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = 0;  </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-local_record_from_uid (ECalLocalRecord *local,</div><div class='del'>-		       const char *uid,</div><div class='del'>-		       ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	g_assert(local!=NULL);</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (ctxt-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-		local_record_from_comp (local, comp, ctxt);</div><div class='del'>-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-		cal_component_set_uid (comp, uid);</div><div class='del'>-		local_record_from_comp (local, comp, ctxt);</div><div class='del'>-	} else {</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-	}	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalComponent *</div><div class='del'>-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-			 GnomePilotRecord *remote,</div><div class='del'>-			 CalComponent *in_comp)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	struct Appointment appt;</div><div class='del'>-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE), it;</div><div class='del'>-	struct icalrecurrencetype recur;</div><div class='del'>-	int pos, i;</div><div class='del'>-	CalComponentText summary = {NULL, NULL};</div><div class='del'>-	CalComponentText description = {NULL, NULL};</div><div class='del'>-	CalComponentDateTime dt = {NULL, NULL};</div><div class='del'>- 	GSList *d_list;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (remote != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	memset (&amp;appt, 0, sizeof (struct Appointment));</div><div class='del'>-	unpack_Appointment (&amp;appt, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	if (in_comp == NULL) {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-		cal_component_set_created (comp, &amp;now);</div><div class='del'>-	} else {</div><div class='del'>-		comp = cal_component_clone (in_comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- 	LOG ("        comp_from_remote_record: "</div><div class='del'>- 	     "creating from remote %s and comp %s\n", </div><div class='del'>-  	     print_remote (remote), cal_component_get_as_string (comp));</div><div class='del'>-</div><div class='del'>-	cal_component_set_last_modified (comp, &amp;now);</div><div class='del'>-</div><div class='del'>-	summary.value = appt.description;</div><div class='del'>-	cal_component_set_summary (comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-	description.value = appt.note;</div><div class='del'>-	d_list = g_slist_append (NULL, &amp;description);</div><div class='del'>-	cal_component_set_comment_list (comp, d_list);</div><div class='del'>-	g_slist_free (d_list);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* FIX ME This is a bit hackish, how else can we tell if there is</div><div class='del'>-	 * no due date set?</div><div class='del'>-	 */</div><div class='del'>-	if (appt.begin.tm_sec || appt.begin.tm_min || appt.begin.tm_hour </div><div class='del'>-	    || appt.begin.tm_mday || appt.begin.tm_mon || appt.begin.tm_year) {</div><div class='del'>-		it = icaltime_from_timet (mktime (&amp;appt.begin), FALSE, FALSE);</div><div class='del'>-		dt.value = &amp;it;</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (appt.event) {</div><div class='del'>-		time_t t = mktime (&amp;appt.begin);</div><div class='del'>-		</div><div class='del'>-		t = time_day_end (t);</div><div class='del'>-		it = icaltime_from_timet (t, FALSE, FALSE);</div><div class='del'>-		dt.value = &amp;it;</div><div class='del'>-		cal_component_set_dtend (comp, &amp;dt);</div><div class='del'>-	} else if (appt.end.tm_sec || appt.end.tm_min || appt.end.tm_hour </div><div class='del'>-	    || appt.end.tm_mday || appt.end.tm_mon || appt.end.tm_year) {</div><div class='del'>-		it = icaltime_from_timet (mktime (&amp;appt.end), FALSE, FALSE);</div><div class='del'>-		dt.value = &amp;it;</div><div class='del'>-		cal_component_set_dtend (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Recurrence information */</div><div class='del'>-  	icalrecurrencetype_clear (&amp;recur);</div><div class='del'>-</div><div class='del'>-	switch (appt.repeatType) {</div><div class='del'>-	case repeatNone:</div><div class='del'>-		recur.freq = ICAL_NO_RECURRENCE;</div><div class='del'>-		/* nothing */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case repeatDaily:</div><div class='del'>-		recur.freq = ICAL_DAILY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case repeatWeekly:</div><div class='del'>-		recur.freq = ICAL_WEEKLY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-</div><div class='del'>-		pos = 0;</div><div class='del'>-		for (i = 0; i &lt; 7; i++) {</div><div class='del'>-			if (appt.repeatDays[i])</div><div class='del'>-				recur.by_day[pos++] = get_ical_day (i);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case repeatMonthlyByDay:</div><div class='del'>-		recur.freq = ICAL_MONTHLY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-		recur.by_month_day[0] = appt.begin.tm_mday;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case repeatMonthlyByDate:</div><div class='del'>-		recur.freq = ICAL_MONTHLY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-		/* Not handled! */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case repeatYearly:</div><div class='del'>-		recur.freq = ICAL_YEARLY_RECURRENCE;</div><div class='del'>-		recur.interval = appt.repeatFrequency;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (recur.freq != ICAL_NO_RECURRENCE) {</div><div class='del'>-		GSList *list = NULL;</div><div class='del'>-		</div><div class='del'>-		/* recurrence start of week */</div><div class='del'>-		recur.week_start = get_ical_day (appt.repeatWeekstart);</div><div class='del'>-</div><div class='del'>-		if (appt.repeatEnd.tm_sec || appt.repeatEnd.tm_min || appt.repeatEnd.tm_hour </div><div class='del'>-		    || appt.repeatEnd.tm_mday || appt.repeatEnd.tm_mon || appt.repeatEnd.tm_year) {</div><div class='del'>-			time_t t = mktime (&amp;appt.repeatEnd);</div><div class='del'>-			t = time_add_day (t, 1);</div><div class='del'>-			recur.until = icaltime_from_timet (t, FALSE, FALSE);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		list = g_slist_append (list, &amp;recur);</div><div class='del'>-		cal_component_set_rrule_list (comp, list);</div><div class='del'>-		g_slist_free (list);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_rrule_list (comp, NULL);		</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;attr &amp; dlpRecAttrSecret)</div><div class='del'>-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);</div><div class='del'>-	else</div><div class='del'>-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-	</div><div class='del'>-	free_Appointment (&amp;appt);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,</div><div class='del'>-	     ECalConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	gboolean success;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (conduit != NULL);</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	LOG ("update_comp: saving to desktop\n%s\n", </div><div class='del'>-	     cal_component_get_as_string (comp));</div><div class='del'>-</div><div class='del'>-	success = cal_client_update_object (ctxt-&gt;client, comp);</div><div class='del'>-</div><div class='del'>-	if (!success)</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-check_for_slow_setting (GnomePilotConduit *c, ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	int count, map_count;</div><div class='del'>-</div><div class='del'>-	count = g_list_length (ctxt-&gt;uids);</div><div class='del'>-	map_count = g_hash_table_size (ctxt-&gt;map-&gt;pid_map);</div><div class='del'>-	</div><div class='del'>-	/* If there are no objects or objects but no log */</div><div class='del'>-	if (map_count == 0) {</div><div class='del'>-		GnomePilotConduitStandard *conduit;</div><div class='del'>-		LOG ("    doing slow sync\n");</div><div class='del'>-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit);</div><div class='del'>-	} else {</div><div class='del'>-		LOG ("    doing fast sync\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot syncing callbacks */</div><div class='del'>-static gint</div><div class='del'>-pre_sync (GnomePilotConduit *conduit,</div><div class='del'>-	  GnomePilotDBInfo *dbi,</div><div class='del'>-	  ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitSyncAbs *abs_conduit;</div><div class='del'>-	GList *l;</div><div class='del'>-	int len;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-	char *filename;</div><div class='del'>-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;</div><div class='del'>-</div><div class='del'>-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);</div><div class='del'>-</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-	LOG ("pre_sync: Calendar Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-	g_message ("Calendar Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;client = NULL;</div><div class='del'>-	</div><div class='del'>-	if (start_calendar_server (ctxt) != 0) {</div><div class='del'>-		WARN(_("Could not start wombat server"));</div><div class='del'>-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the local database */</div><div class='del'>-	ctxt-&gt;uids = cal_client_get_uids (ctxt-&gt;client, CALOBJ_TYPE_EVENT);</div><div class='del'>-	</div><div class='del'>-	/* Load the uid &lt;--&gt; pilot id mapping */</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_read (filename, &amp;ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* Find the added, modified and deleted items */</div><div class='del'>-	ctxt-&gt;changed_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	ctxt-&gt;changed = cal_client_get_changed_uids (ctxt-&gt;client, </div><div class='del'>-						     CALOBJ_TYPE_EVENT,</div><div class='del'>-						     ctxt-&gt;map-&gt;since + 1);</div><div class='del'>-</div><div class='del'>-	for (l = ctxt-&gt;changed; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalObjChange *coc = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (!e_pilot_map_uid_is_archived (ctxt-&gt;map, coc-&gt;uid)) {</div><div class='del'>-			</div><div class='del'>-			g_hash_table_insert (ctxt-&gt;changed_hash, coc-&gt;uid, coc);</div><div class='del'>-			</div><div class='del'>-			switch (coc-&gt;type) {</div><div class='del'>-			case CALOBJ_UPDATED:</div><div class='del'>-				if (e_pilot_map_lookup_pid (ctxt-&gt;map, coc-&gt;uid) &gt; 0)</div><div class='del'>-					mod_records++;</div><div class='del'>-				else</div><div class='del'>-					add_records++;</div><div class='del'>-				break;</div><div class='del'>-				</div><div class='del'>-			case CALOBJ_REMOVED:</div><div class='del'>-				del_records++;</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'>-	/* Set the count information */</div><div class='del'>-	num_records = cal_client_get_n_objects (ctxt-&gt;client, CALOBJ_TYPE_TODO);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);</div><div class='del'>-</div><div class='del'>-	buf = (unsigned char*)g_malloc (0xffff);</div><div class='del'>-	len = dlp_ReadAppBlock (dbi-&gt;pilot_socket, dbi-&gt;db_handle, 0,</div><div class='del'>-			      (unsigned char *)buf, 0xffff);</div><div class='del'>-	</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		WARN (_("Could not read pilot's Calendar application block"));</div><div class='del'>-		WARN ("dlp_ReadAppBlock(...) = %d", len);</div><div class='del'>-		gnome_pilot_conduit_error (conduit,</div><div class='del'>-					   _("Could not read pilot's Calendar application block"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	unpack_AppointmentAppInfo (&amp;(ctxt-&gt;ai), buf, len);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	check_for_slow_setting (conduit, ctxt);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-post_sync (GnomePilotConduit *conduit,</div><div class='del'>-	   GnomePilotDBInfo *dbi,</div><div class='del'>-	   ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gchar *filename;</div><div class='del'>-	</div><div class='del'>-	LOG ("post_sync: Calendar Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_write (filename, ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_pilot_id (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      ECalLocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	LOG ("set_pilot_id: setting to %d\n", ID);</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, ID, uid, FALSE);</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_status_cleared (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		    ECalLocalRecord *local,</div><div class='del'>-		    ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("set_status_cleared: clearing status\n");</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	g_hash_table_remove (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	  ECalLocalRecord **local,</div><div class='del'>-	  ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *uids, *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("beginning for_each");</div><div class='del'>-</div><div class='del'>-		uids = ctxt-&gt;uids;</div><div class='del'>-		count = 0;</div><div class='del'>-		</div><div class='del'>-		if (uids != NULL) {</div><div class='del'>-			LOG ("iterating over %d records", g_list_length (uids));</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, uids-&gt;data, ctxt);</div><div class='del'>-</div><div class='del'>-			iterator = uids;</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		if (g_list_next (iterator)) {</div><div class='del'>-			iterator = g_list_next (iterator);</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, iterator-&gt;data, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each ending");</div><div class='del'>-</div><div class='del'>-			/* Tell the pilot the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each_modified (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		   ECalLocalRecord **local,</div><div class='del'>-		   ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("beginning for_each_modified: beginning\n");</div><div class='del'>-		</div><div class='del'>-		iterator = ctxt-&gt;changed;</div><div class='del'>-		</div><div class='del'>-		count = 0;</div><div class='del'>-	</div><div class='del'>-		LOG ("iterating over %d records", g_hash_table_size (ctxt-&gt;changed_hash));</div><div class='del'>-		</div><div class='del'>-		iterator = next_changed_item (ctxt, iterator);</div><div class='del'>-		if (iterator != NULL) {</div><div class='del'>-			CalObjChange *coc = NULL;</div><div class='del'>-			</div><div class='del'>-			coc = iterator-&gt;data;</div><div class='del'>-		</div><div class='del'>-			LOG ("iterating over %d records", g_hash_table_size (ctxt-&gt;changed_hash));</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, coc-&gt;uid, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		if ((iterator = next_changed_item (ctxt, iterator))) {</div><div class='del'>-			CalObjChange *coc = NULL;</div><div class='del'>-</div><div class='del'>-			coc = iterator-&gt;data;</div><div class='del'>-			</div><div class='del'>-			*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, coc-&gt;uid, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each_modified ending");</div><div class='del'>-</div><div class='del'>-			/* Signal the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 ECalLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	/* used by the quick compare */</div><div class='del'>-	GnomePilotRecord *local_pilot;</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	LOG ("compare: local=%s remote=%s...\n",</div><div class='del'>-		print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local!=NULL,-1);</div><div class='del'>-	g_return_val_if_fail (remote!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	local_pilot = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-	if (!local_pilot) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;length != local_pilot-&gt;length</div><div class='del'>-	    || memcmp (local_pilot-&gt;record, remote-&gt;record, remote-&gt;length))</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		LOG ("    equal");</div><div class='del'>-	else</div><div class='del'>-		LOG ("    not equal");</div><div class='del'>-	</div><div class='del'>-	g_free (local_pilot);</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-add_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    GnomePilotRecord *remote,</div><div class='del'>-	    ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));</div><div class='del'>-</div><div class='del'>-	comp = comp_from_remote_record (conduit, remote, NULL);</div><div class='del'>-	update_comp (conduit, comp, ctxt);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, remote-&gt;ID, uid, FALSE);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-replace_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		ECalLocalRecord *local,</div><div class='del'>-		GnomePilotRecord *remote,</div><div class='del'>-		ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *new_comp;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("replace_record: replace %s with %s\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	new_comp = comp_from_remote_record (conduit, remote, local-&gt;comp);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;comp));</div><div class='del'>-	local-&gt;comp = new_comp;</div><div class='del'>-	update_comp (conduit, local-&gt;comp, ctxt);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	       ECalLocalRecord *local,</div><div class='del'>-	       ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_assert (local-&gt;comp != NULL);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	LOG ("delete_record: deleting %s\n", uid);</div><div class='del'>-</div><div class='del'>-	cal_client_remove_object (ctxt-&gt;client, uid);</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-archive_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		ECalLocalRecord *local,</div><div class='del'>-		gboolean archive,</div><div class='del'>-		ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("archive_record: %s\n", archive ? "yes" : "no");</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, local-&gt;local.ID, uid, archive);</div><div class='del'>-	</div><div class='del'>-        return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-       GnomePilotRecord *remote,</div><div class='del'>-       ECalLocalRecord **local,</div><div class='del'>-       ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("match: looking for local copy of %s\n",</div><div class='del'>-	     print_remote (remote));	</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	*local = NULL;</div><div class='del'>-	uid = e_pilot_map_lookup_uid (ctxt-&gt;map, remote-&gt;ID);</div><div class='del'>-	</div><div class='del'>-	if (!uid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	LOG ("  matched\n");</div><div class='del'>-	</div><div class='del'>-	*local = g_new0 (ECalLocalRecord, 1);</div><div class='del'>-	local_record_from_uid (*local, uid, ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-free_match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    ECalLocalRecord *local,</div><div class='del'>-	    ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_match: freeing\n");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;comp));</div><div class='del'>-	g_free (local);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 ECalLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord **remote,</div><div class='del'>-	 ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("prepare: encoding local %s\n", print_local (local));</div><div class='del'>-</div><div class='del'>-	*remote = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-</div><div class='del'>-	if (!*remote)</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'>-free_prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      ECalLocalRecord *local,</div><div class='del'>-	      GnomePilotRecord **remote,</div><div class='del'>-	      ECalConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_prepare: freeing\n");</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'>-	g_free (*remote);</div><div class='del'>-	*remote = NULL;</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ORBit_MessageValidationResult</div><div class='del'>-accept_all_cookies (CORBA_unsigned_long request_id,</div><div class='del'>-		    CORBA_Principal *principal,</div><div class='del'>-		    CORBA_char *operation)</div><div class='del'>-{</div><div class='del'>-	/* allow ALL cookies */</div><div class='del'>-	return ORBIT_MESSAGE_ALLOW_ALL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilot_id)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	ECalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	LOG ("in calendar's conduit_get_gpilot_conduit\n");</div><div class='del'>-</div><div class='del'>-	/* we need to find wombat with oaf, so make sure oaf</div><div class='del'>-	   is initialized here.  once the desktop is converted</div><div class='del'>-	   to oaf and gpilotd is built with oaf, this can go away */</div><div class='del'>-	if (!oaf_is_initialized ()) {</div><div class='del'>-		char *argv[ 1 ] = {"hi"};</div><div class='del'>-		oaf_init (1, argv);</div><div class='del'>-</div><div class='del'>-		if (bonobo_init (CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-			g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-		ORBit_set_request_validation_handler (accept_all_cookies);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = gnome_pilot_conduit_sync_abs_new ("DatebookDB", 0x64617465);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-</div><div class='del'>-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),</div><div class='del'>-				       "e_calendar_conduit");</div><div class='del'>-</div><div class='del'>-	e_calendar_context_new (&amp;ctxt, pilot_id);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (retval), "calconduit_context", ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, 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'>-	ECalConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), </div><div class='del'>-				    "calconduit_context");</div><div class='del'>-</div><div class='del'>-	e_calendar_context_destroy (&amp;ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (conduit));</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/conduits/calendar/calendar-conduit.h b/calendar/conduits/calendar/calendar-conduit.h<br/>deleted file mode 100644<br/>index d78fae3553..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/calendar-conduit.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/calendar-conduit.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,80 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - Calendar Conduit</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Eskil Heyn Olsen &lt;deity@eskil.dk&gt; </div><div class='del'>- *          JP Rosevear &lt;jpr@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_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-sync-abs.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;e-pilot-map.h&gt;</div><div class='del'>-</div><div class='del'>-/* This is the local record structure for the Evolution Calendar conduit. */</div><div class='del'>-typedef struct _ECalLocalRecord ECalLocalRecord;</div><div class='del'>-struct _ECalLocalRecord {</div><div class='del'>-	/* The stuff from gnome-pilot-conduit-standard-abs.h</div><div class='del'>-	   Must be first in the structure, or instances of this</div><div class='del'>-	   structure cannot be used by gnome-pilot-conduit-standard-abs.</div><div class='del'>-	*/</div><div class='del'>-	GnomePilotDesktopRecord local;</div><div class='del'>-</div><div class='del'>-	/* The corresponding Comp object */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-        /* pilot-link todo structure, used for implementing Transmit. */</div><div class='del'>-	struct Appointment *appt;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is the context for all the GnomeCal conduit methods. */</div><div class='del'>-typedef struct _ECalConduitContext ECalConduitContext;</div><div class='del'>-struct _ECalConduitContext {</div><div class='del'>-	ECalConduitCfg *cfg;</div><div class='del'>-</div><div class='del'>-	struct AppointmentAppInfo ai;</div><div class='del'>-</div><div class='del'>-	CalClient *client;</div><div class='del'>-	char *calendar_file;</div><div class='del'>-	gboolean calendar_load_tried;</div><div class='del'>-	gboolean calendar_load_success;</div><div class='del'>-</div><div class='del'>-	time_t since;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *changed;</div><div class='del'>-	GHashTable *changed_hash;</div><div class='del'>-	</div><div class='del'>-	EPilotMap *map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif __CALENDAR_CONDUIT_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='head'>diff --git a/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop b/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop<br/>deleted file mode 100644<br/>index 51ee34d2bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/e-calendar-conduit-control-applet.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Evolution Calendar conduit</div><div class='del'>-Name[da]=Gnome kalender</div><div class='del'>-Name[es]=Enlace con el calendario de Evolution</div><div class='del'>-Name[fr]=Conduit Calendrier</div><div class='del'>-Name[no]=GNOME kalender</div><div class='del'>-Name[sv]=Kalenderkanal</div><div class='del'>-Name[tr]=Takvim parçasý</div><div class='del'>-Comment=Configure the GnomeCal conduit</div><div class='del'>-Comment[da]=Konfigurér GnomeCal-komponent</div><div class='del'>-Comment[es]=Configurar el enlace con GnomeCal</div><div class='del'>-Comment[fr]=Configuration du conduit calendrier</div><div class='del'>-Comment[no]=Konfigurér GnomeCal-komponent</div><div class='del'>-Comment[sv]=Konfigurera GnomeCal-kanalen</div><div class='del'>-Comment[tr]=GnomeCal takvim parçasý ayarlarý</div><div class='del'>-Exec=e-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/e-calendar.conduit.in b/calendar/conduits/calendar/e-calendar.conduit.in<br/>deleted file mode 100644<br/>index 6143978e8b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/calendar/e-calendar.conduit.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/calendar/e-calendar.conduit.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-&lt;gnome-pilot-conduit version="1.0"&gt;</div><div class='del'>-&lt;conduit id="e_calendar_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libecalendar_conduit.so"/&gt;</div><div class='del'>-&lt;name value="ECalendar"/&gt;</div><div class='del'>-&lt;conduit-attribute name="description" value="Synchronizes Calendar with Evolution"/&gt;</div><div class='del'>-&lt;conduit-attribute name="default-synctype" value="synchronize"/&gt;</div><div class='del'>-&lt;conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/&gt;</div><div class='del'>-&lt;conduit-attribute name="settings" value="TRUE"/&gt;</div><div class='del'>-&lt;/gnome-pilot-conduit&gt;</div><div class='head'>diff --git a/calendar/conduits/todo/.cvsignore b/calendar/conduits/todo/.cvsignore<br/>deleted file mode 100644<br/>index 6b94f92c38..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/todo/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-e-todo-conduit-control-applet</div><div class='del'>-e-todo.conduit</div><div class='head'>diff --git a/calendar/conduits/todo/Makefile.am b/calendar/conduits/todo/Makefile.am<br/>deleted file mode 100644<br/>index 765c9a3742..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/todo/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,80 +0,0 @@</div><div class='del'>-INCLUDES = 					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	-I$(top_srcdir)/calendar		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical	\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical	\</div><div class='del'>-	-I$(top_builddir)/e-util		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)		\</div><div class='del'>-	$(GNOME_PILOT_CFLAGS)</div><div class='del'>-</div><div class='del'>-# ToDo Capplet</div><div class='del'>-bin_PROGRAMS = e-todo-conduit-control-applet</div><div class='del'>-</div><div class='del'>-e_todo_conduit_control_applet_SOURCES = todo-conduit-control-applet.c</div><div class='del'>-</div><div class='del'>-e_todo_conduit_control_applet_LDADD = \</div><div class='del'>-		$(CAPPLET_LIBS)  \</div><div class='del'>-		$(GNOME_LIBDIR) \</div><div class='del'>-		$(GNOME_PILOT_LIBS) \</div><div class='del'>-		$(PISOCK_LIBDIR) $(PISOCK_LIBS) \</div><div class='del'>-		$(GNOME_CAPPLET_LIBS) \</div><div class='del'>-		$(BONOBO_VFS_GNOME_LIBS) \</div><div class='del'>-		$(GNOME_XML_LIB) \</div><div class='del'>-	        $(GNOMEUI_LIBS) \</div><div class='del'>-                $(INTLLIBS)</div><div class='del'>-</div><div class='del'>-# ToDo Conduit</div><div class='del'>-e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits</div><div class='del'>-e_todo_conduits_LTLIBRARIES = libetodo_conduit.la</div><div class='del'>-</div><div class='del'>-libetodo_conduit_la_SOURCES = \</div><div class='del'>-	todo-conduit.c 		\</div><div class='del'>-	todo-conduit.h		\</div><div class='del'>-	todo-conduit-config.h </div><div class='del'>-</div><div class='del'>-libetodo_conduit_la_LIBADD = 					\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/libcal-client-static.la	\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/libcal-util-static.la		\</div><div class='del'>-	$(top_builddir)/libversit/libversit.la				\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical-static.la		\</div><div class='del'>-	$(top_builddir)/e-util/libeconduit-static.la	 		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)					\</div><div class='del'>-	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 				\</div><div class='del'>-	$(UNICODE_LIBS)							\</div><div class='del'>-	$(GNOME_LIBDIR) 						\</div><div class='del'>-	$(GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-e-todo.conduit: e-todo.conduit.in Makefile</div><div class='del'>-	sed -e 's^\@prefix\@^$(prefix)^g' &lt; $(srcdir)/e-todo.conduit.in &gt; e-todo.conduit.tmp \</div><div class='del'>-	&amp;&amp; mv e-todo.conduit.tmp e-todo.conduit</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ccenterdir = $(datadir)/control-center</div><div class='del'>-ccenterPalmPilotdir = $(ccenterdir)/Peripherals</div><div class='del'>-ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits</div><div class='del'>-ccenterConduits_DATA = e-todo-conduit-control-applet.desktop </div><div class='del'>-</div><div class='del'>-panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits</div><div class='del'>-panelConduits_DATA = $(ccenterConduits_DATA)</div><div class='del'>-</div><div class='del'>-Conduitdir = $(datadir)/gnome-pilot/conduits/</div><div class='del'>-Conduit_DATA = e-todo.conduit</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	e-todo.conduit.in \</div><div class='del'>-        $(ccenterConduits_DATA)</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(ccenterConduitsdir)</div><div class='del'>-	$(mkinstalldirs) $(Conduitdir)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='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/conduits/todo/e-todo-conduit-control-applet.desktop b/calendar/conduits/todo/e-todo-conduit-control-applet.desktop<br/>deleted file mode 100644<br/>index 2d392f322b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/e-todo-conduit-control-applet.desktop?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/todo/e-todo-conduit-control-applet.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Evolution ToDo conduit </div><div class='del'>-Name[da]=Udstående</div><div class='del'>-Name[es]=Enlace con el componente `Por Hacer' de Evolution</div><div class='del'>-Name[fr]=Conduit Evolution `A Faire'</div><div class='del'>-Name[no]=Oppgaver</div><div class='del'>-Name[sv]=Att göra-lista</div><div class='del'>-Name[tr]=Yapýlacaklar parçasý</div><div class='del'>-Comment=Configure the todo conduit</div><div class='del'>-Comment[da]=Konfigurér Udstående</div><div class='del'>-Comment[es]=Configurar el enlace con el componente `Por Hacer'</div><div class='del'>-Comment[fr]=Configuration du conduit `A Faire'</div><div class='del'>-Comment[no]=Konfigurér oppgavelisten</div><div class='del'>-Comment[sv]=Konfigurerar att göra-listan</div><div class='del'>-Comment[tr]=Yapýlacaklar parçasý ayarlarý</div><div class='del'>-Exec=e-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/e-todo.conduit.in b/calendar/conduits/todo/e-todo.conduit.in<br/>deleted file mode 100644<br/>index 40e6fd620c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/e-todo.conduit.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/todo/e-todo.conduit.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-&lt;gnome-pilot-conduit version="1.0"&gt;</div><div class='del'>-&lt;conduit id="e_todo_conduit" type="shlib" location="@prefix@/lib/gnome-pilot/conduits/libetodo_conduit.so"/&gt;</div><div class='del'>-&lt;name value="EToDo"/&gt;</div><div class='del'>-&lt;conduit-attribute name="description" value="Synchronizes ToDo List with Evolution"/&gt;</div><div class='del'>-&lt;conduit-attribute name="default-synctype" value="synchronize"/&gt;</div><div class='del'>-&lt;conduit-attribute name="icon" value="@prefix@/share/pixmaps/gnome-calendar-conduit.png"/&gt;</div><div class='del'>-&lt;conduit-attribute name="settings" value="TRUE"/&gt;</div><div class='del'>-&lt;/gnome-pilot-conduit&gt;</div><div class='head'>diff --git a/calendar/conduits/todo/todo-conduit-config.h b/calendar/conduits/todo/todo-conduit-config.h<br/>deleted file mode 100644<br/>index fe7b1dbafa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit-config.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/todo/todo-conduit-config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,120 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - ToDo Conduit Configuration</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</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'>- *          JP Rosevear &lt;jpr@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 __TODO_CONDUIT_CONFIG_H__</div><div class='del'>-#define __TODO_CONDUIT_CONFIG_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-management.h&gt;</div><div class='del'>-#include &lt;libgpilotdCM/gnome-pilot-conduit-config.h&gt;</div><div class='del'>-</div><div class='del'>-/* Configuration info */</div><div class='del'>-typedef struct _EToDoConduitCfg EToDoConduitCfg;</div><div class='del'>-struct _EToDoConduitCfg {</div><div class='del'>-	gboolean open_secret;</div><div class='del'>-	guint32 pilot_id;</div><div class='del'>-	GnomePilotConduitSyncType  sync_type;   /* only used by capplet */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef TODO_CONFIG_LOAD</div><div class='del'>-/* Load the configuration data */</div><div class='del'>-static void </div><div class='del'>-todoconduit_load_configuration (EToDoConduitCfg **c, guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",</div><div class='del'>-		    pilot_id);</div><div class='del'>-	</div><div class='del'>-	*c = g_new0 (EToDoConduitCfg,1);</div><div class='del'>-	g_assert (*c != NULL);</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	(*c)-&gt;open_secret = gnome_config_get_bool ("open_secret=FALSE");</div><div class='del'>-</div><div class='del'>-        /* set in capplets main */</div><div class='del'>-	(*c)-&gt;sync_type = GnomePilotConduitSyncTypeCustom; </div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-	</div><div class='del'>-	(*c)-&gt;pilot_id = pilot_id;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef TODO_CONFIG_SAVE</div><div class='del'>-/* Saves the configuration data. */</div><div class='del'>-static void</div><div class='del'>-todoconduit_save_configuration (EToDoConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	gchar prefix[256];</div><div class='del'>-</div><div class='del'>-	g_snprintf (prefix, 255, "/gnome-pilot.d/e-todo-conduit/Pilot_%u/",</div><div class='del'>-		    c-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	gnome_config_set_bool ("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'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef TODO_CONFIG_DUPE</div><div class='del'>-/* Creates a duplicate of the configuration data */</div><div class='del'>-static EToDoConduitCfg*</div><div class='del'>-todoconduit_dupe_configuration (EToDoConduitCfg *c) </div><div class='del'>-{</div><div class='del'>-	EToDoConduitCfg *retval;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (c != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	retval = g_new0 (EToDoConduitCfg, 1);</div><div class='del'>-	retval-&gt;sync_type = c-&gt;sync_type;</div><div class='del'>-	retval-&gt;open_secret = c-&gt;open_secret;</div><div class='del'>-	retval-&gt;pilot_id = c-&gt;pilot_id;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#ifdef TODO_CONFIG_DESTROY</div><div class='del'>-/* Destroy a configuration */</div><div class='del'>-static void </div><div class='del'>-todoconduit_destroy_configuration (EToDoConduitCfg **c) </div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (c != NULL);</div><div class='del'>-	g_return_if_fail (*c != NULL);</div><div class='del'>-</div><div class='del'>-	g_free (*c);</div><div class='del'>-	*c = NULL;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#endif __TODO_CONDUIT_CONFIG_H__ </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='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 7140522b55..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit-control-applet.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/todo/todo-conduit-control-applet.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,341 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - ToDo Conduit Capplet</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</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'>- *          JP Rosevear &lt;jpr@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;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/gnome-pilot-client.h&gt;</div><div class='del'>-</div><div class='del'>-#define TODO_CONFIG_LOAD 1</div><div class='del'>-#define TODO_CONFIG_SAVE 1</div><div class='del'>-#define TODO_CONFIG_DUPE 1</div><div class='del'>-#define TODO_CONFIG_DESTROY 1</div><div class='del'>-#include &lt;todo-conduit-config.h&gt;</div><div class='del'>-#undef TODO_CONFIG_LOAD</div><div class='del'>-#undef TODO_CONFIG_SAVE</div><div class='del'>-#undef TODO_CONFIG_DUPE</div><div class='del'>-#undef TODO_CONFIG_DESTROY</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'>-GnomePilotConduitManagement *conduit;</div><div class='del'>-GnomePilotConduitConfig *conduit_config;</div><div class='del'>-EToDoConduitCfg *origState = NULL;</div><div class='del'>-EToDoConduitCfg *curState = NULL;</div><div class='del'>-</div><div class='del'>-static void doTrySettings(GtkWidget *widget, EToDoConduitCfg *c);</div><div class='del'>-static void doRevertSettings(GtkWidget *widget, EToDoConduitCfg *c);</div><div class='del'>-static void doSaveSettings(GtkWidget *widget, EToDoConduitCfg *c);</div><div class='del'>-</div><div class='del'>-static void setStateCfg (GtkWidget *w, EToDoConduitCfg *c);</div><div class='del'>-</div><div class='del'>-gint pilotId;</div><div class='del'>-static GnomePilotClient *gpc;</div><div class='del'>-</div><div class='del'>-</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'>-doTrySettings (GtkWidget *widget, EToDoConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	if (c-&gt;sync_type != GnomePilotConduitSyncTypeCustom)</div><div class='del'>-		gnome_pilot_conduit_config_enable_with_first_sync (conduit_config,</div><div class='del'>-								   c-&gt;sync_type,</div><div class='del'>-								   c-&gt;sync_type,</div><div class='del'>-								   TRUE);</div><div class='del'>-	else</div><div class='del'>-		gnome_pilot_conduit_config_disable (conduit_config);</div><div class='del'>-</div><div class='del'>-	todoconduit_save_configuration (c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doRevertSettings (GtkWidget *widget, EToDoConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	activated = org_activation_state;</div><div class='del'>-	*c = *origState;</div><div class='del'>-	setStateCfg (cfgStateWindow, c);</div><div class='del'>-	doTrySettings (widget, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-doSaveSettings (GtkWidget *widget, EToDoConduitCfg *c)</div><div class='del'>-{</div><div class='del'>-	*origState = *c;</div><div class='del'>-	doTrySettings (widget, c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-doHelp (GtkWidget *widget, gpointer data) </div><div class='del'>-{</div><div class='del'>-	GtkWidget *about;</div><div class='del'>-	const gchar *authors[] = {</div><div class='del'>-		_("JP Rosevear &lt;jpr@helixcode.com&gt;"),</div><div class='del'>-		"", _("Original Author:"), </div><div class='del'>-		_("Eskil Heyn Olsen &lt;deity@eskil.dk&gt;"), </div><div class='del'>-		NULL};</div><div class='del'>-  </div><div class='del'>-	about = gnome_about_new (</div><div class='del'>-		_("Evolution ToDo Conduit"), VERSION,</div><div class='del'>-		_("(C) 1998-2000 the Free Software Foundation and Helix Code"),</div><div class='del'>-		authors,</div><div class='del'>-		_("Configuration utility for the evolution 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'>-</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'>-</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_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'>-</div><div class='del'>-static void</div><div class='del'>-setStateCfg (GtkWidget *w, EToDoConduitCfg *c)</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(w), "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'>-	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) c-&gt;sync_type);</div><div class='del'>-	ignore_changes = FALSE;</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), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "revert",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doRevertSettings), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "ok",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doSaveSettings), curState);</div><div class='del'>-	gtk_signal_connect(GTK_OBJECT(capplet), "help",</div><div class='del'>-			   GTK_SIGNAL_FUNC(doHelp), 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'>-</div><div class='del'>-static void </div><div class='del'>-run_error_dialog(gchar *mesg,...) </div><div class='del'>-{</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'>-</div><div class='del'>-static gint </div><div class='del'>-get_pilot_id_from_gpilotd() </div><div class='del'>-{</div><div class='del'>-	GList *pilots=NULL;</div><div class='del'>-	gint pilot;</div><div class='del'>-	int i,err;</div><div class='del'>-  </div><div class='del'>-	i=0;</div><div class='del'>-	/* we don't worry about leaking here, so pilots isn't freed */</div><div class='del'>-	switch(err = gnome_pilot_client_get_pilots(gpc,&amp;pilots)) {</div><div class='del'>-	case GPILOTD_OK: {</div><div class='del'>-		if(pilots) {</div><div class='del'>-			for(i=0;i&lt;g_list_length(pilots);i++) {</div><div class='del'>-				g_message("pilot %d = \"%s\"",i,(gchar*)g_list_nth(pilots,i)-&gt;data); </div><div class='del'>-			}</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'>-				gnome_pilot_client_get_pilot_id_by_name(gpc,</div><div class='del'>-									pilots-&gt;data,  /* this is the first pilot */</div><div class='del'>-									&amp;pilot);</div><div class='del'>-				if(i&gt;1) {</div><div class='del'>-					g_message("too many pilots...");</div><div class='del'>-					/* need a choose here */</div><div class='del'>-				}</div><div class='del'>-				return pilot;</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'>-		break;</div><div class='del'>-	}</div><div class='del'>-	case GPILOTD_ERR_NOT_CONNECTED:</div><div class='del'>-		run_error_dialog(_("Not connected to the gnome-pilot daemon"));</div><div class='del'>-		return -1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning("gnome_pilot_client_get_pilot_ids(...) = %d",err);</div><div class='del'>-		run_error_dialog(_("An error occured when trying to fetch\npilot list from the gnome-pilot daemon"));</div><div class='del'>-		return -1;</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'>-int</div><div class='del'>-main (int argc, char *argv[])</div><div class='del'>-{</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'>-	/* Init capplet */</div><div class='del'>-	gnome_capplet_init ("Evolution ToDo conduit control applet", </div><div class='del'>-			    NULL, argc, argv, </div><div class='del'>-			    NULL, 0, NULL);</div><div class='del'>-   </div><div class='del'>-	/* Setup Client */</div><div class='del'>-	gpc = gnome_pilot_client_new ();</div><div class='del'>-	gnome_pilot_client_connect_to_daemon (gpc);</div><div class='del'>-	pilotId = get_pilot_id_from_gpilotd ();</div><div class='del'>-	if (!pilotId) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	/* Put all code to set things up in here */</div><div class='del'>-	conduit = gnome_pilot_conduit_management_new ("e_todo_conduit", GNOME_PILOT_CONDUIT_MGMT_ID);</div><div class='del'>-	if (conduit == NULL) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	todoconduit_load_configuration (&amp;origState, pilotId);</div><div class='del'>-	conduit_config = gnome_pilot_conduit_config_new (conduit, pilotId);</div><div class='del'>-	org_activation_state = activated =</div><div class='del'>-		gnome_pilot_conduit_config_is_enabled (conduit_config,</div><div class='del'>-						       &amp;origState-&gt;sync_type);</div><div class='del'>-</div><div class='del'>-	curState = todoconduit_dupe_configuration (origState);</div><div class='del'>-    </div><div class='del'>-	pilot_capplet_setup ();</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'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-	gnome_pilot_conduit_management_destroy (conduit);</div><div class='del'>-	todoconduit_destroy_configuration (&amp;origState);</div><div class='del'>-	todoconduit_destroy_configuration (&amp;curState);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}    </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 12b04ad78c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/todo/todo-conduit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1014 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - ToDo Conduit</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: Eskil Heyn Olsen &lt;deity@eskil.dk&gt; </div><div class='del'>- *          JP Rosevear &lt;jpr@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;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'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;pi-source.h&gt;</div><div class='del'>-#include &lt;pi-socket.h&gt;</div><div class='del'>-#include &lt;pi-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'>-#include &lt;libical/src/libical/icaltypes.h&gt;</div><div class='del'>-</div><div class='del'>-#define TODO_CONFIG_LOAD 1</div><div class='del'>-#define TODO_CONFIG_DESTROY 1</div><div class='del'>-#include &lt;todo-conduit-config.h&gt;</div><div class='del'>-#undef TODO_CONFIG_LOAD</div><div class='del'>-#undef TODO_CONFIG_DESTROY</div><div class='del'>-</div><div class='del'>-#include &lt;todo-conduit.h&gt;</div><div class='del'>-</div><div class='del'>-GnomePilotConduit * conduit_get_gpilot_conduit (guint32);</div><div class='del'>-void conduit_destroy_gpilot_conduit (GnomePilotConduit*);</div><div class='del'>-</div><div class='del'>-#define CONDUIT_VERSION "0.1.0"</div><div class='del'>-#ifdef G_LOG_DOMAIN</div><div class='del'>-#undef G_LOG_DOMAIN</div><div class='del'>-#endif</div><div class='del'>-#define G_LOG_DOMAIN "etodoconduit"</div><div class='del'>-</div><div class='del'>-#define DEBUG_CALCONDUIT 1</div><div class='del'>-/* #undef DEBUG_CALCONDUIT */</div><div class='del'>-</div><div class='del'>-#ifdef DEBUG_CALCONDUIT</div><div class='del'>-#define LOG(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-#else</div><div class='del'>-#define LOG(e...)</div><div class='del'>-#endif </div><div class='del'>-</div><div class='del'>-#define WARN(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, e)</div><div class='del'>-#define INFO(e...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, e)</div><div class='del'>-</div><div class='del'>-/* debug spew DELETE ME */</div><div class='del'>-static char *</div><div class='del'>-print_local (EToDoLocalRecord *local)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-</div><div class='del'>-	if (local == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (local-&gt;todo &amp;&amp; local-&gt;todo-&gt;description) {</div><div class='del'>-		sprintf (buff, "[%d %ld %d %d '%s' '%s']",</div><div class='del'>-			 local-&gt;todo-&gt;indefinite,</div><div class='del'>-			 mktime (&amp; local-&gt;todo-&gt;due),</div><div class='del'>-			 local-&gt;todo-&gt;priority,</div><div class='del'>-			 local-&gt;todo-&gt;complete,</div><div class='del'>-			 local-&gt;todo-&gt;description,</div><div class='del'>-			 local-&gt;todo-&gt;note);</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* debug spew DELETE ME */</div><div class='del'>-static char *print_remote (GnomePilotRecord *remote)</div><div class='del'>-{</div><div class='del'>-	static char buff[ 4096 ];</div><div class='del'>-	struct ToDo todo;</div><div class='del'>-</div><div class='del'>-	if (remote == NULL) {</div><div class='del'>-		sprintf (buff, "[NULL]");</div><div class='del'>-		return buff;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	memset (&amp;todo, 0, sizeof (struct ToDo));</div><div class='del'>-	unpack_ToDo (&amp;todo, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	sprintf (buff, "[%d %ld %d %d '%s' '%s']",</div><div class='del'>-		 todo.indefinite,</div><div class='del'>-		 mktime (&amp; todo.due),</div><div class='del'>-		 todo.priority,</div><div class='del'>-		 todo.complete,</div><div class='del'>-		 todo.description,</div><div class='del'>-		 todo.note);</div><div class='del'>-</div><div class='del'>-	return buff;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Context Routines */</div><div class='del'>-static void</div><div class='del'>-e_todo_context_new (EToDoConduitContext **ctxt, guint32 pilot_id) </div><div class='del'>-{</div><div class='del'>-	*ctxt = g_new0 (EToDoConduitContext,1);</div><div class='del'>-	g_assert (ctxt!=NULL);</div><div class='del'>-</div><div class='del'>-	todoconduit_load_configuration (&amp;(*ctxt)-&gt;cfg, pilot_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_todo_context_destroy (EToDoConduitContext **ctxt)</div><div class='del'>-{</div><div class='del'>-	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;client != NULL)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT ((*ctxt)-&gt;client));</div><div class='del'>-</div><div class='del'>-	if ((*ctxt)-&gt;cfg != NULL)</div><div class='del'>-		todoconduit_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'>-</div><div class='del'>-/* Calendar Server routines */</div><div class='del'>-static void</div><div class='del'>-start_calendar_server_cb (GtkWidget *cal_client,</div><div class='del'>-			  CalClientLoadStatus status,</div><div class='del'>-			  EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalClient *client = CAL_CLIENT (cal_client);</div><div class='del'>-</div><div class='del'>-	LOG ("  entering start_calendar_server_load_cb, tried=%d\n",</div><div class='del'>-		ctxt-&gt;calendar_load_tried);</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_LOAD_SUCCESS) {</div><div class='del'>-		ctxt-&gt;calendar_load_success = TRUE;</div><div class='del'>-		LOG ("    success\n");</div><div class='del'>-		gtk_main_quit (); /* end the sub event loop */</div><div class='del'>-	} else {</div><div class='del'>-		if (ctxt-&gt;calendar_load_tried) {</div><div class='del'>-			LOG ("    load and create of calendar failed\n");</div><div class='del'>-			gtk_main_quit (); /* end the sub event loop */</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cal_client_create_calendar (client, ctxt-&gt;calendar_file);</div><div class='del'>-		ctxt-&gt;calendar_load_tried = TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-start_calendar_server (EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (ctxt != NULL, -2);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;client = cal_client_new ();</div><div class='del'>-</div><div class='del'>-	/* FIX ME */</div><div class='del'>-	ctxt-&gt;calendar_file = g_concat_dir_and_file (g_get_home_dir (),</div><div class='del'>-			       "evolution/local/Calendar/calendar.ics");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (ctxt-&gt;client), "cal_loaded",</div><div class='del'>-			    start_calendar_server_cb, ctxt);</div><div class='del'>-</div><div class='del'>-	LOG ("    calling cal_client_load_calendar\n");</div><div class='del'>-	cal_client_load_calendar (ctxt-&gt;client, ctxt-&gt;calendar_file);</div><div class='del'>-</div><div class='del'>-	/* run a sub event loop to turn cal-client's async load</div><div class='del'>-	   notification into a synchronous call */</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	if (ctxt-&gt;calendar_load_success)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Utility routines */</div><div class='del'>-static char *</div><div class='del'>-map_name (EToDoConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup_printf ("%s/evolution/local/Calendar/pilot-map-%d.xml", g_get_home_dir (), ctxt-&gt;cfg-&gt;pilot_id);</div><div class='del'>-</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-next_changed_item (EToDoConduitContext *ctxt, GList *changes) </div><div class='del'>-{</div><div class='del'>-	CalObjChange *coc;</div><div class='del'>-	GList *l;</div><div class='del'>-	</div><div class='del'>-	for (l = changes; l != NULL; l = l-&gt;next) {</div><div class='del'>-		coc = l-&gt;data;</div><div class='del'>-		</div><div class='del'>-		if (g_hash_table_lookup (ctxt-&gt;changed_hash, coc-&gt;uid))</div><div class='del'>-			return l;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-compute_status (EToDoConduitContext *ctxt, EToDoLocalRecord *local, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalObjChange *coc;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = FALSE;</div><div class='del'>-	local-&gt;local.secret = FALSE;</div><div class='del'>-</div><div class='del'>-	coc = g_hash_table_lookup (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-	if (coc == NULL) {</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordNothing;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (coc-&gt;type) {</div><div class='del'>-	case CALOBJ_UPDATED:</div><div class='del'>-		if (e_pilot_map_lookup_pid (ctxt-&gt;map, coc-&gt;uid) &gt; 0)</div><div class='del'>-			local-&gt;local.attr = GnomePilotRecordModified;</div><div class='del'>-		else</div><div class='del'>-			local-&gt;local.attr = GnomePilotRecordNew;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case CALOBJ_REMOVED:</div><div class='del'>-		local-&gt;local.attr = GnomePilotRecordDeleted;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GnomePilotRecord *</div><div class='del'>-local_record_to_pilot_record (EToDoLocalRecord *local,</div><div class='del'>-			      EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotRecord *p = NULL;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, NULL);</div><div class='del'>-	g_assert (local-&gt;comp != NULL);</div><div class='del'>-	g_assert (local-&gt;todo != NULL );</div><div class='del'>-	</div><div class='del'>-	LOG ("local_record_to_remote_record\n");</div><div class='del'>-</div><div class='del'>-	p = g_new0 (GnomePilotRecord, 1);</div><div class='del'>-</div><div class='del'>-	p-&gt;ID = local-&gt;local.ID;</div><div class='del'>-	p-&gt;category = 0;</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'>-	/* Generate pilot record structure */</div><div class='del'>-	p-&gt;record = g_new0 (char,0xffff);</div><div class='del'>-	p-&gt;length = pack_ToDo (local-&gt;todo, p-&gt;record, 0xffff);</div><div class='del'>-</div><div class='del'>-	return p;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * converts a CalComponent object to a EToDoLocalRecord</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-local_record_from_comp (EToDoLocalRecord *local, CalComponent *comp, EToDoConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	int *priority;</div><div class='del'>-	struct icaltimetype *completed;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-	GSList *d_list = NULL;</div><div class='del'>-	CalComponentText *description;</div><div class='del'>-	CalComponentDateTime due;</div><div class='del'>-	time_t due_time;</div><div class='del'>-	CalComponentClassification classif;</div><div class='del'>-</div><div class='del'>-	LOG ("local_record_from_comp\n");</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (local != NULL);</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	local-&gt;comp = comp;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	local-&gt;local.ID = e_pilot_map_lookup_pid (ctxt-&gt;map, uid);</div><div class='del'>-</div><div class='del'>-	compute_status (ctxt, local, uid);</div><div class='del'>-</div><div class='del'>-	local-&gt;todo = g_new0 (struct ToDo,1);</div><div class='del'>-</div><div class='del'>-	/* STOP: don't replace these with g_strdup, since free_ToDo</div><div class='del'>-	   uses free to deallocate */</div><div class='del'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-	if (summary.value) </div><div class='del'>-		local-&gt;todo-&gt;description = strdup ((char *) summary.value);</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (comp, &amp;d_list);</div><div class='del'>-	if (d_list) {</div><div class='del'>-		description = (CalComponentText *) d_list-&gt;data;</div><div class='del'>-		if (description &amp;&amp; description-&gt;value)</div><div class='del'>-			local-&gt;todo-&gt;note = strdup (description-&gt;value);</div><div class='del'>-		else</div><div class='del'>-			local-&gt;todo-&gt;note = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;todo-&gt;note = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (comp, &amp;due);	</div><div class='del'>-	if (due.value) {</div><div class='del'>-		due_time = icaltime_as_timet (*due.value);</div><div class='del'>-		</div><div class='del'>-		local-&gt;todo-&gt;due = *localtime (&amp;due_time);</div><div class='del'>-		local-&gt;todo-&gt;indefinite = 0;</div><div class='del'>-	} else {</div><div class='del'>-		local-&gt;todo-&gt;indefinite = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_get_completed (comp, &amp;completed);</div><div class='del'>-	if (completed) {</div><div class='del'>-		local-&gt;todo-&gt;complete = 1;</div><div class='del'>-		cal_component_free_icaltimetype (completed);</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	cal_component_get_priority (comp, &amp;priority);</div><div class='del'>-	if (priority) {</div><div class='del'>-		local-&gt;todo-&gt;priority = *priority;</div><div class='del'>-		cal_component_free_priority (priority);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cal_component_get_classification (comp, &amp;classif);</div><div class='del'>-</div><div class='del'>-	if (classif == CAL_COMPONENT_CLASS_PRIVATE)</div><div class='del'>-		local-&gt;local.secret = 1;</div><div class='del'>-	else</div><div class='del'>-		local-&gt;local.secret = 0;</div><div class='del'>-</div><div class='del'>-	local-&gt;local.archived = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-local_record_from_uid (EToDoLocalRecord *local,</div><div class='del'>-		       const char *uid,</div><div class='del'>-		       EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	g_assert(local!=NULL);</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (ctxt-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-		local_record_from_comp (local, comp, ctxt);</div><div class='del'>-	} else if (status == CAL_CLIENT_GET_NOT_FOUND) {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-		cal_component_set_uid (comp, uid);</div><div class='del'>-		local_record_from_comp (local, comp, ctxt);</div><div class='del'>-	} else {</div><div class='del'>-		INFO ("Object did not exist");</div><div class='del'>-	}	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CalComponent *</div><div class='del'>-comp_from_remote_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-			 GnomePilotRecord *remote,</div><div class='del'>-			 CalComponent *in_comp)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	struct ToDo todo;</div><div class='del'>-	struct icaltimetype now = icaltime_from_timet (time (NULL), FALSE, FALSE);</div><div class='del'>-	CalComponentText summary = {NULL, NULL};</div><div class='del'>-	CalComponentText description = {NULL, NULL};</div><div class='del'>-	CalComponentDateTime dt = {NULL, NULL};</div><div class='del'>-	struct icaltimetype due;</div><div class='del'>- 	GSList *d_list;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (remote != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	memset (&amp;todo, 0, sizeof (struct ToDo));</div><div class='del'>-	unpack_ToDo (&amp;todo, remote-&gt;record, remote-&gt;length);</div><div class='del'>-</div><div class='del'>-	if (in_comp == NULL) {</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-		cal_component_set_created (comp, &amp;now);</div><div class='del'>-	} else {</div><div class='del'>-		comp = cal_component_clone (in_comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- 	LOG ("        comp_from_remote_record: "</div><div class='del'>- 	     "creating from remote %s and comp %s\n", </div><div class='del'>-  	     print_remote (remote), cal_component_get_as_string (comp));</div><div class='del'>-</div><div class='del'>-	cal_component_set_last_modified (comp, &amp;now);</div><div class='del'>-</div><div class='del'>-	summary.value = todo.description;</div><div class='del'>-	cal_component_set_summary (comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-	description.value = todo.note;</div><div class='del'>-	d_list = g_slist_append (NULL, &amp;description);</div><div class='del'>-	cal_component_set_comment_list (comp, d_list);</div><div class='del'>-	g_slist_free (d_list);</div><div class='del'>-</div><div class='del'>-	if (todo.complete) {</div><div class='del'>-		int percent = 100;</div><div class='del'>-		cal_component_set_completed (comp, &amp;now);</div><div class='del'>-		cal_component_set_percent (comp, &amp;percent);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIX ME This is a bit hackish, how else can we tell if there is</div><div class='del'>-	 * no due date set?</div><div class='del'>-	 */</div><div class='del'>-	if (todo.due.tm_sec || todo.due.tm_min || todo.due.tm_hour </div><div class='del'>-	    || todo.due.tm_mday || todo.due.tm_mon || todo.due.tm_year) {</div><div class='del'>-		due = icaltime_from_timet (mktime (&amp;todo.due), FALSE, FALSE);</div><div class='del'>-		dt.value = &amp;due;</div><div class='del'>-		cal_component_set_due (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	cal_component_set_priority (comp, &amp;todo.priority);</div><div class='del'>-	cal_component_set_transparency (comp, CAL_COMPONENT_TRANSP_NONE);</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;attr &amp; dlpRecAttrSecret)</div><div class='del'>-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PRIVATE);</div><div class='del'>-	else</div><div class='del'>-		cal_component_set_classification (comp, CAL_COMPONENT_CLASS_PUBLIC);</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-	</div><div class='del'>-	free_ToDo(&amp;todo);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_comp (GnomePilotConduitSyncAbs *conduit, CalComponent *comp,</div><div class='del'>-	     EToDoConduitContext *ctxt) </div><div class='del'>-{</div><div class='del'>-	gboolean success;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (conduit != NULL);</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	LOG ("update_comp: saving to desktop\n%s\n", </div><div class='del'>-	     cal_component_get_as_string (comp));</div><div class='del'>-</div><div class='del'>-	success = cal_client_update_object (ctxt-&gt;client, comp);</div><div class='del'>-</div><div class='del'>-	if (!success)</div><div class='del'>-		WARN (_("Error while communicating with calendar server"));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-check_for_slow_setting (GnomePilotConduit *c, EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	int count, map_count;</div><div class='del'>-</div><div class='del'>-	count = g_list_length (ctxt-&gt;uids);</div><div class='del'>-	map_count = g_hash_table_size (ctxt-&gt;map-&gt;pid_map);</div><div class='del'>-	</div><div class='del'>-	/* If there are no objects or objects but no log */</div><div class='del'>-	if (map_count == 0) {</div><div class='del'>-		GnomePilotConduitStandard *conduit;</div><div class='del'>-		LOG ("    doing slow sync\n");</div><div class='del'>-		conduit = GNOME_PILOT_CONDUIT_STANDARD (c);</div><div class='del'>-		gnome_pilot_conduit_standard_set_slow (conduit);</div><div class='del'>-	} else {</div><div class='del'>-		LOG ("    doing fast sync\n");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Pilot syncing callbacks */</div><div class='del'>-static gint</div><div class='del'>-pre_sync (GnomePilotConduit *conduit,</div><div class='del'>-	  GnomePilotDBInfo *dbi,</div><div class='del'>-	  EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	GnomePilotConduitSyncAbs *abs_conduit;</div><div class='del'>-	GList *l;</div><div class='del'>-	int len;</div><div class='del'>-	unsigned char *buf;</div><div class='del'>-	char *filename;</div><div class='del'>-	gint num_records, add_records = 0, mod_records = 0, del_records = 0;</div><div class='del'>-</div><div class='del'>-	abs_conduit = GNOME_PILOT_CONDUIT_SYNC_ABS (conduit);</div><div class='del'>-</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-	LOG ("pre_sync: ToDo Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-	g_message ("ToDo Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-</div><div class='del'>-	ctxt-&gt;client = NULL;</div><div class='del'>-	</div><div class='del'>-	if (start_calendar_server (ctxt) != 0) {</div><div class='del'>-		WARN(_("Could not start wombat server"));</div><div class='del'>-		gnome_pilot_conduit_error (conduit, _("Could not start wombat"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get the local database */</div><div class='del'>-	ctxt-&gt;uids = cal_client_get_uids (ctxt-&gt;client, CALOBJ_TYPE_TODO);</div><div class='del'>-	</div><div class='del'>-	/* Load the uid &lt;--&gt; pilot id map */</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_read (filename, &amp;ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* Count and hash the changes */</div><div class='del'>-	ctxt-&gt;changed_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	ctxt-&gt;changed = cal_client_get_changed_uids (ctxt-&gt;client, </div><div class='del'>-						     CALOBJ_TYPE_TODO,</div><div class='del'>-						     ctxt-&gt;map-&gt;since + 1);</div><div class='del'>-</div><div class='del'>-	for (l = ctxt-&gt;changed; l != NULL; l = l-&gt;next) {</div><div class='del'>-		CalObjChange *coc = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (!e_pilot_map_uid_is_archived (ctxt-&gt;map, coc-&gt;uid)) {</div><div class='del'>-			</div><div class='del'>-			g_hash_table_insert (ctxt-&gt;changed_hash, coc-&gt;uid, coc);</div><div class='del'>-			</div><div class='del'>-			switch (coc-&gt;type) {</div><div class='del'>-			case CALOBJ_UPDATED:</div><div class='del'>-				if (e_pilot_map_lookup_pid (ctxt-&gt;map, coc-&gt;uid) &gt; 0)</div><div class='del'>-					mod_records++;</div><div class='del'>-				else</div><div class='del'>-					add_records++;</div><div class='del'>-				break;</div><div class='del'>-				</div><div class='del'>-			case CALOBJ_REMOVED:</div><div class='del'>-				del_records++;</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'>-	/* Set the count information */</div><div class='del'>-	num_records = cal_client_get_n_objects (ctxt-&gt;client, CALOBJ_TYPE_TODO);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_local_records(abs_conduit, num_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_new_local_records (abs_conduit, add_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records);</div><div class='del'>-	gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records);</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (conduit), "dbinfo", dbi);</div><div class='del'>-</div><div class='del'>-	buf = (unsigned char*)g_malloc (0xffff);</div><div class='del'>-	len = dlp_ReadAppBlock (dbi-&gt;pilot_socket, dbi-&gt;db_handle, 0,</div><div class='del'>-			      (unsigned char *)buf, 0xffff);</div><div class='del'>-	</div><div class='del'>-	if (len &lt; 0) {</div><div class='del'>-		WARN (_("Could not read pilot's ToDo application block"));</div><div class='del'>-		WARN ("dlp_ReadAppBlock(...) = %d", len);</div><div class='del'>-		gnome_pilot_conduit_error (conduit,</div><div class='del'>-					   _("Could not read pilot's ToDo application block"));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	unpack_ToDoAppInfo (&amp;(ctxt-&gt;ai), buf, len);</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	check_for_slow_setting (conduit, ctxt);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-post_sync (GnomePilotConduit *conduit,</div><div class='del'>-	   GnomePilotDBInfo *dbi,</div><div class='del'>-	   EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	gchar *filename;</div><div class='del'>-	</div><div class='del'>-	LOG ("post_sync: ToDo Conduit v.%s", CONDUIT_VERSION);</div><div class='del'>-	LOG ("---------------------------------------------------------\n");</div><div class='del'>-</div><div class='del'>-	filename = map_name (ctxt);</div><div class='del'>-	e_pilot_map_write (filename, ctxt-&gt;map);</div><div class='del'>-	e_pilot_map_destroy (ctxt-&gt;map);</div><div class='del'>-	g_free (filename);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_pilot_id (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      EToDoLocalRecord *local,</div><div class='del'>-	      guint32 ID,</div><div class='del'>-	      EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	LOG ("set_pilot_id: setting to %d\n", ID);</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, ID, uid, FALSE);</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-set_status_cleared (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		    EToDoLocalRecord *local,</div><div class='del'>-		    EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("set_status_cleared: clearing status\n");</div><div class='del'>-	</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	g_hash_table_remove (ctxt-&gt;changed_hash, uid);</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	  EToDoLocalRecord **local,</div><div class='del'>-	  EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *uids, *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("beginning for_each");</div><div class='del'>-</div><div class='del'>-		uids = ctxt-&gt;uids;</div><div class='del'>-		count = 0;</div><div class='del'>-		</div><div class='del'>-		if (uids != NULL) {</div><div class='del'>-			LOG ("iterating over %d records", g_list_length (uids));</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, uids-&gt;data, ctxt);</div><div class='del'>-</div><div class='del'>-			iterator = uids;</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-			(*local) = NULL;</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		if (g_list_next (iterator)) {</div><div class='del'>-			iterator = g_list_next (iterator);</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, iterator-&gt;data, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each ending");</div><div class='del'>-</div><div class='del'>-			/* Tell the pilot the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-</div><div class='del'>-			return 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-for_each_modified (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		   EToDoLocalRecord **local,</div><div class='del'>-		   EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	static GList *iterator;</div><div class='del'>-	static int count;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, 0);</div><div class='del'>-</div><div class='del'>-	if (*local == NULL) {</div><div class='del'>-		LOG ("beginning for_each_modified: beginning\n");</div><div class='del'>-		</div><div class='del'>-		iterator = ctxt-&gt;changed;</div><div class='del'>-		</div><div class='del'>-		count = 0;</div><div class='del'>-	</div><div class='del'>-		LOG ("iterating over %d records", g_hash_table_size (ctxt-&gt;changed_hash));</div><div class='del'>-		</div><div class='del'>-		iterator = next_changed_item (ctxt, iterator);</div><div class='del'>-		if (iterator != NULL) {</div><div class='del'>-			CalObjChange *coc = NULL;</div><div class='del'>-			</div><div class='del'>-			coc = iterator-&gt;data;</div><div class='del'>-		</div><div class='del'>-			LOG ("iterating over %d records", g_hash_table_size (ctxt-&gt;changed_hash));</div><div class='del'>-</div><div class='del'>-			*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, coc-&gt;uid, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("no events");</div><div class='del'>-</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		count++;</div><div class='del'>-		if ((iterator = next_changed_item (ctxt, iterator))) {</div><div class='del'>-			CalObjChange *coc = NULL;</div><div class='del'>-</div><div class='del'>-			coc = iterator-&gt;data;</div><div class='del'>-			</div><div class='del'>-			*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-			local_record_from_uid (*local, coc-&gt;uid, ctxt);</div><div class='del'>-		} else {</div><div class='del'>-			LOG ("for_each_modified ending");</div><div class='del'>-</div><div class='del'>-			/* Signal the iteration is over */</div><div class='del'>-			*local = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-compare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 EToDoLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord *remote,</div><div class='del'>-	 EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	/* used by the quick compare */</div><div class='del'>-	GnomePilotRecord *local_pilot;</div><div class='del'>-	int retval = 0;</div><div class='del'>-</div><div class='del'>-	LOG ("compare: local=%s remote=%s...\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local!=NULL,-1);</div><div class='del'>-	g_return_val_if_fail (remote!=NULL,-1);</div><div class='del'>-</div><div class='del'>-	local_pilot = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-	if (!local_pilot) </div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	if (remote-&gt;length != local_pilot-&gt;length</div><div class='del'>-	    || memcmp (local_pilot-&gt;record, remote-&gt;record, remote-&gt;length))</div><div class='del'>-		retval = 1;</div><div class='del'>-</div><div class='del'>-	if (retval == 0)</div><div class='del'>-		LOG ("    equal");</div><div class='del'>-	else</div><div class='del'>-		LOG ("    not equal");</div><div class='del'>-	</div><div class='del'>-	g_free (local_pilot);</div><div class='del'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-add_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    GnomePilotRecord *remote,</div><div class='del'>-	    EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("add_record: adding %s to desktop\n", print_remote (remote));</div><div class='del'>-</div><div class='del'>-	comp = comp_from_remote_record (conduit, remote, NULL);</div><div class='del'>-	update_comp (conduit, comp, ctxt);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, remote-&gt;ID, uid, FALSE);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-replace_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		EToDoLocalRecord *local,</div><div class='del'>-		GnomePilotRecord *remote,</div><div class='del'>-		EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	CalComponent *new_comp;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("replace_record: replace %s with %s\n",</div><div class='del'>-	     print_local (local), print_remote (remote));</div><div class='del'>-</div><div class='del'>-	new_comp = comp_from_remote_record (conduit, remote, local-&gt;comp);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;comp));</div><div class='del'>-	local-&gt;comp = new_comp;</div><div class='del'>-	update_comp (conduit, local-&gt;comp, ctxt);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-delete_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	       EToDoLocalRecord *local,</div><div class='del'>-	       EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (local-&gt;comp != NULL, -1);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	LOG ("delete_record: deleting %s\n", uid);</div><div class='del'>-</div><div class='del'>-	cal_client_remove_object (ctxt-&gt;client, uid);</div><div class='del'>-	</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-archive_record (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-		EToDoLocalRecord *local,</div><div class='del'>-		gboolean archive,</div><div class='del'>-		EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	int retval = 0;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	LOG ("archive_record: %s\n", archive ? "yes" : "no");</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (local-&gt;comp, &amp;uid);</div><div class='del'>-	e_pilot_map_insert (ctxt-&gt;map, local-&gt;local.ID, uid, archive);</div><div class='del'>-	</div><div class='del'>-        return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-       GnomePilotRecord *remote,</div><div class='del'>-       EToDoLocalRecord **local,</div><div class='del'>-       EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	LOG ("match: looking for local copy of %s\n",</div><div class='del'>-	     print_remote (remote));	</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (remote != NULL, -1);</div><div class='del'>-</div><div class='del'>-	*local = NULL;</div><div class='del'>-	uid = e_pilot_map_lookup_uid (ctxt-&gt;map, remote-&gt;ID);</div><div class='del'>-	</div><div class='del'>-	if (!uid)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	LOG ("  matched\n");</div><div class='del'>-	</div><div class='del'>-	*local = g_new0 (EToDoLocalRecord, 1);</div><div class='del'>-	local_record_from_uid (*local, uid, ctxt);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-free_match (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	    EToDoLocalRecord *local,</div><div class='del'>-	    EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_match: freeing\n");</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (local != NULL, -1);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (local-&gt;comp));</div><div class='del'>-	g_free (local);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	 EToDoLocalRecord *local,</div><div class='del'>-	 GnomePilotRecord **remote,</div><div class='del'>-	 EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("prepare: encoding local %s\n", print_local (local));</div><div class='del'>-</div><div class='del'>-	*remote = local_record_to_pilot_record (local, ctxt);</div><div class='del'>-</div><div class='del'>-	if (!*remote)</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'>-free_prepare (GnomePilotConduitSyncAbs *conduit,</div><div class='del'>-	      EToDoLocalRecord *local,</div><div class='del'>-	      GnomePilotRecord **remote,</div><div class='del'>-	      EToDoConduitContext *ctxt)</div><div class='del'>-{</div><div class='del'>-	LOG ("free_prepare: freeing\n");</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'>-	g_free (*remote);</div><div class='del'>-	*remote = NULL;</div><div class='del'>-</div><div class='del'>-        return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ORBit_MessageValidationResult</div><div class='del'>-accept_all_cookies (CORBA_unsigned_long request_id,</div><div class='del'>-		    CORBA_Principal *principal,</div><div class='del'>-		    CORBA_char *operation)</div><div class='del'>-{</div><div class='del'>-	/* allow ALL cookies */</div><div class='del'>-	return ORBIT_MESSAGE_ALLOW_ALL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GnomePilotConduit *</div><div class='del'>-conduit_get_gpilot_conduit (guint32 pilot_id)</div><div class='del'>-{</div><div class='del'>-	GtkObject *retval;</div><div class='del'>-	EToDoConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	LOG ("in todo's conduit_get_gpilot_conduit\n");</div><div class='del'>-</div><div class='del'>-	/* we need to find wombat with oaf, so make sure oaf</div><div class='del'>-	   is initialized here.  once the desktop is converted</div><div class='del'>-	   to oaf and gpilotd is built with oaf, this can go away */</div><div class='del'>-	if (!oaf_is_initialized ()) {</div><div class='del'>-		char *argv[ 1 ] = {"hi"};</div><div class='del'>-		oaf_init (1, argv);</div><div class='del'>-</div><div class='del'>-		if (bonobo_init (CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL,</div><div class='del'>-				 CORBA_OBJECT_NIL) == FALSE)</div><div class='del'>-			g_error (_("Could not initialize Bonobo"));</div><div class='del'>-</div><div class='del'>-		ORBit_set_request_validation_handler (accept_all_cookies);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retval = gnome_pilot_conduit_sync_abs_new ("ToDoDB", 0x746F646F);</div><div class='del'>-	g_assert (retval != NULL);</div><div class='del'>-</div><div class='del'>-	gnome_pilot_conduit_construct (GNOME_PILOT_CONDUIT (retval),</div><div class='del'>-				       "e_todo_conduit");</div><div class='del'>-</div><div class='del'>-	e_todo_context_new (&amp;ctxt, pilot_id);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (retval), "todoconduit_context", ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (retval, "pre_sync", (GtkSignalFunc) pre_sync, ctxt);</div><div class='del'>-	gtk_signal_connect (retval, "post_sync", (GtkSignalFunc) post_sync, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "set_pilot_id", (GtkSignalFunc) set_pilot_id, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "set_status_cleared", (GtkSignalFunc) set_status_cleared, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "for_each", (GtkSignalFunc) for_each, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "for_each_modified", (GtkSignalFunc) for_each_modified, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "compare", (GtkSignalFunc) compare, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "add_record", (GtkSignalFunc) add_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "replace_record", (GtkSignalFunc) replace_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "delete_record", (GtkSignalFunc) delete_record, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "archive_record", (GtkSignalFunc) archive_record, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "match", (GtkSignalFunc) match, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_match", (GtkSignalFunc) free_match, ctxt);</div><div class='del'>-</div><div class='del'>-  	gtk_signal_connect (retval, "prepare", (GtkSignalFunc) prepare, ctxt);</div><div class='del'>-  	gtk_signal_connect (retval, "free_prepare", (GtkSignalFunc) free_prepare, 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'>-	EToDoConduitContext *ctxt;</div><div class='del'>-</div><div class='del'>-	ctxt = gtk_object_get_data (GTK_OBJECT (conduit), </div><div class='del'>-				    "todoconduit_context");</div><div class='del'>-</div><div class='del'>-	e_todo_context_destroy (&amp;ctxt);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (conduit));</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/conduits/todo/todo-conduit.h b/calendar/conduits/todo/todo-conduit.h<br/>deleted file mode 100644<br/>index 624c6271e7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/conduits/todo/todo-conduit.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/conduits/todo/todo-conduit.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,79 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution calendar - ToDo Conduit Capplet</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1998 Free Software Foundation</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'>- *          JP Rosevear &lt;jpr@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 __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;gnome.h&gt;</div><div class='del'>-#include &lt;pi-todo.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit.h&gt;</div><div class='del'>-#include &lt;gpilotd/gnome-pilot-conduit-sync-abs.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include &lt;e-pilot-map.h&gt;</div><div class='del'>-</div><div class='del'>-/* This is the local record structure for the Evolution ToDo conduit. */</div><div class='del'>-typedef struct _EToDoLocalRecord EToDoLocalRecord;</div><div class='del'>-struct _EToDoLocalRecord {</div><div class='del'>-	/* The stuff from gnome-pilot-conduit-standard-abs.h</div><div class='del'>-	   Must be first in the structure, or instances of this</div><div class='del'>-	   structure cannot be used by gnome-pilot-conduit-standard-abs.</div><div class='del'>-	*/</div><div class='del'>-	GnomePilotDesktopRecord local;</div><div class='del'>-</div><div class='del'>-	/* The corresponding Comp object */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-        /* pilot-link todo structure, used for implementing Transmit. */</div><div class='del'>-	struct ToDo *todo;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* This is the context for all the GnomeCal conduit methods. */</div><div class='del'>-typedef struct _EToDoConduitContext EToDoConduitContext;</div><div class='del'>-struct _EToDoConduitContext {</div><div class='del'>-	EToDoConduitCfg *cfg;</div><div class='del'>-</div><div class='del'>-	struct ToDoAppInfo ai;</div><div class='del'>-</div><div class='del'>-	CalClient *client;</div><div class='del'>-	char *calendar_file;</div><div class='del'>-	gboolean calendar_load_tried;</div><div class='del'>-	gboolean calendar_load_success;</div><div class='del'>-</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *changed;</div><div class='del'>-	GHashTable *changed_hash;</div><div class='del'>-	</div><div class='del'>-	EPilotMap *map;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#endif __TODO_CONDUIT_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='head'>diff --git a/calendar/gui/.cvsignore b/calendar/gui/.cvsignore<br/>deleted file mode 100644<br/>index 1396e98066..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-_libs</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-evolution-calendar</div><div class='del'>-evolution-calendar.pure</div><div class='del'>-getdate.c</div><div class='del'>-*.lo</div><div class='del'>-Evolution-Composer-common.c</div><div class='del'>-Evolution-Composer-skels.c</div><div class='del'>-Evolution-Composer-stubs.c</div><div class='del'>-Evolution-Composer.h
\ No newline at end of file</div><div class='head'>diff --git a/calendar/gui/Evolution-Composer.h b/calendar/gui/Evolution-Composer.h<br/>deleted file mode 100644<br/>index f8e0795590..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/Evolution-Composer.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/Evolution-Composer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,369 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * This file was generated by orbit-idl - DO NOT EDIT!</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#define ORBIT_IDL_SERIAL 9</div><div class='del'>-#include &lt;orb/orbit.h&gt;</div><div class='del'>-</div><div class='del'>-#ifndef Evolution_Composer_H</div><div class='del'>-#define Evolution_Composer_H 1</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-{</div><div class='del'>-#endif				/* __cplusplus */</div><div class='del'>-</div><div class='del'>-/** typedefs **/</div><div class='del'>-#include &lt;bonobo/Bonobo.h&gt;</div><div class='del'>-#if !defined(ORBIT_DECL_Evolution_Composer) &amp;&amp; !defined(_Evolution_Composer_defined)</div><div class='del'>-#define ORBIT_DECL_Evolution_Composer 1</div><div class='del'>-#define _Evolution_Composer_defined 1</div><div class='del'>-#define Evolution_Composer__free CORBA_Object__free</div><div class='del'>-   typedef CORBA_Object Evolution_Composer;</div><div class='del'>-   extern CORBA_unsigned_long Evolution_Composer__classid;</div><div class='del'>-#if !defined(TC_IMPL_TC_Evolution_Composer_0)</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_0 'E'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_1 'v'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_2 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_3 'l'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_4 'u'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_5 't'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_6 'i'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_7 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_8 'n'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_9 '_'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_10 'C'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_11 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_12 'm'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_13 'p'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_14 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_15 's'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_16 'e'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_17 'r'</div><div class='del'>-   extern const struct CORBA_TypeCode_struct TC_Evolution_Composer_struct;</div><div class='del'>-#define TC_Evolution_Composer ((CORBA_TypeCode)&amp;TC_Evolution_Composer_struct)</div><div class='del'>-#endif</div><div class='del'>-#endif</div><div class='del'>-#if !defined(_Evolution_Composer_Recipient_defined)</div><div class='del'>-#define _Evolution_Composer_Recipient_defined 1</div><div class='del'>-   typedef struct</div><div class='del'>-   {</div><div class='del'>-      CORBA_char *name;</div><div class='del'>-      CORBA_char *address;</div><div class='del'>-   }</div><div class='del'>-   Evolution_Composer_Recipient;</div><div class='del'>-</div><div class='del'>-#if !defined(TC_IMPL_TC_Evolution_Composer_Recipient_0)</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_0 'E'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_1 'v'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_2 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_3 'l'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_4 'u'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_5 't'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_6 'i'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_7 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_8 'n'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_9 '_'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_10 'C'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_11 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_12 'm'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_13 'p'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_14 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_15 's'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_16 'e'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_Recipient_17 'r'</div><div class='del'>-   extern const struct CORBA_TypeCode_struct</div><div class='del'>-      TC_Evolution_Composer_Recipient_struct;</div><div class='del'>-#define TC_Evolution_Composer_Recipient ((CORBA_TypeCode)&amp;TC_Evolution_Composer_Recipient_struct)</div><div class='del'>-#endif</div><div class='del'>-   extern Evolution_Composer_Recipient</div><div class='del'>-      *Evolution_Composer_Recipient__alloc(void);</div><div class='del'>-   extern gpointer Evolution_Composer_Recipient__free(gpointer mem,</div><div class='del'>-						      gpointer dat,</div><div class='del'>-						      CORBA_boolean free_strings);	/* ORBit internal use */</div><div class='del'>-#endif</div><div class='del'>-#if !defined(ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient) &amp;&amp; !defined(_CORBA_sequence_Evolution_Composer_Recipient_defined)</div><div class='del'>-#define ORBIT_DECL_CORBA_sequence_Evolution_Composer_Recipient 1</div><div class='del'>-#define _CORBA_sequence_Evolution_Composer_Recipient_defined 1</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_0 'E'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_1 'v'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_2 'o'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_3 'l'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_4 'u'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_5 't'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_6 'i'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_7 'o'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_8 'n'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_9 '_'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_10 'C'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_11 'o'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_12 'm'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_13 'p'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_14 'o'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_15 's'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_16 'e'</div><div class='del'>-#define ORBIT_IMPL_CORBA_sequence_Evolution_Composer_Recipient_17 'r'</div><div class='del'>-   typedef struct</div><div class='del'>-   {</div><div class='del'>-      CORBA_unsigned_long _maximum,</div><div class='del'>-       _length;</div><div class='del'>-      Evolution_Composer_Recipient *_buffer;</div><div class='del'>-      CORBA_boolean _release;</div><div class='del'>-   }</div><div class='del'>-   CORBA_sequence_Evolution_Composer_Recipient;</div><div class='del'>-#if !defined(TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0)</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_0 'E'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_1 'v'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_2 'o'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_3 'l'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_4 'u'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_5 't'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_6 'i'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_7 'o'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_8 'n'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_9 '_'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_10 'C'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_11 'o'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_12 'm'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_13 'p'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_14 'o'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_15 's'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_16 'e'</div><div class='del'>-#define TC_IMPL_TC_CORBA_sequence_Evolution_Composer_Recipient_17 'r'</div><div class='del'>-   extern const struct CORBA_TypeCode_struct</div><div class='del'>-      TC_CORBA_sequence_Evolution_Composer_Recipient_struct;</div><div class='del'>-#define TC_CORBA_sequence_Evolution_Composer_Recipient ((CORBA_TypeCode)&amp;TC_CORBA_sequence_Evolution_Composer_Recipient_struct)</div><div class='del'>-#endif</div><div class='del'>-   extern CORBA_sequence_Evolution_Composer_Recipient</div><div class='del'>-      *CORBA_sequence_Evolution_Composer_Recipient__alloc(void);</div><div class='del'>-   extern gpointer CORBA_sequence_Evolution_Composer_Recipient__free(gpointer</div><div class='del'>-								     mem,</div><div class='del'>-								     gpointer</div><div class='del'>-								     dat,</div><div class='del'>-								     CORBA_boolean free_strings);	/* ORBit internal use */</div><div class='del'>-   Evolution_Composer_Recipient</div><div class='del'>-      *CORBA_sequence_Evolution_Composer_Recipient_allocbuf</div><div class='del'>-      (CORBA_unsigned_long len);</div><div class='del'>-#endif</div><div class='del'>-#if !defined(_Evolution_Composer_RecipientList_defined)</div><div class='del'>-#define _Evolution_Composer_RecipientList_defined 1</div><div class='del'>-   typedef CORBA_sequence_Evolution_Composer_Recipient</div><div class='del'>-      Evolution_Composer_RecipientList;</div><div class='del'>-#if !defined(TC_IMPL_TC_Evolution_Composer_RecipientList_0)</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_0 'E'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_1 'v'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_2 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_3 'l'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_4 'u'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_5 't'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_6 'i'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_7 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_8 'n'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_9 '_'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_10 'C'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_11 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_12 'm'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_13 'p'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_14 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_15 's'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_16 'e'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_RecipientList_17 'r'</div><div class='del'>-   extern const struct CORBA_TypeCode_struct</div><div class='del'>-      TC_Evolution_Composer_RecipientList_struct;</div><div class='del'>-#define TC_Evolution_Composer_RecipientList ((CORBA_TypeCode)&amp;TC_Evolution_Composer_RecipientList_struct)</div><div class='del'>-#endif</div><div class='del'>-   extern Evolution_Composer_RecipientList</div><div class='del'>-      *Evolution_Composer_RecipientList__alloc(void);</div><div class='del'>-   extern gpointer Evolution_Composer_RecipientList__free(gpointer mem,</div><div class='del'>-							  gpointer dat,</div><div class='del'>-							  CORBA_boolean free_strings);	/* ORBit internal use */</div><div class='del'>-#endif</div><div class='del'>-#define ex_Evolution_Composer_CouldNotParse "IDL:Evolution/Composer/CouldNotParse:1.0"</div><div class='del'>-   void _ORBIT_Evolution_Composer_CouldNotParse_demarshal(GIOPRecvBuffer *</div><div class='del'>-							  _ORBIT_recv_buffer,</div><div class='del'>-							  CORBA_Environment *</div><div class='del'>-							  ev);</div><div class='del'>-   void _ORBIT_Evolution_Composer_CouldNotParse_marshal(GIOPSendBuffer *</div><div class='del'>-							_ORBIT_send_buffer,</div><div class='del'>-							CORBA_Environment *</div><div class='del'>-							ev);</div><div class='del'>-#if !defined(_Evolution_Composer_CouldNotParse_defined)</div><div class='del'>-#define _Evolution_Composer_CouldNotParse_defined 1</div><div class='del'>-   typedef struct</div><div class='del'>-   {</div><div class='del'>-      int dummy;</div><div class='del'>-   }</div><div class='del'>-   Evolution_Composer_CouldNotParse;</div><div class='del'>-</div><div class='del'>-#if !defined(TC_IMPL_TC_Evolution_Composer_CouldNotParse_0)</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_0 'E'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_1 'v'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_2 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_3 'l'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_4 'u'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_5 't'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_6 'i'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_7 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_8 'n'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_9 '_'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_10 'C'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_11 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_12 'm'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_13 'p'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_14 'o'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_15 's'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_16 'e'</div><div class='del'>-#define TC_IMPL_TC_Evolution_Composer_CouldNotParse_17 'r'</div><div class='del'>-   extern const struct CORBA_TypeCode_struct</div><div class='del'>-      TC_Evolution_Composer_CouldNotParse_struct;</div><div class='del'>-#define TC_Evolution_Composer_CouldNotParse ((CORBA_TypeCode)&amp;TC_Evolution_Composer_CouldNotParse_struct)</div><div class='del'>-#endif</div><div class='del'>-#define Evolution_Composer_CouldNotParse__alloc() NULL</div><div class='del'>-   extern gpointer Evolution_Composer_CouldNotParse__free(gpointer mem,</div><div class='del'>-							  gpointer dat,</div><div class='del'>-							  CORBA_boolean free_strings);	/* ORBit internal use */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/** POA structures **/</div><div class='del'>-   typedef struct</div><div class='del'>-   {</div><div class='del'>-      void *_private;</div><div class='del'>-      void (*set_headers) (PortableServer_Servant _servant,</div><div class='del'>-			   const Evolution_Composer_RecipientList * to,</div><div class='del'>-			   const Evolution_Composer_RecipientList * cc,</div><div class='del'>-			   const Evolution_Composer_RecipientList * bcc,</div><div class='del'>-			   const CORBA_char * subject,</div><div class='del'>-			   CORBA_Environment * ev);</div><div class='del'>-      void (*set_body_text) (PortableServer_Servant _servant,</div><div class='del'>-			     const CORBA_char * body, CORBA_Environment * ev);</div><div class='del'>-      void (*attach_MIME) (PortableServer_Servant _servant,</div><div class='del'>-			   const CORBA_char * data, CORBA_Environment * ev);</div><div class='del'>-      void (*attach_data) (PortableServer_Servant _servant,</div><div class='del'>-			   const CORBA_char * content_type,</div><div class='del'>-			   const CORBA_char * filename,</div><div class='del'>-			   const CORBA_char * description,</div><div class='del'>-			   const CORBA_boolean show_inline,</div><div class='del'>-			   const CORBA_char * data, CORBA_Environment * ev);</div><div class='del'>-      void (*show) (PortableServer_Servant _servant, CORBA_Environment * ev);</div><div class='del'>-   }</div><div class='del'>-   POA_Evolution_Composer__epv;</div><div class='del'>-   typedef struct</div><div class='del'>-   {</div><div class='del'>-      PortableServer_ServantBase__epv *_base_epv;</div><div class='del'>-      POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;</div><div class='del'>-      POA_Evolution_Composer__epv *Evolution_Composer_epv;</div><div class='del'>-   }</div><div class='del'>-   POA_Evolution_Composer__vepv;</div><div class='del'>-   typedef struct</div><div class='del'>-   {</div><div class='del'>-      void *_private;</div><div class='del'>-      POA_Evolution_Composer__vepv *vepv;</div><div class='del'>-   }</div><div class='del'>-   POA_Evolution_Composer;</div><div class='del'>-   extern void POA_Evolution_Composer__init(PortableServer_Servant servant,</div><div class='del'>-					    CORBA_Environment * ev);</div><div class='del'>-   extern void POA_Evolution_Composer__fini(PortableServer_Servant servant,</div><div class='del'>-					    CORBA_Environment * ev);</div><div class='del'>-</div><div class='del'>-/** prototypes **/</div><div class='del'>-#define Evolution_Composer_ref Bonobo_Unknown_ref</div><div class='del'>-#define Evolution_Composer_unref Bonobo_Unknown_unref</div><div class='del'>-#define Evolution_Composer_queryInterface Bonobo_Unknown_queryInterface</div><div class='del'>-   void Evolution_Composer_set_headers(Evolution_Composer _obj,</div><div class='del'>-				       const Evolution_Composer_RecipientList</div><div class='del'>-				       * to,</div><div class='del'>-				       const Evolution_Composer_RecipientList</div><div class='del'>-				       * cc,</div><div class='del'>-				       const Evolution_Composer_RecipientList</div><div class='del'>-				       * bcc, const CORBA_char * subject,</div><div class='del'>-				       CORBA_Environment * ev);</div><div class='del'>-   void Evolution_Composer_set_body_text(Evolution_Composer _obj,</div><div class='del'>-					 const CORBA_char * body,</div><div class='del'>-					 CORBA_Environment * ev);</div><div class='del'>-   void Evolution_Composer_attach_MIME(Evolution_Composer _obj,</div><div class='del'>-				       const CORBA_char * data,</div><div class='del'>-				       CORBA_Environment * ev);</div><div class='del'>-   void Evolution_Composer_attach_data(Evolution_Composer _obj,</div><div class='del'>-				       const CORBA_char * content_type,</div><div class='del'>-				       const CORBA_char * filename,</div><div class='del'>-				       const CORBA_char * description,</div><div class='del'>-				       const CORBA_boolean show_inline,</div><div class='del'>-				       const CORBA_char * data,</div><div class='del'>-				       CORBA_Environment * ev);</div><div class='del'>-   void Evolution_Composer_show(Evolution_Composer _obj,</div><div class='del'>-				CORBA_Environment * ev);</div><div class='del'>-</div><div class='del'>-   void _ORBIT_skel_Evolution_Composer_set_headers(POA_Evolution_Composer *</div><div class='del'>-						   _ORBIT_servant,</div><div class='del'>-						   GIOPRecvBuffer *</div><div class='del'>-						   _ORBIT_recv_buffer,</div><div class='del'>-						   CORBA_Environment * ev,</div><div class='del'>-						   void (*_impl_set_headers)</div><div class='del'>-						   (PortableServer_Servant</div><div class='del'>-						    _servant,</div><div class='del'>-						    const</div><div class='del'>-						    Evolution_Composer_RecipientList</div><div class='del'>-						    * to,</div><div class='del'>-						    const</div><div class='del'>-						    Evolution_Composer_RecipientList</div><div class='del'>-						    * cc,</div><div class='del'>-						    const</div><div class='del'>-						    Evolution_Composer_RecipientList</div><div class='del'>-						    * bcc,</div><div class='del'>-						    const CORBA_char *</div><div class='del'>-						    subject,</div><div class='del'>-						    CORBA_Environment * ev));</div><div class='del'>-   void _ORBIT_skel_Evolution_Composer_set_body_text(POA_Evolution_Composer *</div><div class='del'>-						     _ORBIT_servant,</div><div class='del'>-						     GIOPRecvBuffer *</div><div class='del'>-						     _ORBIT_recv_buffer,</div><div class='del'>-						     CORBA_Environment * ev,</div><div class='del'>-						     void</div><div class='del'>-						     (*_impl_set_body_text)</div><div class='del'>-						     (PortableServer_Servant</div><div class='del'>-						      _servant,</div><div class='del'>-						      const CORBA_char * body,</div><div class='del'>-						      CORBA_Environment *</div><div class='del'>-						      ev));</div><div class='del'>-   void _ORBIT_skel_Evolution_Composer_attach_MIME(POA_Evolution_Composer *</div><div class='del'>-						   _ORBIT_servant,</div><div class='del'>-						   GIOPRecvBuffer *</div><div class='del'>-						   _ORBIT_recv_buffer,</div><div class='del'>-						   CORBA_Environment * ev,</div><div class='del'>-						   void (*_impl_attach_MIME)</div><div class='del'>-						   (PortableServer_Servant</div><div class='del'>-						    _servant,</div><div class='del'>-						    const CORBA_char * data,</div><div class='del'>-						    CORBA_Environment * ev));</div><div class='del'>-   void _ORBIT_skel_Evolution_Composer_attach_data(POA_Evolution_Composer *</div><div class='del'>-						   _ORBIT_servant,</div><div class='del'>-						   GIOPRecvBuffer *</div><div class='del'>-						   _ORBIT_recv_buffer,</div><div class='del'>-						   CORBA_Environment * ev,</div><div class='del'>-						   void (*_impl_attach_data)</div><div class='del'>-						   (PortableServer_Servant</div><div class='del'>-						    _servant,</div><div class='del'>-						    const CORBA_char *</div><div class='del'>-						    content_type,</div><div class='del'>-						    const CORBA_char *</div><div class='del'>-						    filename,</div><div class='del'>-						    const CORBA_char *</div><div class='del'>-						    description,</div><div class='del'>-						    const CORBA_boolean</div><div class='del'>-						    show_inline,</div><div class='del'>-						    const CORBA_char * data,</div><div class='del'>-						    CORBA_Environment * ev));</div><div class='del'>-   void _ORBIT_skel_Evolution_Composer_show(POA_Evolution_Composer *</div><div class='del'>-					    _ORBIT_servant,</div><div class='del'>-					    GIOPRecvBuffer *</div><div class='del'>-					    _ORBIT_recv_buffer,</div><div class='del'>-					    CORBA_Environment * ev,</div><div class='del'>-					    void (*_impl_show)</div><div class='del'>-					    (PortableServer_Servant _servant,</div><div class='del'>-					     CORBA_Environment * ev));</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</div><div class='del'>-#undef ORBIT_IDL_SERIAL</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 74fb43af70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar.oaf.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/GNOME_Evolution_Calendar.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +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:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/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 calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/calendar"/&gt;</div><div class='del'>-		&lt;item value="text/x-calendar"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       value="Evolution calendar iTip/iMip viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       value="Factory for the calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID: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_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-calendar.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME: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 Calendar Summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       value="Evolution calendar executive summary component."/&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.oafinfo b/calendar/gui/GNOME_Evolution_Calendar.oafinfo<br/>deleted file mode 100644<br/>index 74fb43af70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/GNOME_Evolution_Calendar.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +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:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/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 calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/calendar"/&gt;</div><div class='del'>-		&lt;item value="text/x-calendar"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       value="Evolution calendar iTip/iMip viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       value="Factory for the calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID: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_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-calendar.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME: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 Calendar Summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       value="Evolution calendar executive summary component."/&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.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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 74fb43af70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/GNOME_Evolution_Calendar_gnomecal.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +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:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/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 calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/calendar"/&gt;</div><div class='del'>-		&lt;item value="text/x-calendar"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       value="Evolution calendar iTip/iMip viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       value="Factory for the calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID: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_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-calendar.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME: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 Calendar Summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       value="Evolution calendar executive summary component."/&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.oafinfo b/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo<br/>deleted file mode 100644<br/>index 74fb43af70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/GNOME_Evolution_Calendar_gnomecal.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +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:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/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 calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/calendar"/&gt;</div><div class='del'>-		&lt;item value="text/x-calendar"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       value="Evolution calendar iTip/iMip viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       value="Factory for the calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID: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_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-calendar.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME: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 Calendar Summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       value="Evolution calendar executive summary component."/&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/Makefile.am b/calendar/gui/Makefile.am<br/>deleted file mode 100644<br/>index ebe73826a6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,164 +0,0 @@</div><div class='del'>-## CORBA stuff</div><div class='del'>-</div><div class='del'>-IDLS =                          \</div><div class='del'>-        $(srcdir)/../../composer/Evolution-Composer.idl</div><div class='del'>-</div><div class='del'>-IDL_GENERATED =                 \</div><div class='del'>-        Evolution-Composer.h              \</div><div class='del'>-        Evolution-Composer-common.c       \</div><div class='del'>-        Evolution-Composer-skels.c        \</div><div class='del'>-        Evolution-Composer-stubs.c</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS) </div><div class='del'>-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`   \</div><div class='del'>-                -I . $(srcdir)/../../composer/Evolution-Composer.idl</div><div class='del'>-</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'>-bin_PROGRAMS = evolution-calendar</div><div class='del'>-</div><div class='del'>-INCLUDES = 						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"calendar-gui\"			\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/shell				\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/widgets				\</div><div class='del'>-	-I$(includedir)					\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)			\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)				\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"</div><div class='del'>-</div><div class='del'>-LINK_FLAGS =							\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)				\</div><div class='del'>-	$(EXTRA_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)/widgets/misc/libemiscwidgets.a		\</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)/libical/src/libical/libical.a		\</div><div class='del'>-	$(top_builddir)/widgets/meeting-time-sel/libevolutionmtsel.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'>-	e-meeting-dialog.glade			\</div><div class='del'>-	e-itip-control.glade</div><div class='del'>-</div><div class='del'>-glade_messages = event-editor-dialog.glade.h</div><div class='del'>-</div><div class='del'>-evolution_calendar_SOURCES =			\</div><div class='del'>-	$(IDL_GENERATED)			\</div><div class='del'>-	alarm.c					\</div><div class='del'>-	alarm.h					\</div><div class='del'>-	calendar-config.c			\</div><div class='del'>-	calendar-config.h			\</div><div class='del'>-	calendar-commands.c			\</div><div class='del'>-	calendar-commands.h			\</div><div class='del'>-	calendar-model.c			\</div><div class='del'>-	calendar-model.h			\</div><div class='del'>-	control-factory.c			\</div><div class='del'>-	control-factory.h			\</div><div class='del'>-	component-factory.c			\</div><div class='del'>-	component-factory.h			\</div><div class='del'>-	e-calendar-table.h			\</div><div class='del'>-	e-calendar-table.c			\</div><div class='del'>-	e-day-view-main-item.c			\</div><div class='del'>-	e-day-view-main-item.h			\</div><div class='del'>-	e-day-view-time-item.c			\</div><div class='del'>-	e-day-view-time-item.h			\</div><div class='del'>-	e-day-view-top-item.c			\</div><div class='del'>-	e-day-view-top-item.h			\</div><div class='del'>-	e-day-view.c				\</div><div class='del'>-	e-day-view.h				\</div><div class='del'>-	e-itip-control.h			\</div><div class='del'>-	e-itip-control.c			\</div><div class='del'>-	e-meeting-edit.h			\</div><div class='del'>-	e-meeting-edit.c			\</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-cal.c				\</div><div class='del'>-	gnome-cal.h				\</div><div class='del'>-	gnome-month-item.c			\</div><div class='del'>-	gnome-month-item.h			\</div><div class='del'>-	goto.c					\</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'>-	weekday-picker.c			\</div><div class='del'>-	weekday-picker.h</div><div class='del'>-</div><div class='del'>-evolution_calendar_LDADD =					\</div><div class='del'>-	$(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)/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'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo </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='del'>-	bell.xpm			\</div><div class='del'>-	check-filled.xpm		\</div><div class='del'>-	dayview.xpm			\</div><div class='del'>-	jump.xpm			\</div><div class='del'>-	monthview.xpm			\</div><div class='del'>-	recur.xpm			\</div><div class='del'>-	task-assigned-to.xpm		\</div><div class='del'>-	task-assigned.xpm		\</div><div class='del'>-	task-recurring.xpm		\</div><div class='del'>-	task.xpm			\</div><div class='del'>-	weekview.xpm			\</div><div class='del'>-	workweekview.xpm		\</div><div class='del'>-	yearview.xpm			\</div><div class='del'>-	calendar-control.oafinfo	\</div><div class='del'>-	evolution-calendar.oafinfo</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(help_base)/C</div><div class='del'>-	$(mkinstalldirs) $(Conduitsdir)</div><div class='del'>-</div><div class='del'>-if ENABLE_PURIFY</div><div class='del'>-PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@</div><div class='del'>-</div><div class='del'>-all-local: evolution-calendar.pure</div><div class='del'>-</div><div class='del'>-evolution-calendar.pure: evolution-calendar</div><div class='del'>-	@rm -f evolution-calendar.pure</div><div class='del'>-	$(PLINK) $(evolution_calendar_LDFLAGS) $(evolution_calendar_OBJECTS) $(evolution_calendar_LDADD) $(LIBS)</div><div class='del'>-</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED)</div><div class='del'>-CLEANFILES += $(BUILT_SOURCES)</div><div class='head'>diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c<br/>deleted file mode 100644<br/>index 7d8357599c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify-dialog.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/alarm-notify/alarm-notify-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,225 +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;gnome.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'>- * @trigger: Trigger time for the alarm.</div><div class='del'>- * @occur: Occurrence time for the event.</div><div class='del'>- * @comp: Calendar component object which corresponds to the alarm.</div><div class='del'>- * @func: Function to be called when a dialog action is invoked.</div><div class='del'>- * @func_data: Closure data for @func.</div><div class='del'>- * </div><div class='del'>- * Runs the alarm notification dialog.  The specified @func will be used to</div><div class='del'>- * notify the client about result of the actions in the dialog.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE on success, FALSE if the dialog could not be created.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,</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'>-	CalComponentText summary;</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 (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), 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'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-	if (summary.value)</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (an-&gt;summary), summary.value);</div><div class='del'>-	else</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (an-&gt;summary), _("No summary available."));</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 1e56f1c586..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm-notify-dialog.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ALARM_NOTIFY_CLOSE,</div><div class='del'>-	ALARM_NOTIFY_SNOOZE,</div><div class='del'>-	ALARM_NOTIFY_EDIT</div><div class='del'>-} AlarmNotifyResult;</div><div class='del'>-</div><div class='del'>-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);</div><div class='del'>-</div><div class='del'>-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 085111498b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm-notify/alarm.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/alarm-notify/alarm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,304 +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 "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 - now)) {</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_print ("alarm_ready(): Notifying about alarm on %s\n", 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_print ("alarm_add(): Adding alarm for %s\n", 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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 085111498b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/alarm.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/alarm.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,304 +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 "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 - now)) {</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_print ("alarm_ready(): Notifying about alarm on %s\n", 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_print ("alarm_add(): Adding alarm for %s\n", 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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/calendar-commands.c b/calendar/gui/calendar-commands.c<br/>deleted file mode 100644<br/>index c26144e307..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-commands.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-commands.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,688 +0,0 @@</div><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'>-#include "dialogs/cal-prefs-dialog.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'>-#if 0</div><div class='del'>-#include "yearview.xpm"</div><div class='del'>-#endif</div><div class='del'>-</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'>-/* A list of all of the calendars started */</div><div class='del'>-static GList *all_calendars = NULL;</div><div class='del'>-</div><div class='del'>-/* 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'>-#if 0</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'>-#endif</div><div class='del'>-</div><div class='del'>-/* We have one global preferences dialog. */</div><div class='del'>-static CalPrefsDialog *preferences_dialog = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void update_pixmaps	(BonoboUIComponent *uic);</div><div class='del'>-static void set_pixmap		(BonoboUIComponent *uic,</div><div class='del'>-				 const char        *xml_path,</div><div class='del'>-				 char		  **xpm_data);</div><div class='del'>-</div><div class='del'>-</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'>-#if 0</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'>-#endif</div><div class='del'>-</div><div class='del'>-/* Callback for the new appointment command */</div><div class='del'>-static void</div><div class='del'>-new_appointment_cb (BonoboUIComponent *uih, void *user_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 (user_data);</div><div class='del'>-	gnome_calendar_new_appointment (gcal);</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'>-/* File/Print callback */</div><div class='del'>-static void</div><div class='del'>-file_print_cb (BonoboUIComponent *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'>-</div><div class='del'>-/* This iterates over each calendar telling them to update their config</div><div class='del'>-   settings. */</div><div class='del'>-void</div><div class='del'>-update_all_config_settings (void)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = all_calendars; l; l = l-&gt;next)</div><div class='del'>-		gnome_calendar_update_config_settings (GNOME_CALENDAR (l-&gt;data), FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These are all for the old config code and will eventually be removed. */</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 (BonoboUIComponent *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 (BonoboUIComponent *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 (BonoboUIComponent *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 (BonoboUIComponent *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 (BonoboUIComponent *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'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, "dayview", FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_work_week_view_clicked (BonoboUIComponent *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'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, "workweekview", FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_week_view_clicked (BonoboUIComponent *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'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, "weekview", FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_month_view_clicked (BonoboUIComponent *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'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, "monthview", FALSE, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-new_calendar_cmd (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	new_calendar (full_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_cmd (BonoboUIComponent *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'>-</div><div class='del'>-	if (all_calendars == NULL)</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 (BonoboUIComponent *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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "FIXME: find out who owns this calendar and use that name"</div><div class='del'>-#endif</div><div class='del'>-		/*</div><div class='del'>-		new_calendar ("Somebody", gtk_file_selection_get_filename (fs));</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 (BonoboUIComponent *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 (BonoboUIComponent *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 (BonoboUIComponent *uih, void *user_data, const char *path)</div><div class='del'>-{</div><div class='del'>-	if (!preferences_dialog)</div><div class='del'>-		preferences_dialog = cal_prefs_dialog_new ();</div><div class='del'>-	else</div><div class='del'>-		cal_prefs_dialog_show (preferences_dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarNew", new_calendar_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarOpen", open_calendar_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarSaveAs", save_as_calendar_cmd),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarPrint", file_print_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("EditNewAppointment", new_appointment_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarPreferences", properties_cmd),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarPrev", previous_clicked),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarToday", today_clicked),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarNext", next_clicked),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("CalendarGoto", goto_clicked),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ShowDayView", show_day_view_clicked),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ShowWorkWeekView", show_work_week_view_clicked),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ShowWeekView", show_week_view_clicked),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ShowMonthView", show_month_view_clicked),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_control_activate (BonoboControl *control,</div><div class='del'>-			   GnomeCalendar *cal)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIContainer remote_uih;</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	remote_uih = bonobo_control_get_remote_ui_container (control);</div><div class='del'>-	bonobo_ui_component_set_container (uic, remote_uih);</div><div class='del'>-	bonobo_object_release_unref (remote_uih, NULL);</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* FIXME: Need to update this to use new Bonobo ui stuff somehow.</div><div class='del'>-	   Also need radio buttons really. */</div><div class='del'>-</div><div class='del'>-	/* Note that these indices should correspond with the button indices</div><div class='del'>-	   in the gnome_toolbar_view_buttons UIINFO struct. */</div><div class='del'>-	gnome_calendar_set_view_buttons (cal,</div><div class='del'>-					 gnome_toolbar_view_buttons[0].widget,</div><div class='del'>-					 gnome_toolbar_view_buttons[1].widget,</div><div class='del'>-					 gnome_toolbar_view_buttons[2].widget,</div><div class='del'>-					 gnome_toolbar_view_buttons[3].widget);</div><div class='del'>-</div><div class='del'>-	/* This makes the appropriate radio button in the toolbar active. */</div><div class='del'>-	gnome_calendar_update_view_buttons (cal);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (</div><div class='del'>-		uic, verbs, cal);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_freeze (uic, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-calendar.xml",</div><div class='del'>-			       "evolution-calendar");</div><div class='del'>-</div><div class='del'>-	update_pixmaps (uic);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_thaw (uic, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_pixmaps (BonoboUIComponent *uic)</div><div class='del'>-{</div><div class='del'>-	set_pixmap (uic, "/Toolbar/DayView",	  dayview_xpm);</div><div class='del'>-	set_pixmap (uic, "/Toolbar/WorkWeekView", workweekview_xpm);</div><div class='del'>-	set_pixmap (uic, "/Toolbar/WeekView",	  weekview_xpm);</div><div class='del'>-	set_pixmap (uic, "/Toolbar/MonthView",	  monthview_xpm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_pixmap (BonoboUIComponent *uic,</div><div class='del'>-	    const char        *xml_path,</div><div class='del'>-	    char	     **xpm_data)</div><div class='del'>-{</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-</div><div class='del'>-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) xpm_data);</div><div class='del'>-	g_return_if_fail (pixbuf != NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_pixbuf (uic, xml_path, pixbuf);</div><div class='del'>-</div><div class='del'>-	gdk_pixbuf_unref (pixbuf);</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'>-	BonoboUIComponent *uic = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (uic != NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_rm (uic, "/", NULL);</div><div class='del'>- 	bonobo_ui_component_unset_container (uic);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomeCalendar *</div><div class='del'>-new_calendar (char *full_name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = gnome_calendar_new ();</div><div class='del'>-</div><div class='del'>-	all_calendars = g_list_prepend (all_calendars, gcal);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (gcal);</div><div class='del'>-	return GNOME_CALENDAR (gcal);</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'>-#if 0</div><div class='del'>-	init_default_alarms ();</div><div class='del'>-#endif</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='head'>diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h<br/>deleted file mode 100644<br/>index 19752c9cc8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-commands.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-commands.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,131 +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 "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 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'>-#if 0</div><div class='del'>-extern CalendarAlarm alarm_defaults[4];</div><div class='del'>-#endif</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'>-</div><div class='del'>-</div><div class='del'>-/* This tells all the calendars to reload the config settings. */</div><div class='del'>-void update_all_config_settings (void);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FIXME: These are for the old config code and will be removed eventually.</div><div class='del'>- */</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'>-</div><div class='del'>-</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'>-</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 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 (BonoboUIComponent *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'>-</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 b30bae6a02..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-component.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#ifdef WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-#include &lt;executive-summary/evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#if WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-#include "calendar-summary.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</div><div class='del'>-#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-static BonoboGenericFactory *summary_factory = NULL;</div><div class='del'>-char *evolution_dir;</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 gint owner_count = 0;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      EvolutionShellClient *shell_client,</div><div class='del'>-	      const char *evolution_homedir,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	evolution_dir = g_strdup (evolution_homedir);</div><div class='del'>-	calendar_config_init ();</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'>-		gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	owner_count --;</div><div class='del'>-	if (owner_count &lt;= 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, 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'>-	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'>-#ifdef WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-static BonoboObject *</div><div class='del'>-summary_fn (BonoboGenericFactory *factory, </div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponent *summary_component;</div><div class='del'>-</div><div class='del'>-	summary_component = executive_summary_component_new (NULL,</div><div class='del'>-							     create_summary_view,</div><div class='del'>-							     NULL,</div><div class='del'>-							     evolution_dir);</div><div class='del'>-	return BONOBO_OBJECT (summary_component);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-component_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL &amp;&amp; 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'>-#ifdef WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-	summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL);</div><div class='del'>-#endif</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='del'>-#ifdef WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-	if (summary_factory == NULL)</div><div class='del'>-		g_error ("Cannot initialize Evolution's calendar summary component.");</div><div class='del'>-#endif</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 8e5cd6605f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-component.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-component.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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'>-extern char *evolution_dir;</div><div class='del'>-</div><div class='del'>-void  component_factory_init  (void);</div><div class='del'>-</div><div class='del'>-#endif /* _COMPONENT_FACTORY_H_ */</div><div class='head'>diff --git a/calendar/gui/calendar-config.c b/calendar/gui/calendar-config.c<br/>deleted file mode 100644<br/>index 0245a05f2a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-config.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-config.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,423 +0,0 @@</div><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'>- * calendar-config.c - functions to load/save/get/set user settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	CalWeekdays	working_days;</div><div class='del'>-	gboolean	use_24_hour_format;</div><div class='del'>-	gint		week_start_day;</div><div class='del'>-	gint		day_start_hour;</div><div class='del'>-	gint		day_start_minute;</div><div class='del'>-	gint		day_end_hour;</div><div class='del'>-	gint		day_end_minute;</div><div class='del'>-	gint		time_divisions;</div><div class='del'>-	gboolean	dnav_show_week_no;</div><div class='del'>-	gint		view;</div><div class='del'>-	gfloat		hpane_pos;</div><div class='del'>-	gfloat		vpane_pos;</div><div class='del'>-	gfloat		month_hpane_pos;</div><div class='del'>-	gfloat		month_vpane_pos;</div><div class='del'>-	gboolean	compress_weekend;</div><div class='del'>-	gboolean	show_event_end;</div><div class='del'>-} CalendarConfig;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CalendarConfig *config = NULL;</div><div class='del'>-</div><div class='del'>-static void config_read			(void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_init			(void)</div><div class='del'>-{</div><div class='del'>-	if (config)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	config = g_new0 (CalendarConfig, 1);</div><div class='del'>-</div><div class='del'>-	config_read ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-config_read				(void)</div><div class='del'>-{</div><div class='del'>-	gchar *prefix;</div><div class='del'>-	gboolean is_default;</div><div class='del'>-</div><div class='del'>-	/* 'Display' settings. */</div><div class='del'>-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",</div><div class='del'>-				  evolution_dir);</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	g_free (prefix);</div><div class='del'>-</div><div class='del'>-	config-&gt;working_days = gnome_config_get_int_with_default ("WorkingDays", &amp;is_default);</div><div class='del'>-	if (is_default) {</div><div class='del'>-		config-&gt;working_days = CAL_MONDAY | CAL_TUESDAY</div><div class='del'>-			| CAL_WEDNESDAY | CAL_THURSDAY | CAL_FRIDAY;</div><div class='del'>-	}</div><div class='del'>-	config-&gt;use_24_hour_format = gnome_config_get_bool ("Use24HourFormat=0");</div><div class='del'>-	config-&gt;week_start_day = gnome_config_get_int ("WeekStartDay=1");</div><div class='del'>-	config-&gt;day_start_hour = gnome_config_get_int ("DayStartHour=9");</div><div class='del'>-	config-&gt;day_start_minute = gnome_config_get_int ("DayStartMinute=0");</div><div class='del'>-	config-&gt;day_end_hour = gnome_config_get_int ("DayEndHour=17");</div><div class='del'>-	config-&gt;day_end_minute = gnome_config_get_int ("DayEndMinute=0");</div><div class='del'>-	config-&gt;time_divisions = gnome_config_get_int ("TimeDivisions=30");</div><div class='del'>-	config-&gt;view = gnome_config_get_int ("View=0");</div><div class='del'>-	config-&gt;hpane_pos = gnome_config_get_float ("HPanePosition=1");</div><div class='del'>-	config-&gt;vpane_pos = gnome_config_get_float ("VPanePosition=1");</div><div class='del'>-	config-&gt;month_hpane_pos = gnome_config_get_float ("MonthHPanePosition=0");</div><div class='del'>-	config-&gt;month_vpane_pos = gnome_config_get_float ("MonthVPanePosition=1");</div><div class='del'>-	config-&gt;compress_weekend = gnome_config_get_bool ("CompressWeekend=1");</div><div class='del'>-	config-&gt;show_event_end = gnome_config_get_bool ("ShowEventEndTime=1");</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* 'DateNavigator' settings. */</div><div class='del'>-	prefix = g_strdup_printf ("=%s/config/Calendar=/DateNavigator/",</div><div class='del'>-				  evolution_dir);</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	g_free (prefix);</div><div class='del'>-</div><div class='del'>-	config-&gt;dnav_show_week_no = gnome_config_get_bool ("ShowWeekNumbers=0");</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_write			(void)</div><div class='del'>-{</div><div class='del'>-	gchar *prefix;</div><div class='del'>-	</div><div class='del'>-	/* 'Display' settings. */</div><div class='del'>-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",</div><div class='del'>-				  evolution_dir);</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	g_free (prefix);</div><div class='del'>-</div><div class='del'>-	gnome_config_set_int ("WorkingDays", config-&gt;working_days);</div><div class='del'>-	gnome_config_set_bool ("Use24HourFormat", config-&gt;use_24_hour_format);</div><div class='del'>-	gnome_config_set_int ("WeekStartDay", config-&gt;week_start_day);</div><div class='del'>-	gnome_config_set_int ("DayStartHour", config-&gt;day_start_hour);</div><div class='del'>-	gnome_config_set_int ("DayStartMinute", config-&gt;day_start_minute);</div><div class='del'>-	gnome_config_set_int ("DayEndHour", config-&gt;day_end_hour);</div><div class='del'>-	gnome_config_set_int ("DayEndMinute", config-&gt;day_end_minute);</div><div class='del'>-	gnome_config_set_bool ("CompressWeekend", config-&gt;compress_weekend);</div><div class='del'>-	gnome_config_set_bool ("ShowEventEndTime", config-&gt;show_event_end);</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* 'DateNavigator' settings. */</div><div class='del'>-	prefix = g_strdup_printf ("=%s/config/Calendar=/DateNavigator/",</div><div class='del'>-				  evolution_dir);</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	g_free (prefix);</div><div class='del'>-</div><div class='del'>-	gnome_config_set_bool ("ShowWeekNumbers", config-&gt;dnav_show_week_no);</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_write_on_exit		(void)</div><div class='del'>-{</div><div class='del'>-	gchar *prefix;</div><div class='del'>-	</div><div class='del'>-	/* 'Display' settings. */</div><div class='del'>-	prefix = g_strdup_printf ("=%s/config/Calendar=/Display/",</div><div class='del'>-				  evolution_dir);</div><div class='del'>-	gnome_config_push_prefix (prefix);</div><div class='del'>-	g_free (prefix);</div><div class='del'>-</div><div class='del'>-	gnome_config_set_int ("View", config-&gt;view);</div><div class='del'>-	gnome_config_set_int ("TimeDivisions", config-&gt;time_divisions);</div><div class='del'>-	gnome_config_set_float ("HPanePosition", config-&gt;hpane_pos);</div><div class='del'>-	gnome_config_set_float ("VPanePosition", config-&gt;vpane_pos);</div><div class='del'>-	gnome_config_set_float ("MonthHPanePosition", config-&gt;month_hpane_pos);</div><div class='del'>-	gnome_config_set_float ("MonthVPanePosition", config-&gt;month_vpane_pos);</div><div class='del'>-</div><div class='del'>-	gnome_config_pop_prefix ();</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_config_sync ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calendar Settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* Whether we use 24-hour format or 12-hour format (AM/PM). */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_24_hour_format	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;use_24_hour_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_24_hour_format	(gboolean     use_24_hour)</div><div class='del'>-{</div><div class='del'>-	config-&gt;use_24_hour_format = use_24_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The start day of the week (0 = Sun to 6 = Mon). */</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_week_start_day	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;week_start_day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_week_start_day	(gint	      week_start_day)</div><div class='del'>-{</div><div class='del'>-	config-&gt;week_start_day = week_start_day;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The start and end times of the work-day. */</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_day_start_hour	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;day_start_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_day_start_hour	(gint	      day_start_hour)</div><div class='del'>-{</div><div class='del'>-	config-&gt;day_start_hour = day_start_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_day_start_minute	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;day_start_minute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_day_start_minute	(gint	      day_start_min)</div><div class='del'>-{</div><div class='del'>-	config-&gt;day_start_minute = day_start_min;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_day_end_hour	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;day_end_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_day_end_hour	(gint	      day_end_hour)</div><div class='del'>-{</div><div class='del'>-	config-&gt;day_end_hour = day_end_hour;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_day_end_minute	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;day_end_minute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_day_end_minute	(gint	      day_end_min)</div><div class='del'>-{</div><div class='del'>-	config-&gt;day_end_minute = day_end_min;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_time_divisions	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;time_divisions;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_time_divisions	(gint	      divisions)</div><div class='del'>-{</div><div class='del'>-	config-&gt;time_divisions = divisions;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we show week numbers in the Date Navigator. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_dnav_show_week_no	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;dnav_show_week_no;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_dnav_show_week_no	(gboolean     show_week_no)</div><div class='del'>-{</div><div class='del'>-	config-&gt;dnav_show_week_no = show_week_no;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */</div><div class='del'>-gint</div><div class='del'>-calendar_config_get_default_view	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_default_view	(gint	      view)</div><div class='del'>-{</div><div class='del'>-	config-&gt;view = view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The positions of the panes in the normal and month views. */</div><div class='del'>-gfloat</div><div class='del'>-calendar_config_get_hpane_pos		(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;hpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_hpane_pos		(gfloat	      hpane_pos)</div><div class='del'>-{</div><div class='del'>-	config-&gt;hpane_pos = hpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gfloat</div><div class='del'>-calendar_config_get_vpane_pos		(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;vpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_vpane_pos		(gfloat	      vpane_pos)</div><div class='del'>-{</div><div class='del'>-	config-&gt;vpane_pos = vpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gfloat</div><div class='del'>-calendar_config_get_month_hpane_pos	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;month_hpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos)</div><div class='del'>-{</div><div class='del'>-	config-&gt;month_hpane_pos = hpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gfloat</div><div class='del'>-calendar_config_get_month_vpane_pos	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;month_vpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos)</div><div class='del'>-{</div><div class='del'>-	config-&gt;month_vpane_pos = vpane_pos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we compress the weekend in the week/month views. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_compress_weekend	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;compress_weekend;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_compress_weekend	(gboolean     compress)</div><div class='del'>-{</div><div class='del'>-	config-&gt;compress_weekend = compress;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we show event end times. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_config_get_show_event_end	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;show_event_end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_show_event_end	(gboolean     show_end)</div><div class='del'>-{</div><div class='del'>-	config-&gt;show_event_end = show_end;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The working days of the week, a bit-wise combination of flags. */</div><div class='del'>-CalWeekdays</div><div class='del'>-calendar_config_get_working_days	(void)</div><div class='del'>-{</div><div class='del'>-	return config-&gt;working_days;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_config_set_working_days	(CalWeekdays  days)</div><div class='del'>-{</div><div class='del'>-	config-&gt;working_days = days;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/calendar-config.h b/calendar/gui/calendar-config.h<br/>deleted file mode 100644<br/>index aa9bdefb80..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-config.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-config.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,117 +0,0 @@</div><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'>- * calendar-config.h - functions to load/save/get/set user settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CALENDAR_CONFIG_H_</div><div class='del'>-#define _CALENDAR_CONFIG_H_</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These are used to get/set the working days in the week. The bit-flags are</div><div class='del'>-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the</div><div class='del'>-   day values used by localtime etc. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	CAL_SUNDAY	= 1 &lt;&lt; 0,</div><div class='del'>-	CAL_MONDAY	= 1 &lt;&lt; 1,</div><div class='del'>-	CAL_TUESDAY	= 1 &lt;&lt; 2,</div><div class='del'>-	CAL_WEDNESDAY	= 1 &lt;&lt; 3,</div><div class='del'>-	CAL_THURSDAY	= 1 &lt;&lt; 4,</div><div class='del'>-	CAL_FRIDAY	= 1 &lt;&lt; 5,</div><div class='del'>-	CAL_SATURDAY	= 1 &lt;&lt; 6</div><div class='del'>-} CalWeekdays;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void	  calendar_config_init			(void);</div><div class='del'>-void	  calendar_config_write			(void);</div><div class='del'>-void	  calendar_config_write_on_exit		(void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Calendar Settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* The working days of the week, a bit-wise combination of flags. */</div><div class='del'>-CalWeekdays calendar_config_get_working_days	(void);</div><div class='del'>-void	  calendar_config_set_working_days	(CalWeekdays  days);</div><div class='del'>-</div><div class='del'>-/* The start day of the week (0 = Sun to 6 = Sat). */</div><div class='del'>-gint	  calendar_config_get_week_start_day	(void);</div><div class='del'>-void	  calendar_config_set_week_start_day	(gint	      week_start_day);</div><div class='del'>-</div><div class='del'>-/* The start and end times of the work-day. */</div><div class='del'>-gint	  calendar_config_get_day_start_hour	(void);</div><div class='del'>-void	  calendar_config_set_day_start_hour	(gint	      day_start_hour);</div><div class='del'>-</div><div class='del'>-gint	  calendar_config_get_day_start_minute	(void);</div><div class='del'>-void	  calendar_config_set_day_start_minute	(gint	      day_start_min);</div><div class='del'>-</div><div class='del'>-gint	  calendar_config_get_day_end_hour	(void);</div><div class='del'>-void	  calendar_config_set_day_end_hour	(gint	      day_end_hour);</div><div class='del'>-</div><div class='del'>-gint	  calendar_config_get_day_end_minute	(void);</div><div class='del'>-void	  calendar_config_set_day_end_minute	(gint	      day_end_min);</div><div class='del'>-</div><div class='del'>-/* Whether we use 24-hour format or 12-hour format (AM/PM). */</div><div class='del'>-gboolean  calendar_config_get_24_hour_format	(void);</div><div class='del'>-void	  calendar_config_set_24_hour_format	(gboolean     use_24_hour);</div><div class='del'>-</div><div class='del'>-/* The time divisions in the Day/Work-Week view in minutes (5/10/15/30/60). */</div><div class='del'>-gint	  calendar_config_get_time_divisions	(void);</div><div class='del'>-void	  calendar_config_set_time_divisions	(gint	      divisions);</div><div class='del'>-</div><div class='del'>-/* Whether we show event end times. */</div><div class='del'>-gboolean  calendar_config_get_show_event_end	(void);</div><div class='del'>-void	  calendar_config_set_show_event_end	(gboolean     show_end);</div><div class='del'>-</div><div class='del'>-/* Whether we compress the weekend in the week/month views. */</div><div class='del'>-gboolean  calendar_config_get_compress_weekend	(void);</div><div class='del'>-void	  calendar_config_set_compress_weekend	(gboolean     compress);</div><div class='del'>-</div><div class='del'>-/* Whether we show week numbers in the Date Navigator. */</div><div class='del'>-gboolean  calendar_config_get_dnav_show_week_no	(void);</div><div class='del'>-void	  calendar_config_set_dnav_show_week_no	(gboolean     show_week_no);</div><div class='del'>-</div><div class='del'>-/* The view to show on start-up, 0 = Day, 1 = WorkWeek, 2 = Week, 3 = Month. */</div><div class='del'>-gint	  calendar_config_get_default_view	(void);</div><div class='del'>-void	  calendar_config_set_default_view	(gint	      view);</div><div class='del'>-</div><div class='del'>-/* The positions of the panes in the normal and month views. */</div><div class='del'>-gfloat    calendar_config_get_hpane_pos		(void);</div><div class='del'>-void	  calendar_config_set_hpane_pos		(gfloat	      hpane_pos);</div><div class='del'>-</div><div class='del'>-gfloat    calendar_config_get_vpane_pos		(void);</div><div class='del'>-void	  calendar_config_set_vpane_pos		(gfloat	      vpane_pos);</div><div class='del'>-</div><div class='del'>-gfloat    calendar_config_get_month_hpane_pos	(void);</div><div class='del'>-void	  calendar_config_set_month_hpane_pos	(gfloat	      hpane_pos);</div><div class='del'>-</div><div class='del'>-gfloat    calendar_config_get_month_vpane_pos	(void);</div><div class='del'>-void	  calendar_config_set_month_vpane_pos	(gfloat	      vpane_pos);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* _CALENDAR_CONFIG_H_ */</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 064e855ba1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-model.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-model.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2011 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* Evolution calendar - Data model for ETable</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 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'>-/* We need this for strptime. */</div><div class='del'>-#define _XOPEN_SOURCE</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;math.h&gt;</div><div class='del'>-#undef _XOPEN_SOURCE</div><div class='del'>-#include &lt;sys/time.h&gt;</div><div class='del'>-#define _XOPEN_SOURCE</div><div class='del'>-#include &lt;time.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 "calendar-model.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'>-/* Private part of the ECalendarModel structure */</div><div class='del'>-struct _CalendarModelPrivate {</div><div class='del'>-	/* Calendar client we are using */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* Types of objects we are dealing with */</div><div class='del'>-	CalObjType type;</div><div class='del'>-</div><div class='del'>-	/* 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'>-</div><div class='del'>-	/* Whether we display dates in 24-hour format. */</div><div class='del'>-	gboolean use_24_hour_format;</div><div class='del'>-</div><div class='del'>-	/* HACK: so that ETable can do its stupid append_row() thing */</div><div class='del'>-	guint appending_row : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void calendar_model_class_init (CalendarModelClass *class);</div><div class='del'>-static void calendar_model_init (CalendarModel *model);</div><div class='del'>-static void calendar_model_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static int calendar_model_column_count (ETableModel *etm);</div><div class='del'>-static int calendar_model_row_count (ETableModel *etm);</div><div class='del'>-static void *calendar_model_value_at (ETableModel *etm, int col, int row);</div><div class='del'>-static void calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value);</div><div class='del'>-static gboolean calendar_model_is_cell_editable (ETableModel *etm, int col, int row);</div><div class='del'>-static void calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row);</div><div class='del'>-static void *calendar_model_duplicate_value (ETableModel *etm, int col, const void *value);</div><div class='del'>-static void calendar_model_free_value (ETableModel *etm, int col, void *value);</div><div class='del'>-static void *calendar_model_initialize_value (ETableModel *etm, int col);</div><div class='del'>-static gboolean calendar_model_value_is_empty (ETableModel *etm, int col, const void *value);</div><div class='del'>-#if 0</div><div class='del'>-static char * calendar_model_value_to_string (ETableModel *etm, int col, const void *value);</div><div class='del'>-#endif</div><div class='del'>-static void load_objects (CalendarModel *model);</div><div class='del'>-static int remove_object (CalendarModel *model, const char *uid);</div><div class='del'>-static void ensure_task_complete (CalComponent *comp,</div><div class='del'>-				  time_t completed_date);</div><div class='del'>-static void ensure_task_not_complete (CalComponent *comp);</div><div class='del'>-</div><div class='del'>-static ETableModelClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_get_type:</div><div class='del'>- * @void:</div><div class='del'>- *</div><div class='del'>- * Registers the #CalendarModel class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #CalendarModel class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-calendar_model_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType calendar_model_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!calendar_model_type) {</div><div class='del'>-		static GtkTypeInfo calendar_model_info = {</div><div class='del'>-			"CalendarModel",</div><div class='del'>-			sizeof (CalendarModel),</div><div class='del'>-			sizeof (CalendarModelClass),</div><div class='del'>-			(GtkClassInitFunc) calendar_model_class_init,</div><div class='del'>-			(GtkObjectInitFunc) calendar_model_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		calendar_model_type = gtk_type_unique (E_TABLE_MODEL_TYPE, &amp;calendar_model_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return calendar_model_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the calendar table model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_class_init (CalendarModelClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	ETableModelClass *etm_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	etm_class = (ETableModelClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (E_TABLE_MODEL_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = calendar_model_destroy;</div><div class='del'>-</div><div class='del'>-	etm_class-&gt;column_count = calendar_model_column_count;</div><div class='del'>-	etm_class-&gt;row_count = calendar_model_row_count;</div><div class='del'>-	etm_class-&gt;value_at = calendar_model_value_at;</div><div class='del'>-	etm_class-&gt;set_value_at = calendar_model_set_value_at;</div><div class='del'>-	etm_class-&gt;is_cell_editable = calendar_model_is_cell_editable;</div><div class='del'>-	etm_class-&gt;append_row = calendar_model_append_row;</div><div class='del'>-	etm_class-&gt;duplicate_value = calendar_model_duplicate_value;</div><div class='del'>-	etm_class-&gt;free_value = calendar_model_free_value;</div><div class='del'>-	etm_class-&gt;initialize_value = calendar_model_initialize_value;</div><div class='del'>-	etm_class-&gt;value_is_empty = calendar_model_value_is_empty;</div><div class='del'>-#if 0</div><div class='del'>-	etm_class-&gt;value_to_string = calendar_model_value_to_string;</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 (CalComponent *));</div><div class='del'>-	priv-&gt;uid_index_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	priv-&gt;use_24_hour_format = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called from g_hash_table_foreach_remove(), frees a stored UID-&gt;index</div><div class='del'>- * mapping.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-free_uid_index (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	int *idx;</div><div class='del'>-</div><div class='del'>-	idx = value;</div><div class='del'>-	g_free (idx);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Frees the objects stored in the calendar model */</div><div class='del'>-static void</div><div class='del'>-free_objects (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (priv-&gt;uid_index_hash, free_uid_index, NULL);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;objects-&gt;len; i++) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-</div><div class='del'>-		comp = g_array_index (priv-&gt;objects, CalComponent *, i);</div><div class='del'>-		g_assert (comp != NULL);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-	}</div><div class='del'>-</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 CAL_COMPONENT_FIELD_NUM_FIELDS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* row_count handler for the calendar table model */</div><div class='del'>-static int</div><div class='del'>-calendar_model_row_count (ETableModel *etm)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;objects-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates a nice string representation of a time value */</div><div class='del'>-static char*</div><div class='del'>-get_time_t (CalendarModel *model, time_t *t, gboolean skip_midnight)</div><div class='del'>-{</div><div class='del'>-	static char buffer[64];</div><div class='del'>-	struct tm *tmp_tm;</div><div class='del'>-	char *format;</div><div class='del'>-</div><div class='del'>-	if (*t &lt;= 0) {</div><div class='del'>-		buffer[0] = '\0';</div><div class='del'>-	} else {</div><div class='del'>-		tmp_tm = localtime (t);</div><div class='del'>-</div><div class='del'>-		if (skip_midnight &amp;&amp; tmp_tm-&gt;tm_hour == 0</div><div class='del'>-		    &amp;&amp; tmp_tm-&gt;tm_min == 0 &amp;&amp; tmp_tm-&gt;tm_sec == 0)</div><div class='del'>-			/* strftime format of a weekday and a date. */</div><div class='del'>-			format = _("%a %m/%d/%Y");</div><div class='del'>-		else if (model-&gt;priv-&gt;use_24_hour_format)</div><div class='del'>-			/* strftime format of a weekday, a date and a time,</div><div class='del'>-			   in 24-hour format. */</div><div class='del'>-			format = _("%a %m/%d/%Y %H:%M:%S");</div><div class='del'>-		else</div><div class='del'>-			/* strftime format of a weekday, a date and a time,</div><div class='del'>-			   in 12-hour format. */</div><div class='del'>-			format = _("%a %m/%d/%Y %I:%M:%S %p");</div><div class='del'>-			</div><div class='del'>-		strftime (buffer, sizeof (buffer), format, tmp_tm);</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'>-/* Builds a string based on the list of CATEGORIES properties of a calendar</div><div class='del'>- * component.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-get_categories (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	GSList *categories;</div><div class='del'>-	GString *str;</div><div class='del'>-	char *s;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	cal_component_get_categories_list (comp, &amp;categories);</div><div class='del'>-</div><div class='del'>-	str = g_string_new (NULL);</div><div class='del'>-</div><div class='del'>-	for (l = categories; l; l = l-&gt;next) {</div><div class='del'>-		const char *category;</div><div class='del'>-</div><div class='del'>-		category = l-&gt;data;</div><div class='del'>-		g_string_append (str, category);</div><div class='del'>-</div><div class='del'>-		if (l-&gt;next != NULL)</div><div class='del'>-			g_string_append (str, ", ");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	s = str-&gt;str;</div><div class='del'>-</div><div class='del'>-	g_string_free (str, FALSE);</div><div class='del'>-	cal_component_free_categories_list (categories);</div><div class='del'>-</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns a string based on the CLASSIFICATION property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_classification (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentClassification classif;</div><div class='del'>-</div><div class='del'>-	cal_component_get_classification (comp, &amp;classif);</div><div class='del'>-</div><div class='del'>-	switch (classif) {</div><div class='del'>-	case CAL_COMPONENT_CLASS_NONE:</div><div class='del'>-		return "";</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_PUBLIC:</div><div class='del'>-		return _("Public");</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_PRIVATE:</div><div class='del'>-		return _("Private");</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:</div><div class='del'>-		return _("Confidential");</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_CLASS_UNKNOWN:</div><div class='del'>-		return _("Unknown");</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'>-/* Builds a string for the COMPLETED property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_completed	(CalendarModel *model,</div><div class='del'>-		 CalComponent  *comp)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype *completed;</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	cal_component_get_completed (comp, &amp;completed);</div><div class='del'>-</div><div class='del'>-	if (!completed)</div><div class='del'>-		t = 0;</div><div class='del'>-	else {</div><div class='del'>-		t = icaltime_as_timet (*completed);</div><div class='del'>-		cal_component_free_icaltimetype (completed);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return get_time_t (model, &amp;t, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for and frees a date/time value */</div><div class='del'>-static char *</div><div class='del'>-get_and_free_datetime (CalendarModel *model, CalComponentDateTime dt)</div><div class='del'>-{</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	if (!dt.value)</div><div class='del'>-		t = 0;</div><div class='del'>-	else</div><div class='del'>-		t = icaltime_as_timet (*dt.value);</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;dt);</div><div class='del'>-</div><div class='del'>-	return get_time_t (model, &amp;t, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the DTEND property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_dtend (CalendarModel *model, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtend (comp, &amp;dt);</div><div class='del'>-	return get_and_free_datetime (model, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the DTSTART property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_dtstart (CalendarModel *model, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-</div><div class='del'>-	cal_component_get_dtstart (comp, &amp;dt);</div><div class='del'>-	return get_and_free_datetime (model, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the DUE property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_due (CalendarModel *model, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (comp, &amp;dt);</div><div class='del'>-	return get_and_free_datetime (model, dt);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the GEO property of a calendar component */</div><div class='del'>-static char*</div><div class='del'>-get_geo (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	struct icalgeotype *geo;</div><div class='del'>-	static gchar buf[32];</div><div class='del'>-</div><div class='del'>-	cal_component_get_geo (comp, &amp;geo);</div><div class='del'>-</div><div class='del'>-	if (!geo)</div><div class='del'>-		buf[0] = '\0';</div><div class='del'>-	else {</div><div class='del'>-		g_snprintf (buf, sizeof (buf), "%g %s, %g %s",</div><div class='del'>-			    fabs (geo-&gt;lat),</div><div class='del'>-			    geo-&gt;lat &gt;= 0.0 ? _("N") : _("S"),</div><div class='del'>-			    fabs (geo-&gt;lon),</div><div class='del'>-			    geo-&gt;lon &gt;= 0.0 ? _("E") : _("W"));</div><div class='del'>-		cal_component_free_geo (geo);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the PERCENT property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_percent (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	int *percent;</div><div class='del'>-	static char buf[32];</div><div class='del'>-</div><div class='del'>-	cal_component_get_percent (comp, &amp;percent);</div><div class='del'>-</div><div class='del'>-	if (!percent)</div><div class='del'>-		buf[0] = '\0';</div><div class='del'>-	else {</div><div class='del'>-		g_snprintf (buf, sizeof (buf), "%d%%", *percent);</div><div class='del'>-		cal_component_free_percent (percent);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the PRIORITY property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_priority (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	int *priority;</div><div class='del'>-	static char buf[32];</div><div class='del'>-</div><div class='del'>-	cal_component_get_priority (comp, &amp;priority);</div><div class='del'>-</div><div class='del'>-	if (!priority)</div><div class='del'>-		buf[0] = '\0';</div><div class='del'>-	else {</div><div class='del'>-		g_snprintf (buf, sizeof (buf), "%d", *priority);</div><div class='del'>-		cal_component_free_priority (priority);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return buf;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the SUMMARY property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_summary (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-	if (summary.value)</div><div class='del'>-		return (char *) summary.value;</div><div class='del'>-	else</div><div class='del'>-		return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a string for the TRANSPARENCY property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_transparency (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentTransparency transp;</div><div class='del'>-</div><div class='del'>-	cal_component_get_transparency (comp, &amp;transp);</div><div class='del'>-</div><div class='del'>-	switch (transp) {</div><div class='del'>-	case CAL_COMPONENT_TRANSP_NONE:</div><div class='del'>-		return "";</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TRANSP_TRANSPARENT:</div><div class='del'>-		return _("Transparent");</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TRANSP_OPAQUE:</div><div class='del'>-		return _("Opaque");</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TRANSP_UNKNOWN:</div><div class='del'>-		return _("Unknown");</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'>-/* Builds a string for the URL property of a calendar component */</div><div class='del'>-static char *</div><div class='del'>-get_url (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *url;</div><div class='del'>-</div><div class='del'>-	cal_component_get_url (comp, &amp;url);</div><div class='del'>-</div><div class='del'>-	if (url)</div><div class='del'>-		return (char *) url;</div><div class='del'>-	else</div><div class='del'>-		return "";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the completion date has been set on a component */</div><div class='del'>-static gboolean</div><div class='del'>-get_is_complete (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype *t;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	cal_component_get_completed (comp, &amp;t);</div><div class='del'>-	retval = (t != NULL);</div><div class='del'>-</div><div class='del'>-	if (retval)</div><div class='del'>-		cal_component_free_icaltimetype (t);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether a calendar component is overdue.</div><div class='del'>- *</div><div class='del'>- * FIXME: This will only get called when the component is scrolled into the</div><div class='del'>- * ETable.  There should be some sort of dynamic update thingy for if a component</div><div class='del'>- * becomes overdue while it is being viewed.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-get_is_overdue (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	cal_component_get_due (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	/* First, do we have a due date? */</div><div class='del'>-</div><div class='del'>-	if (!dt.value)</div><div class='del'>-		retval = FALSE;</div><div class='del'>-	else {</div><div class='del'>-		time_t t;</div><div class='del'>-</div><div class='del'>-		/* Second, is it already completed? */</div><div class='del'>-</div><div class='del'>-		if (get_is_complete (comp)) {</div><div class='del'>-			retval = FALSE;</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Third, are we overdue as of right now? */</div><div class='del'>-</div><div class='del'>-		t = icaltime_as_timet (*dt.value);</div><div class='del'>-</div><div class='del'>-		if (t &lt; time (NULL))</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		else</div><div class='del'>-			retval = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	cal_component_free_datetime (&amp;dt);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* value_at handler for the calendar table model */</div><div class='del'>-static void *</div><div class='del'>-calendar_model_value_at (ETableModel *etm, int col, int row)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);</div><div class='del'>-	g_return_val_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len, NULL);</div><div class='del'>-</div><div class='del'>-	comp = g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-	g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		return get_categories (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-		return get_classification (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-		return get_completed (model, comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-		return get_dtend (model, comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-		return get_dtstart (model, comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-		return get_due (model, comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-		return get_geo (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-		return get_percent (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-		return get_priority (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-		return get_summary (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-		return get_transparency (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		return get_url (comp);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-		return GINT_TO_POINTER (cal_component_has_alarms (comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-		/* FIXME: Also support 'Assigned to me' &amp; 'Assigned to someone</div><div class='del'>-		   else'. */</div><div class='del'>-		if (cal_component_has_recurrences (comp))</div><div class='del'>-			return GINT_TO_POINTER (1);</div><div class='del'>-		else</div><div class='del'>-			return GINT_TO_POINTER (0);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-		return GINT_TO_POINTER (get_is_complete (comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-		return GINT_TO_POINTER (cal_component_has_recurrences (comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-		return GINT_TO_POINTER (get_is_overdue (comp));</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		if (get_is_overdue (comp))</div><div class='del'>-			return "red";</div><div class='del'>-		else</div><div class='del'>-			return NULL;</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'>-/* Returns whether a string is NULL, empty, or full of whitespace */</div><div class='del'>-static gboolean</div><div class='del'>-string_is_empty (const char *value)</div><div class='del'>-{</div><div class='del'>-	const char *p;</div><div class='del'>-	gboolean empty = TRUE;</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		p = value;</div><div class='del'>-		while (*p) {</div><div class='del'>-			if (!isspace (*p)) {</div><div class='del'>-				empty = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			p++;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return empty;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* FIXME: We need to set the "transient_for" property for the dialog, but</div><div class='del'>-   the model doesn't know anything about the windows. */</div><div class='del'>-static void</div><div class='del'>-show_date_warning (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	char buffer[64], message[256], *format;</div><div class='del'>-	time_t t;</div><div class='del'>-	struct tm *tmp_tm;</div><div class='del'>-</div><div class='del'>-	t = time (NULL);</div><div class='del'>-	tmp_tm = localtime (&amp;t);</div><div class='del'>-</div><div class='del'>-	if (model-&gt;priv-&gt;use_24_hour_format)</div><div class='del'>-		/* strftime format of a weekday, a date and a time, 24-hour. */</div><div class='del'>-		format = _("%a %m/%d/%Y %H:%M:%S");</div><div class='del'>-	else</div><div class='del'>-		/* strftime format of a weekday, a date and a time, 12-hour. */</div><div class='del'>-		format = _("%a %m/%d/%Y %I:%M:%S %p");</div><div class='del'>-</div><div class='del'>-	strftime (buffer, sizeof (buffer), format, tmp_tm);</div><div class='del'>-</div><div class='del'>-	g_snprintf (message, 256,</div><div class='del'>-		    _("The date must be entered in the format: \n\n%s"),</div><div class='del'>-		    buffer);</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (message,</div><div class='del'>-					GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-					GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of categories from a comma-delimited string */</div><div class='del'>-static GSList *</div><div class='del'>-categories_from_string (const char *value)</div><div class='del'>-{</div><div class='del'>-	GSList *list;</div><div class='del'>-	const char *categ_start;</div><div class='del'>-	const char *categ_end;</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	if (!value)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-</div><div class='del'>-	categ_start = categ_end = NULL;</div><div class='del'>-</div><div class='del'>-	for (p = value; *p; p++) {</div><div class='del'>-		if (categ_start) {</div><div class='del'>-			if (*p == ',') {</div><div class='del'>-				char *c;</div><div class='del'>-</div><div class='del'>-				c = g_strndup (categ_start, categ_end - categ_start + 1);</div><div class='del'>-				list = g_slist_prepend (list, c);</div><div class='del'>-</div><div class='del'>-				categ_start = categ_end = NULL;</div><div class='del'>-			} else if (!isspace (*p))</div><div class='del'>-				categ_end = p;</div><div class='del'>-		} else if (!isspace (*p) &amp;&amp; *p != ',')</div><div class='del'>-			categ_start = categ_end = p;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (categ_start) {</div><div class='del'>-		char *c;</div><div class='del'>-</div><div class='del'>-		c = g_strndup (categ_start, categ_end - categ_start + 1);</div><div class='del'>-		list = g_slist_prepend (list, c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return g_slist_reverse (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the list of categories from a comma-delimited string */</div><div class='del'>-static void</div><div class='del'>-set_categories (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	GSList *list;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	list = categories_from_string (value);</div><div class='del'>-</div><div class='del'>-	cal_component_set_categories_list (comp, list);</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		char *s;</div><div class='del'>-</div><div class='del'>-		s = l-&gt;data;</div><div class='del'>-		g_free (s);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Parses a time value entered by the user; returns -1 if it could not be</div><div class='del'>- * parsed.  Returns 0 for an empty time.</div><div class='del'>- */</div><div class='del'>-static time_t</div><div class='del'>-parse_time (const char *value)</div><div class='del'>-{</div><div class='del'>-	struct tm discard_tm, date_tm, time_tm;</div><div class='del'>-	struct tm *today_tm;</div><div class='del'>-	time_t t;</div><div class='del'>-	const char *pos, *parse_end;</div><div class='del'>-	char *format[4];</div><div class='del'>-	gboolean parsed_date = FALSE, parsed_time = FALSE;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	pos = value;</div><div class='del'>-</div><div class='del'>-	/* Skip any whitespace. */</div><div class='del'>-	while (isspace (*pos))</div><div class='del'>-		pos++;</div><div class='del'>-</div><div class='del'>-	/* Skip any weekday name, full or abbreviated. */</div><div class='del'>-	parse_end = strptime (pos, "%a ", &amp;discard_tm);</div><div class='del'>-	if (parse_end)</div><div class='del'>-		pos = parse_end;</div><div class='del'>-</div><div class='del'>-	memset (&amp;date_tm, 0, sizeof (date_tm));</div><div class='del'>-	/* strptime format for a date. */</div><div class='del'>-	parse_end = strptime (pos, _("%m/%d/%Y"), &amp;date_tm);</div><div class='del'>-	if (parse_end) {</div><div class='del'>-		pos = parse_end;</div><div class='del'>-		parsed_date = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Skip any whitespace. */</div><div class='del'>-	while (isspace (*pos))</div><div class='del'>-		pos++;</div><div class='del'>-</div><div class='del'>-	/* Skip any weekday name, full or abbreviated, again. */</div><div class='del'>-	parse_end = strptime (pos, "%a ", &amp;discard_tm);</div><div class='del'>-	if (parse_end)</div><div class='del'>-		pos = parse_end;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* strptime format for a time of day, in 12-hour format.</div><div class='del'>-	   If it is is not appropriate in the locale set to an empty string. */</div><div class='del'>-	format[0] = _("%I:%M:%S %p%n");</div><div class='del'>-</div><div class='del'>-	/* strptime format for a time of day, in 24-hour format. */</div><div class='del'>-	format[1] = _("%H:%M:%S%n");</div><div class='del'>-</div><div class='del'>-	/* strptime format for time of day, without seconds, 12-hour format.</div><div class='del'>-	   If it is is not appropriate in the locale set to an empty string. */</div><div class='del'>-	format[2] = _("%I:%M %p%n");</div><div class='del'>-</div><div class='del'>-	/* strptime format for time of day, without seconds 24-hour format. */</div><div class='del'>-	format[3] = _("%H:%M%n");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sizeof (format) / sizeof (format[0]); i++) {</div><div class='del'>-		memset (&amp;time_tm, 0, sizeof (time_tm));</div><div class='del'>-		parse_end = strptime (pos, format[i], &amp;time_tm);</div><div class='del'>-		if (parse_end) {</div><div class='del'>-			pos = parse_end;</div><div class='del'>-			parsed_time = TRUE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Skip any whitespace. */</div><div class='del'>-	while (isspace (*pos))</div><div class='del'>-		pos++;</div><div class='del'>-</div><div class='del'>-	/* If we haven't already parsed a date, try again. */</div><div class='del'>-	if (!parsed_date) {</div><div class='del'>-		memset (&amp;date_tm, 0, sizeof (date_tm));</div><div class='del'>-		/* strptime format for a date. */</div><div class='del'>-		parse_end = strptime (pos, _("%m/%d/%Y"), &amp;date_tm);</div><div class='del'>-		if (parse_end) {</div><div class='del'>-			pos = parse_end;</div><div class='del'>-			parsed_date = TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we don't have a date or a time it must be invalid. */</div><div class='del'>-	if (!parsed_date &amp;&amp; !parsed_time)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (parsed_date) {</div><div class='del'>-		/* If a 2-digit year was used we use the current century. */</div><div class='del'>-		if (date_tm.tm_year &lt; 0) {</div><div class='del'>-			t = time (NULL);</div><div class='del'>-			today_tm = localtime (&amp;t);</div><div class='del'>-</div><div class='del'>-			/* This should convert it into a value from 0 to 99. */</div><div class='del'>-			date_tm.tm_year += 1900;</div><div class='del'>-</div><div class='del'>-			/* Now add on the century. */</div><div class='del'>-			date_tm.tm_year += today_tm-&gt;tm_year</div><div class='del'>-				- (today_tm-&gt;tm_year % 100);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* If we didn't get a date we use the current day. */</div><div class='del'>-		t = time (NULL);</div><div class='del'>-		today_tm = localtime (&amp;t);</div><div class='del'>-		date_tm.tm_mday = today_tm-&gt;tm_mday;</div><div class='del'>-		date_tm.tm_mon  = today_tm-&gt;tm_mon;</div><div class='del'>-		date_tm.tm_year = today_tm-&gt;tm_year;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (parsed_time) {</div><div class='del'>-		date_tm.tm_hour = time_tm.tm_hour;</div><div class='del'>-		date_tm.tm_min = time_tm.tm_min;</div><div class='del'>-		date_tm.tm_sec = time_tm.tm_sec;</div><div class='del'>-	} else {</div><div class='del'>-		date_tm.tm_hour = 0;</div><div class='del'>-		date_tm.tm_min = 0;</div><div class='del'>-		date_tm.tm_sec = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-	return mktime (&amp;date_tm);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called to set the "Date Completed" field. We also need to update the</div><div class='del'>-   Status and Percent fields to make sure they match. */</div><div class='del'>-static void</div><div class='del'>-set_completed (CalendarModel *model, CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	t = parse_time (value);</div><div class='del'>-	if (t == -1) {</div><div class='del'>-		show_date_warning (model);</div><div class='del'>-	} else if (t == 0) {</div><div class='del'>-		ensure_task_not_complete (comp);</div><div class='del'>-	} else {</div><div class='del'>-		ensure_task_complete (comp, t);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets a CalComponentDateTime value */</div><div class='del'>-static void</div><div class='del'>-set_datetime (CalendarModel *model, CalComponent *comp, const char *value,</div><div class='del'>-	      void (* set_func) (CalComponent *comp, CalComponentDateTime *dt))</div><div class='del'>-{</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	t = parse_time (value);</div><div class='del'>-	if (t == -1) {</div><div class='del'>-		show_date_warning (model);</div><div class='del'>-		return;</div><div class='del'>-	} else if (t == 0) {</div><div class='del'>-		(* set_func) (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	} else {</div><div class='del'>-		CalComponentDateTime dt;</div><div class='del'>-		struct icaltimetype itt;</div><div class='del'>-</div><div class='del'>-		itt = icaltime_from_timet (t, FALSE, TRUE);</div><div class='del'>-		dt.value = &amp;itt;</div><div class='del'>-		dt.tzid = NULL;</div><div class='del'>-</div><div class='del'>-		(* set_func) (comp, &amp;dt);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: We need to set the "transient_for" property for the dialog, but the</div><div class='del'>- * model doesn't know anything about the windows.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-show_geo_warning (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (_("The geographical position must be entered "</div><div class='del'>-					  "in the format: \n\n45.436845,125.862501"),</div><div class='del'>-					GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-					GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the geographical position value of a component */</div><div class='del'>-static void</div><div class='del'>-set_geo (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	double latitude, longitude;</div><div class='del'>-	int matched;</div><div class='del'>-	struct icalgeotype geo;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_geo (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	matched = sscanf (value, "%lg , %lg", &amp;latitude, &amp;longitude);</div><div class='del'>-</div><div class='del'>-	if (matched != 2) {</div><div class='del'>-		show_geo_warning ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	geo.lat = latitude;</div><div class='del'>-	geo.lon = longitude;</div><div class='del'>-	cal_component_set_geo (comp, &amp;geo);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: We need to set the "transient_for" property for the dialog, but the</div><div class='del'>- * model doesn't know anything about the windows.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-show_percent_warning (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (_("The percent value must be between 0 and 100, inclusive"),</div><div class='del'>-					GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-					GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the percent value of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_percent (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	int matched, percent;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_percent (comp, NULL);</div><div class='del'>-		ensure_task_not_complete (comp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	matched = sscanf (value, "%i", &amp;percent);</div><div class='del'>-</div><div class='del'>-	if (matched != 1 || percent &lt; 0 || percent &gt; 100) {</div><div class='del'>-		show_percent_warning ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_percent (comp, &amp;percent);</div><div class='del'>-</div><div class='del'>-	if (percent == 100)</div><div class='del'>-		ensure_task_complete (comp, -1);</div><div class='del'>-	else</div><div class='del'>-		ensure_task_not_complete (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: We need to set the "transient_for" property for the dialog, but the</div><div class='del'>- * model doesn't know anything about the windows.  */</div><div class='del'>-static void</div><div class='del'>-show_priority_warning (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	dialog = gnome_message_box_new (_("The priority must be between 1 and 9, inclusive"),</div><div class='del'>-					GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-					GNOME_STOCK_BUTTON_OK, NULL);</div><div class='del'>-	gtk_widget_show (dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the priority of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_priority (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	int matched, priority;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_priority (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	matched = sscanf (value, "%i", &amp;priority);</div><div class='del'>-</div><div class='del'>-	if (matched != 1 || priority &lt; 1 || priority &gt; 9) {</div><div class='del'>-		show_priority_warning ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_priority (comp, &amp;priority);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the summary of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_summary (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	CalComponentText text;</div><div class='del'>-</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_summary (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	text.value = value;</div><div class='del'>-	text.altrep = NULL; /* FIXME: should we preserve the old ALTREP? */</div><div class='del'>-</div><div class='del'>-	cal_component_set_summary (comp, &amp;text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets the URI of a calendar component */</div><div class='del'>-static void</div><div class='del'>-set_url (CalComponent *comp, const char *value)</div><div class='del'>-{</div><div class='del'>-	if (string_is_empty (value)) {</div><div class='del'>-		cal_component_set_url (comp, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_set_url (comp, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Called to set the checkbutton field which indicates whether a task is</div><div class='del'>-   complete. */</div><div class='del'>-static void</div><div class='del'>-set_complete (CalComponent *comp, const void *value)</div><div class='del'>-{</div><div class='del'>-	gint state = GPOINTER_TO_INT (value);</div><div class='del'>-</div><div class='del'>-	if (state) {</div><div class='del'>-		ensure_task_complete (comp, -1);</div><div class='del'>-	} else {</div><div class='del'>-		ensure_task_not_complete (comp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* set_value_at handler for the calendar table model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_set_value_at (ETableModel *etm, int col, int row, const void *value)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS);</div><div class='del'>-	g_return_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len);</div><div class='del'>-</div><div class='del'>-	comp = g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-	g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		set_categories (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* FIXME: CLASSIFICATION requires an option menu cell renderer */</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-		set_completed (model, comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-		/* FIXME: Need to reset dtstart if dtend happens before it */</div><div class='del'>-		set_datetime (model, comp, value, cal_component_set_dtend);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-		/* FIXME: Need to reset dtend if dtstart happens after it */</div><div class='del'>-		set_datetime (model, comp, value, cal_component_set_dtstart);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-		set_datetime (model, comp, value, cal_component_set_due);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-		set_geo (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-		set_percent (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-		set_priority (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-		set_summary (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	/* FIXME: TRANSPARENCY requires an option menu cell renderer */</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		set_url (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-		set_complete (comp, value);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	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'>-	/* FIXME: this is an ugly HACK.  ETable needs a better API for the</div><div class='del'>-	 * "click here to add an element" thingy.</div><div class='del'>-	 */</div><div class='del'>-	if (priv-&gt;appending_row)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (priv-&gt;client, comp))</div><div class='del'>-		g_message ("calendar_model_set_value_at(): Could not update the object!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* is_cell_editable handler for the calendar table model */</div><div class='del'>-static gboolean</div><div class='del'>-calendar_model_is_cell_editable (ETableModel *etm, int col, int row)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	model = CALENDAR_MODEL (etm);</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, FALSE);</div><div class='del'>-</div><div class='del'>-	/* FIXME: We can't check this as 'click-to-add' passes row 0. */</div><div class='del'>-	/*g_return_val_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len, FALSE);*/</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* append_row handler for the calendar model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_append_row (ETableModel *etm, ETableModel *source, gint row)</div><div class='del'>-{</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	int *new_idx, col;</div><div class='del'>-	const char *uid;</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'>-	/* This is a HACK */</div><div class='del'>-	priv-&gt;appending_row = TRUE;</div><div class='del'>-</div><div class='del'>-	/* FIXME: This should support other types of components, but for now it</div><div class='del'>-	 * is only used for the task list.</div><div class='del'>-	 */</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	g_array_append_val (priv-&gt;objects, comp);</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, (char *) uid, new_idx);</div><div class='del'>-</div><div class='del'>-	/* Notify the views about the new row. I think we have to do that here,</div><div class='del'>-	   or the views may become confused when they start getting</div><div class='del'>-	   "row_changed" or "cell_changed" signals for this new row. */</div><div class='del'>-	e_table_model_row_inserted (etm, *new_idx);</div><div class='del'>-</div><div class='del'>-	for (col = 0; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS; col++) {</div><div class='del'>-		const void *val;</div><div class='del'>-</div><div class='del'>-		if (!e_table_model_is_cell_editable (etm, col, *new_idx))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		val = e_table_model_value_at(source, col, row);</div><div class='del'>-		e_table_model_set_value_at (etm, col, *new_idx, val);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* This is the end of the HACK */</div><div class='del'>-	priv-&gt;appending_row = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (priv-&gt;client, comp)) {</div><div class='del'>-		/* FIXME: Show error dialog. */</div><div class='del'>-		g_message ("calendar_model_append_row(): Could not add new object!");</div><div class='del'>-		remove_object (model, uid);</div><div class='del'>-		e_table_model_row_deleted (etm, *new_idx);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Duplicates a string value */</div><div class='del'>-static char *</div><div class='del'>-dup_string (const char *value)</div><div class='del'>-{</div><div class='del'>-	return g_strdup (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* duplicate_value handler for the calendar table model */</div><div class='del'>-static void *</div><div class='del'>-calendar_model_duplicate_value (ETableModel *etm, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);</div><div class='del'>-</div><div class='del'>-	/* They are almost all dup_string()s for now, but we'll have real fields</div><div class='del'>-	 * later.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		return dup_string (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-		return (void *) value;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-		return dup_string (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-		return (void *) value;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		return dup_string (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		return (void *) value;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_duplicate_value(): Requested invalid column %d", col);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* free_value handler for the calendar table model */</div><div class='del'>-static void</div><div class='del'>-calendar_model_free_value (ETableModel *etm, int col, void *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		g_free (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-		g_free (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		g_free (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_free_value(): Requested invalid column %d", col);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initializes a string value */</div><div class='del'>-static char *</div><div class='del'>-init_string (void)</div><div class='del'>-{</div><div class='del'>-	return g_strdup ("");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* initialize_value handler for the calendar table model */</div><div class='del'>-static void *</div><div class='del'>-calendar_model_initialize_value (ETableModel *etm, int col)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, NULL);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-		return init_string ();</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION:</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-		return init_string ();</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		return init_string ();</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_initialize_value(): Requested invalid column %d", col);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* value_is_empty handler for the calendar model. This should return TRUE</div><div class='del'>-   unless a significant value has been set. The 'click-to-add' feature</div><div class='del'>-   checks all fields to see if any are not empty and if so it adds a new</div><div class='del'>-   row, so we only want to return FALSE if we have a useful object. */</div><div class='del'>-static gboolean</div><div class='del'>-calendar_model_value_is_empty (ETableModel *etm, int col, const void *value)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (col &gt;= 0 &amp;&amp; col &lt; CAL_COMPONENT_FIELD_NUM_FIELDS, TRUE);</div><div class='del'>-</div><div class='del'>-	switch (col) {</div><div class='del'>-	case CAL_COMPONENT_FIELD_CATEGORIES:</div><div class='del'>-	case CAL_COMPONENT_FIELD_CLASSIFICATION: /* actually goes here, not by itself */</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETED:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTEND:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DTSTART:</div><div class='del'>-	case CAL_COMPONENT_FIELD_DUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_GEO:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PERCENT:</div><div class='del'>-	case CAL_COMPONENT_FIELD_PRIORITY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_SUMMARY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_TRANSPARENCY:</div><div class='del'>-	case CAL_COMPONENT_FIELD_URL:</div><div class='del'>-		return string_is_empty (value);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_FIELD_HAS_ALARMS:</div><div class='del'>-	case CAL_COMPONENT_FIELD_ICON:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COMPLETE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_RECURRING:</div><div class='del'>-	case CAL_COMPONENT_FIELD_OVERDUE:</div><div class='del'>-	case CAL_COMPONENT_FIELD_COLOR:</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_message ("calendar_model_value_is_empty(): Requested invalid column %d", col);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_new:</div><div class='del'>- *</div><div class='del'>- * Creates a new calendar model.  It must be told about the calendar client</div><div class='del'>- * interface object it will monitor with calendar_model_set_cal_client().</div><div class='del'>- *</div><div class='del'>- * Return value: A newly-created calendar model.</div><div class='del'>- **/</div><div class='del'>-CalendarModel *</div><div class='del'>-calendar_model_new (void)</div><div class='del'>-{</div><div class='del'>-	return CALENDAR_MODEL (gtk_type_new (TYPE_CALENDAR_MODEL));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when a calendar is loaded into the server */</div><div class='del'>-static void</div><div class='del'>-cal_loaded_cb (CalClient *client,</div><div class='del'>-	       CalClientLoadStatus status,</div><div class='del'>-	       CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL (model));</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_LOAD_SUCCESS)</div><div class='del'>-		load_objects (model);</div><div class='del'>-</div><div class='del'>-	e_table_model_changed (E_TABLE_MODEL (model));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Removes an object from the model and updates all the indices that follow.</div><div class='del'>- * Returns the index of the object that was removed, or -1 if no object with</div><div class='del'>- * such UID was found.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-remove_object (CalendarModel *model, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	int *idx;</div><div class='del'>-	CalComponent *orig_comp;</div><div class='del'>-	int i;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Find the index of the object to be removed */</div><div class='del'>-</div><div class='del'>-	idx = g_hash_table_lookup (priv-&gt;uid_index_hash, uid);</div><div class='del'>-	if (!idx)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	orig_comp = g_array_index (priv-&gt;objects, CalComponent *, *idx);</div><div class='del'>-	g_assert (orig_comp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Decrease the indices of all the objects that follow in the array */</div><div class='del'>-</div><div class='del'>-	for (i = *idx + 1; i &lt; priv-&gt;objects-&gt;len; i++) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		int *comp_idx;</div><div class='del'>-		const char *comp_uid;</div><div class='del'>-</div><div class='del'>-		comp = g_array_index (priv-&gt;objects, CalComponent *, i);</div><div class='del'>-		g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-</div><div class='del'>-		comp_idx = g_hash_table_lookup (priv-&gt;uid_index_hash, comp_uid);</div><div class='del'>-		g_assert (comp_idx != NULL);</div><div class='del'>-</div><div class='del'>-		(*comp_idx)--;</div><div class='del'>-		g_assert (*comp_idx &gt;= 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove this object from the array and hash */</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&gt;uid_index_hash, uid);</div><div class='del'>-	g_array_remove_index (priv-&gt;objects, *idx);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (orig_comp));</div><div class='del'>-</div><div class='del'>-	n = *idx;</div><div class='del'>-	g_free (idx);</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether a component's type matches the types we support */</div><div class='del'>-static gboolean</div><div class='del'>-matches_type (CalObjType type, CalComponentVType vtype)</div><div class='del'>-{</div><div class='del'>-	return ((vtype == CAL_COMPONENT_EVENT &amp;&amp; (type &amp; CALOBJ_TYPE_EVENT))</div><div class='del'>-		|| (vtype == CAL_COMPONENT_TODO &amp;&amp; (type &amp; CALOBJ_TYPE_TODO))</div><div class='del'>-		|| (vtype == CAL_COMPONENT_JOURNAL &amp;&amp; (type &amp; CALOBJ_TYPE_JOURNAL)));</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'>-	CalComponent *new_comp;</div><div class='del'>-	CalComponentVType new_comp_vtype;</div><div class='del'>-	const char *new_comp_uid;</div><div class='del'>-	int *new_idx;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</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_comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Check if we are interested in this type of object */</div><div class='del'>-</div><div class='del'>-		new_comp_vtype = cal_component_get_vtype (new_comp);</div><div class='del'>-		if (!matches_type (priv-&gt;type, new_comp_vtype)) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (new_comp));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Insert the object into the model */</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (new_comp, &amp;new_comp_uid);</div><div class='del'>-</div><div class='del'>-		if (orig_idx == -1) {</div><div class='del'>-			/* The object not in the model originally, so we just append it */</div><div class='del'>-</div><div class='del'>-			g_array_append_val (priv-&gt;objects, new_comp);</div><div class='del'>-</div><div class='del'>-			new_idx = g_new (int, 1);</div><div class='del'>-			*new_idx = priv-&gt;objects-&gt;len - 1;</div><div class='del'>-</div><div class='del'>-			g_hash_table_insert (priv-&gt;uid_index_hash, (char *) new_comp_uid, new_idx);</div><div class='del'>-		} else {</div><div class='del'>-			int i;</div><div class='del'>-</div><div class='del'>-			/* Insert the new version of the object in its old position */</div><div class='del'>-</div><div class='del'>-			g_array_insert_val (priv-&gt;objects, orig_idx, new_comp);</div><div class='del'>-</div><div class='del'>-			new_idx = g_new (int, 1);</div><div class='del'>-			*new_idx = orig_idx;</div><div class='del'>-			g_hash_table_insert (priv-&gt;uid_index_hash, (char *) new_comp_uid, new_idx);</div><div class='del'>-</div><div class='del'>-			/* Increase the indices of all subsequent objects */</div><div class='del'>-</div><div class='del'>-			for (i = orig_idx + 1; i &lt; priv-&gt;objects-&gt;len; i++) {</div><div class='del'>-				CalComponent *comp;</div><div class='del'>-				int *comp_idx;</div><div class='del'>-				const char *comp_uid;</div><div class='del'>-</div><div class='del'>-				comp = g_array_index (priv-&gt;objects, CalComponent *, i);</div><div class='del'>-				g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-				cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-</div><div class='del'>-				comp_idx = g_hash_table_lookup (priv-&gt;uid_index_hash, comp_uid);</div><div class='del'>-				g_assert (comp_idx != NULL);</div><div class='del'>-</div><div class='del'>-				(*comp_idx)++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</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'>-	if (!cal_client_is_loaded (priv-&gt;client))</div><div class='del'>-		return;</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'>-		CalComponent *comp;</div><div class='del'>-		const char *comp_uid;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		CalComponentVType comp_vtype;</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;comp);</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'>-		/* Check if we are interested in this type of object */</div><div class='del'>-</div><div class='del'>-		comp_vtype = cal_component_get_vtype (comp);</div><div class='del'>-		if (!matches_type (priv-&gt;type, comp_vtype)) {</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Insert the object into the model */</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, comp);</div><div class='del'>-		*idx = priv-&gt;objects-&gt;len - 1;</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-		g_hash_table_insert (priv-&gt;uid_index_hash, (char *) comp_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_get_cal_client:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- * </div><div class='del'>- * Queries the calendar client interface object that a calendar model is using.</div><div class='del'>- * </div><div class='del'>- * Return value: A calendar client interface object.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-calendar_model_get_cal_client (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * calendar_model_set_cal_client:</div><div class='del'>- * @model: A calendar model.</div><div class='del'>- * @client: A calendar client interface object.</div><div class='del'>- * @type: Type of objects to present.</div><div class='del'>- *</div><div class='del'>- * Sets the calendar client interface object that a calendar model will monitor.</div><div class='del'>- * It also sets the types of objects this model will present to an #ETable.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-calendar_model_set_cal_client (CalendarModel *model, CalClient *client, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client == client &amp;&amp; priv-&gt;type == type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_table_model_pre_change (E_TABLE_MODEL(model));</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), "cal_loaded",</div><div class='del'>-				    GTK_SIGNAL_FUNC (cal_loaded_cb), model);</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='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_model_delete_task (CalendarModel *model,</div><div class='del'>-			    gint row)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len);</div><div class='del'>-</div><div class='del'>-	comp = g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-	g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	/* We don't check the return value; FALSE can mean the object was not in</div><div class='del'>-	 * the server anyways.</div><div class='del'>-	 */</div><div class='del'>-	cal_client_remove_object (priv-&gt;client, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_model_mark_task_complete (CalendarModel *model,</div><div class='del'>-				   gint row)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (model != NULL);</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len);</div><div class='del'>-</div><div class='del'>-	comp = g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-	g_assert (comp != NULL);</div><div class='del'>-</div><div class='del'>-	ensure_task_complete (comp, -1);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (priv-&gt;client, comp))</div><div class='del'>-		g_message ("calendar_model_mark_task_complete(): Could not update the object!");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Frees the objects stored in the calendar model */</div><div class='del'>-CalComponent *</div><div class='del'>-calendar_model_get_cal_object (CalendarModel *model,</div><div class='del'>-			       gint	      row)</div><div class='del'>-{</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (model != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), NULL);</div><div class='del'>-</div><div class='del'>-	priv = model-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (row &gt;= 0 &amp;&amp; row &lt; priv-&gt;objects-&gt;len, NULL);</div><div class='del'>-</div><div class='del'>-	return g_array_index (priv-&gt;objects, CalComponent *, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This makes sure a task is marked as complete.</div><div class='del'>-   It makes sure the "Date Completed" property is set. If the completed_date</div><div class='del'>-   is not -1, then that is used, otherwise if the "Date Completed" property</div><div class='del'>-   is not already set it is set to the current time.</div><div class='del'>-   It makes sure the percent is set to 100, and that the status is "Completed".</div><div class='del'>-   Note that this doesn't update the component on the client. */</div><div class='del'>-static void</div><div class='del'>-ensure_task_complete (CalComponent *comp,</div><div class='del'>-		      time_t completed_date)</div><div class='del'>-{</div><div class='del'>-	struct icaltimetype *old_completed = NULL;</div><div class='del'>-	struct icaltimetype new_completed;</div><div class='del'>-	const char *old_status;</div><div class='del'>-	int *old_percent, new_percent;</div><div class='del'>-	gboolean set_completed = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Date Completed. */</div><div class='del'>-	if (completed_date == -1) {</div><div class='del'>-		cal_component_get_completed (comp, &amp;old_completed);</div><div class='del'>-</div><div class='del'>-		if (old_completed) {</div><div class='del'>-			cal_component_free_icaltimetype (old_completed);</div><div class='del'>-			set_completed = FALSE;</div><div class='del'>-		} else {</div><div class='del'>-			completed_date = time (NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (set_completed) {</div><div class='del'>-		new_completed = icaltime_from_timet (completed_date, FALSE,</div><div class='del'>-						     TRUE);</div><div class='del'>-		cal_component_set_completed (comp, &amp;new_completed);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Percent. */</div><div class='del'>-	cal_component_get_percent (comp, &amp;old_percent);</div><div class='del'>-	if (!old_percent || *old_percent != 100) {</div><div class='del'>-		new_percent = 100;</div><div class='del'>-		cal_component_set_percent (comp, &amp;new_percent);</div><div class='del'>-	}</div><div class='del'>-	if (old_percent)</div><div class='del'>-		cal_component_free_percent (old_percent);</div><div class='del'>-</div><div class='del'>-	/* Status. */</div><div class='del'>-	cal_component_get_status (comp, &amp;old_status);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This makes sure a task is marked as incomplete. It clears the</div><div class='del'>-   "Date Completed" property. If the percent is set to 100 it removes it,</div><div class='del'>-   and if the status is "Completed" it sets it to "Needs Action".</div><div class='del'>-   Note that this doesn't update the component on the client. */</div><div class='del'>-static void</div><div class='del'>-ensure_task_not_complete (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *old_status;</div><div class='del'>-	int *old_percent;</div><div class='del'>-</div><div class='del'>-	/* Date Completed. */</div><div class='del'>-	cal_component_set_completed (comp, NULL);</div><div class='del'>-</div><div class='del'>-	/* Percent. */</div><div class='del'>-	cal_component_get_percent (comp, &amp;old_percent);</div><div class='del'>-	if (old_percent &amp;&amp; *old_percent == 100)</div><div class='del'>-		cal_component_set_percent (comp, NULL);</div><div class='del'>-	if (old_percent)</div><div class='del'>-		cal_component_free_percent (old_percent);</div><div class='del'>-</div><div class='del'>-	/* Status. */</div><div class='del'>-	cal_component_get_status (comp, &amp;old_status);</div><div class='del'>-	if (old_status &amp;&amp; !strcmp (old_status, "COMPLETED"))</div><div class='del'>-		cal_component_set_status (comp, "NEEDS-ACTION");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we use 24 hour format to display the times. */</div><div class='del'>-gboolean</div><div class='del'>-calendar_model_get_use_24_hour_format (CalendarModel *model)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (IS_CALENDAR_MODEL (model), TRUE);</div><div class='del'>-</div><div class='del'>-	return model-&gt;priv-&gt;use_24_hour_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-calendar_model_set_use_24_hour_format (CalendarModel *model,</div><div class='del'>-				       gboolean	      use_24_hour_format)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (IS_CALENDAR_MODEL (model));</div><div class='del'>-</div><div class='del'>-	if (model-&gt;priv-&gt;use_24_hour_format != use_24_hour_format) {</div><div class='del'>-		model-&gt;priv-&gt;use_24_hour_format = use_24_hour_format;</div><div class='del'>-		/* Get the views to redraw themselves. */</div><div class='del'>-		e_table_model_changed (E_TABLE_MODEL (model));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/calendar-model.h b/calendar/gui/calendar-model.h<br/>deleted file mode 100644<br/>index ed04706090..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-model.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-model.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,82 +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;gal/e-table/e-table-model.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_CALENDAR_MODEL            (calendar_model_get_type ())</div><div class='del'>-#define CALENDAR_MODEL(obj)            (GTK_CHECK_CAST ((obj), TYPE_CALENDAR_MODEL, CalendarModel))</div><div class='del'>-#define CALENDAR_MODEL_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_CALENDAR_MODEL,	\</div><div class='del'>-					CalendarModelClass))</div><div class='del'>-#define IS_CALENDAR_MODEL(obj)         (GTK_CHECK_TYPE ((obj), TYPE_CALENDAR_MODEL))</div><div class='del'>-#define IS_CALENDAR_MODEL_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_CALENDAR_MODEL))</div><div class='del'>-</div><div class='del'>-typedef struct _CalendarModel CalendarModel;</div><div class='del'>-typedef struct _CalendarModelClass CalendarModelClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CalendarModelPrivate CalendarModelPrivate;</div><div class='del'>-</div><div class='del'>-struct _CalendarModel {</div><div class='del'>-	ETableModel model;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalendarModelPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalendarModelClass {</div><div class='del'>-	ETableModelClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType		calendar_model_get_type		  (void);</div><div class='del'>-</div><div class='del'>-CalendarModel*	calendar_model_new		  (void);</div><div class='del'>-</div><div class='del'>-CalClient*	calendar_model_get_cal_client	  (CalendarModel   *model);</div><div class='del'>-void		calendar_model_set_cal_client	  (CalendarModel   *model,</div><div class='del'>-						   CalClient	   *client,</div><div class='del'>-						   CalObjType	    type);</div><div class='del'>-</div><div class='del'>-void		calendar_model_mark_task_complete (CalendarModel   *model,</div><div class='del'>-						   gint		    row);</div><div class='del'>-void		calendar_model_delete_task	  (CalendarModel   *model,</div><div class='del'>-						   gint		    row);</div><div class='del'>-</div><div class='del'>-CalComponent*	calendar_model_get_cal_object	  (CalendarModel   *model,</div><div class='del'>-						   gint		    row);</div><div class='del'>-</div><div class='del'>-/* Whether we use 24 hour format to display the times. */</div><div class='del'>-gboolean	calendar_model_get_use_24_hour_format (CalendarModel *model);</div><div class='del'>-void		calendar_model_set_use_24_hour_format (CalendarModel *model,</div><div class='del'>-						       gboolean	      use_24_hour_format);</div><div class='del'>-</div><div class='del'>-</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-summary.c b/calendar/gui/calendar-summary.c<br/>deleted file mode 100644<br/>index 0c05ace30a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-summary.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,135 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* calendar-summary.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;executive-summary/evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include "cal-util/cal-component.h"</div><div class='del'>-#include "calendar-model.h"</div><div class='del'>-</div><div class='del'>-#include "calendar-summary.h"</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	CalClient *client;</div><div class='del'>-} CalSummary;</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-generate_html_summary (CalSummary *summary)</div><div class='del'>-{</div><div class='del'>-	GList *uids, *l;</div><div class='del'>-	char *ret_html, *tmp;</div><div class='del'>-	</div><div class='del'>-	ret_html = g_strdup ("&lt;ul&gt;");</div><div class='del'>-	</div><div class='del'>-	uids = cal_client_get_uids (summary-&gt;client, CALOBJ_TYPE_ANY);</div><div class='del'>-	for (l = uids; l; l = l-&gt;next){</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalComponentText text;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		char *uid;</div><div class='del'>-		char *tmp2;</div><div class='del'>-		</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-		status = cal_client_get_object (summary-&gt;client, uid, &amp;comp);</div><div class='del'>-		if (status != CAL_CLIENT_GET_SUCCESS)</div><div class='del'>-			continue;</div><div class='del'>-		</div><div class='del'>-		cal_component_get_summary (comp, &amp;text);</div><div class='del'>-		</div><div class='del'>-		tmp2 = g_strdup_printf ("&lt;li&gt;%s&lt;/li&gt;", text.value);</div><div class='del'>-		</div><div class='del'>-		tmp = ret_html;</div><div class='del'>-		ret_html = g_strconcat (ret_html, tmp2, NULL);</div><div class='del'>-		g_free (tmp);</div><div class='del'>-		g_free (tmp2);</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'>-	tmp = ret_html;</div><div class='del'>-	ret_html = g_strconcat (ret_html, "&lt;/ul&gt;", NULL);</div><div class='del'>-	g_free (tmp);</div><div class='del'>-	</div><div class='del'>-	return ret_html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_loaded (CalClient *client,</div><div class='del'>-	    CalClientLoadStatus status,</div><div class='del'>-	    CalSummary *summary)</div><div class='del'>-{</div><div class='del'>-	char *html;</div><div class='del'>-	</div><div class='del'>-	if (status == CAL_CLIENT_LOAD_SUCCESS) {</div><div class='del'>-		html = generate_html_summary (summary);</div><div class='del'>-		executive_summary_component_update (summary-&gt;component, html);</div><div class='del'>-		g_free (html);</div><div class='del'>-	} else {</div><div class='del'>-		g_print ("Error loading %d\n", status);</div><div class='del'>-		executive_summary_component_update (summary-&gt;component, " ");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-create_summary_view (ExecutiveSummaryComponent *component,</div><div class='del'>-		     char **title,</div><div class='del'>-		     char **icon,</div><div class='del'>-		     void *closure)</div><div class='del'>-{</div><div class='del'>-	char *ret_html;</div><div class='del'>-	char *evoldir;</div><div class='del'>-	char *calfile;</div><div class='del'>-	CalSummary *summary;</div><div class='del'>-	gboolean result;</div><div class='del'>-	</div><div class='del'>-	evoldir = (char *) closure;</div><div class='del'>-	</div><div class='del'>-	/* strdup the title and icon */</div><div class='del'>-	*title = g_strdup ("Things to do");</div><div class='del'>-	*icon = g_strdup ("evolution-tasks.png");</div><div class='del'>-	</div><div class='del'>-	summary = g_new (CalSummary, 1);</div><div class='del'>-	summary-&gt;component = component;</div><div class='del'>-	</div><div class='del'>-	calfile = g_strdup_printf ("%s/local/Calendar/calendar.ics", evoldir);</div><div class='del'>-	g_print ("calfile: %s\n", calfile);</div><div class='del'>-	summary-&gt;client = cal_client_new ();</div><div class='del'>-	</div><div class='del'>-	result = cal_client_load_calendar (summary-&gt;client, calfile);</div><div class='del'>-	if (!result) {</div><div class='del'>-		g_warning ("%s: Could not load %s", __FUNCTION__, calfile);</div><div class='del'>-		return "";</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (summary-&gt;client), "cal_loaded",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_loaded), summary);</div><div class='del'>-	</div><div class='del'>-	return g_strdup (" ");</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/calendar-summary.h b/calendar/gui/calendar-summary.h<br/>deleted file mode 100644<br/>index 8e21262db3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/calendar-summary.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/calendar-summary.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'>-/* calendar-summary.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple 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 CALENDAR_SUMMARY_H</div><div class='del'>-#define CALENDAR_SUMMARY_H</div><div class='del'>-</div><div class='del'>-char * create_summary_view (ExecutiveSummaryComponent *component,</div><div class='del'>-			    char **title,</div><div class='del'>-			    char **icon,</div><div class='del'>-			    void *closure);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/check-filled.xpm b/calendar/gui/check-filled.xpm<br/>deleted file mode 100644<br/>index c0468fc25b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/check-filled.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/check-filled.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static const char * check_filled_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"  ............  ",</div><div class='del'>-"  .          .  ",</div><div class='del'>-"  .        . .  ",</div><div class='del'>-"  .       .. .  ",</div><div class='del'>-"  .      ... .  ",</div><div class='del'>-"  . .   ...  .  ",</div><div class='del'>-"  . .. ...   .  ",</div><div class='del'>-"  . .....    .  ",</div><div class='del'>-"  .  ...     .  ",</div><div class='del'>-"  .   .      .  ",</div><div class='del'>-"  .          .  ",</div><div class='del'>-"  ............  ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/calendar/gui/component-factory.c b/calendar/gui/component-factory.c<br/>deleted file mode 100644<br/>index b30bae6a02..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/component-factory.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/component-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#ifdef WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-#include &lt;executive-summary/evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#endif</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#if WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-#include "calendar-summary.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_ID "OAFIID:evolution-shell-component-factory:evolution-calendar:cba77062-1466-4aac-8ce7-b019eaf2e921"</div><div class='del'>-#define SUMMARY_FACTORY_ID "OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-static BonoboGenericFactory *summary_factory = NULL;</div><div class='del'>-char *evolution_dir;</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 gint owner_count = 0;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      EvolutionShellClient *shell_client,</div><div class='del'>-	      const char *evolution_homedir,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	evolution_dir = g_strdup (evolution_homedir);</div><div class='del'>-	calendar_config_init ();</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'>-		gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	owner_count --;</div><div class='del'>-	if (owner_count &lt;= 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, 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'>-	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'>-#ifdef WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-static BonoboObject *</div><div class='del'>-summary_fn (BonoboGenericFactory *factory, </div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponent *summary_component;</div><div class='del'>-</div><div class='del'>-	summary_component = executive_summary_component_new (NULL,</div><div class='del'>-							     create_summary_view,</div><div class='del'>-							     NULL,</div><div class='del'>-							     evolution_dir);</div><div class='del'>-	return BONOBO_OBJECT (summary_component);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-component_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL &amp;&amp; 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'>-#ifdef WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-	summary_factory = bonobo_generic_factory_new (SUMMARY_FACTORY_ID, summary_fn, NULL);</div><div class='del'>-#endif</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='del'>-#ifdef WANT_THE_EXECUTIVE_SUMMARY</div><div class='del'>-	if (summary_factory == NULL)</div><div class='del'>-		g_error ("Cannot initialize Evolution's calendar summary component.");</div><div class='del'>-#endif</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 8e5cd6605f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/component-factory.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/component-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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'>-extern char *evolution_dir;</div><div class='del'>-</div><div class='del'>-void  component_factory_init  (void);</div><div class='del'>-</div><div class='del'>-#endif /* _COMPONENT_FACTORY_H_ */</div><div class='head'>diff --git a/calendar/gui/control-factory.c b/calendar/gui/control-factory.c<br/>deleted file mode 100644<br/>index daf2b8ea15..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/control-factory.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/control-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,185 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* 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'>-#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'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;gui/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'>-#define CONTROL_FACTORY_ID   "OAFIID:control-factory:calendar:f4f90989-0f50-4af2-ad94-8bbdf331f0bc"</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.ics",</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, BonoboControl *control)</div><div class='del'>-{</div><div class='del'>-	BonoboPropertyBag *pbag;</div><div class='del'>-</div><div class='del'>-	pbag = bonobo_property_bag_new (get_prop, set_prop, gcal);</div><div class='del'>-</div><div class='del'>-	bonobo_property_bag_add (pbag,</div><div class='del'>-				 PROPERTY_CALENDAR_URI,</div><div class='del'>-				 PROPERTY_CALENDAR_URI_IDX,</div><div class='del'>-				 BONOBO_ARG_STRING,</div><div class='del'>-				 NULL,</div><div class='del'>-				 _("The URI that the calendar will display"),</div><div class='del'>-				 0);</div><div class='del'>-</div><div class='del'>-	bonobo_control_set_properties (control, pbag);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback factory function for calendar controls */</div><div class='del'>-static BonoboObject *</div><div class='del'>-control_factory_fn (BonoboGenericFactory *Factory, void *data)</div><div class='del'>-{</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-</div><div class='del'>-	control = control_factory_new_control ();</div><div class='del'>-</div><div class='del'>-	if (control)</div><div class='del'>-		return BONOBO_OBJECT (control);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-control_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	puts ("XXXXXX - initializing calendar factory!!!");</div><div class='del'>-</div><div class='del'>-	factory = bonobo_generic_factory_new (CONTROL_FACTORY_ID, control_factory_fn, 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'>-	BonoboControl *control;</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = new_calendar (full_name);</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (gcal));</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (GTK_WIDGET (gcal));</div><div class='del'>-	if (!control) {</div><div class='del'>-		g_message ("control_factory_fn(): could not create the control!");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	calendar_properties_init (gcal, control);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (control), "activate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (control_activate_cb), gcal);</div><div class='del'>-</div><div class='del'>-	return control;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/control-factory.h b/calendar/gui/control-factory.h<br/>deleted file mode 100644<br/>index bacd2d3d90..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/control-factory.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 dbabb24c5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dayview.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dayview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * dayview_xpm[] = {</div><div class='del'>-"24 24 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #D8D8D4",</div><div class='del'>-"@	c #919191",</div><div class='del'>-"#	c #666666",</div><div class='del'>-"$	c #FFFFFF",</div><div class='del'>-"%	c #F2F1ED",</div><div class='del'>-"....................... ",</div><div class='del'>-".++++++++++++++++++++@. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".@####################. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".@@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".@@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".@@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".$++@%%%%%%%%%%%%%%%%@. ",</div><div class='del'>-".+@@#@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 9b80e03f95..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +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$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(includedir)					\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"		\</div><div class='del'>-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)			\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"</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'>-	cal-prefs-dialog.c	\</div><div class='del'>-	cal-prefs-dialog.h	\</div><div class='del'>-	task-editor.c		\</div><div class='del'>-	task-editor.h</div><div class='del'>-</div><div class='del'>-glade_DATA =			\</div><div class='del'>-	alarm-notify.glade	\</div><div class='del'>-	cal-prefs-dialog.glade	\</div><div class='del'>-	task-editor-dialog.glade</div><div class='del'>-</div><div class='del'>-glade_messages =			\</div><div class='del'>-	alarm-notify.glade.h		\</div><div class='del'>-	cal-prefs-dialog.glade.h	\</div><div class='del'>-	task-editor-dialog.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 7d8357599c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-notify-dialog.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/alarm-notify-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,225 +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;gnome.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'>- * @trigger: Trigger time for the alarm.</div><div class='del'>- * @occur: Occurrence time for the event.</div><div class='del'>- * @comp: Calendar component object which corresponds to the alarm.</div><div class='del'>- * @func: Function to be called when a dialog action is invoked.</div><div class='del'>- * @func_data: Closure data for @func.</div><div class='del'>- * </div><div class='del'>- * Runs the alarm notification dialog.  The specified @func will be used to</div><div class='del'>- * notify the client about result of the actions in the dialog.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE on success, FALSE if the dialog could not be created.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,</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'>-	CalComponentText summary;</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 (comp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_COMPONENT (comp), 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'>-	cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-	if (summary.value)</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (an-&gt;summary), summary.value);</div><div class='del'>-	else</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (an-&gt;summary), _("No summary available."));</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 1e56f1c586..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/alarm-notify-dialog.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	ALARM_NOTIFY_CLOSE,</div><div class='del'>-	ALARM_NOTIFY_SNOOZE,</div><div class='del'>-	ALARM_NOTIFY_EDIT</div><div class='del'>-} AlarmNotifyResult;</div><div class='del'>-</div><div class='del'>-typedef void (* AlarmNotifyFunc) (AlarmNotifyResult result, int snooze_mins, gpointer data);</div><div class='del'>-</div><div class='del'>-gboolean alarm_notify_dialog (time_t trigger, time_t occur, CalComponent *comp,</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c<br/>deleted file mode 100644<br/>index dd97690727..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cal-prefs-dialog.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/cal-prefs-dialog.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,462 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</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'>- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog</div><div class='del'>- * to edit the calendar preference settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#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;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include "cal-prefs-dialog.h"</div><div class='del'>-#include "../calendar-config.h"</div><div class='del'>-#include "../calendar-commands.h"</div><div class='del'>-</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'>-	GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-	GtkWidget *working_days[7];</div><div class='del'>-	GtkWidget *week_start_day;</div><div class='del'>-	GtkWidget *start_of_day;</div><div class='del'>-	GtkWidget *end_of_day;</div><div class='del'>-	GtkWidget *use_12_hour;</div><div class='del'>-	GtkWidget *use_24_hour;</div><div class='del'>-	GtkWidget *time_divisions;</div><div class='del'>-	GtkWidget *show_end_times;</div><div class='del'>-	GtkWidget *compress_weekend;</div><div class='del'>-	GtkWidget *dnav_show_week_no;</div><div class='del'>-} CalPrefsDialogPrivate;</div><div class='del'>-</div><div class='del'>-static const int week_start_day_map[] = {</div><div class='del'>-	1, 2, 3, 4, 5, 6, 0, -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int time_division_map[] = {</div><div class='del'>-	60, 30, 15, 10, 5, -1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void cal_prefs_dialog_class_init		(CalPrefsDialogClass *class);</div><div class='del'>-static void cal_prefs_dialog_init		(CalPrefsDialog	     *prefs);</div><div class='del'>-static gboolean get_widgets			(CalPrefsDialog	     *prefs);</div><div class='del'>-static void cal_prefs_dialog_destroy		(GtkObject	     *object);</div><div class='del'>-static void cal_prefs_dialog_init_widgets	(CalPrefsDialog	     *prefs);</div><div class='del'>-static void cal_prefs_dialog_button_clicked	(GtkWidget	     *dialog,</div><div class='del'>-						 gint		      button,</div><div class='del'>-						 CalPrefsDialog	     *prefs);</div><div class='del'>-static void cal_prefs_dialog_use_24_hour_toggled(GtkWidget	     *button,</div><div class='del'>-						 CalPrefsDialog	     *prefs);</div><div class='del'>-static void cal_prefs_dialog_show_config	(CalPrefsDialog	     *prefs);</div><div class='del'>-static void cal_prefs_dialog_update_config	(CalPrefsDialog	     *prefs);</div><div class='del'>-</div><div class='del'>-GtkWidget*  cal_prefs_dialog_create_time_edit	(void);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (cal_prefs_dialog, "CalPrefsDialog", CalPrefsDialog,</div><div class='del'>-	     cal_prefs_dialog_class_init, cal_prefs_dialog_init,</div><div class='del'>-	     GTK_TYPE_OBJECT)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_class_init (CalPrefsDialogClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_prefs_dialog_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_init (CalPrefsDialog *prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalPrefsDialogPrivate, 1);</div><div class='del'>-	prefs-&gt;priv = priv;</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_prefs_dialog_new:</div><div class='del'>- * @Returns: a new #CalPrefsDialog.</div><div class='del'>- *</div><div class='del'>- * Creates a new #CalPrefsDialog.</div><div class='del'>- **/</div><div class='del'>-CalPrefsDialog *</div><div class='del'>-cal_prefs_dialog_new (void)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialog *prefs;</div><div class='del'>-</div><div class='del'>-	prefs = CAL_PREFS_DIALOG (gtk_type_new (cal_prefs_dialog_get_type ()));</div><div class='del'>-	return cal_prefs_dialog_construct (prefs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_prefs_dialog_construct:</div><div class='del'>- * @prefs: A #CalPrefsDialog.</div><div class='del'>- * </div><div class='del'>- * Constructs a task editor by loading its Glade XML file.</div><div class='del'>- * </div><div class='del'>- * Return value: The same object as @prefs, or NULL if the widgets could not be</div><div class='del'>- * created.  In the latter case, the task editor will automatically be</div><div class='del'>- * destroyed.</div><div class='del'>- **/</div><div class='del'>-CalPrefsDialog *</div><div class='del'>-cal_prefs_dialog_construct (CalPrefsDialog *prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (IS_CAL_PREFS_DIALOG (prefs), NULL);</div><div class='del'>-</div><div class='del'>-	priv = prefs-&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 "/cal-prefs-dialog.glade", NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("cal_prefs_dialog_construct(): Could not load the Glade XML file!");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!get_widgets (prefs)) {</div><div class='del'>-		g_message ("cal_prefs_dialog_construct(): Could not find all widgets in the XML file!");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_prefs_dialog_init_widgets (prefs);</div><div class='del'>-</div><div class='del'>-	cal_prefs_dialog_show_config (prefs);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (priv-&gt;dialog);</div><div class='del'>-</div><div class='del'>-	return prefs;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (prefs));</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'>- */</div><div class='del'>-static gboolean</div><div class='del'>-get_widgets (CalPrefsDialog *prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = prefs-&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;dialog = GW ("cal-prefs-dialog");</div><div class='del'>-</div><div class='del'>-	/* The indices must match the mktime() values. */</div><div class='del'>-	priv-&gt;working_days[0] = GW ("sun_button");</div><div class='del'>-	priv-&gt;working_days[1] = GW ("mon_button");</div><div class='del'>-	priv-&gt;working_days[2] = GW ("tue_button");</div><div class='del'>-	priv-&gt;working_days[3] = GW ("wed_button");</div><div class='del'>-	priv-&gt;working_days[4] = GW ("thu_button");</div><div class='del'>-	priv-&gt;working_days[5] = GW ("fri_button");</div><div class='del'>-	priv-&gt;working_days[6] = GW ("sat_button");</div><div class='del'>-</div><div class='del'>-	priv-&gt;week_start_day = GW ("first_day_of_week");</div><div class='del'>-	priv-&gt;start_of_day = GW ("start_of_day");</div><div class='del'>-	priv-&gt;end_of_day = GW ("end_of_day");</div><div class='del'>-	priv-&gt;use_12_hour = GW ("use_12_hour");</div><div class='del'>-	priv-&gt;use_24_hour = GW ("use_24_hour");</div><div class='del'>-	priv-&gt;time_divisions = GW ("time_divisions");</div><div class='del'>-	priv-&gt;show_end_times = GW ("show_end_times");</div><div class='del'>-	priv-&gt;compress_weekend = GW ("compress_weekend");</div><div class='del'>-	priv-&gt;dnav_show_week_no = GW ("dnav_show_week_no");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;dialog</div><div class='del'>-		&amp;&amp; priv-&gt;working_days[0]</div><div class='del'>-		&amp;&amp; priv-&gt;working_days[1]</div><div class='del'>-		&amp;&amp; priv-&gt;working_days[2]</div><div class='del'>-		&amp;&amp; priv-&gt;working_days[3]</div><div class='del'>-		&amp;&amp; priv-&gt;working_days[4]</div><div class='del'>-		&amp;&amp; priv-&gt;working_days[5]</div><div class='del'>-		&amp;&amp; priv-&gt;working_days[6]</div><div class='del'>-		&amp;&amp; priv-&gt;week_start_day</div><div class='del'>-		&amp;&amp; priv-&gt;start_of_day</div><div class='del'>-		&amp;&amp; priv-&gt;end_of_day</div><div class='del'>-		&amp;&amp; priv-&gt;use_12_hour</div><div class='del'>-		&amp;&amp; priv-&gt;use_24_hour</div><div class='del'>-		&amp;&amp; priv-&gt;time_divisions</div><div class='del'>-		&amp;&amp; priv-&gt;show_end_times</div><div class='del'>-		&amp;&amp; priv-&gt;compress_weekend</div><div class='del'>-		&amp;&amp; priv-&gt;dnav_show_week_no);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialog *prefs;</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_PREFS_DIALOG (object));</div><div class='del'>-</div><div class='del'>-	prefs = CAL_PREFS_DIALOG (object);</div><div class='del'>-	priv = prefs-&gt;priv;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	prefs-&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'>-/* Called by libglade to create our custom EDateEdit widgets. */</div><div class='del'>-GtkWidget *</div><div class='del'>-cal_prefs_dialog_create_time_edit (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dedit;</div><div class='del'>-</div><div class='del'>-	dedit = e_date_edit_new ();</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 0, 24);</div><div class='del'>-	e_date_edit_set_show_date (E_DATE_EDIT (dedit), FALSE);</div><div class='del'>-</div><div class='del'>-	return dedit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-cal_prefs_dialog_show		(CalPrefsDialog *prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));</div><div class='del'>-</div><div class='del'>-	priv = prefs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If the dialog is already show just raise it, otherwise refresh the</div><div class='del'>-	   config settings and show it. */</div><div class='del'>-	if (GTK_WIDGET_MAPPED (priv-&gt;dialog)) {</div><div class='del'>-		gdk_window_raise (priv-&gt;dialog-&gt;window);</div><div class='del'>-	} else {</div><div class='del'>-		cal_prefs_dialog_show_config (prefs);</div><div class='del'>-		gtk_widget_show (priv-&gt;dialog);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Connects any necessary signal handlers. */</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_init_widgets	(CalPrefsDialog	*prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = prefs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;dialog), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_button_clicked),</div><div class='del'>-			    prefs);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;use_24_hour), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_prefs_dialog_use_24_hour_toggled),</div><div class='del'>-			    prefs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_button_clicked	(GtkWidget	*dialog,</div><div class='del'>-				 gint		 button,</div><div class='del'>-				 CalPrefsDialog *prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_CAL_PREFS_DIALOG (prefs));</div><div class='del'>-</div><div class='del'>-	priv = prefs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* OK &amp; Apply buttons update the config settings. */</div><div class='del'>-	if (button == 0 || button == 1)</div><div class='del'>-		cal_prefs_dialog_update_config	(prefs);</div><div class='del'>-</div><div class='del'>-	/* OK &amp; Close buttons close the dialog. */</div><div class='del'>-	if (button == 0 || button == 2)</div><div class='del'>-		gtk_widget_hide (priv-&gt;dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_use_24_hour_toggled	(GtkWidget	*button,</div><div class='del'>-					 CalPrefsDialog *prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-	gboolean use_24_hour;</div><div class='del'>-</div><div class='del'>-	priv = prefs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	use_24_hour = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-&gt;use_24_hour));</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv-&gt;start_of_day),</div><div class='del'>-					    use_24_hour);</div><div class='del'>-	e_date_edit_set_use_24_hour_format (E_DATE_EDIT (priv-&gt;end_of_day),</div><div class='del'>-					    use_24_hour);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Shows the current config settings in the dialog. */</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_show_config	(CalPrefsDialog	*prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-	CalWeekdays working_days;</div><div class='del'>-	gint mask, day, week_start_day, time_divisions;</div><div class='del'>-</div><div class='del'>-	priv = prefs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Working Days. */</div><div class='del'>-	working_days = calendar_config_get_working_days ();</div><div class='del'>-	mask = 1 &lt;&lt; 0;</div><div class='del'>-	for (day = 0; day &lt; 7; day++) {</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;working_days[day]), (working_days &amp; mask) ? TRUE : FALSE);</div><div class='del'>-		mask &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Week Start Day. */</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;week_start_day, week_start_day,</div><div class='del'>-				  week_start_day_map);</div><div class='del'>-</div><div class='del'>-	/* Start of Day. */</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;start_of_day),</div><div class='del'>-				     calendar_config_get_day_start_hour (),</div><div class='del'>-				     calendar_config_get_day_start_minute ());</div><div class='del'>-</div><div class='del'>-	/* End of Day. */</div><div class='del'>-	e_date_edit_set_time_of_day (E_DATE_EDIT (priv-&gt;end_of_day),</div><div class='del'>-				     calendar_config_get_day_end_hour (),</div><div class='del'>-				     calendar_config_get_day_end_minute ());</div><div class='del'>-</div><div class='del'>-	/* 12/24 Hour Format. */</div><div class='del'>-	if (calendar_config_get_24_hour_format ())</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;use_24_hour), TRUE);</div><div class='del'>-	else</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;use_12_hour), TRUE);</div><div class='del'>-</div><div class='del'>-	/* Time Divisions. */</div><div class='del'>-	time_divisions = calendar_config_get_time_divisions ();</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;time_divisions, time_divisions,</div><div class='del'>-				  time_division_map);</div><div class='del'>-</div><div class='del'>-	/* Show Appointment End Times. */</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;show_end_times),</div><div class='del'>-				      calendar_config_get_show_event_end ());</div><div class='del'>-</div><div class='del'>-	/* Compress Weekend. */</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;compress_weekend), calendar_config_get_compress_weekend ());</div><div class='del'>-</div><div class='del'>-	/* Date Navigator - Show Week Numbers. */</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;dnav_show_week_no), calendar_config_get_dnav_show_week_no ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Updates the config values based on the settings in the dialog. */</div><div class='del'>-static void</div><div class='del'>-cal_prefs_dialog_update_config	(CalPrefsDialog	*prefs)</div><div class='del'>-{</div><div class='del'>-	CalPrefsDialogPrivate *priv;</div><div class='del'>-	CalWeekdays working_days;</div><div class='del'>-	gint mask, day, week_start_day, time_divisions, hour, minute;</div><div class='del'>-</div><div class='del'>-	priv = prefs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Working Days. */</div><div class='del'>-	working_days = 0;</div><div class='del'>-	mask = 1 &lt;&lt; 0;</div><div class='del'>-	for (day = 0; day &lt; 7; day++) {</div><div class='del'>-		if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-&gt;working_days[day])))</div><div class='del'>-			working_days |= mask;</div><div class='del'>-		mask &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-	calendar_config_set_working_days (working_days);</div><div class='del'>-</div><div class='del'>-	/* Week Start Day. */</div><div class='del'>-	week_start_day = e_dialog_option_menu_get (priv-&gt;week_start_day,</div><div class='del'>-						   week_start_day_map);</div><div class='del'>-	calendar_config_set_week_start_day (week_start_day);</div><div class='del'>-</div><div class='del'>-	/* Start of Day. */</div><div class='del'>-	if (e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;start_of_day),</div><div class='del'>-					 &amp;hour, &amp;minute)) {</div><div class='del'>-		calendar_config_set_day_start_hour (hour);</div><div class='del'>-		calendar_config_set_day_start_minute (minute);</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: Show error dialog? */</div><div class='del'>-		g_warning ("Couldn't parse start of day");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* End of Day. */</div><div class='del'>-	if (e_date_edit_get_time_of_day (E_DATE_EDIT (priv-&gt;end_of_day),</div><div class='del'>-					 &amp;hour, &amp;minute)) {</div><div class='del'>-		calendar_config_set_day_end_hour (hour);</div><div class='del'>-		calendar_config_set_day_end_minute (minute);</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: Show error dialog? */</div><div class='del'>-		g_warning ("Couldn't parse end of day");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 12/24 Hour Format. */</div><div class='del'>-	calendar_config_set_24_hour_format (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-&gt;use_24_hour)));</div><div class='del'>-</div><div class='del'>-	/* Time Divisions. */</div><div class='del'>-	time_divisions = e_dialog_option_menu_get (priv-&gt;time_divisions,</div><div class='del'>-						   time_division_map);</div><div class='del'>-	calendar_config_set_time_divisions (time_divisions);</div><div class='del'>-</div><div class='del'>-	/* Show Appointment End Times. */</div><div class='del'>-	calendar_config_set_show_event_end (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-&gt;show_end_times)));</div><div class='del'>-</div><div class='del'>-	/* Compress Weekend. */</div><div class='del'>-	calendar_config_set_compress_weekend (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-&gt;compress_weekend)));</div><div class='del'>-</div><div class='del'>-	/* Date Navigator - Show Week Numbers. */</div><div class='del'>-	calendar_config_set_dnav_show_week_no (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-&gt;dnav_show_week_no)));</div><div class='del'>-</div><div class='del'>-	calendar_config_write ();</div><div class='del'>-	update_all_config_settings ();</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade b/calendar/gui/dialogs/cal-prefs-dialog.glade<br/>deleted file mode 100644<br/>index c0e225764b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cal-prefs-dialog.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/cal-prefs-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1243 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;preferences&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;preferences&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;cal-prefs-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;cal-prefs-dialog&lt;/name&gt;</div><div class='del'>-  &lt;title&gt;Calendar Preferences&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;True&lt;/hide_on_close&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-    &lt;child_name&gt;GnomeDialog:vbox&lt;/child_name&gt;</div><div class='del'>-    &lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-    &lt;child&gt;</div><div class='del'>-      &lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-      &lt;child_name&gt;GnomeDialog:action_area&lt;/child_name&gt;</div><div class='del'>-      &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-      &lt;layout_style&gt;GTK_BUTTONBOX_END&lt;/layout_style&gt;</div><div class='del'>-      &lt;spacing&gt;8&lt;/spacing&gt;</div><div class='del'>-      &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-      &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-      &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-      &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button1&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_OK&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button2&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_APPLY&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	&lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;stock_button&gt;GNOME_STOCK_BUTTON_CLOSE&lt;/stock_button&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkNotebook&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;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;vbox8&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;6&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame9&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Work week&lt;/label&gt;</div><div class='del'>-	  &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	  &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;vbox9&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;3&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox8&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;mon_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Mon&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;tue_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;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;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;wed_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Wed&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;thu_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;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;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;fri_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Fri&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;sat_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Sat&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;sun_button&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;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;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox9&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label16&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;First day of week:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;first_day_of_week&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;items&gt;Monday</div><div class='del'>-Tuesday</div><div class='del'>-Wednesday</div><div class='del'>-Thursday</div><div class='del'>-Friday</div><div class='del'>-Saturday</div><div class='del'>-Sunday</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-		&lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox11&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label17&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Start of day:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;start_of_day&lt;/name&gt;</div><div class='del'>-		&lt;creation_function&gt;cal_prefs_dialog_create_time_edit&lt;/creation_function&gt;</div><div class='del'>-		&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-		&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-		&lt;last_modification_time&gt;Tue, 10 Oct 2000 15:12:12 GMT&lt;/last_modification_time&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label18&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;End of day:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;end_of_day&lt;/name&gt;</div><div class='del'>-		&lt;creation_function&gt;cal_prefs_dialog_create_time_edit&lt;/creation_function&gt;</div><div class='del'>-		&lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-		&lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-		&lt;last_modification_time&gt;Tue, 10 Oct 2000 15:12:21 GMT&lt;/last_modification_time&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame10&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Display 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;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;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;3&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;0&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label19&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Time divisions:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;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;label20&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Time format:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;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;show_end_times&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;Show appointment end times&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;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;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;compress_weekend&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;Compress weekends&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;3&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;hbox10&lt;/name&gt;</div><div class='del'>-	      &lt;homogeneous&gt;True&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;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'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;use_12_hour&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;12 hour (am/pm)&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;group&gt;time_format_group&lt;/group&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;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;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;use_24_hour&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;24 hour&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;group&gt;time_format_group&lt;/group&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;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;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alignment4&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-	      &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;time_divisions&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;items&gt;60 minutes</div><div class='del'>-30 minutes</div><div class='del'>-15 minutes</div><div class='del'>-10 minutes</div><div class='del'>-05 minutes</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-		&lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	      &lt;/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;frame11&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Date navigator 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;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;dnav_show_week_no&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Show week numbers&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'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Notebook:tab&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Calendar&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/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;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox4&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &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;frame3&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Show&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;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'>-</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;Due Date&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;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;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;checkbutton2&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Time Until Due&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;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;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;checkbutton3&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Priority&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;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;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;GtkFrame&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;frame4&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Highlight&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;vbox5&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;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;Overdue Items&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkCheckButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;checkbutton5&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Items Due Today&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;checkbutton6&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Items Not Yet Due&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'>-	&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;Colors&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;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;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;GnomeColorPicker&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;colorpicker1&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;dither&gt;True&lt;/dither&gt;</div><div class='del'>-	      &lt;use_alpha&gt;False&lt;/use_alpha&gt;</div><div class='del'>-	      &lt;title&gt;Pick a color&lt;/title&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;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;GnomeColorPicker&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;colorpicker2&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;dither&gt;True&lt;/dither&gt;</div><div class='del'>-	      &lt;use_alpha&gt;False&lt;/use_alpha&gt;</div><div class='del'>-	      &lt;title&gt;Pick a color&lt;/title&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;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;GnomeColorPicker&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;colorpicker3&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;dither&gt;True&lt;/dither&gt;</div><div class='del'>-	      &lt;use_alpha&gt;False&lt;/use_alpha&gt;</div><div class='del'>-	      &lt;title&gt;Pick a color&lt;/title&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;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;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;1&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;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;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/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;label8&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Items Not Yet Due:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_RIGHT&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;/widget&gt;</div><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;1&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;label9&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Items Due Today:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_RIGHT&lt;/justify&gt;</div><div class='del'>-		&lt;wrap&gt;True&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;/widget&gt;</div><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;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;label10&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;Overdue Items:&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_JUSTIFY_RIGHT&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;/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;label11&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;TaskPad&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_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;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'>-</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;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	  &lt;label&gt;Defaults&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;4&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;hbox5&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;GtkCheckButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;checkbutton7&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;Remind me of all appointments&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;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;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;spinbutton1&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-	      &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-	      &lt;numeric&gt;False&lt;/numeric&gt;</div><div class='del'>-	      &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-	      &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;value&gt;1&lt;/value&gt;</div><div class='del'>-	      &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-	      &lt;upper&gt;100&lt;/upper&gt;</div><div class='del'>-	      &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-	      &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-	      &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label12&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;minutes before they occur.&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_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;3&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><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;frame7&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	  &lt;label&gt;Visual 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;4&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;checkbutton8&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;label&gt;Beep when alarm windows appear.&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;GtkFrame&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame8&lt;/name&gt;</div><div class='del'>-	  &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	  &lt;label&gt;Audio 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;4&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;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;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;hbox6&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;checkbutton9&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Alarms timeout after&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;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;5&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;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;label13&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;seconds.&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_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;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;True&lt;/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;checkbutton10&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;label&gt;Enable snoozing for&lt;/label&gt;</div><div class='del'>-		&lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		&lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;spinbutton3&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;600&lt;/value&gt;</div><div class='del'>-		&lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-		&lt;upper&gt;1000&lt;/upper&gt;</div><div class='del'>-		&lt;step&gt;1&lt;/step&gt;</div><div class='del'>-		&lt;page&gt;10&lt;/page&gt;</div><div class='del'>-		&lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;label14&lt;/name&gt;</div><div class='del'>-		&lt;label&gt;seconds.&lt;/label&gt;</div><div class='del'>-		&lt;justify&gt;GTK_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'>-      &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;Reminders&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/cal-prefs-dialog.glade.h b/calendar/gui/dialogs/cal-prefs-dialog.glade.h<br/>deleted file mode 100644<br/>index 0a29d11999..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cal-prefs-dialog.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/cal-prefs-dialog.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +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_("Calendar Preferences");</div><div class='del'>-gchar *s = N_("Work week");</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_("First day of week:");</div><div class='del'>-gchar *s = N_("Monday");</div><div class='del'>-gchar *s = N_("Tuesday");</div><div class='del'>-gchar *s = N_("Wednesday");</div><div class='del'>-gchar *s = N_("Thursday");</div><div class='del'>-gchar *s = N_("Friday");</div><div class='del'>-gchar *s = N_("Saturday");</div><div class='del'>-gchar *s = N_("Sunday");</div><div class='del'>-gchar *s = N_("Start of day:");</div><div class='del'>-gchar *s = N_("End of day:");</div><div class='del'>-gchar *s = N_("Display options");</div><div class='del'>-gchar *s = N_("Time divisions:");</div><div class='del'>-gchar *s = N_("Time format:");</div><div class='del'>-gchar *s = N_("Show appointment end times");</div><div class='del'>-gchar *s = N_("Compress weekends");</div><div class='del'>-gchar *s = N_("12 hour (am/pm)");</div><div class='del'>-gchar *s = N_("24 hour");</div><div class='del'>-gchar *s = N_("60 minutes");</div><div class='del'>-gchar *s = N_("30 minutes");</div><div class='del'>-gchar *s = N_("15 minutes");</div><div class='del'>-gchar *s = N_("10 minutes");</div><div class='del'>-gchar *s = N_("05 minutes");</div><div class='del'>-gchar *s = N_("Date navigator options");</div><div class='del'>-gchar *s = N_("Show week numbers");</div><div class='del'>-gchar *s = N_("Calendar");</div><div class='del'>-gchar *s = N_("Show");</div><div class='del'>-gchar *s = N_("Due Date");</div><div class='del'>-gchar *s = N_("Time Until Due");</div><div class='del'>-gchar *s = N_("Priority");</div><div class='del'>-gchar *s = N_("Highlight");</div><div class='del'>-gchar *s = N_("Overdue Items");</div><div class='del'>-gchar *s = N_("Items Due Today");</div><div class='del'>-gchar *s = N_("Items Not Yet Due");</div><div class='del'>-gchar *s = N_("Colors");</div><div class='del'>-gchar *s = N_("Pick a color");</div><div class='del'>-gchar *s = N_("Pick a color");</div><div class='del'>-gchar *s = N_("Pick a color");</div><div class='del'>-gchar *s = N_("Items Not Yet Due:");</div><div class='del'>-gchar *s = N_("Items Due Today:");</div><div class='del'>-gchar *s = N_("Overdue Items:");</div><div class='del'>-gchar *s = N_("TaskPad");</div><div class='del'>-gchar *s = N_("Defaults");</div><div class='del'>-gchar *s = N_("Remind me of all appointments");</div><div class='del'>-gchar *s = N_("minutes before they occur.");</div><div class='del'>-gchar *s = N_("Visual Alarms");</div><div class='del'>-gchar *s = N_("Beep when alarm windows appear.");</div><div class='del'>-gchar *s = N_("Audio Alarms");</div><div class='del'>-gchar *s = N_("Alarms timeout after");</div><div class='del'>-gchar *s = N_("seconds.");</div><div class='del'>-gchar *s = N_("Enable snoozing for");</div><div class='del'>-gchar *s = N_("seconds.");</div><div class='del'>-gchar *s = N_("Reminders");</div><div class='head'>diff --git a/calendar/gui/dialogs/cal-prefs-dialog.h b/calendar/gui/dialogs/cal-prefs-dialog.h<br/>deleted file mode 100644<br/>index 52f115e0ac..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/cal-prefs-dialog.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/cal-prefs-dialog.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : </div><div class='del'>- *  Damon Chaplin &lt;damon@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'>- * CalPrefsDialog - a GtkObject which handles a libglade-loaded dialog</div><div class='del'>- * to edit the calendar preference settings.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _CAL_PREFS_DIALOG_H_</div><div class='del'>-#define _CAL_PREFS_DIALOG_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_PREFS_DIALOG(obj)          GTK_CHECK_CAST (obj, cal_prefs_dialog_get_type (), CalPrefsDialog)</div><div class='del'>-#define CAL_PREFS_DIALOG_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, cal_prefs_dialog_get_type (), CalPrefsDialogClass)</div><div class='del'>-#define IS_CAL_PREFS_DIALOG(obj)       GTK_CHECK_TYPE (obj, cal_prefs_dialog_get_type ())</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CalPrefsDialog       CalPrefsDialog;</div><div class='del'>-typedef struct _CalPrefsDialogClass  CalPrefsDialogClass;</div><div class='del'>-</div><div class='del'>-struct _CalPrefsDialog</div><div class='del'>-{</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 _CalPrefsDialogClass</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType		cal_prefs_dialog_get_type	(void);</div><div class='del'>-CalPrefsDialog* cal_prefs_dialog_construct	(CalPrefsDialog *prefs);</div><div class='del'>-CalPrefsDialog* cal_prefs_dialog_new		(void);</div><div class='del'>-</div><div class='del'>-void		cal_prefs_dialog_show		(CalPrefsDialog *prefs);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* _CAL_PREFS_DIALOG_H_ */</div><div class='head'>diff --git a/calendar/gui/dialogs/task-editor-dialog.glade b/calendar/gui/dialogs/task-editor-dialog.glade<br/>deleted file mode 100644<br/>index bdde9ed091..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-editor-dialog.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/task-editor-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,706 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;task-editor-dialog&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;task-editor-dialog&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;task-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;task-editor-dialog&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;task-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;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;notebook1&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;vbox1&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table3&lt;/name&gt;</div><div class='del'>-	  &lt;rows&gt;1&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;S_ummary&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;summary&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;summary&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator1&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;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;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox4&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table1&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;4&lt;/column_spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Sta_rt Date:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;_Due Date:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label9&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;% Comp_lete:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;default_focus_target&gt;percent-complete&lt;/default_focus_target&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;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;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;percent-complete&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;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;10&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;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;Custom&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;due-date&lt;/name&gt;</div><div class='del'>-	      &lt;creation_function&gt;task_editor_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	      &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	      &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	      &lt;last_modification_time&gt;Sun, 10 Sep 2000 17:32:18 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;start-date&lt;/name&gt;</div><div class='del'>-	      &lt;creation_function&gt;task_editor_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	      &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	      &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	      &lt;last_modification_time&gt;Sun, 10 Sep 2000 17:33:31 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator2&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;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;hbox3&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;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Status:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;status&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;status&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;Not Started</div><div class='del'>-In Progress</div><div class='del'>-Completed</div><div class='del'>-Cancelled</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Priority:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;priority&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;priority&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;High</div><div class='del'>-Normal</div><div class='del'>-Low</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label18&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;C_lassification:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;classification&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;classification&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;None</div><div class='del'>-Public</div><div class='del'>-Private</div><div class='del'>-Confidential</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-	  &lt;height&gt;150&lt;/height&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_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;GtkText&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;description&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label16&lt;/name&gt;</div><div class='del'>-	      &lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	      &lt;label&gt;_Contacts...&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;contacts&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;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;button4&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label17&lt;/name&gt;</div><div class='del'>-	      &lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	      &lt;label&gt;Ca_tegories...&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;categories&lt;/name&gt;</div><div class='del'>-	    &lt;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;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;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;Task&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_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;table4&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;2&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;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;label12&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Date Completed:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label14&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;URL:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;url&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;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;completed-date&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;task_editor_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Sun, 10 Sep 2000 17:34:07 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &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;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'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/dialogs/task-editor-dialog.glade.h b/calendar/gui/dialogs/task-editor-dialog.glade.h<br/>deleted file mode 100644<br/>index 8ba4eea0a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-editor-dialog.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/task-editor-dialog.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +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_("task-editor-dialog");</div><div class='del'>-gchar *s = N_("S_ummary");</div><div class='del'>-gchar *s = N_("Sta_rt Date:");</div><div class='del'>-gchar *s = N_("_Due Date:");</div><div class='del'>-gchar *s = N_("% Comp_lete:");</div><div class='del'>-gchar *s = N_("_Status:");</div><div class='del'>-gchar *s = N_("Not Started");</div><div class='del'>-gchar *s = N_("In Progress");</div><div class='del'>-gchar *s = N_("Completed");</div><div class='del'>-gchar *s = N_("Cancelled");</div><div class='del'>-gchar *s = N_("_Priority:");</div><div class='del'>-gchar *s = N_("High");</div><div class='del'>-gchar *s = N_("Normal");</div><div class='del'>-gchar *s = N_("Low");</div><div class='del'>-gchar *s = N_("C_lassification:");</div><div class='del'>-gchar *s = N_("None");</div><div class='del'>-gchar *s = N_("Public");</div><div class='del'>-gchar *s = N_("Private");</div><div class='del'>-gchar *s = N_("Confidential");</div><div class='del'>-gchar *s = N_("_Contacts...");</div><div class='del'>-gchar *s = N_("Ca_tegories...");</div><div class='del'>-gchar *s = N_("Task");</div><div class='del'>-gchar *s = N_("Date Completed:");</div><div class='del'>-gchar *s = N_("URL:");</div><div class='del'>-gchar *s = N_("Details");</div><div class='head'>diff --git a/calendar/gui/dialogs/task-editor.c b/calendar/gui/dialogs/task-editor.c<br/>deleted file mode 100644<br/>index f26bae2e09..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-editor.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/task-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1182 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</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'>- * TaskEditor - a GtkObject which handles a libglade-loaded dialog to edit</div><div class='del'>- * tasks.</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;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include "task-editor.h"</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'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	/* Client to use */</div><div class='del'>-	CalClient *client;</div><div class='del'>-	</div><div class='del'>-	/* Calendar component we are editing; this is an internal copy and is</div><div class='del'>-	 * not one of the read-only objects from the parent calendar.</div><div class='del'>-	 */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* This is TRUE while we are setting the widget values. We just return</div><div class='del'>-	   from any signal handlers. */</div><div class='del'>-	gboolean ignore_callbacks;</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 *summary;</div><div class='del'>-</div><div class='del'>-	GtkWidget *due_date;</div><div class='del'>-	GtkWidget *start_date;</div><div class='del'>-</div><div class='del'>-	GtkWidget *percent_complete;</div><div class='del'>-</div><div class='del'>-	GtkWidget *status;</div><div class='del'>-	GtkWidget *priority;</div><div class='del'>-	GtkWidget *classification;</div><div class='del'>-</div><div class='del'>-	GtkWidget *description;</div><div class='del'>-</div><div class='del'>-	GtkWidget *contacts;</div><div class='del'>-	GtkWidget *categories;</div><div class='del'>-</div><div class='del'>-	GtkWidget *completed_date;</div><div class='del'>-	GtkWidget *url;</div><div class='del'>-} TaskEditorPrivate;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note that these two arrays must match. */</div><div class='del'>-static const int status_map[] = {</div><div class='del'>-	ICAL_STATUS_NEEDSACTION,</div><div class='del'>-	ICAL_STATUS_INPROCESS,</div><div class='del'>-	ICAL_STATUS_COMPLETED,</div><div class='del'>-	ICAL_STATUS_CANCELLED,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const char* status_string_map[] = {</div><div class='del'>-	"NEEDS-ACTION",</div><div class='del'>-	"IN-PROCESS",</div><div class='del'>-	"COMPLETED",</div><div class='del'>-	"CANCELLED",</div><div class='del'>-	NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	PRIORITY_HIGH,</div><div class='del'>-	PRIORITY_NORMAL,</div><div class='del'>-	PRIORITY_LOW,</div><div class='del'>-	PRIORITY_UNDEFINED,</div><div class='del'>-} TaskEditorPriority;</div><div class='del'>-</div><div class='del'>-static const int priority_map[] = {</div><div class='del'>-	PRIORITY_HIGH,</div><div class='del'>-	PRIORITY_NORMAL,</div><div class='del'>-	PRIORITY_LOW,</div><div class='del'>-	PRIORITY_UNDEFINED,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int classification_map[] = {</div><div class='del'>-	CAL_COMPONENT_CLASS_NONE,</div><div class='del'>-	CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-	CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-	CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void task_editor_class_init (TaskEditorClass *class);</div><div class='del'>-static void task_editor_init (TaskEditor *tedit);</div><div class='del'>-static gint app_delete_event_cb (GtkWidget *widget,</div><div class='del'>-				 GdkEvent *event,</div><div class='del'>-				 gpointer data);</div><div class='del'>-static void close_dialog (TaskEditor *tedit);</div><div class='del'>-static gboolean get_widgets (TaskEditor *tedit);</div><div class='del'>-static void init_widgets (TaskEditor *tedit);</div><div class='del'>-static void task_editor_destroy (GtkObject *object);</div><div class='del'>-static char * make_title_from_comp (CalComponent *comp);</div><div class='del'>-static void clear_widgets (TaskEditor *tedit);</div><div class='del'>-static void fill_widgets (TaskEditor *tedit);</div><div class='del'>-</div><div class='del'>-static void file_save_cb (GtkWidget *widget, gpointer data);</div><div class='del'>-static void file_save_and_close_cb (GtkWidget *widget, gpointer data);</div><div class='del'>-static void file_delete_cb (GtkWidget *widget, gpointer data);</div><div class='del'>-static void file_close_cb (GtkWidget *widget, gpointer data);</div><div class='del'>-</div><div class='del'>-static void debug_xml_cb (GtkWidget *widget, gpointer data);</div><div class='del'>-</div><div class='del'>-static void save_todo_object (TaskEditor *tedit);</div><div class='del'>-static void dialog_to_comp_object (TaskEditor *tedit);</div><div class='del'>-</div><div class='del'>-static void obj_updated_cb (CalClient *client, const char *uid, gpointer data);</div><div class='del'>-static void obj_removed_cb (CalClient *client, const char *uid, gpointer data);</div><div class='del'>-static void raise_and_focus (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-static TaskEditorPriority priority_value_to_index (int priority_value);</div><div class='del'>-static int priority_index_to_value (TaskEditorPriority priority);</div><div class='del'>-</div><div class='del'>-static int status_string_to_value	(const char *status_string);</div><div class='del'>-static const char* status_value_to_string	(int status);</div><div class='del'>-</div><div class='del'>-static void completed_changed		(EDateEdit	*dedit,</div><div class='del'>-					 TaskEditor	*tedit);</div><div class='del'>-static void status_changed		(GtkMenu	*menu,</div><div class='del'>-					 TaskEditor	*tedit);</div><div class='del'>-static void percent_complete_changed	(GtkAdjustment	*adj,</div><div class='del'>-					 TaskEditor	*tedit);</div><div class='del'>-</div><div class='del'>-GtkWidget * task_editor_create_date_edit (void);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE(task_editor, "TaskEditor", TaskEditor,</div><div class='del'>-	    task_editor_class_init, task_editor_init, GTK_TYPE_OBJECT)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-task_editor_class_init (TaskEditorClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_OBJECT);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = task_editor_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-task_editor_init (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (TaskEditorPrivate, 1);</div><div class='del'>-	tedit-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;ignore_callbacks = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_editor_new:</div><div class='del'>- * @Returns: a new #TaskEditor.</div><div class='del'>- *</div><div class='del'>- * Creates a new #TaskEditor.</div><div class='del'>- **/</div><div class='del'>-TaskEditor *</div><div class='del'>-task_editor_new (void)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *tedit;</div><div class='del'>-</div><div class='del'>-	tedit = TASK_EDITOR (gtk_type_new (task_editor_get_type ()));</div><div class='del'>-	return task_editor_construct (tedit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileDelete", file_delete_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileClose", file_close_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", file_save_and_close_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", debug_xml_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_editor_construct:</div><div class='del'>- * @tedit: A #TaskEditor.</div><div class='del'>- * </div><div class='del'>- * Constructs a task editor by loading its Glade XML file.</div><div class='del'>- * </div><div class='del'>- * Return value: The same object as @tedit, or NULL if the widgets could not be</div><div class='del'>- * created.  In the latter case, the task editor will automatically be</div><div class='del'>- * destroyed.</div><div class='del'>- **/</div><div class='del'>-TaskEditor *</div><div class='del'>-task_editor_construct (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	GtkWidget         *bonobo_win;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (tedit != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_TASK_EDITOR (tedit), NULL);</div><div class='del'>-</div><div class='del'>-	priv = tedit-&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 "/task-editor-dialog.glade", NULL);</div><div class='del'>-	if (!priv-&gt;xml) {</div><div class='del'>-		g_message ("task_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 (tedit)) {</div><div class='del'>-		g_message ("task_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 (tedit);</div><div class='del'>-</div><div class='del'>-	/* Construct the app */</div><div class='del'>-</div><div class='del'>-	priv-&gt;uic = bonobo_ui_component_new ("task-editor-dialog");</div><div class='del'>-	if (!priv-&gt;uic) {</div><div class='del'>-		g_message ("task_editor_construct(): Could not create the UI component");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_win = bonobo_window_new ("event-editor-dialog", "Event Editor");</div><div class='del'>-</div><div class='del'>-	/* FIXME: The sucking bit */</div><div class='del'>-	{</div><div class='del'>-		GtkWidget *contents;</div><div class='del'>-</div><div class='del'>-		contents = gnome_dock_get_client_area (</div><div class='del'>-			GNOME_DOCK (GNOME_APP (priv-&gt;app)-&gt;dock));</div><div class='del'>-		if (!contents) {</div><div class='del'>-			g_message ("event_editor_construct(): Could not get contents");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		gtk_widget_ref (contents);</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (contents-&gt;parent), contents);</div><div class='del'>-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);</div><div class='del'>-		gtk_widget_destroy (priv-&gt;app);</div><div class='del'>-		priv-&gt;app = GTK_WIDGET (bonobo_win);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		BonoboUIContainer *container = bonobo_ui_container_new ();</div><div class='del'>-		bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv-&gt;app));</div><div class='del'>-		bonobo_ui_component_set_container (</div><div class='del'>-			priv-&gt;uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (</div><div class='del'>-		priv-&gt;uic, verbs, tedit);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (priv-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-task-editor-dialog.xml",</div><div class='del'>-			       "evolution-task-editor");</div><div class='del'>-</div><div class='del'>-	/* Hook to destruction of the dialog */</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), tedit);</div><div class='del'>-</div><div class='del'>-	/* Show the dialog */</div><div class='del'>-	gtk_widget_show (priv-&gt;app);</div><div class='del'>-</div><div class='del'>-	return tedit;</div><div class='del'>-</div><div class='del'>- error:</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (tedit));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Called by libglade to create our custom EDateEdit widgets. */</div><div class='del'>-GtkWidget *</div><div class='del'>-task_editor_create_date_edit (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dedit;</div><div class='del'>-</div><div class='del'>-	dedit = e_date_edit_new ();</div><div class='del'>-	/* FIXME: Set other options. */</div><div class='del'>-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 8, 18);</div><div class='del'>-	e_date_edit_set_allow_no_date_set (E_DATE_EDIT (dedit), TRUE);</div><div class='del'>-	return dedit;</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'>-	TaskEditor *tedit;</div><div class='del'>-</div><div class='del'>-	/* FIXME: need to check for a dirty object */</div><div class='del'>-</div><div class='del'>-	tedit = TASK_EDITOR (data);</div><div class='del'>-	close_dialog (tedit);</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'>-/* Closes the dialog box and emits the appropriate signals */</div><div class='del'>-static void</div><div class='del'>-close_dialog (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;app != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (tedit));</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 (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tedit-&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 ("task-editor-dialog");</div><div class='del'>-</div><div class='del'>-	priv-&gt;summary = GW ("summary");</div><div class='del'>-</div><div class='del'>-	priv-&gt;due_date = GW ("due-date");</div><div class='del'>-	priv-&gt;start_date = GW ("start-date");</div><div class='del'>-</div><div class='del'>-	priv-&gt;percent_complete = GW ("percent-complete");</div><div class='del'>-</div><div class='del'>-	priv-&gt;status = GW ("status");</div><div class='del'>-	priv-&gt;priority = GW ("priority");</div><div class='del'>-	priv-&gt;classification = GW ("classification");</div><div class='del'>-</div><div class='del'>-	priv-&gt;description = GW ("description");</div><div class='del'>-</div><div class='del'>-	priv-&gt;contacts = GW ("contacts");</div><div class='del'>-	priv-&gt;categories = GW ("categories");</div><div class='del'>-</div><div class='del'>-	priv-&gt;completed_date = GW ("completed-date");</div><div class='del'>-	priv-&gt;url = GW ("url");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (priv-&gt;app</div><div class='del'>-		&amp;&amp; priv-&gt;summary</div><div class='del'>-		&amp;&amp; priv-&gt;due_date</div><div class='del'>-		&amp;&amp; priv-&gt;start_date</div><div class='del'>-		&amp;&amp; priv-&gt;percent_complete</div><div class='del'>-		&amp;&amp; priv-&gt;status</div><div class='del'>-		&amp;&amp; priv-&gt;priority</div><div class='del'>-		&amp;&amp; priv-&gt;classification</div><div class='del'>-		&amp;&amp; priv-&gt;description</div><div class='del'>-		&amp;&amp; priv-&gt;contacts</div><div class='del'>-		&amp;&amp; priv-&gt;categories</div><div class='del'>-		&amp;&amp; priv-&gt;completed_date</div><div class='del'>-		&amp;&amp; priv-&gt;url);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Hooks the widget signals */</div><div class='del'>-static void</div><div class='del'>-init_widgets (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Connect signals. The Status, Percent Complete &amp; Date Completed</div><div class='del'>-	   properties are closely related so whenever one changes we may need</div><div class='del'>-	   to update the other 2. */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;completed_date), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (completed_changed), tedit);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_OPTION_MENU (priv-&gt;status)-&gt;menu),</div><div class='del'>-			    "deactivate",</div><div class='del'>-			    GTK_SIGNAL_FUNC (status_changed), tedit);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (GTK_SPIN_BUTTON (priv-&gt;percent_complete)-&gt;adjustment),</div><div class='del'>-			    "value_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (percent_complete_changed), tedit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-task_editor_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *tedit;</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (object));</div><div class='del'>-</div><div class='del'>-	tedit = TASK_EDITOR (object);</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;uic) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;uic));</div><div class='del'>-		priv-&gt;uic = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;app) {</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;comp) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-		priv-&gt;comp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;client),</div><div class='del'>-					       tedit);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-		priv-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;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'>-	tedit-&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'>-void </div><div class='del'>-task_editor_set_cal_client (TaskEditor *tedit,</div><div class='del'>-			    CalClient *client)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (tedit != NULL);</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (client == priv-&gt;client)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (cal_client_is_loaded (client));	</div><div class='del'>-	</div><div class='del'>-	if (client)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;client),</div><div class='del'>-					       tedit);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	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), tedit);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "obj_removed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (obj_removed_cb), tedit);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar client tells us that an object changed */</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'>-	TaskEditor *tedit;</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	const gchar *editing_uid;</div><div class='del'>-</div><div class='del'>-	tedit = TASK_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	/* If we aren't showing the object which has been updated, return. */</div><div class='del'>-	if (!priv-&gt;comp)</div><div class='del'>-	  return;</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;editing_uid);</div><div class='del'>-	if (strcmp (uid, editing_uid))</div><div class='del'>-	  return;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Get the task from the server. */</div><div class='del'>-	status = cal_client_get_object (priv-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Everything is fine */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* The object is no longer in the server, so do nothing */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	raise_and_focus (priv-&gt;app);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar client tells us that an object was removed */</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'>-	TaskEditor *tedit;</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	const gchar *editing_uid;</div><div class='del'>-</div><div class='del'>-	tedit = TASK_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (tedit != NULL);</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If we aren't showing the object which has been updated, return. */</div><div class='del'>-	if (!priv-&gt;comp)</div><div class='del'>-	  return;</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;editing_uid);</div><div class='del'>-	if (strcmp (uid, editing_uid))</div><div class='del'>-	  return;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	raise_and_focus (priv-&gt;app);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Brings attention to a window by raising it and giving it focus */</div><div class='del'>-static void</div><div class='del'>-raise_and_focus (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_assert (GTK_WIDGET_REALIZED (widget));</div><div class='del'>-	gdk_window_show (widget-&gt;window);</div><div class='del'>-	gtk_widget_grab_focus (widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * task_editor_set_todo_object:</div><div class='del'>- * @tedit: A #TaskEditor.</div><div class='del'>- * @comp: A todo object.</div><div class='del'>- * </div><div class='del'>- * Sets the todo object that a task editor dialog will manipulate.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-task_editor_set_todo_object	(TaskEditor	*tedit,</div><div class='del'>-				 CalComponent	*comp)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	char *title;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (tedit != NULL);</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-		priv-&gt;comp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (comp)</div><div class='del'>-		priv-&gt;comp = cal_component_clone (comp);</div><div class='del'>-</div><div class='del'>-	title = make_title_from_comp (priv-&gt;comp);</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 (tedit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Creates an appropriate title for the task editor dialog */</div><div class='del'>-static char *</div><div class='del'>-make_title_from_comp (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *summary;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	</div><div class='del'>-	if (!comp)</div><div class='del'>-		return g_strdup (_("Edit Task"));</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	if (text.value)</div><div class='del'>-		summary = text.value;</div><div class='del'>-	else</div><div class='del'>-		summary =  _("No summary");</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	type = cal_component_get_vtype (comp);</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		return g_strdup_printf (_("Appointment - %s"), summary);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		return g_strdup_printf (_("Task - %s"), summary);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_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_comp(): Cannot handle object of type %d", type);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</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 (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-</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 (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	CalComponentDateTime d;</div><div class='del'>-	struct icaltimetype *completed;</div><div class='del'>-	CalComponentClassification classification;</div><div class='del'>-	GSList *l;</div><div class='del'>-	time_t t;</div><div class='del'>-	int *priority_value, *percent;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	TaskEditorPriority priority;</div><div class='del'>-	const char *url, *status_string;</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	clear_widgets (tedit);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We want to ignore any signals emitted while changing fields. */</div><div class='del'>-	priv-&gt;ignore_callbacks = TRUE;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (priv-&gt;comp, &amp;text);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;summary, text.value);</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (priv-&gt;comp, &amp;l);</div><div class='del'>-	if (l) {</div><div class='del'>-		text = *(CalComponentText *)l-&gt;data;</div><div class='del'>-		e_dialog_editable_set (priv-&gt;description, text.value);</div><div class='del'>-	} else {</div><div class='del'>-		e_dialog_editable_set (priv-&gt;description, NULL);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (l);</div><div class='del'>-	</div><div class='del'>-	/* Due Date. */</div><div class='del'>-	cal_component_get_due (priv-&gt;comp, &amp;d);</div><div class='del'>-	if (d.value) {</div><div class='del'>-		t = icaltime_as_timet (*d.value);</div><div class='del'>-	} else {</div><div class='del'>-		t = -1;</div><div class='del'>-	}</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;due_date), t);</div><div class='del'>-</div><div class='del'>-	/* Start Date. */</div><div class='del'>-	cal_component_get_dtstart (priv-&gt;comp, &amp;d);</div><div class='del'>-	if (d.value) {</div><div class='del'>-		t = icaltime_as_timet (*d.value);</div><div class='del'>-	} else {</div><div class='del'>-		t = -1;</div><div class='del'>-	}</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;start_date), t);</div><div class='del'>-</div><div class='del'>-	/* Completed Date. */</div><div class='del'>-	cal_component_get_completed (priv-&gt;comp, &amp;completed);</div><div class='del'>-	if (completed) {</div><div class='del'>-		t = icaltime_as_timet (*completed);</div><div class='del'>-		cal_component_free_icaltimetype (completed);</div><div class='del'>-	} else {</div><div class='del'>-		t = -1;</div><div class='del'>-	}</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date), t);</div><div class='del'>-</div><div class='del'>-	/* Percent Complete. */</div><div class='del'>-	cal_component_get_percent (priv-&gt;comp, &amp;percent);</div><div class='del'>-	if (percent) {</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, *percent);</div><div class='del'>-		cal_component_free_percent (percent);</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: Could check if task is completed and set 100%. */</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Status. */</div><div class='del'>-	cal_component_get_status (priv-&gt;comp, &amp;status_string);</div><div class='del'>-	if (status_string) {</div><div class='del'>-		status = status_string_to_value (status_string);</div><div class='del'>-	} else {</div><div class='del'>-		/* Try to user the percent value. */</div><div class='del'>-		if (percent) {</div><div class='del'>-			if (*percent == 0)</div><div class='del'>-				status = ICAL_STATUS_NEEDSACTION;</div><div class='del'>-			else if (*percent == 100)</div><div class='del'>-				status = ICAL_STATUS_COMPLETED;</div><div class='del'>-			else</div><div class='del'>-				status = ICAL_STATUS_INPROCESS;</div><div class='del'>-		} else {</div><div class='del'>-			status = ICAL_STATUS_NEEDSACTION;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_print ("Setting status\n");</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;status, status, status_map);</div><div class='del'>-</div><div class='del'>-	/* Priority. */</div><div class='del'>-	cal_component_get_priority (priv-&gt;comp, &amp;priority_value);</div><div class='del'>-	if (priority_value) {</div><div class='del'>-		priority = priority_value_to_index (*priority_value);</div><div class='del'>-		cal_component_free_priority (priority_value);</div><div class='del'>-	} else {</div><div class='del'>-		priority = PRIORITY_UNDEFINED;</div><div class='del'>-	}</div><div class='del'>-	g_print ("Setting priority\n");</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;priority, priority, priority_map);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Classification. */</div><div class='del'>-	cal_component_get_classification (priv-&gt;comp, &amp;classification);</div><div class='del'>-	g_print ("Setting classification\n");</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;classification, classification,</div><div class='del'>-				  classification_map);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* URL. */</div><div class='del'>-	cal_component_get_url (priv-&gt;comp, &amp;url);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;url, url);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ignore_callbacks = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_todo_object (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	char *title;</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;client != NULL);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dialog_to_comp_object (tedit);</div><div class='del'>-</div><div class='del'>-	title = make_title_from_comp (priv-&gt;comp);</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'>-	if (!cal_client_update_object (priv-&gt;client, priv-&gt;comp))</div><div class='del'>-		g_message ("save_todo_object(): Could not update the object!");</div><div class='del'>-}</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_comp_object (TaskEditor *tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentText *text;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	time_t t;</div><div class='del'>-	GSList *list;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	TaskEditorPriority priority;</div><div class='del'>-	int priority_value, percent;</div><div class='del'>-	CalComponentClassification classification;</div><div class='del'>-	char *url;</div><div class='del'>-	const char *status_string;</div><div class='del'>-	</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-	comp = priv-&gt;comp;</div><div class='del'>-</div><div class='del'>-	/* Summary. */</div><div class='del'>-	text = g_new0 (CalComponentText, 1);</div><div class='del'>-	text-&gt;value = e_dialog_editable_get (priv-&gt;summary);</div><div class='del'>-	cal_component_set_summary (comp, text);</div><div class='del'>-</div><div class='del'>-	/* Description. Note that we use the text variable again, and it is</div><div class='del'>-	   freed in cal_component_free_text_list(). */</div><div class='del'>-	list = NULL;</div><div class='del'>-	text-&gt;value  = e_dialog_editable_get (priv-&gt;description);</div><div class='del'>-	list = g_slist_prepend (list, text);</div><div class='del'>-	cal_component_set_description_list (comp, list);</div><div class='del'>-	cal_component_free_text_list (list);</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	date.value = g_new (struct icaltimetype, 1);</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	/* Due Date. */</div><div class='del'>-	t = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;due_date));</div><div class='del'>-	if (t != -1) {</div><div class='del'>-		*date.value = icaltime_from_timet (t, FALSE, FALSE);</div><div class='del'>-		cal_component_set_due (comp, &amp;date);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_due (comp, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Start Date. */</div><div class='del'>-	t = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;start_date));</div><div class='del'>-	if (t != -1) {</div><div class='del'>-		*date.value = icaltime_from_timet (t, FALSE, FALSE);</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_dtstart (comp, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Completed Date. */</div><div class='del'>-	t = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;completed_date));</div><div class='del'>-	if (t != -1) {</div><div class='del'>-		*date.value = icaltime_from_timet (t, FALSE, FALSE);</div><div class='del'>-		cal_component_set_completed (comp, date.value);</div><div class='del'>-	} else {</div><div class='del'>-		cal_component_set_completed (comp, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (date.value);</div><div class='del'>-</div><div class='del'>-	/* Percent Complete. */</div><div class='del'>-	percent = e_dialog_spin_get_int (priv-&gt;percent_complete);</div><div class='del'>-	cal_component_set_percent (comp, &amp;percent);</div><div class='del'>-</div><div class='del'>-	/* Status. */</div><div class='del'>-	status = e_dialog_option_menu_get (priv-&gt;status, status_map);</div><div class='del'>-	status_string = status_value_to_string (status);</div><div class='del'>-	cal_component_set_status (comp, status_string);</div><div class='del'>-</div><div class='del'>-	/* Priority. */</div><div class='del'>-	priority = e_dialog_option_menu_get (priv-&gt;priority, priority_map);</div><div class='del'>-	priority_value = priority_index_to_value (priority);</div><div class='del'>-	cal_component_set_priority (comp, &amp;priority_value);</div><div class='del'>-</div><div class='del'>-	/* Classification. */</div><div class='del'>-	classification = e_dialog_option_menu_get (priv-&gt;classification,</div><div class='del'>-						   classification_map);</div><div class='del'>-	cal_component_set_classification (comp, classification);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* URL. */</div><div class='del'>-	url = e_dialog_editable_get (priv-&gt;url);</div><div class='del'>-	cal_component_set_url (comp, url);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-debug_xml_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *tedit = TASK_EDITOR (data);</div><div class='del'>-	TaskEditorPrivate *priv = tedit-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	bonobo_window_dump (BONOBO_WINDOW (priv-&gt;app), "on demand");</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'>-	TaskEditor *tedit;</div><div class='del'>-</div><div class='del'>-	tedit = TASK_EDITOR (data);</div><div class='del'>-	save_todo_object (tedit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* File/Save and Close callback */</div><div class='del'>-static void</div><div class='del'>-file_save_and_close_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *tedit;</div><div class='del'>-</div><div class='del'>-	tedit = TASK_EDITOR (data);</div><div class='del'>-	save_todo_object (tedit);</div><div class='del'>-	close_dialog (tedit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* File/Delete callback */</div><div class='del'>-static void</div><div class='del'>-file_delete_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *tedit;</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	tedit = TASK_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	/* We don't check the return value; FALSE can mean the object was not in</div><div class='del'>-	 * the server anyways.</div><div class='del'>-	 */</div><div class='del'>-	cal_client_remove_object (priv-&gt;client, uid);</div><div class='del'>-</div><div class='del'>-	close_dialog (tedit);</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'>-	TaskEditor *tedit;</div><div class='del'>-</div><div class='del'>-	tedit = TASK_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	close_dialog (tedit);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static TaskEditorPriority</div><div class='del'>-priority_value_to_index (int priority_value)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPriority retval;</div><div class='del'>-</div><div class='del'>-	if (priority_value == 0)</div><div class='del'>-		retval = PRIORITY_UNDEFINED;</div><div class='del'>-	else if (priority_value &lt;= 4)</div><div class='del'>-		retval = PRIORITY_HIGH;</div><div class='del'>-	else if (priority_value == 5)</div><div class='del'>-		retval = PRIORITY_NORMAL;</div><div class='del'>-	else </div><div class='del'>-		retval = PRIORITY_LOW;</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-priority_index_to_value (TaskEditorPriority priority)</div><div class='del'>-{</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	switch (priority) {</div><div class='del'>-	case PRIORITY_UNDEFINED:</div><div class='del'>-		retval = 0;</div><div class='del'>-		break;</div><div class='del'>-	case PRIORITY_HIGH:</div><div class='del'>-		retval = 3;</div><div class='del'>-		break;</div><div class='del'>-	case PRIORITY_NORMAL:</div><div class='del'>-		retval = 5;</div><div class='del'>-		break;</div><div class='del'>-	case PRIORITY_LOW:</div><div class='del'>-		retval = 7;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		retval = -1;</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-status_string_to_value	(const char *status_string)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; status_map[i] != -1; i++) {</div><div class='del'>-		if (!strcmp (status_string_map[i], status_string))</div><div class='del'>-			return status_map[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning ("Invalid todo status string");</div><div class='del'>-	return ICAL_STATUS_NEEDSACTION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const char*</div><div class='del'>-status_value_to_string	(int status)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; status_map[i] != -1; i++) {</div><div class='del'>-		if (status_map[i] == status)</div><div class='del'>-			return status_string_map[i];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning ("Invalid todo status value");</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'>-completed_changed	(EDateEdit	*dedit,</div><div class='del'>-			 TaskEditor	*tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ignore_callbacks)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	t = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;completed_date));</div><div class='del'>-	priv-&gt;ignore_callbacks = TRUE;</div><div class='del'>-	if (t == -1) {</div><div class='del'>-		/* If the 'Completed Date' is set to 'None', we set the</div><div class='del'>-		   status to 'Not Started' and the percent-complete to 0.</div><div class='del'>-		   The task may actually be partially-complete, but we leave</div><div class='del'>-		   it to the user to set those fields. */</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;status, ICAL_STATUS_NEEDSACTION,</div><div class='del'>-					  status_map);</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 0);</div><div class='del'>-	} else {</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;status, ICAL_STATUS_COMPLETED,</div><div class='del'>-					  status_map);</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 100);</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;ignore_callbacks = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-status_changed		(GtkMenu	*menu,</div><div class='del'>-			 TaskEditor	*tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ignore_callbacks)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	status = e_dialog_option_menu_get (priv-&gt;status, status_map);</div><div class='del'>-	priv-&gt;ignore_callbacks = TRUE;</div><div class='del'>-	if (status == ICAL_STATUS_NEEDSACTION) {</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 0);</div><div class='del'>-		e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date), -1);</div><div class='del'>-	} else if (status == ICAL_STATUS_COMPLETED) {</div><div class='del'>-		e_dialog_spin_set (priv-&gt;percent_complete, 100);</div><div class='del'>-		e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-				      time (NULL));</div><div class='del'>-	}</div><div class='del'>-	priv-&gt;ignore_callbacks = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-percent_complete_changed	(GtkAdjustment	*adj,</div><div class='del'>-				 TaskEditor	*tedit)</div><div class='del'>-{</div><div class='del'>-	TaskEditorPrivate *priv;</div><div class='del'>-	gint percent;</div><div class='del'>-	icalproperty_status status;</div><div class='del'>-	time_t date_completed;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_TASK_EDITOR (tedit));</div><div class='del'>-</div><div class='del'>-	priv = tedit-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;ignore_callbacks)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	percent = e_dialog_spin_get_int (priv-&gt;percent_complete);</div><div class='del'>-	priv-&gt;ignore_callbacks = TRUE;</div><div class='del'>-</div><div class='del'>-	if (percent == 100) {</div><div class='del'>-		date_completed = time (NULL);</div><div class='del'>-		status = ICAL_STATUS_COMPLETED;</div><div class='del'>-	} else {</div><div class='del'>-		/* FIXME: Set to 'None'. */</div><div class='del'>-		date_completed = time (NULL);</div><div class='del'>-</div><div class='del'>-		if (percent == 0)</div><div class='del'>-			status = ICAL_STATUS_NEEDSACTION;</div><div class='del'>-		else</div><div class='del'>-			status = ICAL_STATUS_INPROCESS;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;completed_date),</div><div class='del'>-			      date_completed);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;status, status, status_map);</div><div class='del'>-</div><div class='del'>-	priv-&gt;ignore_callbacks = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/dialogs/task-editor.h b/calendar/gui/dialogs/task-editor.h<br/>deleted file mode 100644<br/>index a53d29c2a2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-editor.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/task-editor.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </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'>-#ifndef _TASK_EDITOR_H_</div><div class='del'>-#define _TASK_EDITOR_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;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'>-#define TASK_EDITOR(obj)          GTK_CHECK_CAST (obj, task_editor_get_type (), TaskEditor)</div><div class='del'>-#define TASK_EDITOR_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, task_editor_get_type (), TaskEditorClass)</div><div class='del'>-#define IS_TASK_EDITOR(obj)       GTK_CHECK_TYPE (obj, task_editor_get_type ())</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _TaskEditor       TaskEditor;</div><div class='del'>-typedef struct _TaskEditorClass  TaskEditorClass;</div><div class='del'>-</div><div class='del'>-struct _TaskEditor</div><div class='del'>-{</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 _TaskEditorClass</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType	    task_editor_get_type	(void);</div><div class='del'>-TaskEditor* task_editor_construct	(TaskEditor	*tedit);</div><div class='del'>-TaskEditor* task_editor_new		(void);</div><div class='del'>-</div><div class='del'>-void	    task_editor_set_cal_client	(TaskEditor	*tedit,</div><div class='del'>-					 CalClient	*client);</div><div class='del'>-void	    task_editor_set_todo_object	(TaskEditor	*tedit,</div><div class='del'>-					 CalComponent	*comp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* _TASK_EDITOR_H_ */</div><div class='head'>diff --git a/calendar/gui/dialogs/task-page.glade b/calendar/gui/dialogs/task-page.glade<br/>deleted file mode 100644<br/>index bdde9ed091..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/dialogs/task-page.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/dialogs/task-page.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,706 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;task-editor-dialog&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;task-editor-dialog&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-  &lt;output_translatable_strings&gt;True&lt;/output_translatable_strings&gt;</div><div class='del'>-  &lt;translatable_strings_file&gt;task-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;task-editor-dialog&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;task-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;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;notebook1&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;vbox1&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;table3&lt;/name&gt;</div><div class='del'>-	  &lt;rows&gt;1&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;S_ummary&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;summary&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;False&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;summary&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator1&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;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;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox4&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table1&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;4&lt;/column_spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Sta_rt Date:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;_Due Date:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label9&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;% Comp_lete:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;default_focus_target&gt;percent-complete&lt;/default_focus_target&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;2&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;3&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;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;GtkSpinButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;percent-complete&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;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;10&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;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;Custom&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;due-date&lt;/name&gt;</div><div class='del'>-	      &lt;creation_function&gt;task_editor_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	      &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	      &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	      &lt;last_modification_time&gt;Sun, 10 Sep 2000 17:32:18 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;start-date&lt;/name&gt;</div><div class='del'>-	      &lt;creation_function&gt;task_editor_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	      &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	      &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	      &lt;last_modification_time&gt;Sun, 10 Sep 2000 17:33:31 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHSeparator&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hseparator2&lt;/name&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;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;hbox3&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;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Status:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;status&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;status&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;Not Started</div><div class='del'>-In Progress</div><div class='del'>-Completed</div><div class='del'>-Cancelled</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;_Priority:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;priority&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;priority&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;High</div><div class='del'>-Normal</div><div class='del'>-Low</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label18&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;C_lassification:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;classification&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;classification&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;items&gt;None</div><div class='del'>-Public</div><div class='del'>-Private</div><div class='del'>-Confidential</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-	    &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-	  &lt;height&gt;150&lt;/height&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_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;GtkText&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;description&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;button3&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label16&lt;/name&gt;</div><div class='del'>-	      &lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	      &lt;label&gt;_Contacts...&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;contacts&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;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;button4&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label17&lt;/name&gt;</div><div class='del'>-	      &lt;sensitive&gt;False&lt;/sensitive&gt;</div><div class='del'>-	      &lt;label&gt;Ca_tegories...&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;4&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;categories&lt;/name&gt;</div><div class='del'>-	    &lt;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;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;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;Task&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_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;table4&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	&lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;row_spacing&gt;2&lt;/row_spacing&gt;</div><div class='del'>-	&lt;column_spacing&gt;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;label12&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Date Completed:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label14&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;URL:&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;url&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;Custom&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;completed-date&lt;/name&gt;</div><div class='del'>-	  &lt;creation_function&gt;task_editor_create_date_edit&lt;/creation_function&gt;</div><div class='del'>-	  &lt;int1&gt;0&lt;/int1&gt;</div><div class='del'>-	  &lt;int2&gt;0&lt;/int2&gt;</div><div class='del'>-	  &lt;last_modification_time&gt;Sun, 10 Sep 2000 17:34:07 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	    &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	    &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	    &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	    &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	    &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	    &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &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;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'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c<br/>deleted file mode 100644<br/>index 7f7b25ada8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-calendar-table.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-calendar-table.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,427 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/*</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'>- * ECalendarTable - displays the CalComponent objects in a table (an ETable).</div><div class='del'>- * Used for calendar events and tasks.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-table-scrolled.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-checkbox.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-toggle.h&gt;</div><div class='del'>-#include &lt;gal/e-table/e-cell-text.h&gt;</div><div class='del'>-#include "e-calendar-table.h"</div><div class='del'>-#include "calendar-model.h"</div><div class='del'>-#include "dialogs/task-editor.h"</div><div class='del'>-</div><div class='del'>-/* Pixmaps. */</div><div class='del'>-#include "task.xpm"</div><div class='del'>-#include "task-recurring.xpm"</div><div class='del'>-#include "task-assigned.xpm"</div><div class='del'>-#include "task-assigned-to.xpm"</div><div class='del'>-</div><div class='del'>-#include "check-filled.xpm"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_calendar_table_class_init (ECalendarTableClass *class);</div><div class='del'>-static void e_calendar_table_init (ECalendarTable *cal_table);</div><div class='del'>-static void e_calendar_table_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void e_calendar_table_on_double_click (ETable *table,</div><div class='del'>-					      gint row,</div><div class='del'>-					      ECalendarTable *cal_table);</div><div class='del'>-static gint e_calendar_table_on_right_click (ETable *table,</div><div class='del'>-					     gint row,</div><div class='del'>-					     gint col,</div><div class='del'>-					     GdkEventButton *event,</div><div class='del'>-					     ECalendarTable *cal_table);</div><div class='del'>-static void e_calendar_table_on_open_task (GtkWidget *menuitem,</div><div class='del'>-					   gpointer	  data);</div><div class='del'>-static void e_calendar_table_on_mark_task_complete (GtkWidget *menuitem,</div><div class='del'>-						    gpointer   data);</div><div class='del'>-static void e_calendar_table_on_delete_task (GtkWidget *menuitem,</div><div class='del'>-					     gpointer   data);</div><div class='del'>-static gint e_calendar_table_on_key_press (ETable *table,</div><div class='del'>-					   gint row,</div><div class='del'>-					   gint col,</div><div class='del'>-					   GdkEventKey *event,</div><div class='del'>-					   ECalendarTable *cal_table);</div><div class='del'>-</div><div class='del'>-static void e_calendar_table_open_task (ECalendarTable *cal_table,</div><div class='del'>-					gint row);</div><div class='del'>-</div><div class='del'>-/* The icons to represent the task. */</div><div class='del'>-#define E_CALENDAR_MODEL_NUM_ICONS	4</div><div class='del'>-static char** icon_xpm_data[E_CALENDAR_MODEL_NUM_ICONS] = {</div><div class='del'>-	task_xpm, task_recurring_xpm, task_assigned_xpm, task_assigned_to_xpm</div><div class='del'>-};</div><div class='del'>-static GdkPixbuf* icon_pixbufs[E_CALENDAR_MODEL_NUM_ICONS] = { 0 };</div><div class='del'>-</div><div class='del'>-static GtkTableClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_calendar_table_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType e_calendar_table_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!e_calendar_table_type){</div><div class='del'>-		GtkTypeInfo e_calendar_table_info = {</div><div class='del'>-			"ECalendarTable",</div><div class='del'>-			sizeof (ECalendarTable),</div><div class='del'>-			sizeof (ECalendarTableClass),</div><div class='del'>-			(GtkClassInitFunc) e_calendar_table_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_calendar_table_init,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		parent_class = gtk_type_class (GTK_TYPE_TABLE);</div><div class='del'>-		e_calendar_table_type = gtk_type_unique (GTK_TYPE_TABLE,</div><div class='del'>-							 &amp;e_calendar_table_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_calendar_table_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_class_init (ECalendarTableClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	widget_class = (GtkWidgetClass *) class;</div><div class='del'>-</div><div class='del'>-	/* Method override */</div><div class='del'>-	object_class-&gt;destroy		= e_calendar_table_destroy;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	widget_class-&gt;realize		= e_calendar_table_realize;</div><div class='del'>-	widget_class-&gt;unrealize		= e_calendar_table_unrealize;</div><div class='del'>-	widget_class-&gt;style_set		= e_calendar_table_style_set;</div><div class='del'>- 	widget_class-&gt;size_allocate	= e_calendar_table_size_allocate;</div><div class='del'>-	widget_class-&gt;focus_in_event	= e_calendar_table_focus_in;</div><div class='del'>-	widget_class-&gt;focus_out_event	= e_calendar_table_focus_out;</div><div class='del'>-	widget_class-&gt;key_press_event	= e_calendar_table_key_press;</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_CALENDAR_TABLE_SPEC				\</div><div class='del'>-	"&lt;ETableSpecification click-to-add=\"true\" _click-to-add-message=\"Click to add a task\" draw-grid=\"true\"&gt;"	\</div><div class='del'>-        "&lt;ETableColumn model_col= \"0\" _title=\"Categories\"            expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"1\" _title=\"Classification\"        expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"2\" _title=\"Completion Date\"       expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"3\" _title=\"End Date\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"4\" _title=\"Start Date\"            expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"5\" _title=\"Due Date\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"6\" _title=\"Geographical Position\" expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"7\" _title=\"Percent complete\"      expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"8\" _title=\"Priority\"              expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col= \"9\" _title=\"Summary\"               expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"summary\"  compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col=\"10\" _title=\"Transparency\"          expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col=\"11\" _title=\"URL\"                   expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col=\"12\" _title=\"Alarms\"                expansion=\"1.0\" minimum_width=\"10\" resizable=\"true\" cell=\"string\"   compare=\"string\"/&gt;"  \</div><div class='del'>-        "&lt;ETableColumn model_col=\"13\" pixbuf=\"icon\"                  expansion=\"1.0\" minimum_width=\"18\" resizable=\"false\" cell=\"icon\"     compare=\"integer\"/&gt;" \</div><div class='del'>-        "&lt;ETableColumn model_col=\"14\" pixbuf=\"complete\"              expansion=\"1.0\" minimum_width=\"18\" resizable=\"false\" cell=\"checkbox\" compare=\"integer\"/&gt;" \</div><div class='del'>-	"&lt;ETableState&gt;" 				\</div><div class='del'>-                "&lt;column source=\"13\"/&gt;"               \</div><div class='del'>-                "&lt;column source= \"9\"/&gt;"               \</div><div class='del'>-                "&lt;column source=\"14\"/&gt;"               \</div><div class='del'>-        	"&lt;grouping&gt; &lt;/grouping&gt;"		\</div><div class='del'>-	"&lt;/ETableState&gt;"				\</div><div class='del'>-	"&lt;/ETableSpecification&gt;"</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_init (ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *table;</div><div class='del'>-	ETableModel *model;</div><div class='del'>-	ECell *cell;</div><div class='del'>-	ETableExtras *extras;</div><div class='del'>-	gint i;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	gboolean success[E_CALENDAR_TABLE_COLOR_LAST];</div><div class='del'>-	gint nfailed;</div><div class='del'>-</div><div class='del'>-	/* Allocate the colors we need. */</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (GTK_WIDGET (cal_table));</div><div class='del'>-</div><div class='del'>-	cal_table-&gt;colors[E_CALENDAR_TABLE_COLOR_OVERDUE].red   = 65535;</div><div class='del'>-	cal_table-&gt;colors[E_CALENDAR_TABLE_COLOR_OVERDUE].green = 0;</div><div class='del'>-	cal_table-&gt;colors[E_CALENDAR_TABLE_COLOR_OVERDUE].blue  = 0;</div><div class='del'>-</div><div class='del'>-	nfailed = gdk_colormap_alloc_colors (colormap, cal_table-&gt;colors,</div><div class='del'>-					     E_CALENDAR_TABLE_COLOR_LAST,</div><div class='del'>-					     FALSE, 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'>-	/* Create the model */</div><div class='del'>-</div><div class='del'>-	cal_table-&gt;model = calendar_model_new ();</div><div class='del'>-	model = E_TABLE_MODEL (cal_table-&gt;model);</div><div class='del'>-</div><div class='del'>-	/* Create the header columns */</div><div class='del'>-</div><div class='del'>-	extras = e_table_extras_new();</div><div class='del'>-</div><div class='del'>-	cell = e_cell_text_new (NULL, GTK_JUSTIFY_LEFT);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (cell),</div><div class='del'>-			"strikeout_column", CAL_COMPONENT_FIELD_COMPLETE,</div><div class='del'>-			"bold_column", CAL_COMPONENT_FIELD_OVERDUE,</div><div class='del'>-			"color_column", CAL_COMPONENT_FIELD_COLOR,</div><div class='del'>-			NULL);</div><div class='del'>-	e_table_extras_add_cell(extras, "summary", cell);</div><div class='del'>-</div><div class='del'>-	/* Create pixmaps */</div><div class='del'>-</div><div class='del'>-	if (!icon_pixbufs[0])</div><div class='del'>-		for (i = 0; i &lt; E_CALENDAR_MODEL_NUM_ICONS; i++) {</div><div class='del'>-			icon_pixbufs[i] = gdk_pixbuf_new_from_xpm_data (</div><div class='del'>-				(const char **) icon_xpm_data[i]);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	cell = e_cell_toggle_new (0, E_CALENDAR_MODEL_NUM_ICONS, icon_pixbufs);</div><div class='del'>-	e_table_extras_add_cell(extras, "icon", cell);</div><div class='del'>-	e_table_extras_add_pixbuf(extras, "icon", icon_pixbufs[0]);</div><div class='del'>-</div><div class='del'>-	pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) check_filled_xpm);</div><div class='del'>-	e_table_extras_add_pixbuf(extras, "complete", pixbuf);</div><div class='del'>-	gdk_pixbuf_unref(pixbuf);</div><div class='del'>-</div><div class='del'>-	/* Create the table */</div><div class='del'>-</div><div class='del'>-	table = e_table_scrolled_new (model, extras, E_CALENDAR_TABLE_SPEC,</div><div class='del'>-				      NULL);</div><div class='del'>-	cal_table-&gt;etable = table;</div><div class='del'>-	gtk_table_attach (GTK_TABLE (cal_table), table, 0, 1, 0, 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (table);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (table), "double_click",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_calendar_table_on_double_click),</div><div class='del'>-			    cal_table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (table), "right_click",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_calendar_table_on_right_click),</div><div class='del'>-			    cal_table);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (table), "key_press",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_calendar_table_on_key_press),</div><div class='del'>-			    cal_table);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_calendar_table_new:</div><div class='del'>- * @Returns: a new #ECalendarTable.</div><div class='del'>- *</div><div class='del'>- * Creates a new #ECalendarTable.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-e_calendar_table_new (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = GTK_WIDGET (gtk_type_new (e_calendar_table_get_type ()));</div><div class='del'>-</div><div class='del'>-	return cal_table;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-</div><div class='del'>-	cal_table = E_CALENDAR_TABLE (object);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (cal_table-&gt;model));</div><div class='del'>-	cal_table-&gt;model = NULL;</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_calendar_table_set_cal_client (ECalendarTable *cal_table,</div><div class='del'>-				 CalClient	*client)</div><div class='del'>-{</div><div class='del'>-	calendar_model_set_cal_client (cal_table-&gt;model, client,</div><div class='del'>-				       CALOBJ_TYPE_TODO);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_double_click (ETable *table,</div><div class='del'>-				  gint row,</div><div class='del'>-				  ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	e_calendar_table_open_task (cal_table, row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeUIInfo e_calendar_table_popup_uiinfo[] = {</div><div class='del'>-	{ GNOME_APP_UI_ITEM, N_("Open..."),</div><div class='del'>-	  N_("Open the task"), e_calendar_table_on_open_task,</div><div class='del'>-	  NULL, NULL, 0, 0, 0, 0 },</div><div class='del'>-	{ GNOME_APP_UI_ITEM, N_("Mark Complete"),</div><div class='del'>-	  N_("Mark the task complete"), e_calendar_table_on_mark_task_complete,</div><div class='del'>-	  NULL, NULL, 0, 0, 0, 0 },</div><div class='del'>-	{ GNOME_APP_UI_ITEM, N_("Delete"),</div><div class='del'>-	  N_("Delete the task"), e_calendar_table_on_delete_task,</div><div class='del'>-	  NULL, NULL, 0, 0, 0, 0 },</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'>-typedef struct _ECalendarMenuData ECalendarMenuData;</div><div class='del'>-struct _ECalendarMenuData {</div><div class='del'>-	ECalendarTable *cal_table;</div><div class='del'>-	gint row;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_calendar_table_on_right_click (ETable *table,</div><div class='del'>-				 gint row,</div><div class='del'>-				 gint col,</div><div class='del'>-				 GdkEventButton *event,</div><div class='del'>-				 ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	ECalendarMenuData menu_data;</div><div class='del'>-	GtkWidget *popup_menu;</div><div class='del'>-</div><div class='del'>-	menu_data.cal_table = cal_table;</div><div class='del'>-	menu_data.row = row;</div><div class='del'>-</div><div class='del'>-	popup_menu = gnome_popup_menu_new (e_calendar_table_popup_uiinfo);</div><div class='del'>-	gnome_popup_menu_do_popup_modal (popup_menu, NULL, NULL, event,</div><div class='del'>-					 &amp;menu_data);</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (popup_menu);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_open_task (GtkWidget *menuitem,</div><div class='del'>-			       gpointer	  data)</div><div class='del'>-{</div><div class='del'>-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;</div><div class='del'>-</div><div class='del'>-	e_calendar_table_open_task (menu_data-&gt;cal_table,</div><div class='del'>-				    menu_data-&gt;row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_mark_task_complete (GtkWidget *menuitem,</div><div class='del'>-					gpointer   data)</div><div class='del'>-{</div><div class='del'>-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;</div><div class='del'>-</div><div class='del'>-	calendar_model_mark_task_complete (menu_data-&gt;cal_table-&gt;model,</div><div class='del'>-					   menu_data-&gt;row);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_calendar_table_on_delete_task (GtkWidget *menuitem,</div><div class='del'>-				 gpointer   data)</div><div class='del'>-{</div><div class='del'>-	ECalendarMenuData *menu_data = (ECalendarMenuData*) data;</div><div class='del'>-</div><div class='del'>-	calendar_model_delete_task (menu_data-&gt;cal_table-&gt;model,</div><div class='del'>-				    menu_data-&gt;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_calendar_table_on_key_press (ETable *table,</div><div class='del'>-			       gint row,</div><div class='del'>-			       gint col,</div><div class='del'>-			       GdkEventKey *event,</div><div class='del'>-			       ECalendarTable *cal_table)</div><div class='del'>-{</div><div class='del'>-	if (event-&gt;keyval == GDK_Delete) {</div><div class='del'>-		calendar_model_delete_task (cal_table-&gt;model, row);</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_calendar_table_open_task (ECalendarTable *cal_table,</div><div class='del'>-			    gint row)</div><div class='del'>-{</div><div class='del'>-	TaskEditor *tedit;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	tedit = task_editor_new ();</div><div class='del'>-	task_editor_set_cal_client (tedit, calendar_model_get_cal_client (cal_table-&gt;model));</div><div class='del'>-</div><div class='del'>-	comp = calendar_model_get_cal_object (cal_table-&gt;model, row);</div><div class='del'>-	task_editor_set_todo_object (tedit, comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Loads the state of the table (headers shown etc.) from the given file. */</div><div class='del'>-void</div><div class='del'>-e_calendar_table_load_state	(ECalendarTable *cal_table,</div><div class='del'>-				 gchar		*filename)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	if (stat (filename, &amp;st) == 0 &amp;&amp; st.st_size &gt; 0</div><div class='del'>-	    &amp;&amp; S_ISREG (st.st_mode)) {</div><div class='del'>-		e_table_scrolled_load_state (E_TABLE_SCROLLED (cal_table-&gt;etable), filename);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Saves the state of the table (headers shown etc.) to the given file. */</div><div class='del'>-void</div><div class='del'>-e_calendar_table_save_state (ECalendarTable	*cal_table,</div><div class='del'>-			     gchar		*filename)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR_TABLE (cal_table));</div><div class='del'>-</div><div class='del'>-	e_table_scrolled_save_state (E_TABLE_SCROLLED (cal_table-&gt;etable),</div><div class='del'>-				     filename);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-calendar-table.h b/calendar/gui/e-calendar-table.h<br/>deleted file mode 100644<br/>index 1265a80a72..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-calendar-table.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-calendar-table.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * 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'>-#ifndef _E_CALENDAR_TABLE_H_</div><div class='del'>-#define _E_CALENDAR_TABLE_H_</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtktable.h&gt;</div><div class='del'>-#include "calendar-model.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * ECalendarTable - displays the iCalendar objects in a table (an ETable).</div><div class='del'>- * Used for calendar events and tasks.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* These index our colors array. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_CALENDAR_TABLE_COLOR_OVERDUE,</div><div class='del'>-	</div><div class='del'>-	E_CALENDAR_TABLE_COLOR_LAST</div><div class='del'>-} ECalendarTableColors;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define E_CALENDAR_TABLE(obj)          GTK_CHECK_CAST (obj, e_calendar_table_get_type (), ECalendarTable)</div><div class='del'>-#define E_CALENDAR_TABLE_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass, e_calendar_table_get_type (), ECalendarTableClass)</div><div class='del'>-#define E_IS_CALENDAR_TABLE(obj)       GTK_CHECK_TYPE (obj, e_calendar_table_get_type ())</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ECalendarTable       ECalendarTable;</div><div class='del'>-typedef struct _ECalendarTableClass  ECalendarTableClass;</div><div class='del'>-</div><div class='del'>-struct _ECalendarTable</div><div class='del'>-{</div><div class='del'>-	GtkTable table;</div><div class='del'>-</div><div class='del'>-	CalendarModel *model;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *etable;</div><div class='del'>-	</div><div class='del'>-	/* Colors for drawing. */</div><div class='del'>-	GdkColor colors[E_CALENDAR_TABLE_COLOR_LAST];</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ECalendarTableClass</div><div class='del'>-{</div><div class='del'>-	GtkTableClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType	   e_calendar_table_get_type		(void);</div><div class='del'>-GtkWidget* e_calendar_table_new			(void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void	   e_calendar_table_set_cal_client	(ECalendarTable *cal_table,</div><div class='del'>-						 CalClient	*client);</div><div class='del'>-</div><div class='del'>-/* These load and save the state of the table (headers shown etc.) to/from</div><div class='del'>-   the given file. */</div><div class='del'>-void	   e_calendar_table_load_state		(ECalendarTable *cal_table,</div><div class='del'>-						 gchar		*filename);</div><div class='del'>-void	   e_calendar_table_save_state		(ECalendarTable *cal_table,</div><div class='del'>-						 gchar		*filename);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* _E_CALENDAR_TABLE_H_ */</div><div class='head'>diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c<br/>deleted file mode 100644<br/>index edcb0b4b82..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-main-item.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-day-view-main-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,662 +0,0 @@</div><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 day_x, day_w, work_day;</div><div class='del'>-	gint start_row, end_row, rect_x, rect_y, rect_width, rect_height;</div><div class='del'>-	struct tm *day_start;</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'>-	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'>-		work_day = day_view-&gt;working_days &amp; (1 &lt;&lt; day_start-&gt;tm_wday);</div><div class='del'>-</div><div class='del'>-		day_x = day_view-&gt;day_offsets[day] - x;</div><div class='del'>-		day_w = day_view-&gt;day_widths[day];</div><div class='del'>-</div><div class='del'>-		if (work_day) {</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    day_x, 0 - y,</div><div class='del'>-					    day_w, work_day_start_y - (0 - y));</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    day_x, work_day_start_y,</div><div class='del'>-					    day_w, work_day_end_y - work_day_start_y);</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    day_x, work_day_end_y,</div><div class='del'>-					    day_w, height - work_day_end_y);</div><div class='del'>-		} else {</div><div class='del'>-			gdk_gc_set_foreground (gc, &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING]);</div><div class='del'>-			gdk_draw_rectangle (drawable, gc, TRUE,</div><div class='del'>-					    day_x, 0,</div><div class='del'>-					    day_w, height);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Paint the selection background. */</div><div class='del'>-	if (GTK_WIDGET_HAS_FOCUS (day_view)</div><div class='del'>-	    &amp;&amp; day_view-&gt;selection_start_day != -1</div><div class='del'>-	    &amp;&amp; !day_view-&gt;selection_in_top_canvas) {</div><div class='del'>-		for (day = day_view-&gt;selection_start_day;</div><div class='del'>-		     day &lt;= day_view-&gt;selection_end_day;</div><div class='del'>-		     day++) {</div><div class='del'>-			if (day == day_view-&gt;selection_start_day</div><div class='del'>-			    &amp;&amp; day_view-&gt;selection_start_row != -1)</div><div class='del'>-				start_row = day_view-&gt;selection_start_row;</div><div class='del'>-			else</div><div class='del'>-				start_row = 0;</div><div class='del'>-			if (day == day_view-&gt;selection_end_day</div><div class='del'>-			    &amp;&amp; day_view-&gt;selection_end_row != -1)</div><div class='del'>-				end_row = day_view-&gt;selection_end_row;</div><div class='del'>-			else</div><div class='del'>-				end_row = day_view-&gt;rows - 1;</div><div class='del'>-</div><div class='del'>-			rect_x = day_view-&gt;day_offsets[day] - x;</div><div class='del'>-			rect_width = day_view-&gt;day_widths[day];</div><div class='del'>-			rect_y = start_row * day_view-&gt;row_height - y;</div><div class='del'>-			rect_height = (end_row - start_row + 1) * day_view-&gt;row_height;</div><div class='del'>-</div><div class='del'>-			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'>-	CalComponent *comp;</div><div class='del'>-	gint num_icons, icon_x, icon_y, icon_x_inc, icon_y_inc;</div><div class='del'>-	gint max_icon_w, max_icon_h;</div><div class='del'>-	gboolean draw_reminder_icon, draw_recurrence_icon;</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'>-	comp = event-&gt;comp;</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_alarms (comp)) {</div><div class='del'>-		draw_reminder_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_recurrences (comp)) {</div><div class='del'>-		draw_recurrence_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 19d8d40317..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-time-item.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-day-view-time-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,547 +0,0 @@</div><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;gnome.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include "e-day-view-time-item.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The spacing between items in the time column. GRID_X_PAD is the space down</div><div class='del'>-   either side of the column, i.e. outside the main horizontal grid lines.</div><div class='del'>-   HOUR_L_PAD &amp; HOUR_R_PAD are the spaces on the left &amp; right side of the</div><div class='del'>-   big hour number (this is inside the horizontal grid lines).</div><div class='del'>-   MIN_X_PAD is the spacing either side of the minute number. The smaller</div><div class='del'>-   horizontal grid lines match with this.</div><div class='del'>-   60_MIN_X_PAD is the space either side of the HH:MM display used when</div><div class='del'>-   we are displaying 60 mins per row (inside the main grid lines). */</div><div class='del'>-#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'>-	time_min_x1 = 0;</div><div class='del'>-	hour_r = 0;</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'>-	if (!day_view-&gt;use_24_hour_format) {</div><div class='del'>-		if (hour == 0 || hour == 12)</div><div class='del'>-			hour = 12;</div><div class='del'>-		else</div><div class='del'>-			hour %= 12;</div><div class='del'>-	}</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'>-			if (!day_view-&gt;use_24_hour_format) {</div><div class='del'>-				if (hour == 0 || hour == 12)</div><div class='del'>-					hour = 12;</div><div class='del'>-				else</div><div class='del'>-					hour %= 12;</div><div class='del'>-			}</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'>-	calendar_config_set_time_divisions (divisions);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_on_button_press (EDayViewTimeItem *dvtmitem,</div><div class='del'>-				      GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GnomeCanvas *canvas;</div><div class='del'>-	gint row;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	canvas = GNOME_CANVAS_ITEM (dvtmitem)-&gt;canvas;</div><div class='del'>-</div><div class='del'>-	row = e_day_view_time_item_convert_position_to_row (dvtmitem,</div><div class='del'>-							    event-&gt;button.y);</div><div class='del'>-</div><div class='del'>-	if (row == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_HAS_FOCUS (day_view))</div><div class='del'>-		gtk_widget_grab_focus (GTK_WIDGET (day_view));</div><div class='del'>-</div><div class='del'>-	if (gdk_pointer_grab (GTK_LAYOUT (canvas)-&gt;bin_window, FALSE,</div><div class='del'>-			      GDK_POINTER_MOTION_MASK</div><div class='del'>-			      | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-			      FALSE, NULL, event-&gt;button.time) == 0) {</div><div class='del'>-		e_day_view_start_selection (day_view, -1, row);</div><div class='del'>-		dvtmitem-&gt;dragging_selection = TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_on_button_release (EDayViewTimeItem *dvtmitem,</div><div class='del'>-					GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	if (dvtmitem-&gt;dragging_selection) {</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;button.time);</div><div class='del'>-		e_day_view_finish_selection (day_view);</div><div class='del'>-		e_day_view_stop_auto_scroll (day_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dvtmitem-&gt;dragging_selection = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_time_item_on_motion_notify (EDayViewTimeItem *dvtmitem,</div><div class='del'>-				       GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GnomeCanvas *canvas;</div><div class='del'>-	gdouble window_y;</div><div class='del'>-	gint y, row;</div><div class='del'>-</div><div class='del'>-	if (!dvtmitem-&gt;dragging_selection)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-</div><div class='del'>-	canvas = GNOME_CANVAS_ITEM (dvtmitem)-&gt;canvas;</div><div class='del'>-</div><div class='del'>-	y = event-&gt;motion.y;</div><div class='del'>-	row = e_day_view_time_item_convert_position_to_row (dvtmitem, y);</div><div class='del'>-</div><div class='del'>-	if (row != -1) {</div><div class='del'>-		gnome_canvas_world_to_window (canvas, 0, event-&gt;motion.y,</div><div class='del'>-					      NULL, &amp;window_y);</div><div class='del'>-		e_day_view_update_selection (day_view, -1, row);</div><div class='del'>-		e_day_view_check_auto_scroll (day_view, -1, (gint) window_y);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the row corresponding to the y position, or -1. */</div><div class='del'>-static gint</div><div class='del'>-e_day_view_time_item_convert_position_to_row (EDayViewTimeItem *dvtmitem,</div><div class='del'>-					      gint y)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	gint row;</div><div class='del'>-</div><div class='del'>-	day_view = dvtmitem-&gt;day_view;</div><div class='del'>-	g_return_val_if_fail (day_view != NULL, -1);</div><div class='del'>-</div><div class='del'>-	if (y &lt; 0)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	row = y / day_view-&gt;row_height;</div><div class='del'>-	if (row &gt;= day_view-&gt;rows)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return row;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-day-view-time-item.h b/calendar/gui/e-day-view-time-item.h<br/>deleted file mode 100644<br/>index 8b20fe999e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-time-item.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 8a85983592..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view-top-item.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-day-view-top-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,592 +0,0 @@</div><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], *format;</div><div class='del'>-	GdkRectangle clip_rect;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint canvas_width, canvas_height, left_edge, day, date_width, date_x;</div><div class='del'>-	gint item_height, event_num;</div><div class='del'>-	struct tm *day_start;</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 format %A = full weekday name, %d = day of month,</div><div class='del'>-			   %B = full month name. Don't use any other specifiers. */</div><div class='del'>-			format = _("%A %d %B");</div><div class='del'>-		else if (day_view-&gt;date_format == E_DAY_VIEW_DATE_ABBREVIATED)</div><div class='del'>-			/* strftime format %a = abbreviated weekday name, %d = day of month,</div><div class='del'>-			   %b = abbreviated month name. Don't use any other specifiers. */</div><div class='del'>-			format = _("%a %d %b");</div><div class='del'>-		else if (day_view-&gt;date_format == E_DAY_VIEW_DATE_NO_WEEKDAY)</div><div class='del'>-			/* strftime format %d = day of month, %b = abbreviated month name.</div><div class='del'>-			   Don't use any other specifiers. */</div><div class='del'>-			format = _("%d %b");</div><div class='del'>-		else</div><div class='del'>-			format = "%d";</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), format, 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'>-	CalComponent *comp;</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'>-	comp = event-&gt;comp;</div><div class='del'>-</div><div class='del'>-	/* Draw the lines across the top &amp; bottom of the entire event. */</div><div class='del'>-	gdk_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 (cal_component_has_recurrences (comp)) {</div><div class='del'>-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-		gdk_gc_set_clip_mask (gc, day_view-&gt;recurrence_mask);</div><div class='del'>-		gdk_draw_pixmap (drawable, gc,</div><div class='del'>-				 day_view-&gt;recurrence_icon,</div><div class='del'>-				 0, 0, icon_x, icon_y,</div><div class='del'>-				 E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-				 E_DAY_VIEW_ICON_HEIGHT);</div><div class='del'>-		icon_x -= icon_x_inc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_alarms (comp)) {</div><div class='del'>-		gdk_gc_set_clip_origin (gc, icon_x, icon_y);</div><div class='del'>-		gdk_gc_set_clip_mask (gc, day_view-&gt;reminder_mask);</div><div class='del'>-		gdk_draw_pixmap (drawable, gc,</div><div class='del'>-				 day_view-&gt;reminder_icon,</div><div class='del'>-				 0, 0, icon_x, icon_y,</div><div class='del'>-				 E_DAY_VIEW_ICON_WIDTH,</div><div class='del'>-				 E_DAY_VIEW_ICON_HEIGHT);</div><div class='del'>-		icon_x -= icon_x_inc;</div><div class='del'>-	}</div><div class='del'>-	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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 50f6639f58..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-day-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6083 +0,0 @@</div><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 &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-</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'>-</div><div class='del'>-static gboolean e_day_view_on_time_canvas_button_press (GtkWidget *widget,</div><div class='del'>-							GdkEventButton *event,</div><div class='del'>-							EDayView *day_view);</div><div class='del'>-</div><div class='del'>-static void e_day_view_update_calendar_selection_time (EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_on_main_canvas_motion (GtkWidget *widget,</div><div class='del'>-						  GdkEventMotion *event,</div><div class='del'>-						  EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_convert_event_coords (EDayView *day_view,</div><div class='del'>-						 GdkEvent *event,</div><div class='del'>-						 GdkWindow *window,</div><div class='del'>-						 gint *x_return,</div><div class='del'>-						 gint *y_return);</div><div class='del'>-static void e_day_view_update_long_event_resize (EDayView *day_view,</div><div class='del'>-						 gint day);</div><div class='del'>-static void e_day_view_update_resize (EDayView *day_view,</div><div class='del'>-				      gint row);</div><div class='del'>-static void e_day_view_finish_long_event_resize (EDayView *day_view);</div><div class='del'>-static void e_day_view_finish_resize (EDayView *day_view);</div><div class='del'>-static void e_day_view_abort_resize (EDayView *day_view,</div><div class='del'>-				     guint32 time);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean e_day_view_on_long_event_button_press (EDayView		*day_view,</div><div class='del'>-						       gint		 event_num,</div><div class='del'>-						       GdkEventButton	*event,</div><div class='del'>-						       EDayViewPosition  pos,</div><div class='del'>-						       gint		 event_x,</div><div class='del'>-						       gint		 event_y);</div><div class='del'>-static gboolean e_day_view_on_event_button_press (EDayView	 *day_view,</div><div class='del'>-						  gint		  day,</div><div class='del'>-						  gint		  event_num,</div><div class='del'>-						  GdkEventButton *event,</div><div class='del'>-						  EDayViewPosition pos,</div><div class='del'>-						  gint		  event_x,</div><div class='del'>-						  gint		  event_y);</div><div class='del'>-static void e_day_view_on_long_event_click (EDayView *day_view,</div><div class='del'>-					    gint event_num,</div><div class='del'>-					    GdkEventButton  *bevent,</div><div class='del'>-					    EDayViewPosition pos,</div><div class='del'>-					    gint	     event_x,</div><div class='del'>-					    gint	     event_y);</div><div class='del'>-static void e_day_view_on_event_click (EDayView *day_view,</div><div class='del'>-				       gint day,</div><div class='del'>-				       gint event_num,</div><div class='del'>-				       GdkEventButton  *event,</div><div class='del'>-				       EDayViewPosition pos,</div><div class='del'>-				       gint		event_x,</div><div class='del'>-				       gint		event_y);</div><div class='del'>-static void e_day_view_on_event_double_click (EDayView *day_view,</div><div class='del'>-					      gint day,</div><div class='del'>-					      gint event_num);</div><div class='del'>-static void e_day_view_on_event_right_click (EDayView *day_view,</div><div class='del'>-					     GdkEventButton *bevent,</div><div class='del'>-					     gint day,</div><div class='del'>-					     gint event_num);</div><div class='del'>-</div><div class='del'>-static void e_day_view_recalc_day_starts (EDayView *day_view,</div><div class='del'>-					  time_t start_time);</div><div class='del'>-static void e_day_view_recalc_num_rows	(EDayView	*day_view);</div><div class='del'>-static void e_day_view_recalc_cell_sizes	(EDayView	*day_view);</div><div class='del'>-</div><div class='del'>-static EDayViewPosition e_day_view_convert_position_in_top_canvas (EDayView *day_view,</div><div class='del'>-								   gint x,</div><div class='del'>-								   gint y,</div><div class='del'>-								   gint *day_return,</div><div class='del'>-								   gint *event_num_return);</div><div class='del'>-static EDayViewPosition e_day_view_convert_position_in_main_canvas (EDayView *day_view,</div><div class='del'>-								    gint x,</div><div class='del'>-								    gint y,</div><div class='del'>-								    gint *day_return,</div><div class='del'>-								    gint *row_return,</div><div class='del'>-								    gint *event_num_return);</div><div class='del'>-static gboolean e_day_view_find_event_from_item (EDayView *day_view,</div><div class='del'>-						 GnomeCanvasItem *item,</div><div class='del'>-						 gint *day_return,</div><div class='del'>-						 gint *event_num_return);</div><div class='del'>-static gboolean e_day_view_find_event_from_uid (EDayView *day_view,</div><div class='del'>-						const gchar *uid,</div><div class='del'>-						gint *day_return,</div><div class='del'>-						gint *event_num_return);</div><div class='del'>-</div><div class='del'>-typedef gboolean (* EDayViewForeachEventCallback) (EDayView *day_view,</div><div class='del'>-						   gint day,</div><div class='del'>-						   gint event_num,</div><div class='del'>-						   gpointer data);</div><div class='del'>-</div><div class='del'>-static void e_day_view_foreach_event_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_queue_reload_events (EDayView *day_view);</div><div class='del'>-static gboolean e_day_view_reload_events_idle_cb	(gpointer data);</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 (CalComponent *comp,</div><div class='del'>-				 time_t	  start,</div><div class='del'>-				 time_t	  end,</div><div class='del'>-				 gpointer data);</div><div class='del'>-static void e_day_view_update_event_label (EDayView *day_view,</div><div class='del'>-					   gint day,</div><div class='del'>-					   gint event_num);</div><div class='del'>-static void e_day_view_update_long_event_label (EDayView *day_view,</div><div class='del'>-						gint event_num);</div><div class='del'>-</div><div class='del'>-static void e_day_view_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'>-#ifndef NO_WARNINGS</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'>-#endif</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'>-	gint day;</div><div class='del'>-	GnomeCanvasGroup *canvas_group;</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_SET_FLAGS (day_view, GTK_CAN_FOCUS);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;calendar = NULL;</div><div class='del'>-	day_view-&gt;client = NULL;</div><div class='del'>-</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'>-	day_view-&gt;reload_events_idle_id = 0;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; E_DAY_VIEW_MAX_DAYS; day++) {</div><div class='del'>-		day_view-&gt;events[day] = g_array_new (FALSE, FALSE,</div><div class='del'>-						     sizeof (EDayViewEvent));</div><div class='del'>-		day_view-&gt;events_sorted[day] = TRUE;</div><div class='del'>-		day_view-&gt;need_layout[day] = FALSE;</div><div class='del'>-		day_view-&gt;need_reshape[day] = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* These indicate that the times haven't been set. */</div><div class='del'>-	day_view-&gt;lower = 0;</div><div class='del'>-	day_view-&gt;upper = 0;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Initialize day_starts. */</div><div class='del'>-	day_view-&gt;work_week_view = FALSE;</div><div class='del'>-	day_view-&gt;days_shown = 1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;mins_per_row = 30;</div><div class='del'>-	day_view-&gt;date_format = E_DAY_VIEW_DATE_FULL;</div><div class='del'>-	day_view-&gt;rows_in_top_display = 0;</div><div class='del'>-</div><div class='del'>-	/* Note that these don't work yet. It would need a few fixes to the</div><div class='del'>-	   way event-&gt;start_minute and event-&gt;end_minute are used, and there</div><div class='del'>-	   may be problems with events that go outside the visible times. */</div><div class='del'>-	day_view-&gt;first_hour_shown = 0;</div><div class='del'>-	day_view-&gt;first_minute_shown = 0;</div><div class='del'>-	day_view-&gt;last_hour_shown = 24;</div><div class='del'>-	day_view-&gt;last_minute_shown = 0;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;main_gc = NULL;</div><div class='del'>-	e_day_view_recalc_num_rows (day_view);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;working_days = E_DAY_VIEW_MONDAY | E_DAY_VIEW_TUESDAY</div><div class='del'>-		| E_DAY_VIEW_WEDNESDAY | E_DAY_VIEW_THURSDAY</div><div class='del'>-		| E_DAY_VIEW_FRIDAY;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;work_day_start_hour = 9;</div><div class='del'>-	day_view-&gt;work_day_start_minute = 0;</div><div class='del'>-	day_view-&gt;work_day_end_hour = 17;</div><div class='del'>-	day_view-&gt;work_day_end_minute = 0;</div><div class='del'>-	day_view-&gt;scroll_to_work_day = TRUE;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;editing_event_day = -1;</div><div class='del'>-	day_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_start_row = -1;</div><div class='del'>-	day_view-&gt;selection_start_day = -1;</div><div class='del'>-	day_view-&gt;selection_end_row = -1;</div><div class='del'>-	day_view-&gt;selection_end_day = -1;</div><div class='del'>-	day_view-&gt;selection_is_being_dragged = FALSE;</div><div class='del'>-	day_view-&gt;selection_drag_pos = E_DAY_VIEW_DRAG_END;</div><div class='del'>-	day_view-&gt;selection_in_top_canvas = FALSE;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_drag_pos = E_DAY_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;pressed_event_day = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_event_day = -1;</div><div class='del'>-	day_view-&gt;drag_last_day = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;auto_scroll_timeout_id = 0;</div><div class='del'>-</div><div class='del'>-	/* 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'>-	/*</div><div class='del'>-	 * Top Canvas</div><div class='del'>-	 */</div><div class='del'>-	day_view-&gt;top_canvas = e_canvas_new ();</div><div class='del'>-	gtk_table_attach (GTK_TABLE (day_view), day_view-&gt;top_canvas,</div><div class='del'>-			  1, 2, 0, 1, GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas), "button_press_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_press),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas), "button_release_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_button_release),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas), "motion_notify_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_motion),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-				  "drag_motion",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_motion),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-				  "drag_leave",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_leave),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-			    "drag_begin",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-			    "drag_end",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-			    "drag_data_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;top_canvas),</div><div class='del'>-			    "drag_data_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_top_canvas_drag_data_received),</div><div class='del'>-			    day_view);</div><div class='del'>-</div><div class='del'>-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view-&gt;top_canvas)-&gt;root);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;top_canvas_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_day_view_top_item_get_type (),</div><div class='del'>-				       "EDayViewTopItem::day_view", day_view,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_long_event_rect_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type(),</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_long_event_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_long_event_rect_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_long_event_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_long_event_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_text_get_type (),</div><div class='del'>-				       "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				       "line_wrap", TRUE,</div><div class='del'>-				       "clip", TRUE,</div><div class='del'>-				       "max_lines", 1,</div><div class='del'>-				       "editable", TRUE,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_long_event_item);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Main Canvas</div><div class='del'>-	 */</div><div class='del'>-	day_view-&gt;main_canvas = e_canvas_new ();</div><div class='del'>-	gtk_table_attach (GTK_TABLE (day_view), day_view-&gt;main_canvas,</div><div class='del'>-			  1, 2, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (day_view-&gt;main_canvas);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas), "realize",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_canvas_realized),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "button_press_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_press),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "button_release_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_button_release),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "motion_notify_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_motion),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "drag_motion",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_motion),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-				  "drag_leave",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_leave),</div><div class='del'>-				  day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-			    "drag_begin",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_begin),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-			    "drag_end",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_end),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-			    "drag_data_get",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_drag_data_get),</div><div class='del'>-			    day_view);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (day_view-&gt;main_canvas),</div><div class='del'>-			    "drag_data_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_day_view_on_main_canvas_drag_data_received),</div><div class='del'>-			    day_view);</div><div class='del'>-</div><div class='del'>-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view-&gt;main_canvas)-&gt;root);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;main_canvas_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_day_view_main_item_get_type (),</div><div class='del'>-				       "EDayViewMainItem::day_view", day_view,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_rect_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type(),</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_bar_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type(),</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_bar_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;main_canvas_top_resize_bar_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;main_canvas_bottom_resize_bar_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_rect_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_bar_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       gnome_canvas_rect_get_type (),</div><div class='del'>-				       "width_pixels", 1,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_bar_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_text_get_type (),</div><div class='del'>-				       "anchor", GTK_ANCHOR_NW,</div><div class='del'>-				       "line_wrap", TRUE,</div><div class='del'>-				       "clip", TRUE,</div><div class='del'>-				       "editable", TRUE,</div><div class='del'>-				       NULL);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_item);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Times Canvas</div><div class='del'>-	 */</div><div class='del'>-	day_view-&gt;time_canvas = e_canvas_new ();</div><div class='del'>-	gtk_layout_set_vadjustment (GTK_LAYOUT (day_view-&gt;time_canvas),</div><div class='del'>-				    GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (day_view), day_view-&gt;time_canvas,</div><div class='del'>-			  0, 1, 1, 2,</div><div class='del'>-			  GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (day_view-&gt;time_canvas);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (day_view-&gt;time_canvas),</div><div class='del'>-				  "button_press_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (e_day_view_on_time_canvas_button_press),</div><div class='del'>-				  day_view);</div><div class='del'>-</div><div class='del'>-	canvas_group = GNOME_CANVAS_GROUP (GNOME_CANVAS (day_view-&gt;time_canvas)-&gt;root);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;time_canvas_item =</div><div class='del'>-		gnome_canvas_item_new (canvas_group,</div><div class='del'>-				       e_day_view_time_item_get_type (),</div><div class='del'>-				       "EDayViewTimeItem::day_view", day_view,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Scrollbar.</div><div class='del'>-	 */</div><div class='del'>-	day_view-&gt;vscrollbar = gtk_vscrollbar_new (GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment);</div><div class='del'>-	gtk_table_attach (GTK_TABLE (day_view), day_view-&gt;vscrollbar,</div><div class='del'>-			  2, 3, 1, 2, 0, GTK_EXPAND | GTK_FILL, 0, 0);</div><div class='del'>-	gtk_widget_show (day_view-&gt;vscrollbar);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Create the cursors. */</div><div class='del'>-	day_view-&gt;normal_cursor = gdk_cursor_new (GDK_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;reload_events_idle_id != 0) {</div><div class='del'>-		g_source_remove (day_view-&gt;reload_events_idle_id);</div><div class='del'>-		day_view-&gt;reload_events_idle_id = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view-&gt;client), day_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (day_view-&gt;client));</div><div class='del'>-		day_view-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;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'>-	GdkColormap *colormap;</div><div class='del'>-	gboolean success[E_DAY_VIEW_COLOR_LAST];</div><div class='del'>-	gint nfailed;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;realize)(widget);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-	day_view-&gt;main_gc = gdk_gc_new (widget-&gt;window);</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (widget);</div><div class='del'>-</div><div class='del'>-	/* Allocate the colors. */</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].red   = 247 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].green = 247 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_WORKING].blue  = 244 * 257;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].red   = 216 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].green = 216 * 257;</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_BG_NOT_WORKING].blue  = 214 * 257;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;colors[E_DAY_VIEW_COLOR_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'>-	/* 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'>-</div><div class='del'>-	/* Set the canvas item colors. */</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_long_event_rect_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_long_event_rect_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_rect_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;resize_bar_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;main_canvas_top_resize_bar_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;main_canvas_bottom_resize_bar_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_rect_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BACKGROUND],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_bar_item,</div><div class='del'>-			       "fill_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_VBAR],</div><div class='del'>-			       "outline_color_gdk", &amp;day_view-&gt;colors[E_DAY_VIEW_COLOR_EVENT_BORDER],</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Set the fonts for the text items used when dragging. */</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_long_event_item,</div><div class='del'>-			       "font_gdk", GTK_WIDGET (day_view)-&gt;style-&gt;font,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_item,</div><div class='del'>-			       "font_gdk", GTK_WIDGET (day_view)-&gt;style-&gt;font,</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_unrealize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	gdk_gc_unref (day_view-&gt;main_gc);</div><div class='del'>-	day_view-&gt;main_gc = NULL;</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (widget);</div><div class='del'>-	for (i = 0; i &lt; E_DAY_VIEW_COLOR_LAST; i++)</div><div class='del'>-		gdk_colors_free (colormap, &amp;day_view-&gt;colors[i].pixel, 1, 0);</div><div class='del'>-</div><div class='del'>-	gdk_pixmap_unref (day_view-&gt;reminder_icon);</div><div class='del'>-	day_view-&gt;reminder_icon = NULL;</div><div class='del'>-	gdk_pixmap_unref (day_view-&gt;recurrence_icon);</div><div class='del'>-	day_view-&gt;recurrence_icon = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_style_set (GtkWidget *widget,</div><div class='del'>-		      GtkStyle  *previous_style)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint top_rows, top_canvas_height;</div><div class='del'>-	gint hour, max_large_hour_width;</div><div class='del'>-	gint minute, max_minute_width, i;</div><div class='del'>-	gint month, day, width;</div><div class='del'>-	gint longest_month_width, longest_abbreviated_month_width;</div><div class='del'>-	gint longest_weekday_width, longest_abbreviated_weekday_width;</div><div class='del'>-	struct tm date_tm;</div><div class='del'>-	gchar buffer[128];</div><div class='del'>-	gint times_width;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;style_set)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;style_set)(widget, previous_style);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-	font = widget-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Recalculate the height of each row based on the font size. */</div><div class='del'>-	day_view-&gt;row_height = font-&gt;ascent + font-&gt;descent + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD * 2 + 2 /* FIXME */;</div><div class='del'>-	day_view-&gt;row_height = MAX (day_view-&gt;row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2);</div><div class='del'>-	GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment-&gt;step_increment = day_view-&gt;row_height;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;top_row_height = font-&gt;ascent + font-&gt;descent + E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT * 2 + E_DAY_VIEW_LONG_EVENT_Y_PAD * 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP;</div><div class='del'>-	day_view-&gt;top_row_height = MAX (day_view-&gt;top_row_height, E_DAY_VIEW_ICON_HEIGHT + E_DAY_VIEW_ICON_Y_PAD + 2 + E_DAY_VIEW_TOP_CANVAS_Y_GAP);</div><div class='del'>-</div><div class='del'>-	/* Set the height of the top canvas based on the row height and the</div><div class='del'>-	   number of rows needed (min 1 + 1 for the dates + 1 space for DnD).*/</div><div class='del'>-	top_rows = MAX (1, day_view-&gt;rows_in_top_display);</div><div class='del'>-	top_canvas_height = (top_rows + 2) * day_view-&gt;top_row_height;</div><div class='del'>-	gtk_widget_set_usize (day_view-&gt;top_canvas, -1, top_canvas_height);</div><div class='del'>-</div><div class='del'>-	/* Find the longest full &amp; abbreviated month names. */</div><div class='del'>-	memset (&amp;date_tm, 0, sizeof (date_tm));</div><div class='del'>-	date_tm.tm_year = 100;</div><div class='del'>-	date_tm.tm_mday = 1;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	longest_month_width = 0;</div><div class='del'>-	longest_abbreviated_month_width = 0;</div><div class='del'>-	for (month = 0; month &lt; 12; month++) {</div><div class='del'>-		date_tm.tm_mon = month;</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), "%B", &amp;date_tm);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_month_width) {</div><div class='del'>-			longest_month_width = width;</div><div class='del'>-			day_view-&gt;longest_month_name = month;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), "%b", &amp;date_tm);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_abbreviated_month_width) {</div><div class='del'>-			longest_abbreviated_month_width = width;</div><div class='del'>-			day_view-&gt;longest_abbreviated_month_name = month;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find the longest full &amp; abbreviated weekday names. */</div><div class='del'>-	memset (&amp;date_tm, 0, sizeof (date_tm));</div><div class='del'>-	date_tm.tm_year = 100;</div><div class='del'>-	date_tm.tm_mon = 0;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	longest_weekday_width = 0;</div><div class='del'>-	longest_abbreviated_weekday_width = 0;</div><div class='del'>-	for (day = 0; day &lt; 7; day++) {</div><div class='del'>-		date_tm.tm_mday = 2 + day;</div><div class='del'>-		date_tm.tm_wday = day;</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), "%A", &amp;date_tm);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_weekday_width) {</div><div class='del'>-			longest_weekday_width = width;</div><div class='del'>-			day_view-&gt;longest_weekday_name = day;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		strftime (buffer, sizeof (buffer), "%a", &amp;date_tm);</div><div class='del'>-		width = gdk_string_width (font, buffer);</div><div class='del'>-		if (width &gt; longest_abbreviated_weekday_width) {</div><div class='del'>-			longest_abbreviated_weekday_width = width;</div><div class='del'>-			day_view-&gt;longest_abbreviated_weekday_name = day;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Calculate the widths of all the time strings necessary. */</div><div class='del'>-	day_view-&gt;max_small_hour_width = 0;</div><div class='del'>-	max_large_hour_width = 0;</div><div class='del'>-	for (hour = 0; hour &lt; 24; hour++) {</div><div class='del'>-		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'>-	gint day, scroll_y;</div><div class='del'>-	gboolean need_reshape;</div><div class='del'>-	gdouble old_x2, old_y2, new_x2, new_y2;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_size_allocate\n");</div><div class='del'>-#endif</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	(*GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate) (widget, allocation);</div><div class='del'>-</div><div class='del'>-	e_day_view_recalc_cell_sizes (day_view);</div><div class='del'>-</div><div class='del'>-	/* Set the scroll region of the top canvas to its allocated size. */</div><div class='del'>-	gnome_canvas_get_scroll_region (GNOME_CANVAS (day_view-&gt;top_canvas),</div><div class='del'>-					NULL, NULL, &amp;old_x2, &amp;old_y2);</div><div class='del'>-	new_x2 = day_view-&gt;top_canvas-&gt;allocation.width - 1;</div><div class='del'>-	new_y2 = day_view-&gt;top_canvas-&gt;allocation.height - 1;</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2)</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (day_view-&gt;top_canvas),</div><div class='del'>-						0, 0, new_x2, new_y2);</div><div class='del'>-</div><div class='del'>-	need_reshape = e_day_view_update_scroll_regions (day_view);</div><div class='del'>-</div><div class='del'>-	/* Scroll to the start of the working day, if this is the initial</div><div class='del'>-	   allocation. */</div><div class='del'>-	if (day_view-&gt;scroll_to_work_day) {</div><div class='del'>-		scroll_y = e_day_view_convert_time_to_position (day_view, day_view-&gt;work_day_start_hour, day_view-&gt;work_day_start_minute);</div><div class='del'>-		gnome_canvas_scroll_to (GNOME_CANVAS (day_view-&gt;main_canvas),</div><div class='del'>-					0, scroll_y);</div><div class='del'>-		day_view-&gt;scroll_to_work_day = FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Flag that we need to reshape the events. Note that changes in height</div><div class='del'>-	   don't matter, since the rows are always the same height. */</div><div class='del'>-	if (need_reshape) {</div><div class='del'>-		day_view-&gt;long_events_need_reshape = TRUE;</div><div class='del'>-		for (day = 0; day &lt; E_DAY_VIEW_MAX_DAYS; day++)</div><div class='del'>-			day_view-&gt;need_reshape[day] = TRUE;</div><div class='del'>-</div><div class='del'>-		e_day_view_check_layout (day_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_recalc_cell_sizes	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	/* An array of dates, one for each month in the year 2000. They must</div><div class='del'>-	   all be Sundays. */</div><div class='del'>-	static const int days[12] = { 23, 20, 19, 23, 21, 18,</div><div class='del'>-				      23, 20, 17, 22, 19, 24 };</div><div class='del'>-	gfloat width, offset;</div><div class='del'>-	gint day, max_width;</div><div class='del'>-	struct tm date_tm;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	char buffer[128];</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (((GtkWidget*)day_view)-&gt;style != NULL);</div><div class='del'>-	font = GTK_WIDGET (day_view)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Calculate the column sizes, using floating point so that pixels</div><div class='del'>-	   get divided evenly. Note that we use one more element than the</div><div class='del'>-	   number of columns, to make it easy to get the column widths. */</div><div class='del'>-	width = day_view-&gt;main_canvas-&gt;allocation.width;</div><div class='del'>-	width /= day_view-&gt;days_shown;</div><div class='del'>-	offset = 0;</div><div class='del'>-	for (day = 0; day &lt;= day_view-&gt;days_shown; day++) {</div><div class='del'>-		day_view-&gt;day_offsets[day] = floor (offset + 0.5);</div><div class='del'>-		offset += width;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the days widths based on the offsets. */</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		day_view-&gt;day_widths[day] = day_view-&gt;day_offsets[day + 1] - day_view-&gt;day_offsets[day];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Determine which date format to use, based on the column widths.</div><div class='del'>-	   We want to check the widths using the longest full or abbreviated</div><div class='del'>-	   month name and the longest full or abbreviated weekday name, as</div><div class='del'>-	   appropriate. */</div><div class='del'>-	max_width = day_view-&gt;day_widths[0];</div><div class='del'>-</div><div class='del'>-	memset (&amp;date_tm, 0, sizeof (date_tm));</div><div class='del'>-	date_tm.tm_year = 100;</div><div class='del'>-</div><div class='del'>-	/* Try "Thursday 21 January". */</div><div class='del'>-	date_tm.tm_mon = day_view-&gt;longest_month_name;</div><div class='del'>-	date_tm.tm_mday = days[date_tm.tm_mon]</div><div class='del'>-		+ day_view-&gt;longest_weekday_name;</div><div class='del'>-	date_tm.tm_wday = day_view-&gt;longest_weekday_name;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-	/* strftime format %A = full weekday name, %d = day of month,</div><div class='del'>-	   %B = full month name. Don't use any other specifiers. */</div><div class='del'>-	strftime (buffer, sizeof (buffer), _("%A %d %B"), &amp;date_tm);</div><div class='del'>-	if (gdk_string_width (font, buffer) &lt; max_width) {</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_FULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try "Thu 21 Jan". */</div><div class='del'>-	date_tm.tm_mon = day_view-&gt;longest_abbreviated_month_name;</div><div class='del'>-	date_tm.tm_mday = days[date_tm.tm_mon]</div><div class='del'>-		+ day_view-&gt;longest_abbreviated_weekday_name;</div><div class='del'>-	date_tm.tm_wday = day_view-&gt;longest_abbreviated_weekday_name;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-	/* strftime format %a = abbreviated weekday name, %d = day of month,</div><div class='del'>-	   %b = abbreviated month name. Don't use any other specifiers. */</div><div class='del'>-	strftime (buffer, sizeof (buffer), _("%a %d %b"), &amp;date_tm);</div><div class='del'>-	if (gdk_string_width (font, buffer) &lt; max_width) {</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_ABBREVIATED;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try "23 Jan". */</div><div class='del'>-	date_tm.tm_mon = day_view-&gt;longest_abbreviated_month_name;</div><div class='del'>-	date_tm.tm_mday = 23;</div><div class='del'>-	date_tm.tm_wday = 0;</div><div class='del'>-	date_tm.tm_isdst = -1;</div><div class='del'>-	/* strftime format %d = day of month, %b = abbreviated month name.</div><div class='del'>-	   Don't use any other specifiers. */</div><div class='del'>-	strftime (buffer, sizeof (buffer), _("%d %b"), &amp;date_tm);</div><div class='del'>-	if (gdk_string_width (font, buffer) &lt; max_width)</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_NO_WEEKDAY;</div><div class='del'>-	else</div><div class='del'>-		day_view-&gt;date_format = E_DAY_VIEW_DATE_SHORT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_focus_in (GtkWidget *widget, GdkEventFocus *event)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_SET_FLAGS (widget, GTK_HAS_FOCUS);</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	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'>-/* Callback used when the calendar client finishes loading */</div><div class='del'>-static void</div><div class='del'>-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_CLIENT_LOAD_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_day_view_queue_reload_events (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar client tells us that an object changed */</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'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (data));</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* If our time hasn't been set yet, just return. */</div><div class='del'>-	if (day_view-&gt;lower == 0 &amp;&amp; day_view-&gt;upper == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Get the event from the server. */</div><div class='del'>-	status = cal_client_get_object (day_view-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Everything is fine */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* The object is no longer in the server, so do nothing */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We only care about events. */</div><div class='del'>-	if (cal_component_get_vtype (comp) != CAL_COMPONENT_EVENT) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "FIXME"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		/* Do this the long way every time for now */</div><div class='del'>-#if 0</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'>-#endif</div><div class='del'>-		/* The dates have changed, so we need to remove the</div><div class='del'>-		   old occurrrences before adding the new ones. */</div><div class='del'>-#if 0</div><div class='del'>-		g_print ("dates changed - removing occurrences\n");</div><div class='del'>-#endif</div><div class='del'>-		e_day_view_foreach_event_with_uid (day_view, uid,</div><div class='del'>-						   e_day_view_remove_event_cb,</div><div class='del'>-						   NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add the occurrences of the event. */</div><div class='del'>-	cal_recur_generate_instances (comp, day_view-&gt;lower,</div><div class='del'>-				      day_view-&gt;upper,</div><div class='del'>-				      e_day_view_add_event,</div><div class='del'>-				      day_view);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</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'>-/* Callback used when the calendar client tells us that an object was removed */</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'>-	EDayView *day_view;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	e_day_view_foreach_event_with_uid (day_view, uid,</div><div class='del'>-					   e_day_view_remove_event_cb, NULL);</div><div class='del'>-</div><div class='del'>-	e_day_view_check_layout (day_view);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_day_view_set_cal_client:</div><div class='del'>- * @day_view: A day view.</div><div class='del'>- * @client: A calendar client interface object.</div><div class='del'>- *</div><div class='del'>- * Sets the calendar client interface object that a day view will monitor.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_day_view_set_cal_client	(EDayView	*day_view,</div><div class='del'>-				 CalClient	*client)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (day_view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (client == day_view-&gt;client)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (day_view-&gt;client), day_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (day_view-&gt;client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	day_view-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;client) {</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (day_view-&gt;client), "cal_loaded",</div><div class='del'>-				    GTK_SIGNAL_FUNC (cal_loaded_cb), day_view);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (day_view-&gt;client), "obj_updated",</div><div class='del'>-				    GTK_SIGNAL_FUNC (obj_updated_cb), day_view);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (day_view-&gt;client), "obj_removed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (obj_removed_cb), day_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_day_view_queue_reload_events (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef NO_WARNINGS</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_update_event_cb (EDayView *day_view,</div><div class='del'>-			    gint day,</div><div class='del'>-			    gint event_num,</div><div class='del'>-			    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	comp = data;</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_update_event_cb day:%i event_num:%i\n",</div><div class='del'>-		 day, event_num);</div><div class='del'>-#endif</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	event-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		e_day_view_update_long_event_label (day_view, event_num);</div><div class='del'>-		e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-	} else {</div><div class='del'>-		e_day_view_update_event_label (day_view, day, event_num);</div><div class='del'>-		e_day_view_reshape_day_event (day_view, day, event_num);</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-#endif</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'>-	const char *u;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		for (event_num = day_view-&gt;events[day]-&gt;len - 1;</div><div class='del'>-		     event_num &gt;= 0;</div><div class='del'>-		     event_num--) {</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-			cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-			if (uid &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-				if (!(*callback) (day_view, day, event_num,</div><div class='del'>-						  data))</div><div class='del'>-					return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (event_num = day_view-&gt;long_events-&gt;len - 1;</div><div class='del'>-	     event_num &gt;= 0;</div><div class='del'>-	     event_num--) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-		if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-			if (!(*callback) (day_view, E_DAY_VIEW_LONG_EVENT,</div><div class='del'>-					  event_num, data))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_remove_event_cb (EDayView *day_view,</div><div class='del'>-			    gint day,</div><div class='del'>-			    gint event_num,</div><div class='del'>-			    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_remove_event_cb day:%i event_num:%i\n",</div><div class='del'>-		 day, event_num);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	/* If we were editing this event, set editing_event_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'>-	gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		g_array_remove_index (day_view-&gt;long_events, event_num);</div><div class='del'>-		day_view-&gt;long_events_need_layout = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		g_array_remove_index (day_view-&gt;events[day], event_num);</div><div class='del'>-		day_view-&gt;need_layout[day] = TRUE;</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This updates the text shown for an event. If the event start or end do not</div><div class='del'>-   lie on a row boundary, the time is displayed before the summary. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_event_label (EDayView *day_view,</div><div class='del'>-			       gint day,</div><div class='del'>-			       gint event_num)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	char *text;</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'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* If the event isn't visible just return. */</div><div class='del'>-	if (!event-&gt;canvas_item)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	text = summary.value ? (char*) summary.value : "";</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;editing_event_num == event_num)</div><div class='del'>-		editing_event = TRUE;</div><div class='del'>-</div><div class='del'>-	if (!editing_event</div><div class='del'>-	    &amp;&amp; (event-&gt;start_minute % day_view-&gt;mins_per_row != 0</div><div class='del'>-		|| 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'>-</div><div class='del'>-		free_text = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-			       "text", text,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	if (free_text)</div><div class='del'>-		g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_long_event_label (EDayView *day_view,</div><div class='del'>-				    gint      event_num)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* If the event isn't visible just return. */</div><div class='del'>-	if (!event-&gt;canvas_item)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	gnome_canvas_item_set (event-&gt;canvas_item,</div><div class='del'>-			       "text", summary.value ? summary.value : "",</div><div class='del'>-			       NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the day and index of the event with the given canvas item.</div><div class='del'>-   If is is a long event, -1 is returned as the day.</div><div class='del'>-   Returns TRUE if the event was found. */</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_find_event_from_item (EDayView *day_view,</div><div class='del'>-				 GnomeCanvasItem *item,</div><div class='del'>-				 gint *day_return,</div><div class='del'>-				 gint *event_num_return)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		for (event_num = 0; event_num &lt; day_view-&gt;events[day]-&gt;len;</div><div class='del'>-		     event_num++) {</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-			if (event-&gt;canvas_item == item) {</div><div class='del'>-				*day_return = day;</div><div class='del'>-				*event_num_return = event_num;</div><div class='del'>-				return TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;long_events-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-		if (event-&gt;canvas_item == item) {</div><div class='del'>-			*day_return = E_DAY_VIEW_LONG_EVENT;</div><div class='del'>-			*event_num_return = event_num;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Finds the day and index of the event with the given uid.</div><div class='del'>-   If is is a long event, E_DAY_VIEW_LONG_EVENT is returned as the day.</div><div class='del'>-   Returns TRUE if an event with the uid was found.</div><div class='del'>-   Note that for recurring events there may be several EDayViewEvents, one</div><div class='del'>-   for each instance, all with the same iCalObject and uid. So only use this</div><div class='del'>-   function if you know the event doesn't recur or you are just checking to</div><div class='del'>-   see if any events with the uid exist. */</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_find_event_from_uid (EDayView *day_view,</div><div class='del'>-				const gchar *uid,</div><div class='del'>-				gint *day_return,</div><div class='del'>-				gint *event_num_return)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	const char *u;</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; day_view-&gt;days_shown; day++) {</div><div class='del'>-		for (event_num = 0; event_num &lt; day_view-&gt;events[day]-&gt;len;</div><div class='del'>-		     event_num++) {</div><div class='del'>-			event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-						EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-			cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-			if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-				*day_return = day;</div><div class='del'>-				*event_num_return = event_num;</div><div class='del'>-				return TRUE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; day_view-&gt;long_events-&gt;len;</div><div class='del'>-	     event_num++) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-		if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-			*day_return = E_DAY_VIEW_LONG_EVENT;</div><div class='del'>-			*event_num_return = event_num;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets the selected time range. The EDayView will show the day or week</div><div class='del'>-   corresponding to the start time. If the start_time &amp; end_time are not equal</div><div class='del'>-   and are both visible in the view, then the selection is set to those times,</div><div class='del'>-   otherwise it is set to 1 hour from the start of the working day. */</div><div class='del'>-void</div><div class='del'>-e_day_view_set_selected_time_range	(EDayView	*day_view,</div><div class='del'>-					 time_t		 start_time,</div><div class='del'>-					 time_t		 end_time)</div><div class='del'>-{</div><div class='del'>-	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;work_week_view) {</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_queue_reload_events (day_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the selection. */</div><div class='del'>-	start_in_grid = e_day_view_convert_time_to_grid_position (day_view,</div><div class='del'>-								  start_time,</div><div class='del'>-								  &amp;start_col,</div><div class='del'>-								  &amp;start_row);</div><div class='del'>-	end_in_grid = e_day_view_convert_time_to_grid_position (day_view,</div><div class='del'>-								end_time - 60,</div><div class='del'>-								&amp;end_col,</div><div class='del'>-								&amp;end_row);</div><div class='del'>-</div><div class='del'>-	/* If either of the times isn't in the grid, or the selection covers</div><div class='del'>-	   an entire day, we set the selection to 1 row from the start of the</div><div class='del'>-	   working day, in the day corresponding to the start time. */</div><div class='del'>-	if (!start_in_grid || !end_in_grid</div><div class='del'>-	    || (start_row == 0 &amp;&amp; end_row == day_view-&gt;rows - 1)) {</div><div class='del'>-		end_col = start_col;</div><div class='del'>-</div><div class='del'>-		start_row = e_day_view_convert_time_to_row (day_view, day_view-&gt;work_day_start_hour, day_view-&gt;work_day_start_minute);</div><div class='del'>-		start_row = CLAMP (start_row, 0, day_view-&gt;rows - 1);</div><div class='del'>-		end_row = start_row;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start_row != day_view-&gt;selection_start_row</div><div class='del'>-	    || start_col != day_view-&gt;selection_start_day) {</div><div class='del'>-		need_redraw = TRUE;</div><div class='del'>-		day_view-&gt;selection_in_top_canvas = FALSE;</div><div class='del'>-		day_view-&gt;selection_start_row = start_row;</div><div class='del'>-		day_view-&gt;selection_start_day = start_col;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (end_row != day_view-&gt;selection_end_row</div><div class='del'>-	    || end_col != day_view-&gt;selection_end_day) {</div><div class='del'>-		need_redraw = TRUE;</div><div class='del'>-		day_view-&gt;selection_in_top_canvas = FALSE;</div><div class='del'>-		day_view-&gt;selection_end_row = end_row;</div><div class='del'>-		day_view-&gt;selection_end_day = end_col;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (need_redraw) {</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* 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'>-/* Whether we are displaying a work-week, in which case the display always</div><div class='del'>-   starts on the first day of the working week. */</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_work_week_view	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;work_week_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_work_week_view	(EDayView	*day_view,</div><div class='del'>-				 gboolean	 work_week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;work_week_view == work_week_view)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;work_week_view = work_week_view;</div><div class='del'>-</div><div class='del'>-	/* FIXME: need to recalc the first day shown if now work-week view. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_day_view_get_days_shown	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), -1);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;days_shown;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_days_shown	(EDayView	*day_view,</div><div class='del'>-				 gint		 days_shown)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-	g_return_if_fail (days_shown &gt;= 1);</div><div class='del'>-	g_return_if_fail (days_shown &lt;= E_DAY_VIEW_MAX_DAYS);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;days_shown != days_shown) {</div><div class='del'>-		day_view-&gt;days_shown = days_shown;</div><div class='del'>-		e_day_view_recalc_day_starts (day_view, day_view-&gt;lower);</div><div class='del'>-		e_day_view_recalc_cell_sizes (day_view);</div><div class='del'>-		e_day_view_queue_reload_events (day_view);</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'>-/* This specifies the working days in the week. The value is a bitwise</div><div class='del'>-   combination of day flags. Defaults to Mon-Fri. */</div><div class='del'>-EDayViewDays</div><div class='del'>-e_day_view_get_working_days	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), 0);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;working_days;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_working_days	(EDayView	*day_view,</div><div class='del'>-				 EDayViewDays	 days)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;working_days != days) {</div><div class='del'>-		day_view-&gt;working_days = days;</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'>-/* The start and end time of the working day. This only affects the background</div><div class='del'>-   colors. */</div><div class='del'>-void</div><div class='del'>-e_day_view_get_working_day		(EDayView	*day_view,</div><div class='del'>-					 gint		*start_hour,</div><div class='del'>-					 gint		*start_minute,</div><div class='del'>-					 gint		*end_hour,</div><div class='del'>-					 gint		*end_minute)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	*start_hour = day_view-&gt;work_day_start_hour;</div><div class='del'>-	*start_minute = day_view-&gt;work_day_start_minute;</div><div class='del'>-	*end_hour = day_view-&gt;work_day_end_hour;</div><div class='del'>-	*end_minute = day_view-&gt;work_day_end_minute;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_working_day		(EDayView	*day_view,</div><div class='del'>-					 gint		 start_hour,</div><div class='del'>-					 gint		 start_minute,</div><div class='del'>-					 gint		 end_hour,</div><div class='del'>-					 gint		 end_minute)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	day_view-&gt;work_day_start_hour = start_hour;</div><div class='del'>-	day_view-&gt;work_day_start_minute = start_minute;</div><div class='del'>-	day_view-&gt;work_day_end_hour = end_hour;</div><div class='del'>-	day_view-&gt;work_day_end_minute = end_minute;</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether we use 12-hour of 24-hour format. */</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_24_hour_format	(EDayView	*day_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (day_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return day_view-&gt;use_24_hour_format;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_set_24_hour_format	(EDayView	*day_view,</div><div class='del'>-				 gboolean	 use_24_hour)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_DAY_VIEW (day_view));</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;use_24_hour_format != use_24_hour) {</div><div class='del'>-		day_view-&gt;use_24_hour_format = use_24_hour;</div><div class='del'>-</div><div class='del'>-		/* FIXME: Eventually we need to do a re-layout. */</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_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'>-	/* Handle scroll wheel events */</div><div class='del'>-	if (event-&gt;button == 4 || event-&gt;button == 5) {</div><div class='del'>-		GtkAdjustment *adj = GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment;</div><div class='del'>-		gfloat new_value;</div><div class='del'>-</div><div class='del'>-		new_value = adj-&gt;value + ((event-&gt;button == 4) ?</div><div class='del'>-					  -adj-&gt;page_increment / 2:</div><div class='del'>-					  adj-&gt;page_increment / 2);</div><div class='del'>-		new_value = CLAMP (new_value, adj-&gt;lower, adj-&gt;upper - adj-&gt;page_size);</div><div class='del'>-		gtk_adjustment_set_value (adj, new_value);</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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_time_canvas_button_press (GtkWidget      *widget,</div><div class='del'>-					GdkEventButton *event,</div><div class='del'>-					EDayView       *day_view)</div><div class='del'>-{</div><div class='del'>-	/* Handle scroll wheel events */</div><div class='del'>-	if (event-&gt;button == 4 || event-&gt;button == 5) {</div><div class='del'>-		GtkAdjustment *adj = GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment;</div><div class='del'>-		gfloat new_value;</div><div class='del'>-</div><div class='del'>-		new_value = adj-&gt;value + ((event-&gt;button == 4) ?</div><div class='del'>-					  -adj-&gt;page_increment / 2:</div><div class='del'>-					  adj-&gt;page_increment / 2);</div><div class='del'>-		new_value = CLAMP (new_value, adj-&gt;lower, adj-&gt;upper - adj-&gt;page_size);</div><div class='del'>-		gtk_adjustment_set_value (adj, new_value);</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-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 (!(cal_component_has_recurrences (event-&gt;comp))</div><div class='del'>-	    &amp;&amp; (pos == E_DAY_VIEW_POS_LEFT_EDGE</div><div class='del'>-		|| pos == E_DAY_VIEW_POS_RIGHT_EDGE)) {</div><div class='del'>-		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 (!(cal_component_has_recurrences (event-&gt;comp))</div><div class='del'>-	    &amp;&amp; (pos == E_DAY_VIEW_POS_TOP_EDGE</div><div class='del'>-		|| pos == E_DAY_VIEW_POS_BOTTOM_EDGE)) {</div><div class='del'>-		/* 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 (cal_component_has_recurrences (event-&gt;comp)) {</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'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-	e_day_view_get_selected_time_range (day_view, &amp;dtstart, &amp;dtend);</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet (dtstart, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet (dtend, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_edit_object (day_view-&gt;calendar, comp);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_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;comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_delete_occurrence (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	struct icaltimetype *time;</div><div class='del'>-	GSList *list;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We must duplicate the CalComponent, or we won't know it has changed</div><div class='del'>-	   when we get the "update_event" callback. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_component_get_exdate_list (comp, &amp;list);</div><div class='del'>-	time = g_new0 (struct icaltimetype, 1);</div><div class='del'>-	*time = icaltime_from_timet (event-&gt;start, FALSE, FALSE);</div><div class='del'>-	list = g_slist_append (list, time);</div><div class='del'>-	cal_component_set_exdate_list (comp, list);</div><div class='del'>-	cal_component_free_exdate_list (list);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_day_view_on_delete_occurrence(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	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'>-	cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	/* We don't check the return value; FALSE can mean the object was not in</div><div class='del'>-	 * the server anyways.</div><div class='del'>-	 */</div><div class='del'>-	cal_client_remove_object (day_view-&gt;client, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	CalComponent *comp, *new_comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	GSList *list;</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	event = e_day_view_get_popup_menu_event (day_view);</div><div class='del'>-	if (event == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	/* For the recurring object, we add a exception to get rid of the</div><div class='del'>-	   instance. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_component_get_exdate_list (comp, &amp;list);</div><div class='del'>-	*date.value = icaltime_from_timet (event-&gt;start, FALSE, FALSE);</div><div class='del'>-	list = g_slist_append (list, &amp;date);</div><div class='del'>-	cal_component_set_exdate_list (comp, list);</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-</div><div class='del'>-	/* For the unrecurred instance we duplicate the original object,</div><div class='del'>-	   create a new uid for it, get rid of the recurrence rules, and set</div><div class='del'>-	   the start &amp; end times to the instances times. */</div><div class='del'>-	new_comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_component_set_uid (new_comp, cal_component_gen_uid ());</div><div class='del'>-	cal_component_set_rdate_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_rrule_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_exdate_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_exrule_list (new_comp, NULL);</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet (event-&gt;start, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtstart (new_comp, &amp;date);</div><div class='del'>-	*date.value = icaltime_from_timet (event-&gt;end, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtend (new_comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	/* Now update both CalComponents. Note that we do this last since at</div><div class='del'>-	 * present the updates happen synchronously so our event may disappear.</div><div class='del'>-	 */</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, new_comp))</div><div class='del'>-		g_message ("e_day_view_on_unrecur_appointment(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (new_comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static EDayViewEvent*</div><div class='del'>-e_day_view_get_popup_menu_event (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;popup_event_num == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;popup_event_day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		return &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-				       EDayViewEvent,</div><div class='del'>-				       day_view-&gt;popup_event_num);</div><div class='del'>-	else</div><div class='del'>-		return &amp;g_array_index (day_view-&gt;events[day_view-&gt;popup_event_day],</div><div class='del'>-				       EDayViewEvent,</div><div class='del'>-				       day_view-&gt;popup_event_num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_top_canvas_button_release (GtkWidget *widget,</div><div class='del'>-					 GdkEventButton *event,</div><div class='del'>-					 EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_is_being_dragged) {</div><div class='del'>-		gdk_pointer_ungrab (event-&gt;time);</div><div class='del'>-		e_day_view_finish_selection (day_view);</div><div class='del'>-	} else if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-		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 (!(cal_component_has_recurrences (event-&gt;comp))</div><div class='del'>-		    &amp;&amp; (abs (canvas_x - day_view-&gt;drag_event_x) </div><div class='del'>-			&gt; E_DAY_VIEW_DRAG_START_OFFSET</div><div class='del'>-			|| abs (canvas_y - day_view-&gt;drag_event_y) </div><div class='del'>-			&gt; E_DAY_VIEW_DRAG_START_OFFSET)) {</div><div class='del'>-			day_view-&gt;drag_event_day = day_view-&gt;pressed_event_day;</div><div class='del'>-			day_view-&gt;drag_event_num = day_view-&gt;pressed_event_num;</div><div class='del'>-			day_view-&gt;pressed_event_day = -1;</div><div class='del'>-</div><div class='del'>-			/* Hide the horizontal bars. */</div><div class='del'>-			if (day_view-&gt;resize_bars_event_day != -1) {</div><div class='del'>-				day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-				day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-				gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-				gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			target_list = gtk_target_list_new (target_table,</div><div class='del'>-							   n_targets);</div><div class='del'>-			gtk_drag_begin (widget, target_list,</div><div class='del'>-					GDK_ACTION_COPY | GDK_ACTION_MOVE,</div><div class='del'>-					1, (GdkEvent*)mevent);</div><div class='del'>-			gtk_target_list_unref (target_list);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		cursor = day_view-&gt;normal_cursor;</div><div class='del'>-</div><div class='del'>-		/* Recurring events can't be resized. */</div><div class='del'>-		if (event &amp;&amp; !cal_component_has_recurrences (event-&gt;comp)) {</div><div class='del'>-			switch (pos) {</div><div class='del'>-			case E_DAY_VIEW_POS_LEFT_EDGE:</div><div class='del'>-			case E_DAY_VIEW_POS_RIGHT_EDGE:</div><div class='del'>-				cursor = day_view-&gt;resize_width_cursor;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Only set the cursor if it is different to last one set. */</div><div class='del'>-		if (day_view-&gt;last_cursor_set_in_top_canvas != cursor) {</div><div class='del'>-			day_view-&gt;last_cursor_set_in_top_canvas = cursor;</div><div class='del'>-			gdk_window_set_cursor (widget-&gt;window, cursor);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_on_main_canvas_motion (GtkWidget *widget,</div><div class='del'>-				  GdkEventMotion *mevent,</div><div class='del'>-				  EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event = NULL;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint event_x, event_y, scroll_x, scroll_y, canvas_x, canvas_y;</div><div class='del'>-	gint row, day, event_num;</div><div class='del'>-	GdkCursor *cursor;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_main_canvas_motion\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Convert the coords to the main canvas window, or return if the</div><div class='del'>-	   window is not found. */</div><div class='del'>-	if (!e_day_view_convert_event_coords (day_view, (GdkEvent*) mevent,</div><div class='del'>-					      GTK_LAYOUT (widget)-&gt;bin_window,</div><div class='del'>-					      &amp;event_x, &amp;event_y))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	canvas_x = event_x + scroll_x;</div><div class='del'>-	canvas_y = event_y + scroll_y;</div><div class='del'>-</div><div class='del'>-	pos = e_day_view_convert_position_in_main_canvas (day_view,</div><div class='del'>-							  canvas_x, canvas_y,</div><div class='del'>-							  &amp;day, &amp;row,</div><div class='del'>-							  &amp;event_num);</div><div class='del'>-	if (event_num != -1)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_is_being_dragged) {</div><div class='del'>-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {</div><div class='del'>-			e_day_view_update_selection (day_view, day, row);</div><div class='del'>-			e_day_view_check_auto_scroll (day_view,</div><div class='del'>-						      event_x, event_y);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-		if (pos != E_DAY_VIEW_POS_OUTSIDE) {</div><div class='del'>-			e_day_view_update_resize (day_view, row);</div><div class='del'>-			e_day_view_check_auto_scroll (day_view,</div><div class='del'>-						      event_x, event_y);</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	} else if (day_view-&gt;pressed_event_day != -1</div><div class='del'>-		   &amp;&amp; day_view-&gt;pressed_event_day != E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		GtkTargetList *target_list;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day_view-&gt;pressed_event_day], EDayViewEvent, day_view-&gt;pressed_event_num);</div><div class='del'>-</div><div class='del'>-		if (!cal_component_has_recurrences (event-&gt;comp)</div><div class='del'>-		    &amp;&amp; (abs (canvas_x - day_view-&gt;drag_event_x) </div><div class='del'>-			&gt; E_DAY_VIEW_DRAG_START_OFFSET</div><div class='del'>-			|| abs (canvas_y - day_view-&gt;drag_event_y) </div><div class='del'>-			&gt; E_DAY_VIEW_DRAG_START_OFFSET)) {</div><div class='del'>-			day_view-&gt;drag_event_day = day_view-&gt;pressed_event_day;</div><div class='del'>-			day_view-&gt;drag_event_num = day_view-&gt;pressed_event_num;</div><div class='del'>-			day_view-&gt;pressed_event_day = -1;</div><div class='del'>-</div><div class='del'>-			/* Hide the horizontal bars. */</div><div class='del'>-			if (day_view-&gt;resize_bars_event_day != -1) {</div><div class='del'>-				day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-				day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-				gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-				gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			target_list = gtk_target_list_new (target_table,</div><div class='del'>-							   n_targets);</div><div class='del'>-			gtk_drag_begin (widget, target_list,</div><div class='del'>-					GDK_ACTION_COPY | GDK_ACTION_MOVE,</div><div class='del'>-					1, (GdkEvent*)mevent);</div><div class='del'>-			gtk_target_list_unref (target_list);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		cursor = day_view-&gt;normal_cursor;</div><div class='del'>-</div><div class='del'>-		/* Recurring events can't be resized. */</div><div class='del'>-		if (event &amp;&amp; !cal_component_has_recurrences (event-&gt;comp)) {</div><div class='del'>-			switch (pos) {</div><div class='del'>-			case E_DAY_VIEW_POS_LEFT_EDGE:</div><div class='del'>-				cursor = day_view-&gt;move_cursor;</div><div class='del'>-				break;</div><div class='del'>-			case E_DAY_VIEW_POS_TOP_EDGE:</div><div class='del'>-			case E_DAY_VIEW_POS_BOTTOM_EDGE:</div><div class='del'>-				cursor = day_view-&gt;resize_height_cursor;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Only set the cursor if it is different to last one set. */</div><div class='del'>-		if (day_view-&gt;last_cursor_set_in_main_canvas != cursor) {</div><div class='del'>-			day_view-&gt;last_cursor_set_in_main_canvas = cursor;</div><div class='del'>-			gdk_window_set_cursor (widget-&gt;window, cursor);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets the selection to a single cell. If day is -1 then the current</div><div class='del'>-   start day is reused. If row is -1 then the selection is in the top canvas.</div><div class='del'>-*/</div><div class='del'>-void</div><div class='del'>-e_day_view_start_selection (EDayView *day_view,</div><div class='del'>-			    gint day,</div><div class='del'>-			    gint row)</div><div class='del'>-{</div><div class='del'>-	if (day == -1) {</div><div class='del'>-		day = day_view-&gt;selection_start_day;</div><div class='del'>-		if (day == -1)</div><div class='del'>-			day = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_start_day = day;</div><div class='del'>-	day_view-&gt;selection_end_day = day;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_start_row = row;</div><div class='del'>-	day_view-&gt;selection_end_row = row;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_is_being_dragged = TRUE;</div><div class='del'>-	day_view-&gt;selection_drag_pos = E_DAY_VIEW_DRAG_END;</div><div class='del'>-	day_view-&gt;selection_in_top_canvas = (row == -1) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Updates the selection during a drag. If day is -1 the selection day is</div><div class='del'>-   unchanged. */</div><div class='del'>-void</div><div class='del'>-e_day_view_update_selection (EDayView *day_view,</div><div class='del'>-			     gint day,</div><div class='del'>-			     gint row)</div><div class='del'>-{</div><div class='del'>-	gboolean need_redraw = FALSE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Updating selection %i,%i\n", day, row);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	day_view-&gt;selection_in_top_canvas = (row == -1) ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	if (day == -1)</div><div class='del'>-		day = (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-			? day_view-&gt;selection_start_day</div><div class='del'>-			: day_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START) {</div><div class='del'>-		if (row != day_view-&gt;selection_start_row</div><div class='del'>-		    || day != day_view-&gt;selection_start_day) {</div><div class='del'>-			need_redraw = TRUE;</div><div class='del'>-			day_view-&gt;selection_start_row = row;</div><div class='del'>-			day_view-&gt;selection_start_day = day;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (row != day_view-&gt;selection_end_row</div><div class='del'>-		    || day != day_view-&gt;selection_end_day) {</div><div class='del'>-			need_redraw = TRUE;</div><div class='del'>-			day_view-&gt;selection_end_row = row;</div><div class='del'>-			day_view-&gt;selection_end_day = day;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	if (need_redraw) {</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_normalize_selection (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	gint tmp_row, tmp_day;</div><div class='del'>-</div><div class='del'>-	/* Switch the drag position if necessary. */</div><div class='del'>-	if (day_view-&gt;selection_start_day &gt; day_view-&gt;selection_end_day</div><div class='del'>-	    || (day_view-&gt;selection_start_day == day_view-&gt;selection_end_day</div><div class='del'>-		&amp;&amp; day_view-&gt;selection_start_row &gt; day_view-&gt;selection_end_row)) {</div><div class='del'>-		tmp_row = day_view-&gt;selection_start_row;</div><div class='del'>-		tmp_day = day_view-&gt;selection_start_day;</div><div class='del'>-		day_view-&gt;selection_start_day = day_view-&gt;selection_end_day;</div><div class='del'>-		day_view-&gt;selection_start_row = day_view-&gt;selection_end_row;</div><div class='del'>-		day_view-&gt;selection_end_day = tmp_day;</div><div class='del'>-		day_view-&gt;selection_end_row = tmp_row;</div><div class='del'>-		if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-			day_view-&gt;selection_drag_pos = E_DAY_VIEW_DRAG_END;</div><div class='del'>-		else</div><div class='del'>-			day_view-&gt;selection_drag_pos = E_DAY_VIEW_DRAG_START;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_day_view_finish_selection (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	day_view-&gt;selection_is_being_dragged = FALSE;</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_long_event_resize (EDayView *day_view,</div><div class='del'>-				     gint day)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-	gboolean need_reshape = FALSE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Updating resize Day:%i\n", day);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {</div><div class='del'>-		day = MIN (day, day_view-&gt;resize_end_row);</div><div class='del'>-		if (day != day_view-&gt;resize_start_row) {</div><div class='del'>-			need_reshape = TRUE;</div><div class='del'>-			day_view-&gt;resize_start_row = day;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		day = MAX (day, day_view-&gt;resize_start_row);</div><div class='del'>-		if (day != day_view-&gt;resize_end_row) {</div><div class='del'>-			need_reshape = TRUE;</div><div class='del'>-			day_view-&gt;resize_end_row = day;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	if (need_reshape) {</div><div class='del'>-		e_day_view_reshape_long_event (day_view, event_num);</div><div class='del'>-		e_day_view_reshape_resize_long_event_rect_item (day_view);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_resize (EDayView *day_view,</div><div class='del'>-			  gint row)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	gboolean need_reshape = FALSE;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("Updating resize Row:%i\n", row);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;resize_event_day;</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {</div><div class='del'>-		row = MIN (row, day_view-&gt;resize_end_row);</div><div class='del'>-		if (row != day_view-&gt;resize_start_row) {</div><div class='del'>-			need_reshape = TRUE;</div><div class='del'>-			day_view-&gt;resize_start_row = row;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		row = MAX (row, day_view-&gt;resize_start_row);</div><div class='del'>-		if (row != day_view-&gt;resize_end_row) {</div><div class='del'>-			need_reshape = TRUE;</div><div class='del'>-			day_view-&gt;resize_end_row = row;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	if (need_reshape) {</div><div class='del'>-		e_day_view_reshape_day_event (day_view, day, event_num);</div><div class='del'>-		e_day_view_reshape_resize_rect_item (day_view);</div><div class='del'>-		e_day_view_reshape_main_canvas_resize_bars (day_view);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This converts the resize start or end row back to a time and updates the</div><div class='del'>-   event. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_finish_long_event_resize (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* We use a temporary copy of the comp since we don't want to</div><div class='del'>-	   change the original comp here. Otherwise we would not detect that</div><div class='del'>-	   the event's time had changed in the "update_event" callback. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_LEFT_EDGE) {</div><div class='del'>-		dt = day_view-&gt;day_starts[day_view-&gt;resize_start_row];</div><div class='del'>-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-	} else {</div><div class='del'>-		dt = day_view-&gt;day_starts[day_view-&gt;resize_end_row + 1];</div><div class='del'>-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);</div><div class='del'>-		cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_long_event_rect_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_drag_pos = E_DAY_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_day_view_finish_long_event_resize(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This converts the resize start or end row back to a time and updates the</div><div class='del'>-   event. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_finish_resize (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;resize_event_day;</div><div class='del'>-	event_num = day_view-&gt;resize_event_num;</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* We use a temporary shallow copy of the ico since we don't want to</div><div class='del'>-	   change the original ico here. Otherwise we would not detect that</div><div class='del'>-	   the event's time had changed in the "update_event" callback. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_TOP_EDGE) {</div><div class='del'>-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view-&gt;resize_start_row);</div><div class='del'>-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);</div><div class='del'>-		cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-	} else {</div><div class='del'>-		dt = e_day_view_convert_grid_position_to_time (day_view, day, day_view-&gt;resize_end_row + 1);</div><div class='del'>-		*date.value = icaltime_from_timet (dt, FALSE, FALSE);</div><div class='del'>-		cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_rect_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;resize_bar_item);</div><div class='del'>-</div><div class='del'>-	/* Hide the horizontal bars. */</div><div class='del'>-	day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_drag_pos = E_DAY_VIEW_POS_NONE;</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_day_view_finish_resize(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_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'>-/* This frees any events currently loaded, and queues a reload. */</div><div class='del'>-static void</div><div class='del'>-e_day_view_queue_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'>-	if (day_view-&gt;reload_events_idle_id == 0) {</div><div class='del'>-		/* We'll use a high idle priority here, so the events are</div><div class='del'>-		   reloaded before the canvas is updated. */</div><div class='del'>-		day_view-&gt;reload_events_idle_id = g_idle_add_full</div><div class='del'>-			(G_PRIORITY_HIGH_IDLE,</div><div class='del'>-			 e_day_view_reload_events_idle_cb, day_view, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_reload_events_idle_cb	(gpointer data)</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</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'>-	GDK_THREADS_ENTER ();</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (data);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;reload_events_idle_id = 0;</div><div class='del'>-</div><div class='del'>-	e_day_view_reload_events (day_view);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_LEAVE ();</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_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'>-	if (!(day_view-&gt;client &amp;&amp; cal_client_is_loaded (day_view-&gt;client)))</div><div class='del'>-		return;</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'>-		cal_client_generate_instances (day_view-&gt;client,</div><div class='del'>-					       CALOBJ_TYPE_EVENT,</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'>-	/* Reset all our indices. */</div><div class='del'>-	day_view-&gt;editing_event_day = -1;</div><div class='del'>-	day_view-&gt;popup_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_event_day = -1;</div><div class='del'>-	day_view-&gt;pressed_event_day = -1;</div><div class='del'>-	day_view-&gt;drag_event_day = -1;</div><div class='del'>-</div><div class='del'>-	e_day_view_free_event_array (day_view, day_view-&gt;long_events);</div><div class='del'>-</div><div class='del'>-	for (day = 0; day &lt; E_DAY_VIEW_MAX_DAYS; day++)</div><div class='del'>-		e_day_view_free_event_array (day_view, day_view-&gt;events[day]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_free_event_array (EDayView *day_view,</div><div class='del'>-			     GArray *array)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; array-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (array, EDayViewEvent, event_num);</div><div class='del'>-		if (event-&gt;canvas_item)</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (array, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This adds one event to the view, adding it to the appropriate array. */</div><div class='del'>-static gboolean</div><div class='del'>-e_day_view_add_event (CalComponent *comp,</div><div class='del'>-		      time_t	  start,</div><div class='del'>-		      time_t	  end,</div><div class='del'>-		      gpointer	  data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	EDayView *day_view;</div><div class='del'>-	EDayViewEvent event;</div><div class='del'>-	gint day, offset;</div><div class='del'>-	struct 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'>-#if 0</div><div class='del'>-	g_print ("Day view lower: %s", ctime (&amp;day_view-&gt;lower));</div><div class='del'>-	g_print ("Day view upper: %s", ctime (&amp;day_view-&gt;upper));</div><div class='del'>-	g_print ("Event start: %s", ctime (&amp;start));</div><div class='del'>-	g_print ("Event end  : %s\n", ctime (&amp;end));</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* Check that the event times are valid. */</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, TRUE);</div><div class='del'>-	g_return_val_if_fail (start &lt; day_view-&gt;upper, TRUE);</div><div class='del'>-	g_return_val_if_fail (end &gt; day_view-&gt;lower, TRUE);</div><div class='del'>-</div><div class='del'>-	start_tm = *(localtime (&amp;start));</div><div class='del'>-	end_tm = *(localtime (&amp;end));</div><div class='del'>-</div><div class='del'>-	event.comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-	event.start = start;</div><div class='del'>-	event.end = end;</div><div class='del'>-	event.canvas_item = NULL;</div><div class='del'>-</div><div class='del'>-	/* Calculate the start &amp; end minute, relative to the top of the</div><div class='del'>-	   display. */</div><div class='del'>-	offset = day_view-&gt;first_hour_shown * 60</div><div class='del'>-		+ day_view-&gt;first_minute_shown;</div><div class='del'>-	event.start_minute = start_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'>-	CalComponent *comp;</div><div class='del'>-	gint min_text_x, max_text_w, text_width, line_len;</div><div class='del'>-	gchar *text, *end_of_line;</div><div class='del'>-	gboolean show_icons = TRUE, use_max_width = FALSE;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_get_long_event_position (day_view, event_num,</div><div class='del'>-						 &amp;start_day, &amp;end_day,</div><div class='del'>-						 &amp;item_x, &amp;item_y,</div><div class='del'>-						 &amp;item_w, &amp;item_h)) {</div><div class='del'>-		if (event-&gt;canvas_item) {</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-			event-&gt;canvas_item = NULL;</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Take off the border and padding. */</div><div class='del'>-	item_x += E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD;</div><div class='del'>-	item_w -= (E_DAY_VIEW_LONG_EVENT_BORDER_WIDTH + E_DAY_VIEW_LONG_EVENT_X_PAD) * 2;</div><div class='del'>-	item_y += E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD;</div><div class='del'>-	item_h -= (E_DAY_VIEW_LONG_EVENT_BORDER_HEIGHT + E_DAY_VIEW_LONG_EVENT_Y_PAD) * 2;</div><div class='del'>-</div><div class='del'>-	/* We don't show the icons while resizing, since we'd have to</div><div class='del'>-	   draw them on top of the resize rect. Nor when editing. */</div><div class='del'>-	num_icons = 0;</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-	font = GTK_WIDGET (day_view)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_day == E_DAY_VIEW_LONG_EVENT</div><div class='del'>-	    &amp;&amp; day_view-&gt;resize_event_num == event_num)</div><div class='del'>-		show_icons = FALSE;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;editing_event_day == E_DAY_VIEW_LONG_EVENT</div><div class='del'>-	    &amp;&amp; day_view-&gt;editing_event_num == event_num) {</div><div class='del'>-		show_icons = FALSE;</div><div class='del'>-		use_max_width = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (show_icons) {</div><div class='del'>-		if (cal_component_has_alarms (comp))</div><div class='del'>-			num_icons++;</div><div class='del'>-		if (cal_component_has_recurrences (comp))</div><div class='del'>-			num_icons++;</div><div class='del'>-	}</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'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_get_event_position (day_view, day, event_num,</div><div class='del'>-					    &amp;item_x, &amp;item_y,</div><div class='del'>-					    &amp;item_w, &amp;item_h)) {</div><div class='del'>-		if (event-&gt;canvas_item) {</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (event-&gt;canvas_item));</div><div class='del'>-			event-&gt;canvas_item = NULL;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Skip the border and padding. */</div><div class='del'>-		item_x += E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD;</div><div class='del'>-		item_w -= E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD * 2;</div><div class='del'>-		item_y += E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD;</div><div class='del'>-		item_h -= (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2;</div><div class='del'>-</div><div class='del'>-		/* We don't show the icons while resizing, since we'd have to</div><div class='del'>-		   draw them on top of the resize rect. */</div><div class='del'>-		num_icons = 0;</div><div class='del'>-		if (day_view-&gt;resize_drag_pos == E_DAY_VIEW_POS_NONE</div><div class='del'>-		    || day_view-&gt;resize_event_day != day</div><div class='del'>-		    || day_view-&gt;resize_event_num != event_num) {</div><div class='del'>-			if (cal_component_has_alarms (comp))</div><div class='del'>-				num_icons++;</div><div class='del'>-			if (cal_component_has_recurrences (comp))</div><div class='del'>-				num_icons++;</div><div class='del'>-		}</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'>-	CalComponent *comp;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	gchar *initial_text;</div><div class='del'>-	guint keyval;</div><div class='del'>-	gboolean stop_emission;</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_DAY_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	day_view = E_DAY_VIEW (widget);</div><div class='del'>-	keyval = event-&gt;keyval;</div><div class='del'>-</div><div class='del'>-	/* The Escape key aborts a resize operation. */</div><div class='del'>-	if (day_view-&gt;resize_drag_pos != E_DAY_VIEW_POS_NONE) {</div><div class='del'>-		if (keyval == GDK_Escape) {</div><div class='del'>-			e_day_view_abort_resize (day_view, event-&gt;time);</div><div class='del'>-		}</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Handle the cursor keys for moving &amp; extending the selection. */</div><div class='del'>-	stop_emission = TRUE;</div><div class='del'>-	if (event-&gt;state &amp; GDK_SHIFT_MASK) {</div><div class='del'>-		switch (keyval) {</div><div class='del'>-		case GDK_Up:</div><div class='del'>-			e_day_view_cursor_key_up_shifted (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Down:</div><div class='del'>-			e_day_view_cursor_key_down_shifted (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Left:</div><div class='del'>-			e_day_view_cursor_key_left_shifted (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Right:</div><div class='del'>-			e_day_view_cursor_key_right_shifted (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			stop_emission = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		switch (keyval) {</div><div class='del'>-		case GDK_Up:</div><div class='del'>-			e_day_view_cursor_key_up (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Down:</div><div class='del'>-			e_day_view_cursor_key_down (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Left:</div><div class='del'>-			e_day_view_cursor_key_left (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		case GDK_Right:</div><div class='del'>-			e_day_view_cursor_key_right (day_view, event);</div><div class='del'>-			break;</div><div class='del'>-		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'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-</div><div class='del'>-	e_day_view_get_selected_time_range (day_view, &amp;dtstart, &amp;dtend);</div><div class='del'>-</div><div class='del'>-	dt.value = &amp;itt;</div><div class='del'>-	dt.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	*dt.value = icaltime_from_timet (dtstart, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	*dt.value = icaltime_from_timet (dtend, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;dt);</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 (comp, dtstart, dtend, day_view);</div><div class='del'>-	e_day_view_check_layout (day_view);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	if (e_day_view_find_event_from_uid (day_view, uid, &amp;day, &amp;event_num)) {</div><div class='del'>-		e_day_view_start_editing_event (day_view, day, event_num,</div><div class='del'>-						initial_text);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Couldn't find event to start editing.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_up_shifted (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	gint *row;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-		row = &amp;day_view-&gt;selection_start_row;</div><div class='del'>-	else</div><div class='del'>-		row = &amp;day_view-&gt;selection_end_row;</div><div class='del'>-</div><div class='del'>-	if (*row == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*row = *row - 1;</div><div class='del'>-</div><div class='del'>-	e_day_view_ensure_rows_visible (day_view, *row, *row);</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_down_shifted (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	gint *row;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-		row = &amp;day_view-&gt;selection_start_row;</div><div class='del'>-	else</div><div class='del'>-		row = &amp;day_view-&gt;selection_end_row;</div><div class='del'>-</div><div class='del'>-	if (*row &gt;= day_view-&gt;rows - 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*row = *row + 1;</div><div class='del'>-</div><div class='del'>-	e_day_view_ensure_rows_visible (day_view, *row, *row);</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_left_shifted (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	gint *day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-		day = &amp;day_view-&gt;selection_start_day;</div><div class='del'>-	else</div><div class='del'>-		day = &amp;day_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-	if (*day == 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*day = *day - 1;</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_right_shifted (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	gint *day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_drag_pos == E_DAY_VIEW_DRAG_START)</div><div class='del'>-		day = &amp;day_view-&gt;selection_start_day;</div><div class='del'>-	else</div><div class='del'>-		day = &amp;day_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-	if (*day &gt;= day_view-&gt;days_shown - 1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*day = *day + 1;</div><div class='del'>-</div><div class='del'>-	e_day_view_normalize_selection (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_up (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_start_day == -1) {</div><div class='del'>-		day_view-&gt;selection_start_day = 0;</div><div class='del'>-		day_view-&gt;selection_start_row = 0;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;selection_end_day = day_view-&gt;selection_start_day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas) {</div><div class='del'>-		return;</div><div class='del'>-	} else if (day_view-&gt;selection_start_row == 0) {</div><div class='del'>-		day_view-&gt;selection_in_top_canvas = TRUE;</div><div class='del'>-		day_view-&gt;selection_start_row = -1;</div><div class='del'>-	} else {</div><div class='del'>-		day_view-&gt;selection_start_row--;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;selection_end_row = day_view-&gt;selection_start_row;</div><div class='del'>-</div><div class='del'>-	if (!day_view-&gt;selection_in_top_canvas)</div><div class='del'>-		e_day_view_ensure_rows_visible (day_view,</div><div class='del'>-						day_view-&gt;selection_start_row,</div><div class='del'>-						day_view-&gt;selection_end_row);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_down (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_start_day == -1) {</div><div class='del'>-		day_view-&gt;selection_start_day = 0;</div><div class='del'>-		day_view-&gt;selection_start_row = 0;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;selection_end_day = day_view-&gt;selection_start_day;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;selection_in_top_canvas) {</div><div class='del'>-		day_view-&gt;selection_in_top_canvas = FALSE;</div><div class='del'>-		day_view-&gt;selection_start_row = 0;</div><div class='del'>-	} else if (day_view-&gt;selection_start_row &gt;= day_view-&gt;rows - 1) {</div><div class='del'>-		return;</div><div class='del'>-	} else {</div><div class='del'>-		day_view-&gt;selection_start_row++;</div><div class='del'>-	}</div><div class='del'>-	day_view-&gt;selection_end_row = day_view-&gt;selection_start_row;</div><div class='del'>-</div><div class='del'>-	if (!day_view-&gt;selection_in_top_canvas)</div><div class='del'>-		e_day_view_ensure_rows_visible (day_view,</div><div class='del'>-						day_view-&gt;selection_start_row,</div><div class='del'>-						day_view-&gt;selection_end_row);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_calendar_selection_time (day_view);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Optimise? */</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_cursor_key_left (EDayView *day_view, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	if (day_view-&gt;selection_start_day == 0) {</div><div class='del'>-		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 TRUE;</div><div class='del'>-	if (start_row == 0 &amp;&amp; end_row == day_view-&gt;rows)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	/* If any of the rows already have E_DAY_VIEW_MAX_COLUMNS columns,</div><div class='del'>-	   return FALSE. */</div><div class='del'>-	for (row = start_row; row &lt;= end_row; row++) {</div><div class='del'>-		if (day_view-&gt;cols_per_row[day][row] &gt;= E_DAY_VIEW_MAX_COLUMNS)</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_ensure_rows_visible (EDayView *day_view,</div><div class='del'>-				gint start_row,</div><div class='del'>-				gint end_row)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	gfloat value, min_value, max_value;</div><div class='del'>-</div><div class='del'>-	adj = GTK_LAYOUT (day_view-&gt;main_canvas)-&gt;vadjustment;</div><div class='del'>-</div><div class='del'>-	value = adj-&gt;value;</div><div class='del'>-</div><div class='del'>-	min_value = (end_row + 1) * day_view-&gt;row_height - adj-&gt;page_size;</div><div class='del'>-	if (value &lt; min_value)</div><div class='del'>-		value = min_value;</div><div class='del'>-</div><div class='del'>-	max_value = start_row * day_view-&gt;row_height;</div><div class='del'>-	if (value &gt; max_value)</div><div class='del'>-		value = max_value;</div><div class='del'>-</div><div class='del'>-	if (value != adj-&gt;value) {</div><div class='del'>-		adj-&gt;value = value;</div><div class='del'>-		gtk_adjustment_value_changed (adj);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_start_editing_event (EDayView *day_view,</div><div class='del'>-				gint	  day,</div><div class='del'>-				gint	  event_num,</div><div class='del'>-				gchar    *initial_text)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	ETextEventProcessor *event_processor = NULL;</div><div class='del'>-	ETextEventProcessorCommand command;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_start_editing_event\n");</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* If we are already editing the event, just return. */</div><div class='del'>-	if (day == day_view-&gt;editing_event_day</div><div class='del'>-	    &amp;&amp; event_num == day_view-&gt;editing_event_num)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the event is not shown, don't try to edit it. */</div><div class='del'>-	if (!event-&gt;canvas_item)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* We must grab the focus before setting the initial text, since</div><div class='del'>-	   grabbing the focus will result in a call to</div><div class='del'>-	   e_day_view_on_editing_started(), which will reset the text to get</div><div class='del'>-	   rid of the start and end times. */</div><div class='del'>-	e_canvas_item_grab_focus (event-&gt;canvas_item);</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'>-	CalComponentText summary;</div><div class='del'>-</div><div class='del'>-	/* Note: the item we are passed here isn't reliable, so we just stop</div><div class='del'>-	   the edit of whatever item was being edited. We also receive this</div><div class='del'>-	   event twice for some reason. */</div><div class='del'>-	day = day_view-&gt;editing_event_day;</div><div class='del'>-	event_num = day_view-&gt;editing_event_num;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("In e_day_view_on_editing_stopped Day:%i Event:%i\n",</div><div class='del'>-		 day, event_num);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* If no item is being edited, just return. */</div><div class='del'>-	if (day == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		editing_long_event = TRUE;</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		/* Hide the horizontal bars. */</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reset the edit fields. */</div><div class='del'>-	day_view-&gt;editing_event_day = -1;</div><div class='del'>-	day_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;resize_bars_event_day = -1;</div><div class='del'>-	day_view-&gt;resize_bars_event_num = -1;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (event-&gt;canvas_item),</div><div class='del'>-			"text", &amp;text,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* Only update the summary if necessary. */</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	if (text &amp;&amp; summary.value &amp;&amp; !strcmp (text, summary.value)) {</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 (text) {</div><div class='del'>-		summary.value = text;</div><div class='del'>-		summary.altrep = NULL;</div><div class='del'>-		cal_component_set_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-		g_free (text);</div><div class='del'>-	} else</div><div class='del'>-		cal_component_set_summary (event-&gt;comp, NULL);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (day_view-&gt;client, event-&gt;comp))</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'>-</div><div class='del'>-	*item_x = day_view-&gt;day_offsets[day]</div><div class='del'>-		+ day_view-&gt;day_widths[day] * start_col / cols_in_row;</div><div class='del'>-	*item_w = day_view-&gt;day_widths[day] * num_columns / cols_in_row</div><div class='del'>-		- E_DAY_VIEW_GAP_WIDTH;</div><div class='del'>-	*item_w = MAX (*item_w, 0);</div><div class='del'>-	*item_y = start_row * day_view-&gt;row_height;</div><div class='del'>-#if 0</div><div class='del'>-	*item_h = (end_row - start_row + 1) * day_view-&gt;row_height;</div><div class='del'>-#else</div><div class='del'>-	/* This makes the event end on the grid line of the next row,</div><div class='del'>-	   which maybe looks nicer if you have 2 events on consecutive rows. */</div><div class='del'>-	*item_h = (end_row - start_row + 1) * day_view-&gt;row_height + 1;</div><div class='del'>-#endif</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_day_view_get_long_event_position	(EDayView	*day_view,</div><div class='del'>-					 gint		 event_num,</div><div class='del'>-					 gint		*start_day,</div><div class='del'>-					 gint		*end_day,</div><div class='del'>-					 gint		*item_x,</div><div class='del'>-					 gint		*item_y,</div><div class='del'>-					 gint		*item_w,</div><div class='del'>-					 gint		*item_h)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-				event_num);</div><div class='del'>-</div><div class='del'>-	/* If the event is flagged as not displayed, return FALSE. */</div><div class='del'>-	if (event-&gt;num_columns == 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (!e_day_view_find_long_event_days (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'>-		CalComponentText summary;</div><div class='del'>-</div><div class='del'>-		cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-		if (event) {</div><div class='del'>-			cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-			text = g_strdup (summary.value);</div><div class='del'>-		} else {</div><div class='del'>-			text = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (day_view-&gt;drag_long_event_item,</div><div class='del'>-				       "text", text ? text : "",</div><div class='del'>-				       NULL);</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_long_event_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_long_event_item);</div><div class='del'>-</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_day_view_on_main_canvas_drag_motion (GtkWidget      *widget,</div><div class='del'>-				       GdkDragContext *context,</div><div class='del'>-				       gint            x,</div><div class='del'>-				       gint            y,</div><div class='del'>-				       guint           time,</div><div class='del'>-				       EDayView	      *day_view)</div><div class='del'>-{</div><div class='del'>-	gint scroll_x, scroll_y;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	day_view-&gt;drag_event_x = x + scroll_x;</div><div class='del'>-	day_view-&gt;drag_event_y = y + scroll_y;</div><div class='del'>-</div><div class='del'>-	e_day_view_reshape_main_canvas_drag_item (day_view);</div><div class='del'>-	e_day_view_reshape_main_canvas_resize_bars (day_view);</div><div class='del'>-</div><div class='del'>-	e_day_view_check_auto_scroll (day_view, x, y);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_reshape_main_canvas_drag_item (EDayView *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint x, y, day, row;</div><div class='del'>-</div><div class='del'>-	/* Calculate the day &amp; start row of the event being dragged, using</div><div class='del'>-	   the current mouse position. */</div><div class='del'>-	x = day_view-&gt;drag_event_x;</div><div class='del'>-	y = day_view-&gt;drag_event_y;</div><div class='del'>-	pos = e_day_view_convert_position_in_main_canvas (day_view, x, y,</div><div class='del'>-							  &amp;day, &amp;row, NULL);</div><div class='del'>-	/* This shouldn't really happen in a drag. */</div><div class='del'>-	if (pos == E_DAY_VIEW_POS_OUTSIDE)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;drag_event_day != -1</div><div class='del'>-	    &amp;&amp; day_view-&gt;drag_event_day != E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		row -= day_view-&gt;drag_event_offset;</div><div class='del'>-	row = MAX (row, 0);</div><div class='del'>-</div><div class='del'>-	e_day_view_update_main_canvas_drag (day_view, row, day);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_update_main_canvas_drag (EDayView *day_view,</div><div class='del'>-				    gint row,</div><div class='del'>-				    gint day)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event = NULL;</div><div class='del'>-	gint cols_in_row, start_col, num_columns, num_rows, start_row, end_row;</div><div class='del'>-	gdouble item_x, item_y, item_w, item_h;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gchar *text;</div><div class='del'>-</div><div class='del'>-	/* If the position hasn't changed, just return. */</div><div class='del'>-	if (day_view-&gt;drag_last_day == day</div><div class='del'>-	    &amp;&amp; day_view-&gt;drag_last_row == row</div><div class='del'>-	    &amp;&amp; (day_view-&gt;drag_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_last_day = day;</div><div class='del'>-	day_view-&gt;drag_last_row = row;</div><div class='del'>-</div><div class='del'>-	/* Calculate the event's position. If the event is in the same</div><div class='del'>-	   position we started in, we use the same columns. */</div><div class='del'>-	cols_in_row = 1;</div><div class='del'>-	start_row = 0;</div><div class='del'>-	start_col = 0;</div><div class='del'>-	num_columns = 1;</div><div class='del'>-	num_rows = 1;</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;drag_event_day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					day_view-&gt;drag_event_num);</div><div class='del'>-	} else if (day_view-&gt;drag_event_day != -1) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day_view-&gt;drag_event_day],</div><div class='del'>-					EDayViewEvent,</div><div class='del'>-					day_view-&gt;drag_event_num);</div><div class='del'>-		start_row = event-&gt;start_minute / day_view-&gt;mins_per_row;</div><div class='del'>-		end_row = (event-&gt;end_minute - 1) / day_view-&gt;mins_per_row;</div><div class='del'>-		num_rows = end_row - start_row + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (day_view-&gt;drag_event_day == day &amp;&amp; start_row == row) {</div><div class='del'>-		cols_in_row = day_view-&gt;cols_per_row[day][row];</div><div class='del'>-		start_col = event-&gt;start_row_or_col;</div><div class='del'>-		num_columns = event-&gt;num_columns;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	item_x = day_view-&gt;day_offsets[day]</div><div class='del'>-		+ day_view-&gt;day_widths[day] * start_col / cols_in_row;</div><div class='del'>-	item_w = day_view-&gt;day_widths[day] * num_columns / cols_in_row</div><div class='del'>-		- E_DAY_VIEW_GAP_WIDTH;</div><div class='del'>-	item_y = row * day_view-&gt;row_height;</div><div class='del'>-	item_h = num_rows * day_view-&gt;row_height;</div><div class='del'>-</div><div class='del'>-	/* Set the positions of the event &amp; associated items. */</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_rect_item,</div><div class='del'>-			       "x1", item_x + E_DAY_VIEW_BAR_WIDTH - 1,</div><div class='del'>-			       "y1", item_y,</div><div class='del'>-			       "x2", item_x + item_w - 1,</div><div class='del'>-			       "y2", item_y + item_h - 1,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_bar_item,</div><div class='del'>-			       "x1", item_x,</div><div class='del'>-			       "y1", item_y,</div><div class='del'>-			       "x2", item_x + E_DAY_VIEW_BAR_WIDTH - 1,</div><div class='del'>-			       "y2", item_y + item_h - 1,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	font = GTK_WIDGET (day_view)-&gt;style-&gt;font;</div><div class='del'>-	gnome_canvas_item_set (day_view-&gt;drag_item,</div><div class='del'>-			       "font_gdk", font,</div><div class='del'>-			       "clip_width", item_w - E_DAY_VIEW_BAR_WIDTH - E_DAY_VIEW_EVENT_X_PAD * 2,</div><div class='del'>-			       "clip_height", item_h - (E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD) * 2,</div><div class='del'>-			       NULL);</div><div class='del'>-	e_canvas_item_move_absolute (day_view-&gt;drag_item,</div><div class='del'>-				     item_x + E_DAY_VIEW_BAR_WIDTH + E_DAY_VIEW_EVENT_X_PAD,</div><div class='del'>-				     item_y + E_DAY_VIEW_EVENT_BORDER_HEIGHT + E_DAY_VIEW_EVENT_Y_PAD);</div><div class='del'>-</div><div class='del'>-	if (!(day_view-&gt;drag_bar_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE)) {</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_bar_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_bar_item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!(day_view-&gt;drag_rect_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE)) {</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_rect_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_rect_item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the text, if necessary. We don't want to set the text every</div><div class='del'>-	   time it moves, so we check if it is currently invisible and only</div><div class='del'>-	   set the text then. */</div><div class='del'>-	if (!(day_view-&gt;drag_item-&gt;object.flags &amp; GNOME_CANVAS_ITEM_VISIBLE)) {</div><div class='del'>-		CalComponentText summary;</div><div class='del'>-</div><div class='del'>-		if (event) {</div><div class='del'>-			cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-			text = g_strdup (summary.value);</div><div class='del'>-		} else {</div><div class='del'>-			text = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (day_view-&gt;drag_item,</div><div class='del'>-				       "text", text ? text : "",</div><div class='del'>-				       NULL);</div><div class='del'>-		gnome_canvas_item_raise_to_top (day_view-&gt;drag_item);</div><div class='del'>-		gnome_canvas_item_show (day_view-&gt;drag_item);</div><div class='del'>-</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_top_canvas_drag_leave (GtkWidget      *widget,</div><div class='del'>-				     GdkDragContext *context,</div><div class='del'>-				     guint           time,</div><div class='del'>-				     EDayView	     *day_view)</div><div class='del'>-{</div><div class='del'>-	day_view-&gt;drag_last_day = -1;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_long_event_rect_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_long_event_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_main_canvas_drag_leave (GtkWidget      *widget,</div><div class='del'>-				      GdkDragContext *context,</div><div class='del'>-				      guint           time,</div><div class='del'>-				      EDayView	     *day_view)</div><div class='del'>-{</div><div class='del'>-	day_view-&gt;drag_last_day = -1;</div><div class='del'>-</div><div class='del'>-	e_day_view_stop_auto_scroll (day_view);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_rect_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_bar_item);</div><div class='del'>-	gnome_canvas_item_hide (day_view-&gt;drag_item);</div><div class='del'>-</div><div class='del'>-	/* Hide the resize bars if they are being used in the drag. */</div><div class='del'>-	if (day_view-&gt;drag_event_day == day_view-&gt;resize_bars_event_day</div><div class='del'>-	    &amp;&amp; day_view-&gt;drag_event_num == day_view-&gt;resize_bars_event_num) {</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_top_resize_bar_item);</div><div class='del'>-		gnome_canvas_item_hide (day_view-&gt;main_canvas_bottom_resize_bar_item);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_drag_begin (GtkWidget      *widget,</div><div class='del'>-			  GdkDragContext *context,</div><div class='del'>-			  EDayView	 *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;drag_event_day;</div><div class='del'>-	event_num = day_view-&gt;drag_event_num;</div><div class='del'>-</div><div class='del'>-	/* These should both be set. */</div><div class='del'>-	g_return_if_fail (day != -1);</div><div class='del'>-	g_return_if_fail (event_num != -1);</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-	/* Hide the text item, since it will be shown in the special drag</div><div class='del'>-	   items. */</div><div class='del'>-	gnome_canvas_item_hide (event-&gt;canvas_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_drag_end (GtkWidget      *widget,</div><div class='del'>-			GdkDragContext *context,</div><div class='del'>-			EDayView       *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;drag_event_day;</div><div class='del'>-	event_num = day_view-&gt;drag_event_num;</div><div class='del'>-</div><div class='del'>-	/* If the calendar has already been updated in drag_data_received()</div><div class='del'>-	   we just return. */</div><div class='del'>-	if (day == -1 || event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;top_canvas);</div><div class='del'>-	} else {</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day], EDayViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		gtk_widget_queue_draw (day_view-&gt;main_canvas);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Show the text item again. */</div><div class='del'>-	gnome_canvas_item_show (event-&gt;canvas_item);</div><div class='del'>-</div><div class='del'>-	day_view-&gt;drag_event_day = -1;</div><div class='del'>-	day_view-&gt;drag_event_num = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_drag_data_get (GtkWidget          *widget,</div><div class='del'>-			     GdkDragContext     *context,</div><div class='del'>-			     GtkSelectionData   *selection_data,</div><div class='del'>-			     guint               info,</div><div class='del'>-			     guint               time,</div><div class='del'>-			     EDayView		*day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event;</div><div class='del'>-	gint day, event_num;</div><div class='del'>-	const char *event_uid;</div><div class='del'>-</div><div class='del'>-	day = day_view-&gt;drag_event_day;</div><div class='del'>-	event_num = day_view-&gt;drag_event_num;</div><div class='del'>-</div><div class='del'>-	/* These should both be set. */</div><div class='del'>-	g_return_if_fail (day != -1);</div><div class='del'>-	g_return_if_fail (event_num != -1);</div><div class='del'>-</div><div class='del'>-	if (day == E_DAY_VIEW_LONG_EVENT)</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;long_events,</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-	else</div><div class='del'>-		event = &amp;g_array_index (day_view-&gt;events[day],</div><div class='del'>-					EDayViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (event-&gt;comp, &amp;event_uid);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (event_uid != NULL);</div><div class='del'>-</div><div class='del'>-	if (info == TARGET_CALENDAR_EVENT) {</div><div class='del'>-		gtk_selection_data_set (selection_data,	selection_data-&gt;target,</div><div class='del'>-					8, event_uid, strlen (event_uid));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_top_canvas_drag_data_received  (GtkWidget          *widget,</div><div class='del'>-					      GdkDragContext     *context,</div><div class='del'>-					      gint                x,</div><div class='del'>-					      gint                y,</div><div class='del'>-					      GtkSelectionData   *data,</div><div class='del'>-					      guint               info,</div><div class='del'>-					      guint               time,</div><div class='del'>-					      EDayView	         *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event=NULL;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint day, start_day, end_day, num_days;</div><div class='del'>-	gint start_offset, end_offset;</div><div class='del'>-	gchar *event_uid;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-</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'>-			const char *uid;</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'>-			cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-			if (!event_uid || !uid || strcmp (event_uid, uid))</div><div class='del'>-				g_warning ("Unexpected event UID");</div><div class='del'>-</div><div class='del'>-			/* We use a temporary shallow of the comp since we</div><div class='del'>-			   don't want to change the original comp here.</div><div class='del'>-			   Otherwise we would not detect that the event's time</div><div class='del'>-			   had changed in the "update_event" callback. */</div><div class='del'>-</div><div class='del'>-			comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-			date.value = &amp;itt;</div><div class='del'>-			date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-			dt = day_view-&gt;day_starts[day] + start_offset * 60;</div><div class='del'>-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);</div><div class='del'>-			cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-			if (end_offset == -1 || end_offset == 0)</div><div class='del'>-				dt = day_view-&gt;day_starts[day + num_days];</div><div class='del'>-			else</div><div class='del'>-				dt = day_view-&gt;day_starts[day + num_days - 1] + end_offset * 60;</div><div class='del'>-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);</div><div class='del'>-			cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-			gtk_drag_finish (context, TRUE, TRUE, time);</div><div class='del'>-</div><div class='del'>-			/* Reset this since it will be invalid. */</div><div class='del'>-			day_view-&gt;drag_event_day = -1;</div><div class='del'>-</div><div class='del'>-			/* Show the text item again, just in case it hasn't</div><div class='del'>-			   moved. If we don't do this it may not appear. */</div><div class='del'>-			if (event-&gt;canvas_item)</div><div class='del'>-				gnome_canvas_item_show (event-&gt;canvas_item);</div><div class='del'>-</div><div class='del'>-			if (!cal_client_update_object (day_view-&gt;client, comp))</div><div class='del'>-				g_message ("e_day_view_on_top_canvas_drag_data_received(): Could "</div><div class='del'>-					   "not update the object!");</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_drag_finish (context, FALSE, FALSE, time);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_day_view_on_main_canvas_drag_data_received  (GtkWidget          *widget,</div><div class='del'>-					       GdkDragContext     *context,</div><div class='del'>-					       gint                x,</div><div class='del'>-					       gint                y,</div><div class='del'>-					       GtkSelectionData   *data,</div><div class='del'>-					       guint               info,</div><div class='del'>-					       guint               time,</div><div class='del'>-					       EDayView		  *day_view)</div><div class='del'>-{</div><div class='del'>-	EDayViewEvent *event = NULL;</div><div class='del'>-	EDayViewPosition pos;</div><div class='del'>-	gint day, row, start_row, end_row, num_rows, scroll_x, scroll_y;</div><div class='del'>-	gint start_offset, end_offset;</div><div class='del'>-	gchar *event_uid;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_get_scroll_offsets (GNOME_CANVAS (widget),</div><div class='del'>-					 &amp;scroll_x, &amp;scroll_y);</div><div class='del'>-	x += scroll_x;</div><div class='del'>-	y += scroll_y;</div><div class='del'>-</div><div class='del'>-	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'>-			const char *uid;</div><div class='del'>-			num_rows = 1;</div><div class='del'>-			start_offset = 0;</div><div class='del'>-			end_offset = 0;</div><div class='del'>-</div><div class='del'>-			if (day_view-&gt;drag_event_day == E_DAY_VIEW_LONG_EVENT) {</div><div class='del'>-				event = &amp;g_array_index (day_view-&gt;long_events, EDayViewEvent,</div><div class='del'>-							day_view-&gt;drag_event_num);</div><div class='del'>-			} else 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'>-			cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-			if (!event_uid || !uid || strcmp (event_uid, uid))</div><div class='del'>-				g_warning ("Unexpected event UID");</div><div class='del'>-</div><div class='del'>-			/* We use a temporary shallow copy of comp since we</div><div class='del'>-			   don't want to change the original comp here.</div><div class='del'>-			   Otherwise we would not detect that the event's time</div><div class='del'>-			   had changed in the "update_event" callback. */</div><div class='del'>-			comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-</div><div class='del'>-			date.value = &amp;itt;</div><div class='del'>-			date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row) + start_offset * 60;</div><div class='del'>-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);</div><div class='del'>-			cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-			dt = e_day_view_convert_grid_position_to_time (day_view, day, row + num_rows) - end_offset * 60;</div><div class='del'>-			*date.value = icaltime_from_timet (dt, FALSE, FALSE);</div><div class='del'>-			cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-			gtk_drag_finish (context, TRUE, TRUE, time);</div><div class='del'>-</div><div class='del'>-			/* Reset this since it will be invalid. */</div><div class='del'>-			day_view-&gt;drag_event_day = -1;</div><div class='del'>-</div><div class='del'>-			/* Show the text item again, just in case it hasn't</div><div class='del'>-			   moved. If we don't do this it may not appear. */</div><div class='del'>-			if (event-&gt;canvas_item)</div><div class='del'>-				gnome_canvas_item_show (event-&gt;canvas_item);</div><div class='del'>-</div><div class='del'>-			if (!cal_client_update_object (day_view-&gt;client, comp))</div><div class='del'>-				g_message ("e_day_view_on_main_canvas_drag_data_received(): "</div><div class='del'>-					   "Could not update the object!");</div><div class='del'>-</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_drag_finish (context, FALSE, FALSE, time);</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h<br/>deleted file mode 100644<br/>index bf72d47f46..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-day-view.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-day-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,565 +0,0 @@</div><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 the week view for anything more</div><div class='del'>-   than about 9 days. */</div><div class='del'>-#define E_DAY_VIEW_MAX_DAYS		10</div><div class='del'>-</div><div class='del'>-/* This is used as a special code to signify a long event instead of the day</div><div class='del'>-   of a normal event. */</div><div class='del'>-#define E_DAY_VIEW_LONG_EVENT		E_DAY_VIEW_MAX_DAYS</div><div class='del'>-</div><div class='del'>-/* The maximum number of columns of appointments within a day. */</div><div class='del'>-#define E_DAY_VIEW_MAX_COLUMNS		6</div><div class='del'>-</div><div class='del'>-/* The width of the gap between appointments. This should be at least</div><div class='del'>-   E_DAY_VIEW_BAR_WIDTH, since in the top canvas we use this space to draw</div><div class='del'>-   the triangle to represent continuing events. */</div><div class='del'>-#define E_DAY_VIEW_GAP_WIDTH		7</div><div class='del'>-</div><div class='del'>-/* The width of the bars down the left of each column and appointment.</div><div class='del'>-   This includes the borders on each side of it. */</div><div class='del'>-#define E_DAY_VIEW_BAR_WIDTH		7</div><div class='del'>-</div><div class='del'>-/* The height of the horizontal bar above &amp; beneath the selected event.</div><div class='del'>-   This includes the borders on the top and bottom. */</div><div class='del'>-#define E_DAY_VIEW_BAR_HEIGHT		6</div><div class='del'>-</div><div class='del'>-/* The size of the reminder &amp; recurrence icons, and padding around them. */</div><div class='del'>-#define E_DAY_VIEW_ICON_WIDTH		16</div><div class='del'>-#define E_DAY_VIEW_ICON_HEIGHT		16</div><div class='del'>-#define E_DAY_VIEW_ICON_X_PAD		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 get/set the working days in the week. The bit-flags are</div><div class='del'>-   combined together. The bits must be from 0 (Sun) to 6 (Sat) to match the</div><div class='del'>-   day values used by localtime etc. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_SUNDAY	= 1 &lt;&lt; 0,</div><div class='del'>-	E_DAY_VIEW_MONDAY	= 1 &lt;&lt; 1,</div><div class='del'>-	E_DAY_VIEW_TUESDAY	= 1 &lt;&lt; 2,</div><div class='del'>-	E_DAY_VIEW_WEDNESDAY	= 1 &lt;&lt; 3,</div><div class='del'>-	E_DAY_VIEW_THURSDAY	= 1 &lt;&lt; 4,</div><div class='del'>-	E_DAY_VIEW_FRIDAY	= 1 &lt;&lt; 5,</div><div class='del'>-	E_DAY_VIEW_SATURDAY	= 1 &lt;&lt; 6</div><div class='del'>-} EDayViewDays;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These are used to specify the type of an appointment. They match those</div><div class='del'>-   used in EMeetingTimeSelector. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_BUSY_TENTATIVE	= 0,</div><div class='del'>-	E_DAY_VIEW_BUSY_OUT_OF_OFFICE	= 1,</div><div class='del'>-	E_DAY_VIEW_BUSY_BUSY		= 2,</div><div class='del'>-</div><div class='del'>-	E_DAY_VIEW_BUSY_LAST		= 3</div><div class='del'>-} EDayViewBusyType;</div><div class='del'>-</div><div class='del'>-/* This is used to specify the format used when displaying the dates.</div><div class='del'>-   The full format is like 'Thursday 12 September'. The abbreviated format is</div><div class='del'>-   like 'Thu 12 Sep'. The no weekday format is like '12 Sep'. The short format</div><div class='del'>-   is like '12'. The actual format used is determined in</div><div class='del'>-   e_day_view_recalc_cell_sizes(), once we know the font being used. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_DATE_FULL,</div><div class='del'>-	E_DAY_VIEW_DATE_ABBREVIATED,</div><div class='del'>-	E_DAY_VIEW_DATE_NO_WEEKDAY,</div><div class='del'>-	E_DAY_VIEW_DATE_SHORT</div><div class='del'>-} EDayViewDateFormat;</div><div class='del'>-</div><div class='del'>-/* These index our colors array. */</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_WORKING,</div><div class='del'>-	E_DAY_VIEW_COLOR_BG_NOT_WORKING,</div><div class='del'>-	E_DAY_VIEW_COLOR_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'>-	CalComponent *comp;</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'>-	/* Calendar client object we are monitoring */</div><div class='del'>-	CalClient *client;</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'>-	/* Whether we are showing the work-week view. */</div><div class='del'>-	gboolean work_week_view;</div><div class='del'>-</div><div class='del'>-	/* The number of days we are showing. Usually 1 or 5, but can be up</div><div class='del'>-	   to E_DAY_VIEW_MAX_DAYS, e.g. when the user selects a range of</div><div class='del'>-	   days in the mini calendar. */</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 id of our idle function to reload all events. */</div><div class='del'>-	gint reload_events_idle_id;</div><div class='del'>-</div><div class='del'>-	/* The number of minutes per row. 5, 10, 15, 30 or 60. */</div><div class='del'>-	gint mins_per_row;</div><div class='del'>-</div><div class='del'>-	/* The number of rows needed, depending on the times shown and the</div><div class='del'>-	   minutes per row. */</div><div class='del'>-	gint rows;</div><div class='del'>-</div><div class='del'>-	/* The height of each row. */</div><div class='del'>-	gint row_height;</div><div class='del'>-</div><div class='del'>-	/* The number of rows in the top display. */</div><div class='del'>-	gint rows_in_top_display;</div><div class='del'>-</div><div class='del'>-	/* The height of each row in the top canvas. */</div><div class='del'>-	gint top_row_height;</div><div class='del'>-</div><div class='del'>-	/* The first and last times shown in the display. The last time isn't</div><div class='del'>-	   included in the range. Default is 0:00-24:00 */</div><div class='del'>-	gint first_hour_shown;</div><div class='del'>-	gint first_minute_shown;</div><div class='del'>-	gint last_hour_shown;</div><div class='del'>-	gint last_minute_shown;</div><div class='del'>-</div><div class='del'>-	/* Bitwise combination of working days. Defaults to Mon-Fri. */</div><div class='del'>-	EDayViewDays working_days;</div><div class='del'>-</div><div class='del'>-	/* The start and end of the work day, rounded to the nearest row. */</div><div class='del'>-	gint work_day_start_hour;</div><div class='del'>-	gint work_day_start_minute;</div><div class='del'>-	gint work_day_end_hour;</div><div class='del'>-	gint work_day_end_minute;</div><div class='del'>-</div><div class='del'>-	/* Whether we use 12-hour of 24-hour format. */</div><div class='del'>-	gboolean use_24_hour_format;</div><div class='del'>-</div><div class='del'>-	/* 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 longest month &amp; weekday names in the current font.</div><div class='del'>-	   Months are 0 to 11. Weekdays are 0 (Sun) to 6 (Sat). */</div><div class='del'>-	gint longest_month_name;</div><div class='del'>-	gint longest_abbreviated_month_name;</div><div class='del'>-	gint longest_weekday_name;</div><div class='del'>-	gint longest_abbreviated_weekday_name;</div><div class='del'>-</div><div class='del'>-	/* The large font 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 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'>-void       e_day_view_set_cal_client		(EDayView	*day_view,</div><div class='del'>-						 CalClient	*client);</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 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'>-/* Whether we are displaying a work-week, in which case the display always</div><div class='del'>-   starts on the first day of the working week. */</div><div class='del'>-gboolean   e_day_view_get_work_week_view	(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_work_week_view	(EDayView	*day_view,</div><div class='del'>-						 gboolean	 work_week_view);</div><div class='del'>-</div><div class='del'>-/* The number of days shown in the EDayView, from 1 to 7. This is normally</div><div class='del'>-   either 1 or 5 (for the Work-Week view). */</div><div class='del'>-gint	   e_day_view_get_days_shown		(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_days_shown		(EDayView	*day_view,</div><div class='del'>-						 gint		 days_shown);</div><div class='del'>-</div><div class='del'>-/* This specifies how many minutes are represented by one row in the display.</div><div class='del'>-   It can be 60, 30, 15, 10 or 5. The default is 30. */</div><div class='del'>-gint	   e_day_view_get_mins_per_row		(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_mins_per_row		(EDayView	*day_view,</div><div class='del'>-						 gint		 mins_per_row);</div><div class='del'>-</div><div class='del'>-/* This specifies the working days in the week. The value is a bitwise</div><div class='del'>-   combination of day flags. Defaults to Mon-Fri. */</div><div class='del'>-EDayViewDays e_day_view_get_working_days	(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_working_days		(EDayView	*day_view,</div><div class='del'>-						 EDayViewDays	 days);</div><div class='del'>-</div><div class='del'>-/* The start and end time of the working day. This only affects the background</div><div class='del'>-   colors. */</div><div class='del'>-void	   e_day_view_get_working_day		(EDayView	*day_view,</div><div class='del'>-						 gint		*start_hour,</div><div class='del'>-						 gint		*start_minute,</div><div class='del'>-						 gint		*end_hour,</div><div class='del'>-						 gint		*end_minute);</div><div class='del'>-void	   e_day_view_set_working_day		(EDayView	*day_view,</div><div class='del'>-						 gint		 start_hour,</div><div class='del'>-						 gint		 start_minute,</div><div class='del'>-						 gint		 end_hour,</div><div class='del'>-						 gint		 end_minute);</div><div class='del'>-</div><div class='del'>-/* Whether we use 12-hour of 24-hour format. */</div><div class='del'>-gboolean   e_day_view_get_24_hour_format	(EDayView	*day_view);</div><div class='del'>-void	   e_day_view_set_24_hour_format	(EDayView	*day_view,</div><div class='del'>-						 gboolean	 use_24_hour);</div><div class='del'>-</div><div class='del'>-/*</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-itip-control.c b/calendar/gui/e-itip-control.c<br/>deleted file mode 100644<br/>index 193667b9b7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-itip-control.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-itip-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,476 +0,0 @@</div><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-itip-control.c</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *    Jesse Pavel &lt;jpavel@helixcode.com&gt;</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;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;icaltypes.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-itip-control.h"</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define DEFAULT_WIDTH 500</div><div class='del'>-#define DEFAULT_HEIGHT 400</div><div class='del'>-</div><div class='del'>-extern gchar *evolution_dir;</div><div class='del'>-</div><div class='del'>-typedef struct _EItipControlPrivate EItipControlPrivate;</div><div class='del'>-</div><div class='del'>-struct _EItipControlPrivate {</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-	GtkWidget *main_frame;</div><div class='del'>-	GtkWidget *text_box;</div><div class='del'>-	GtkWidget *organizer_entry, *dtstart_label, *dtend_label;</div><div class='del'>-	GtkWidget *summary_entry, *description_box;</div><div class='del'>-	GtkWidget *add_button;</div><div class='del'>-	GtkWidget *loading_window;</div><div class='del'>-	GtkWidget *loading_progress;</div><div class='del'>-</div><div class='del'>-	icalcomponent *main_comp, *comp;</div><div class='del'>-	CalComponent *cal_comp;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static icalparameter *</div><div class='del'>-get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-</div><div class='del'>-	for (param = icalproperty_get_first_parameter (prop, ICAL_ANY_PARAMETER);</div><div class='del'>-	     param != NULL &amp;&amp; icalparameter_isa (param) != kind;</div><div class='del'>-	     param = icalproperty_get_next_parameter (prop, ICAL_ANY_PARAMETER) );</div><div class='del'>-</div><div class='del'>-	return param;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-itip_control_destroy_cb (GtkObject *object,</div><div class='del'>-		    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv = data;</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-	if (priv-&gt;main_comp != NULL) {</div><div class='del'>-		icalcomponent_free (priv-&gt;main_comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;cal_comp != NULL) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;cal_comp));</div><div class='del'>-	}</div><div class='del'>-	g_free (priv);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static void</div><div class='del'>-itip_control_size_request_cb (GtkWidget *widget, GtkRequisition *requisition)</div><div class='del'>-{</div><div class='del'>-	requisition-&gt;width = DEFAULT_WIDTH;</div><div class='del'>-	requisition-&gt;height = DEFAULT_HEIGHT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_loaded_cb (GtkObject *object, CalClientGetStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalClient *client = CAL_CLIENT (object);</div><div class='del'>-	EItipControlPrivate *priv = data;</div><div class='del'>-</div><div class='del'>-	gtk_widget_hide (priv-&gt;loading_progress);</div><div class='del'>-</div><div class='del'>-	if (status == CAL_CLIENT_GET_SUCCESS) {</div><div class='del'>-		if (cal_client_update_object (client, priv-&gt;cal_comp) == FALSE) {</div><div class='del'>-			GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-			dialog = gnome_warning_dialog("I couldn't update your calendar file!\n");</div><div class='del'>-			gnome_dialog_run (GNOME_DIALOG(dialog));</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			/* We have success. */</div><div class='del'>-			GtkWidget *dialog;</div><div class='del'>-	</div><div class='del'>-			dialog = gnome_ok_dialog("Component successfully added.");</div><div class='del'>-			gnome_dialog_run (GNOME_DIALOG(dialog));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-		dialog = gnome_ok_dialog("There was an error loading the calendar file.");</div><div class='del'>-		gnome_dialog_run (GNOME_DIALOG(dialog));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_button_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv = data;</div><div class='del'>-	gchar cal_uri[255];</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	sprintf (cal_uri, "%s/local/Calendar/calendar.ics", evolution_dir);</div><div class='del'>-	</div><div class='del'>-	client = cal_client_new ();</div><div class='del'>-	if (cal_client_load_calendar (client, cal_uri) == FALSE) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-		dialog = gnome_warning_dialog("I couldn't open your calendar file!\n");</div><div class='del'>-		gnome_dialog_run (GNOME_DIALOG(dialog));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (client));</div><div class='del'>-	</div><div class='del'>-		return;</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_cb), priv);</div><div class='del'>-	</div><div class='del'>-	gtk_progress_bar_update (GTK_PROGRESS_BAR (priv-&gt;loading_progress), 0.5);</div><div class='del'>-	gtk_widget_show (priv-&gt;loading_progress);</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'>- * Bonobo::PersistStream</div><div class='del'>- *</div><div class='del'>- * These two functions implement the Bonobo::PersistStream load and</div><div class='del'>- * save methods which allow data to be loaded into and out of the</div><div class='del'>- * BonoboObject.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-stream_read (Bonobo_Stream stream)</div><div class='del'>-{</div><div class='del'>-	Bonobo_Stream_iobuf *buffer;</div><div class='del'>-	CORBA_Environment    ev;</div><div class='del'>-	gchar *data = NULL;</div><div class='del'>-	gint length = 0;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	do {</div><div class='del'>-#define READ_CHUNK_SIZE 65536</div><div class='del'>-		Bonobo_Stream_read (stream, READ_CHUNK_SIZE,</div><div class='del'>-				    &amp;buffer, &amp;ev);</div><div class='del'>-</div><div class='del'>-		if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-			CORBA_exception_free (&amp;ev);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (buffer-&gt;_length &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		data = g_realloc (data,</div><div class='del'>-				  length + buffer-&gt;_length);</div><div class='del'>-</div><div class='del'>-		memcpy (data + length,</div><div class='del'>-			buffer-&gt;_buffer, buffer-&gt;_length);</div><div class='del'>-</div><div class='del'>-		length += buffer-&gt;_length;</div><div class='del'>-</div><div class='del'>-		CORBA_free (buffer);</div><div class='del'>-	} while (1);</div><div class='del'>-</div><div class='del'>-	CORBA_free (buffer);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (data == NULL)</div><div class='del'>-	  data = g_strdup("");</div><div class='del'>-</div><div class='del'>-	return data;</div><div class='del'>-} /* stream_read */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:load method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_load (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv = data;</div><div class='del'>-	gchar *vcalendar;</div><div class='del'>-	gint pos, length, length2;</div><div class='del'>-	icalcomponent_kind comp_kind;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/calendar") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    </div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ((vcalendar = stream_read (stream)) == NULL) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_FileNotFound, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Do something with the data, here. */</div><div class='del'>-	pos = 0;</div><div class='del'>-	length = strlen (vcalendar);</div><div class='del'>-	length2 = strlen (gtk_editable_get_chars (GTK_EDITABLE (priv-&gt;text_box), 0, -1));</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	if (length2 &gt; 0) </div><div class='del'>-		gtk_editable_delete_text (GTK_EDITABLE (priv-&gt;text_box), 0, length2);</div><div class='del'>-</div><div class='del'>-	gtk_editable_insert_text (GTK_EDITABLE (priv-&gt;text_box),</div><div class='del'>-				  vcalendar,</div><div class='del'>-				  length,</div><div class='del'>-				  &amp;pos);</div><div class='del'>-</div><div class='del'>-	priv-&gt;main_comp = icalparser_parse_string (vcalendar);</div><div class='del'>-	if (priv-&gt;main_comp == NULL) {</div><div class='del'>-		g_printerr ("e-itip-control.c: the iCalendar data was invalid!\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;comp = icalcomponent_get_first_component (priv-&gt;main_comp,</div><div class='del'>-							ICAL_ANY_COMPONENT);</div><div class='del'>-	if (priv-&gt;comp == NULL) {</div><div class='del'>-		g_printerr ("e-itip-control.c: I could not extract a proper component from\n"</div><div class='del'>-			    "     the vCalendar data.\n");</div><div class='del'>-		icalcomponent_free (priv-&gt;main_comp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	comp_kind = icalcomponent_isa (priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	switch (comp_kind) {</div><div class='del'>-	case ICAL_VEVENT_COMPONENT:</div><div class='del'>-	case ICAL_VTODO_COMPONENT:</div><div class='del'>-	case ICAL_VJOURNAL_COMPONENT:</div><div class='del'>-		priv-&gt;cal_comp = cal_component_new ();</div><div class='del'>-		if (cal_component_set_icalcomponent (priv-&gt;cal_comp, priv-&gt;comp) == FALSE) {</div><div class='del'>-			g_printerr ("e-itip-control.c: I couldn't create a CalComponent from the iTip data.\n");</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (priv-&gt;cal_comp));</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case ICAL_VFREEBUSY_COMPONENT:</div><div class='del'>-		/* Take care of busy time information. */</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		/* We don't know what this is, so bail. */</div><div class='del'>-		{</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-		dialog = gnome_warning_dialog("I don't recognize this type of calendar component.");</div><div class='del'>-		gnome_dialog_run (GNOME_DIALOG(dialog));</div><div class='del'>-</div><div class='del'>-		g_free (vcalendar);</div><div class='del'>-</div><div class='del'>-		return;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	} /* End switch. */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Okay, good then; now I will pick apart the component to get</div><div class='del'>-	 all the things I'll show in my control. */</div><div class='del'>-	{</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		gchar *new_text;</div><div class='del'>-		gchar *organizer, *description, *summary;</div><div class='del'>-		struct icaltimetype dtstart, dtend;</div><div class='del'>-		time_t tstart, tend;</div><div class='del'>-</div><div class='del'>-		prop = icalcomponent_get_first_property (priv-&gt;comp, ICAL_ORGANIZER_PROPERTY);</div><div class='del'>-		if (prop) {</div><div class='del'>-			organizer = icalproperty_get_organizer (prop);</div><div class='del'>-		</div><div class='del'>-			/* Here I strip off the "MAILTO:" if it is present. */</div><div class='del'>-			new_text = strchr (organizer, ':');</div><div class='del'>-			if (new_text != NULL)</div><div class='del'>-				new_text++;</div><div class='del'>-			else</div><div class='del'>-				new_text = organizer;</div><div class='del'>-</div><div class='del'>-			gtk_entry_set_text (GTK_ENTRY (priv-&gt;organizer_entry), new_text);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prop = icalcomponent_get_first_property (priv-&gt;comp, ICAL_SUMMARY_PROPERTY);</div><div class='del'>-		if (prop) {</div><div class='del'>-			summary = icalproperty_get_summary (prop);</div><div class='del'>-			gtk_entry_set_text (GTK_ENTRY (priv-&gt;summary_entry), summary);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prop = icalcomponent_get_first_property (priv-&gt;comp, ICAL_DESCRIPTION_PROPERTY);</div><div class='del'>-		if (prop) {</div><div class='del'>-			description = icalproperty_get_summary (prop);</div><div class='del'>-	</div><div class='del'>-			pos = 0;</div><div class='del'>-			length = strlen (description);</div><div class='del'>-			length2 = strlen (gtk_editable_get_chars </div><div class='del'>-						(GTK_EDITABLE (priv-&gt;description_box), 0, -1));</div><div class='del'>-		</div><div class='del'>-			if (length2 &gt; 0)</div><div class='del'>-				gtk_editable_delete_text (GTK_EDITABLE (priv-&gt;description_box), 0, length2);</div><div class='del'>-		</div><div class='del'>-			gtk_editable_insert_text (GTK_EDITABLE (priv-&gt;description_box),</div><div class='del'>-						  description,</div><div class='del'>-						  length,</div><div class='del'>-						  &amp;pos);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		prop = icalcomponent_get_first_property (priv-&gt;comp, ICAL_DTSTART_PROPERTY);</div><div class='del'>-		dtstart = icalproperty_get_dtstart (prop);</div><div class='del'>-		prop = icalcomponent_get_first_property (priv-&gt;comp, ICAL_DTEND_PROPERTY);</div><div class='del'>-		dtend = icalproperty_get_dtend (prop);</div><div class='del'>-</div><div class='del'>-		tstart = icaltime_as_timet (dtstart);</div><div class='del'>-		tend = icaltime_as_timet (dtend);</div><div class='del'>-</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (priv-&gt;dtstart_label), ctime (&amp;tstart));</div><div class='del'>-		gtk_label_set_text (GTK_LABEL (priv-&gt;dtend_label), ctime (&amp;tend));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	pos = 0;</div><div class='del'>-	length = strlen (vcalendar);</div><div class='del'>-	length2 = strlen (gtk_editable_get_chars (GTK_EDITABLE (priv-&gt;text_box), 0, -1));</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	if (length2 &gt; 0) </div><div class='del'>-		gtk_editable_delete_text (GTK_EDITABLE (priv-&gt;text_box), 0, length2);</div><div class='del'>-</div><div class='del'>-	gtk_editable_insert_text (GTK_EDITABLE (priv-&gt;text_box),</div><div class='del'>-				  vcalendar,</div><div class='del'>-				  length,</div><div class='del'>-				  &amp;pos);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	g_free (vcalendar);</div><div class='del'>-</div><div class='del'>-} /* pstream_load */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * This function implements the Bonobo::PersistStream:save method.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-pstream_save (BonoboPersistStream *ps, const Bonobo_Stream stream,</div><div class='del'>-	      Bonobo_Persist_ContentType type, void *data,</div><div class='del'>-	      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv = data;</div><div class='del'>-	gchar                *vcalendar;</div><div class='del'>-	int                  length;</div><div class='del'>-</div><div class='del'>-	if (type &amp;&amp; g_strcasecmp (type, "text/calendar") != 0 &amp;&amp;	    </div><div class='del'>-	    g_strcasecmp (type, "text/x-calendar") != 0) {	    </div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Bonobo_Persist_WrongDataType, NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Put something into vcalendar here. */</div><div class='del'>-	length = gtk_text_get_length (GTK_TEXT (priv-&gt;text_box));</div><div class='del'>-	vcalendar = gtk_editable_get_chars (GTK_EDITABLE (priv-&gt;text_box), 0, -1);</div><div class='del'>-</div><div class='del'>-	bonobo_stream_client_write (stream, vcalendar, length, ev);</div><div class='del'>-	g_free (vcalendar);</div><div class='del'>-} /* pstream_save */</div><div class='del'>-</div><div class='del'>-static CORBA_long</div><div class='del'>-pstream_get_max_size (BonoboPersistStream *ps, void *data,</div><div class='del'>-		      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	EItipControlPrivate *priv = data;</div><div class='del'>-	gint length;</div><div class='del'>-  </div><div class='del'>-	length = gtk_text_get_length (GTK_TEXT (priv-&gt;text_box));</div><div class='del'>-</div><div class='del'>-	return length;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Bonobo_Persist_ContentTypeList *</div><div class='del'>-pstream_get_content_types (BonoboPersistStream *ps, void *closure,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	return bonobo_persist_generate_content_types (2, "text/calendar", "text/x-calendar");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-e_itip_control_factory (BonoboGenericFactory *Factory, void *closure)</div><div class='del'>-{</div><div class='del'>-	BonoboControl      *control;</div><div class='del'>-	BonoboPersistStream *stream;</div><div class='del'>-	EItipControlPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (EItipControlPrivate, 1);</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/" "e-itip-control.glade", "main_frame");</div><div class='del'>-</div><div class='del'>-	/* Create the control. */</div><div class='del'>-	priv-&gt;main_frame = glade_xml_get_widget (priv-&gt;xml, "main_frame");</div><div class='del'>-	priv-&gt;text_box = glade_xml_get_widget (priv-&gt;xml, "text_box");</div><div class='del'>-	priv-&gt;organizer_entry = glade_xml_get_widget (priv-&gt;xml, "organizer_entry");</div><div class='del'>-	priv-&gt;dtstart_label = glade_xml_get_widget (priv-&gt;xml, "dtstart_label");</div><div class='del'>-	priv-&gt;dtend_label = glade_xml_get_widget (priv-&gt;xml, "dtend_label");</div><div class='del'>-	priv-&gt;summary_entry = glade_xml_get_widget (priv-&gt;xml, "summary_entry");</div><div class='del'>-	priv-&gt;description_box = glade_xml_get_widget (priv-&gt;xml, "description_box");</div><div class='del'>-	priv-&gt;add_button = glade_xml_get_widget (priv-&gt;xml, "add_button");</div><div class='del'>-	priv-&gt;loading_progress = glade_xml_get_widget (priv-&gt;xml, "loading_progress");</div><div class='del'>-	priv-&gt;loading_window = glade_xml_get_widget (priv-&gt;xml, "loading_window");</div><div class='del'>-</div><div class='del'>-	gtk_text_set_editable (GTK_TEXT (priv-&gt;text_box), FALSE);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;main_frame), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (itip_control_destroy_cb), priv);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;main_frame), "size_request",</div><div class='del'>-			    GTK_SIGNAL_FUNC (itip_control_size_request_cb), priv);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;add_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (add_button_clicked_cb), priv);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (priv-&gt;text_box);</div><div class='del'>-	gtk_widget_show (priv-&gt;main_frame);</div><div class='del'>-</div><div class='del'>-	control = bonobo_control_new (priv-&gt;main_frame);</div><div class='del'>-</div><div class='del'>-	stream = bonobo_persist_stream_new (pstream_load, pstream_save,</div><div class='del'>-					    pstream_get_max_size,</div><div class='del'>-					    pstream_get_content_types,</div><div class='del'>-					    priv);</div><div class='del'>-</div><div class='del'>-	if (stream == NULL) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (control));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_object_add_interface (BONOBO_OBJECT (control),</div><div class='del'>-				    BONOBO_OBJECT (stream));</div><div class='del'>-</div><div class='del'>-	return BONOBO_OBJECT (control);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_itip_control_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	factory =</div><div class='del'>-		bonobo_generic_factory_new (</div><div class='del'>-		        "OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a",</div><div class='del'>-			e_itip_control_factory, NULL);</div><div class='del'>-</div><div class='del'>-	if (factory == NULL)</div><div class='del'>-		g_error ("I could not register an iTip control factory.");</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/gui/e-itip-control.glade b/calendar/gui/e-itip-control.glade<br/>deleted file mode 100644<br/>index e17d20190e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-itip-control.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-itip-control.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,455 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-itip-control&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-itip-control&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;window1&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;window1&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_TOPLEVEL&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;main_frame&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;label&gt;Test iTip control&lt;/label&gt;</div><div class='del'>-    &lt;label_xalign&gt;0.11&lt;/label_xalign&gt;</div><div class='del'>-    &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;scrolledwindow1&lt;/name&gt;</div><div class='del'>-      &lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-      &lt;vscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/vscrollbar_policy&gt;</div><div class='del'>-      &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-      &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkViewport&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;viewport1&lt;/name&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox1&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table1&lt;/name&gt;</div><div class='del'>-	    &lt;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;9&lt;/column_spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;6&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;organizer_entry&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;summary_entry&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;2&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;3&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkScrolledWindow&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;scrolledwindow2&lt;/name&gt;</div><div class='del'>-	      &lt;hscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/hscrollbar_policy&gt;</div><div class='del'>-	      &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	      &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	      &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;3&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;4&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;description_box&lt;/name&gt;</div><div class='del'>-		&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		&lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-		&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Date:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_RIGHT&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&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Organizer:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_RIGHT&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;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Summary:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_RIGHT&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;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;label9&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Description:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_RIGHT&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&lt;/yalign&gt;</div><div class='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;GtkAlignment&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;alignment1&lt;/name&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-	      &lt;xscale&gt;1&lt;/xscale&gt;</div><div class='del'>-	      &lt;yscale&gt;1&lt;/yscale&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;True&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;hbox1&lt;/name&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;dtstart_label&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;date-start&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;--to--&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;19&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;dtend_label&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;date-end&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbuttonbox1&lt;/name&gt;</div><div class='del'>-	    &lt;layout_style&gt;GTK_BUTTONBOX_DEFAULT_STYLE&lt;/layout_style&gt;</div><div class='del'>-	    &lt;spacing&gt;30&lt;/spacing&gt;</div><div class='del'>-	    &lt;child_min_width&gt;85&lt;/child_min_width&gt;</div><div class='del'>-	    &lt;child_min_height&gt;27&lt;/child_min_height&gt;</div><div class='del'>-	    &lt;child_ipad_x&gt;7&lt;/child_ipad_x&gt;</div><div class='del'>-	    &lt;child_ipad_y&gt;0&lt;/child_ipad_y&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;add_button&lt;/name&gt;</div><div class='del'>-	      &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;label&gt;Add to Calendar&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;text_box&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;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'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;loading_window&lt;/name&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Loading Calendar&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_DIALOG&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_CENTER&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;False&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;False&lt;/auto_shrink&gt;</div><div class='del'>-</div><div class='del'>-  &lt;widget&gt;</div><div class='del'>-    &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-    &lt;name&gt;frame1&lt;/name&gt;</div><div class='del'>-    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-    &lt;label&gt;&lt;/label&gt;</div><div class='del'>-    &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-    &lt;shadow_type&gt;GTK_SHADOW_ETCHED_OUT&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;vbox2&lt;/name&gt;</div><div class='del'>-      &lt;border_width&gt;7&lt;/border_width&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;1&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;6&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;9&lt;/spacing&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;label10&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Loading calendar...&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkProgressBar&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;progressbar1&lt;/name&gt;</div><div class='del'>-	  &lt;value&gt;0&lt;/value&gt;</div><div class='del'>-	  &lt;lower&gt;0&lt;/lower&gt;</div><div class='del'>-	  &lt;upper&gt;100&lt;/upper&gt;</div><div class='del'>-	  &lt;bar_style&gt;GTK_PROGRESS_CONTINUOUS&lt;/bar_style&gt;</div><div class='del'>-	  &lt;orientation&gt;GTK_PROGRESS_LEFT_TO_RIGHT&lt;/orientation&gt;</div><div class='del'>-	  &lt;activity_mode&gt;False&lt;/activity_mode&gt;</div><div class='del'>-	  &lt;show_text&gt;False&lt;/show_text&gt;</div><div class='del'>-	  &lt;format&gt;%P %%&lt;/format&gt;</div><div class='del'>-	  &lt;text_xalign&gt;0.5&lt;/text_xalign&gt;</div><div class='del'>-	  &lt;text_yalign&gt;0.5&lt;/text_yalign&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/e-itip-control.h b/calendar/gui/e-itip-control.h<br/>deleted file mode 100644<br/>index 467f0578ef..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-itip-control.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-itip-control.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#ifndef __E_ITIP_CONTROL_H__</div><div class='del'>-#define __E_ITIP_CONTROL_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-</div><div class='del'>-void             e_itip_control_factory_init (void);</div><div class='del'>-</div><div class='del'>-#endif /* __E_ITIP_CONTROL_H__ */</div><div class='head'>diff --git a/calendar/gui/e-meeting-dialog.glade b/calendar/gui/e-meeting-dialog.glade<br/>deleted file mode 100644<br/>index 96e6707013..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-dialog.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-meeting-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,473 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;GTK-Interface&gt;</div><div class='del'>-</div><div class='del'>-&lt;project&gt;</div><div class='del'>-  &lt;name&gt;e-meeting-dialog&lt;/name&gt;</div><div class='del'>-  &lt;program_name&gt;e-meeting-dialog&lt;/program_name&gt;</div><div class='del'>-  &lt;directory&gt;&lt;/directory&gt;</div><div class='del'>-  &lt;source_directory&gt;src&lt;/source_directory&gt;</div><div class='del'>-  &lt;pixmaps_directory&gt;pixmaps&lt;/pixmaps_directory&gt;</div><div class='del'>-  &lt;language&gt;C&lt;/language&gt;</div><div class='del'>-  &lt;gnome_support&gt;True&lt;/gnome_support&gt;</div><div class='del'>-  &lt;gettext_support&gt;True&lt;/gettext_support&gt;</div><div class='del'>-&lt;/project&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GtkWindow&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;meeting_window&lt;/name&gt;</div><div class='del'>-  &lt;width&gt;486&lt;/width&gt;</div><div class='del'>-  &lt;height&gt;330&lt;/height&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Meeting Invitations&lt;/title&gt;</div><div class='del'>-  &lt;type&gt;GTK_WINDOW_DIALOG&lt;/type&gt;</div><div class='del'>-  &lt;position&gt;GTK_WIN_POS_NONE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;True&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;True&lt;/allow_grow&gt;</div><div class='del'>-  &lt;auto_shrink&gt;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;vbox1&lt;/name&gt;</div><div class='del'>-    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-    &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-    &lt;widget&gt;</div><div class='del'>-      &lt;class&gt;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_BOTH&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_LINE&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;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	&lt;child_name&gt;Toolbar:button&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;send_button&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Send</div><div class='del'>-Updates&lt;/label&gt;</div><div class='del'>-	&lt;stock_pixmap&gt;GNOME_STOCK_PIXMAP_MAIL_SND&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;GtkVSeparator&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vseparator1&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;13&lt;/width&gt;</div><div class='del'>-	&lt;height&gt;58&lt;/height&gt;</div><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;child_name&gt;Toolbar:button&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;cancel_button&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Cancel</div><div class='del'>-Meeting&lt;/label&gt;</div><div class='del'>-	&lt;stock_pixmap&gt;GNOME_STOCK_PIXMAP_CLOSE&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;GtkVSeparator&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;vseparator2&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;12&lt;/width&gt;</div><div class='del'>-	&lt;height&gt;58&lt;/height&gt;</div><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;child_name&gt;Toolbar:button&lt;/child_name&gt;</div><div class='del'>-	&lt;name&gt;schedule_button&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Schedule</div><div class='del'>-Time&lt;/label&gt;</div><div class='del'>-	&lt;stock_pixmap&gt;GNOME_STOCK_PIXMAP_MULTIPLE&lt;/stock_pixmap&gt;</div><div class='del'>-      &lt;/widget&gt;</div><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;border_width&gt;3&lt;/border_width&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;4&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label3&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Organizer: &lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_JUSTIFY_RIGHT&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;3&lt;/xpad&gt;</div><div class='del'>-	&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;1&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;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;organizer_entry&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;252&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;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;hbox1&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	&lt;pack&gt;GTK_PACK_END&lt;/pack&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label1&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Attendees: &lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_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;4&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	  &lt;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;GtkHButtonBox&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;hbuttonbox3&lt;/name&gt;</div><div class='del'>-	&lt;layout_style&gt;GTK_BUTTONBOX_START&lt;/layout_style&gt;</div><div class='del'>-	&lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-	&lt;child_min_width&gt;83&lt;/child_min_width&gt;</div><div class='del'>-	&lt;child_min_height&gt;29&lt;/child_min_height&gt;</div><div class='del'>-	&lt;child_ipad_x&gt;8&lt;/child_ipad_x&gt;</div><div class='del'>-	&lt;child_ipad_y&gt;1&lt;/child_ipad_y&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	  &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;add_button&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Add&lt;/label&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;delete_button&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Delete&lt;/label&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;edit_button&lt;/name&gt;</div><div class='del'>-	  &lt;can_default&gt;True&lt;/can_default&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;label&gt;Edit&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;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;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;attendee_list&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;columns&gt;4&lt;/columns&gt;</div><div class='del'>-	&lt;column_widths&gt;145,141,60,80&lt;/column_widths&gt;</div><div class='del'>-	&lt;selection_mode&gt;GTK_SELECTION_SINGLE&lt;/selection_mode&gt;</div><div class='del'>-	&lt;show_titles&gt;True&lt;/show_titles&gt;</div><div class='del'>-	&lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label8&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Attendee&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label5&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Role&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label6&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;RSVP&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	  &lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-	  &lt;name&gt;label7&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Status&lt;/label&gt;</div><div class='del'>-	  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-	  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;widget&gt;</div><div class='del'>-  &lt;class&gt;GnomeDialog&lt;/class&gt;</div><div class='del'>-  &lt;name&gt;edit_dialog&lt;/name&gt;</div><div class='del'>-  &lt;width&gt;344&lt;/width&gt;</div><div class='del'>-  &lt;height&gt;152&lt;/height&gt;</div><div class='del'>-  &lt;visible&gt;False&lt;/visible&gt;</div><div class='del'>-  &lt;title&gt;Attendee&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_MOUSE&lt;/position&gt;</div><div class='del'>-  &lt;modal&gt;True&lt;/modal&gt;</div><div class='del'>-  &lt;allow_shrink&gt;False&lt;/allow_shrink&gt;</div><div class='del'>-  &lt;allow_grow&gt;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_SPREAD&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;GtkHBox&lt;/class&gt;</div><div class='del'>-      &lt;name&gt;hbox2&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &lt;child&gt;</div><div class='del'>-	&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-      &lt;widget&gt;</div><div class='del'>-	&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	&lt;name&gt;label2&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Attendee 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.5&lt;/xalign&gt;</div><div class='del'>-	&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	&lt;xpad&gt;6&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;address_entry&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	&lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	&lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	&lt;text&gt;&lt;/text&gt;</div><div class='del'>-	&lt;child&gt;</div><div class='del'>-	  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	  &lt;expand&gt;True&lt;/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;hbox4&lt;/name&gt;</div><div class='del'>-      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-      &lt;spacing&gt;0&lt;/spacing&gt;</div><div class='del'>-      &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;label9&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Role&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_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;5&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;role_combo&lt;/name&gt;</div><div class='del'>-	&lt;width&gt;160&lt;/width&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;Chair</div><div class='del'>-Required Participant</div><div class='del'>-Optional Participant</div><div class='del'>-Non-Participant</div><div class='del'>-Other</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&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;role_entry&lt;/name&gt;</div><div class='del'>-	  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	  &lt;editable&gt;False&lt;/editable&gt;</div><div class='del'>-	  &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	  &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	  &lt;text&gt;Required Participant&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;rsvp_check&lt;/name&gt;</div><div class='del'>-	&lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	&lt;label&gt;RSVP&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;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'>-      &lt;/widget&gt;</div><div class='del'>-    &lt;/widget&gt;</div><div class='del'>-  &lt;/widget&gt;</div><div class='del'>-&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-&lt;/GTK-Interface&gt;</div><div class='head'>diff --git a/calendar/gui/e-meeting-edit.c b/calendar/gui/e-meeting-edit.c<br/>deleted file mode 100644<br/>index 107dfc66a3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-edit.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-meeting-edit.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,997 +0,0 @@</div><div class='del'>-/* Evolution calendar - Meeting 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: Jesse Pavel &lt;jpavel@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;icaltypes.h&gt;</div><div class='del'>-#include &lt;ical.h&gt;</div><div class='del'>-#include &lt;widgets/meeting-time-sel/e-meeting-time-sel.h&gt;</div><div class='del'>-#include &lt;Evolution-Composer.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include "e-meeting-edit.h"</div><div class='del'>-</div><div class='del'>-#define E_MEETING_GLADE_XML "e-meeting-dialog.glade"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMeetingEditorPrivate EMeetingEditorPrivate;</div><div class='del'>-</div><div class='del'>-struct _EMeetingEditorPrivate {</div><div class='del'>-	/* These are the widgets to be used in the GUI. */</div><div class='del'>-	GladeXML *xml;</div><div class='del'>-	GtkWidget *meeting_window;</div><div class='del'>-	GtkWidget *attendee_list;</div><div class='del'>-	GtkWidget *address_entry;</div><div class='del'>-	GtkWidget *edit_dialog;</div><div class='del'>-	GtkWidget *organizer_entry;</div><div class='del'>-	GtkWidget *role_entry;</div><div class='del'>-	GtkWidget *rsvp_check;</div><div class='del'>-	GtkWidget *send_button, *schedule_button;</div><div class='del'>-	</div><div class='del'>-	gint changed_signal_id;</div><div class='del'>-</div><div class='del'>-	/* Various pieces of information. */</div><div class='del'>-	gint selected_row;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClient *client;</div><div class='del'>-	icalcomponent *icalcomp, *vevent;</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-</div><div class='del'>-	gint numentries;  /* How many attendees are there? */</div><div class='del'>-	gboolean dirty;  /* Has anything changed? */</div><div class='del'>-}; </div><div class='del'>-</div><div class='del'>-#define NUM_COLUMNS 4  /* The number of columns in our attendee list. */</div><div class='del'>-</div><div class='del'>-enum column_names {ADDRESS_COL, ROLE_COL, RSVP_COL, STATUS_COL};</div><div class='del'>-</div><div class='del'>-static gchar *partstat_values[] = {</div><div class='del'>-	"Needs action",</div><div class='del'>-	"Accepted",</div><div class='del'>-	"Declined",</div><div class='del'>-	"Tentative",</div><div class='del'>-	"Delegated",</div><div class='del'>-	"Completed",</div><div class='del'>-	"In Progress",</div><div class='del'>-	"Unknown"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gchar *role_values[] = {</div><div class='del'>-	"Chair",</div><div class='del'>-	"Required Participant",</div><div class='del'>-	"Optional Participant",</div><div class='del'>-	"Non-Participant",</div><div class='del'>-	"Other"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note that I have to iterate and check myself because</div><div class='del'>-   ical_property_get_xxx_parameter doesn't take into account the</div><div class='del'>-   kind of parameter for which you wish to search! */</div><div class='del'>-static icalparameter *</div><div class='del'>-get_icalparam_by_type (icalproperty *prop, icalparameter_kind kind)</div><div class='del'>-{</div><div class='del'>-	icalparameter *param;</div><div class='del'>-</div><div class='del'>-	for (param = icalproperty_get_first_parameter (prop, ICAL_ANY_PARAMETER);</div><div class='del'>-	     param != NULL &amp;&amp; icalparameter_isa (param) != kind;</div><div class='del'>-	     param = icalproperty_get_next_parameter (prop, ICAL_ANY_PARAMETER) );</div><div class='del'>-</div><div class='del'>-	return param;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_organizer (EMeetingEditorPrivate *priv)</div><div class='del'>-{</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	gchar *text;</div><div class='del'>-</div><div class='del'>-	/* Save the organizer into the iCAL object. */</div><div class='del'>-</div><div class='del'>-	text = gtk_entry_get_text (GTK_ENTRY (priv-&gt;organizer_entry));</div><div class='del'>-	if (strlen (text) &gt; 0) {</div><div class='del'>-		gchar buffer[200];</div><div class='del'>-		g_snprintf (buffer, 190, "MAILTO:%s", text);</div><div class='del'>-	</div><div class='del'>-		prop = icalcomponent_get_first_property (priv-&gt;vevent, ICAL_ORGANIZER_PROPERTY);</div><div class='del'>-		if (prop == NULL) {</div><div class='del'>-			/* We need to add an ORGANIZER property. */</div><div class='del'>-			prop = icalproperty_new (ICAL_ORGANIZER_PROPERTY);</div><div class='del'>-			icalcomponent_add_property (priv-&gt;vevent, prop);</div><div class='del'>-		}</div><div class='del'>-		value = icalvalue_new_text (buffer);</div><div class='del'>-		icalproperty_set_value (prop, 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'>-static gboolean</div><div class='del'>-window_delete_cb (GtkWidget *widget,</div><div class='del'>-		  GdkEvent *event,</div><div class='del'>-		  gpointer data)</div><div class='del'>-{	</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	save_organizer (priv);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;dirty == TRUE) {</div><div class='del'>-		/* FIXME: notify the event editor that our data has changed. </div><div class='del'>-			For now, I'll just display a dialog box. */</div><div class='del'>-		{</div><div class='del'>-			GtkWidget *dialog;</div><div class='del'>-		</div><div class='del'>-			dialog = gnome_warning_dialog_parented ("Note that the meeting has changed,\n"</div><div class='del'>-								"and you should save this event.",</div><div class='del'>-								GTK_WINDOW (priv-&gt;meeting_window));</div><div class='del'>-			gnome_dialog_run (GNOME_DIALOG(dialog));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (priv-&gt;organizer_entry), "");</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'>-window_destroy_cb (GtkWidget *widget,</div><div class='del'>-		   gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_main_quit ();</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* put_property_in_list() synchronizes the display of row `rownum'</div><div class='del'>-   in our attendee list to the values of `prop'. If rownum &lt; 0,</div><div class='del'>-   then put_property_in_list() will append a new row. </div><div class='del'>-   If the property doesn't contain certain parameters that we deem</div><div class='del'>-   necessary, it will add them. */</div><div class='del'>-static void</div><div class='del'>-put_property_in_list (icalproperty *prop, gint rownum, gpointer data)</div><div class='del'>-{</div><div class='del'>-	gchar *row_text[NUM_COLUMNS];</div><div class='del'>-	gchar *text, *new_text;</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	gint enumval;</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	value = icalproperty_get_value (prop);</div><div class='del'>-</div><div class='del'>-	if (value != NULL) {</div><div class='del'>-		text = strdup (icalvalue_as_ical_string (value));</div><div class='del'>-	</div><div class='del'>-		/* Here I strip off the "MAILTO:" if it is present. */</div><div class='del'>-		new_text = strchr (text, ':');</div><div class='del'>-		if (new_text != NULL)</div><div class='del'>-			new_text++;</div><div class='del'>-		else</div><div class='del'>-			new_text = text;</div><div class='del'>-	</div><div class='del'>-		row_text[ADDRESS_COL] = g_strdup (new_text);</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);</div><div class='del'>-	if (param == NULL) {</div><div class='del'>-		param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);</div><div class='del'>-		icalproperty_add_parameter (prop, param);</div><div class='del'>-	}</div><div class='del'>-		</div><div class='del'>-	enumval = icalparameter_get_role (param);</div><div class='del'>-	if (enumval &lt; 0 || enumval &gt; 4)</div><div class='del'>-		enumval = 4;</div><div class='del'>-	</div><div class='del'>-	row_text[ROLE_COL] = role_values [enumval];</div><div class='del'>-</div><div class='del'>-	param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);</div><div class='del'>-	if (param == NULL) {</div><div class='del'>-		param = icalparameter_new_rsvp (TRUE);</div><div class='del'>-		icalproperty_add_parameter (prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (icalparameter_get_rsvp (param))</div><div class='del'>-		row_text[RSVP_COL] = "Y";</div><div class='del'>-	else</div><div class='del'>-		row_text[RSVP_COL] = "N";</div><div class='del'>-</div><div class='del'>-	param = get_icalparam_by_type (prop, ICAL_PARTSTAT_PARAMETER);</div><div class='del'>-	if (param == NULL) {</div><div class='del'>-		param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);</div><div class='del'>-		icalproperty_add_parameter (prop, param);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	enumval = icalparameter_get_partstat (param);</div><div class='del'>-	if (enumval &lt; 0 || enumval &gt; 7) {</div><div class='del'>-		enumval = 7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	row_text[STATUS_COL] = partstat_values [enumval];</div><div class='del'>-</div><div class='del'>-	if (rownum &lt; 0) {</div><div class='del'>-		gtk_clist_append (GTK_CLIST (priv-&gt;attendee_list), row_text);</div><div class='del'>-		gtk_clist_set_row_data (GTK_CLIST (priv-&gt;attendee_list), priv-&gt;numentries, prop);</div><div class='del'>-		priv-&gt;numentries++;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		for (cntr = 0; cntr &lt; NUM_COLUMNS; cntr++) {</div><div class='del'>-			gtk_clist_set_text (GTK_CLIST (priv-&gt;attendee_list), </div><div class='del'>-					    rownum,</div><div class='del'>-					    cntr,</div><div class='del'>-					    row_text[cntr]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (row_text[ADDRESS_COL]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-/********</div><div class='del'>- * edit_attendee() performs the GUI manipulation and interaction for</div><div class='del'>- * editing `prop' and returns TRUE if the user indicated that he wants</div><div class='del'>- * to save the new property information.</div><div class='del'>- * </div><div class='del'>- * Note that it is necessary that the property have parameters of the types</div><div class='del'>- * RSVP, PARTSTAT, and ROLE already when passed into this function. </div><div class='del'>- ********/</div><div class='del'>-static gboolean</div><div class='del'>-edit_attendee (icalproperty *prop, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-	gint button_num;</div><div class='del'>-	gchar *new_text, *text;</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	gchar buffer[200];</div><div class='del'>-	gint cntr;</div><div class='del'>-	gint enumval;</div><div class='del'>-	gboolean retval;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (prop != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;edit_dialog == NULL || priv-&gt;address_entry == NULL) {</div><div class='del'>-		priv-&gt;edit_dialog = glade_xml_get_widget (priv-&gt;xml, "edit_dialog");</div><div class='del'>-		priv-&gt;address_entry = glade_xml_get_widget (priv-&gt;xml, "address_entry");</div><div class='del'>-</div><div class='del'>-		gnome_dialog_set_close (GNOME_DIALOG (priv-&gt;edit_dialog), TRUE);</div><div class='del'>-		gnome_dialog_editable_enters (GNOME_DIALOG (priv-&gt;edit_dialog), </div><div class='del'>-					      GTK_EDITABLE (priv-&gt;address_entry));</div><div class='del'>-		gnome_dialog_close_hides (GNOME_DIALOG (priv-&gt;edit_dialog), TRUE);</div><div class='del'>-		gnome_dialog_set_default (GNOME_DIALOG (priv-&gt;edit_dialog), 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;edit_dialog != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (priv-&gt;address_entry != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	gtk_widget_realize (priv-&gt;edit_dialog);</div><div class='del'>-	</div><div class='del'>-	value = icalproperty_get_value (prop);</div><div class='del'>-</div><div class='del'>-	if (value != NULL) {</div><div class='del'>-		text = strdup (icalvalue_as_ical_string (value));</div><div class='del'>-	</div><div class='del'>-		/* Here I strip off the "MAILTO:" if it is present. */</div><div class='del'>-		new_text = strchr (text, ':');</div><div class='del'>-		if (new_text != NULL)</div><div class='del'>-			new_text++;</div><div class='del'>-		else</div><div class='del'>-			new_text = text;</div><div class='del'>-	</div><div class='del'>-		gtk_entry_set_text (GTK_ENTRY (priv-&gt;address_entry), new_text);</div><div class='del'>-		g_free (text);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		gtk_entry_set_text (GTK_ENTRY (priv-&gt;address_entry), "");</div><div class='del'>-	}</div><div class='del'>-				</div><div class='del'>-</div><div class='del'>-	param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);</div><div class='del'>-	enumval = icalparameter_get_role (param);</div><div class='del'>-	if (enumval &lt; 0 || enumval &gt; 4)</div><div class='del'>-		enumval = 4;</div><div class='del'>-	</div><div class='del'>-	text = role_values [enumval];</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (priv-&gt;role_entry), text);</div><div class='del'>-</div><div class='del'>-	param = get_icalparam_by_type (prop, ICAL_RSVP_PARAMETER);</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;rsvp_check),</div><div class='del'>-					icalparameter_get_rsvp (param));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (priv-&gt;edit_dialog);</div><div class='del'>-</div><div class='del'>-	button_num = gnome_dialog_run (GNOME_DIALOG (priv-&gt;edit_dialog));</div><div class='del'>-</div><div class='del'>-	if (button_num == 0) {</div><div class='del'>-		/* The user pressed the OK button. */</div><div class='del'>-		new_text = gtk_entry_get_text (GTK_ENTRY (priv-&gt;address_entry));</div><div class='del'>-</div><div class='del'>-		g_snprintf (buffer, 190, "MAILTO:%s", new_text);</div><div class='del'>-		value = icalvalue_new_text (buffer);</div><div class='del'>-		icalproperty_set_value (prop, value);</div><div class='del'>-</div><div class='del'>-		/* Take care of the ROLE. */</div><div class='del'>-		icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);</div><div class='del'>-</div><div class='del'>-		param = NULL;</div><div class='del'>-		text = gtk_entry_get_text (GTK_ENTRY(priv-&gt;role_entry));</div><div class='del'>-</div><div class='del'>-		for (cntr = 0; cntr &lt; 5; cntr++) {</div><div class='del'>-			if (strncmp (text, role_values[cntr], 3) == 0) {</div><div class='del'>-				param = icalparameter_new_role (cntr);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (param == NULL) {</div><div class='del'>-			g_print ("e-meeting-edit.c: edit_attendee() the ROLE param was null.\n");</div><div class='del'>-			/* Use this as a default case, if none of the others match. */</div><div class='del'>-			param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		icalproperty_add_parameter (prop, param);</div><div class='del'>-</div><div class='del'>-		/* Now the RSVP. */</div><div class='del'>-		icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);</div><div class='del'>-</div><div class='del'>-		param = icalparameter_new_rsvp </div><div class='del'>-				(gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv-&gt;rsvp_check)));</div><div class='del'>-		icalproperty_add_parameter (prop, param);</div><div class='del'>-</div><div class='del'>-		retval = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else  /* The user didn't say OK. */</div><div class='del'>-		retval = FALSE;</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'>-schedule_button_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	EMeetingTimeSelector *mts;</div><div class='del'>-	EMeetingTimeSelectorAttendeeType type;</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	gchar *attendee;</div><div class='del'>-	gint cntr, row;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	icalparameter *param;</div><div class='del'>-	gint button_num;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</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'>-	</div><div class='del'>-	dialog = gnome_dialog_new ("Schedule Meeting", "Set Time", "Cancel", NULL);</div><div class='del'>-</div><div class='del'>-	gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 400);</div><div class='del'>-	gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, TRUE, FALSE);</div><div class='del'>-</div><div class='del'>-	mts = (EMeetingTimeSelector *)e_meeting_time_selector_new ();</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (GNOME_DIALOG (dialog)-&gt;vbox), GTK_WIDGET (mts));</div><div class='del'>-	gtk_window_add_accel_group (GTK_WINDOW (dialog),</div><div class='del'>-				    E_MEETING_TIME_SELECTOR (mts)-&gt;accel_group);</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (mts));</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'>-	/* Let's stick all the attendees that we have in our clist, into the</div><div class='del'>-	   meeting time widget. */</div><div class='del'>-	for (cntr = 0; cntr &lt; priv-&gt;numentries; cntr++ ) {</div><div class='del'>-		gtk_clist_get_text (GTK_CLIST (priv-&gt;attendee_list), cntr, </div><div class='del'>-				    ADDRESS_COL, &amp;attendee);</div><div class='del'>-		row = e_meeting_time_selector_attendee_add (mts, attendee, NULL);</div><div class='del'>-</div><div class='del'>-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv-&gt;attendee_list), cntr);</div><div class='del'>-		param = get_icalparam_by_type (prop, ICAL_ROLE_PARAMETER);</div><div class='del'>-</div><div class='del'>-		switch (icalparameter_get_role (param)) {</div><div class='del'>-			case ICAL_ROLE_CHAIR:</div><div class='del'>-			case ICAL_ROLE_REQPARTICIPANT:</div><div class='del'>-			  type = E_MEETING_TIME_SELECTOR_REQUIRED_PERSON;</div><div class='del'>-			  break;</div><div class='del'>-			default:</div><div class='del'>-			  type = E_MEETING_TIME_SELECTOR_OPTIONAL_PERSON;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		e_meeting_time_selector_attendee_set_type (mts, row, type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* I don't want the meeting widget to be destroyed before I can</div><div class='del'>-	   extract information from it; so now the dialog window will just</div><div class='del'>-	   be hidden when the user clicks a button or closes it. */</div><div class='del'>-	gnome_dialog_close_hides (GNOME_DIALOG (dialog), TRUE);</div><div class='del'>-</div><div class='del'>-	gnome_dialog_set_close (GNOME_DIALOG (dialog), TRUE);</div><div class='del'>-</div><div class='del'>-	button_num = gnome_dialog_run (GNOME_DIALOG (dialog));</div><div class='del'>-</div><div class='del'>-	if (button_num == 0) {</div><div class='del'>-		/* The user clicked "Set Time". */</div><div class='del'>-                gint start_year, start_month, start_day, start_hour, start_minute, </div><div class='del'>-		     end_year, end_month, end_day, end_hour, end_minute;</div><div class='del'>-		CalComponentDateTime cal_dtstart, cal_dtend;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		e_meeting_time_selector_get_meeting_time (mts,</div><div class='del'>-							       &amp;start_year,</div><div class='del'>-							       &amp;start_month,</div><div class='del'>-							       &amp;start_day,</div><div class='del'>-							       &amp;start_hour,</div><div class='del'>-							       &amp;start_minute,</div><div class='del'>-							       &amp;end_year,</div><div class='del'>-							       &amp;end_month,</div><div class='del'>-							       &amp;end_day,</div><div class='del'>-							       &amp;end_hour,</div><div class='del'>-							       &amp;end_minute);</div><div class='del'>-		</div><div class='del'>-		cal_component_get_dtstart (priv-&gt;comp, &amp;cal_dtstart);</div><div class='del'>-		cal_component_get_dtend (priv-&gt;comp, &amp;cal_dtend);</div><div class='del'>-</div><div class='del'>-		cal_dtstart.value-&gt;second = 0;</div><div class='del'>-		cal_dtstart.value-&gt;minute = start_minute;</div><div class='del'>-		cal_dtstart.value-&gt;hour = start_hour;</div><div class='del'>-		cal_dtstart.value-&gt;day = start_day;</div><div class='del'>-		cal_dtstart.value-&gt;month = start_month;</div><div class='del'>-		cal_dtstart.value-&gt;year = start_year;</div><div class='del'>-</div><div class='del'>-		cal_dtend.value-&gt;second = 0;</div><div class='del'>-		cal_dtend.value-&gt;minute = end_minute;</div><div class='del'>-		cal_dtend.value-&gt;hour = end_hour;</div><div class='del'>-		cal_dtend.value-&gt;day = end_day;</div><div class='del'>-		cal_dtend.value-&gt;month = end_month;</div><div class='del'>-		cal_dtend.value-&gt;year = end_year;</div><div class='del'>-</div><div class='del'>-		cal_component_set_dtstart (priv-&gt;comp, &amp;cal_dtstart);</div><div class='del'>-		cal_component_set_dtend (priv-&gt;comp, &amp;cal_dtend);</div><div class='del'>-</div><div class='del'>-		cal_component_free_datetime (&amp;cal_dtstart);</div><div class='del'>-		cal_component_free_datetime (&amp;cal_dtend);</div><div class='del'>-</div><div class='del'>-		event_editor_update_widgets (priv-&gt;ee);	</div><div class='del'>-</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_widget_destroy (GTK_WIDGET (dialog));</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define COMPOSER_OAFID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gchar *itip_methods[] = {</div><div class='del'>-	"REQUEST"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum itip_method_enum {</div><div class='del'>-	METHOD_REQUEST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/********</div><div class='del'>- * This routine is called when the send button is clicked. Duh. </div><div class='del'>- * Actually, I'm just testing my commenting macros.</div><div class='del'>- ********/</div><div class='del'>-static void</div><div class='del'>-send_button_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-	BonoboObjectClient *bonobo_server;</div><div class='del'>-	Evolution_Composer composer_server;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Composer_RecipientList *to_list, *cc_list, *bcc_list;</div><div class='del'>-	Evolution_Composer_Recipient *recipient;</div><div class='del'>-	gchar *cell_text;</div><div class='del'>-	CORBA_char *subject;</div><div class='del'>-	gint cntr;</div><div class='del'>-	gint len;</div><div class='del'>-	CalComponentText caltext;</div><div class='del'>-	CORBA_char *content_type, *filename, *description, *attach_data;</div><div class='del'>-	CORBA_boolean show_inline;</div><div class='del'>-	CORBA_char tempstr[200];</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/********</div><div class='del'>-	 * CODE</div><div class='del'>-	 ********/</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* First, I obtain an object reference that represents the Composer. */</div><div class='del'>-	bonobo_server = bonobo_object_activate (COMPOSER_OAFID, 0);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (bonobo_server != NULL);</div><div class='del'>-</div><div class='del'>-	composer_server = bonobo_object_corba_objref (BONOBO_OBJECT (bonobo_server));</div><div class='del'>-</div><div class='del'>-	/* All right, now I have to convert my list of recipients into one of those</div><div class='del'>-	   CORBA sequences. */</div><div class='del'>-	to_list = Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	to_list-&gt;_maximum = priv-&gt;numentries;</div><div class='del'>-	to_list-&gt;_length = priv-&gt;numentries; </div><div class='del'>-	to_list-&gt;_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (priv-&gt;numentries);</div><div class='del'>-</div><div class='del'>-	for (cntr = 0; cntr &lt; priv-&gt;numentries; cntr++) {</div><div class='del'>-		gtk_clist_get_text (GTK_CLIST (priv-&gt;attendee_list),</div><div class='del'>-				    cntr, ADDRESS_COL,</div><div class='del'>-				    &amp;cell_text);</div><div class='del'>-		len = strlen (cell_text);</div><div class='del'>-</div><div class='del'>-		recipient = &amp;(to_list-&gt;_buffer[cntr]);</div><div class='del'>-		recipient-&gt;name = CORBA_string_alloc (0);  /* FIXME: we may want an actual name here. */</div><div class='del'>-		recipient-&gt;name[0] = '\0';</div><div class='del'>-		recipient-&gt;address = CORBA_string_alloc (len);</div><div class='del'>-		strcpy (recipient-&gt;address, cell_text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cc_list = Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	cc_list-&gt;_maximum = cc_list-&gt;_length = 0;</div><div class='del'>-	bcc_list = Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	bcc_list-&gt;_maximum = bcc_list-&gt;_length = 0;</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (priv-&gt;comp, &amp;caltext);</div><div class='del'>-	subject = CORBA_string_alloc (strlen (caltext.value));</div><div class='del'>-	strcpy (subject, caltext.value);</div><div class='del'>-</div><div class='del'>-	Evolution_Composer_set_headers (composer_server, to_list, cc_list, bcc_list, subject, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_printerr ("gui/e-meeting-edit.c: I couldn't set the composer headers via CORBA! Aagh.\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	sprintf (tempstr, "text/calendar;METHOD=%s", itip_methods[METHOD_REQUEST]);</div><div class='del'>-	content_type = CORBA_string_alloc (strlen (tempstr));</div><div class='del'>-	strcpy (content_type, tempstr);</div><div class='del'>-	filename = CORBA_string_alloc (0);</div><div class='del'>-	filename[0] = '\0';</div><div class='del'>-	sprintf (tempstr, "Calendar attachment");</div><div class='del'>-	description = CORBA_string_alloc (strlen (tempstr));</div><div class='del'>-	strcpy (description, tempstr);</div><div class='del'>-	show_inline = FALSE;</div><div class='del'>-</div><div class='del'>-	/* I need to create an encapsulating iCalendar component, and stuff our vEvent</div><div class='del'>-	   into it. */</div><div class='del'>-	{</div><div class='del'>-		icalcomponent *comp;</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-		icalvalue *value;</div><div class='del'>-		gchar *ical_string;</div><div class='del'>-</div><div class='del'>-		save_organizer (priv);</div><div class='del'>-		</div><div class='del'>-		comp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);</div><div class='del'>-		</div><div class='del'>-		prop = icalproperty_new (ICAL_PRODID_PROPERTY);</div><div class='del'>-		value = icalvalue_new_text ("-//HelixCode/Evolution//EN");</div><div class='del'>-		icalproperty_set_value (prop, value);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-</div><div class='del'>-		prop = icalproperty_new (ICAL_VERSION_PROPERTY);</div><div class='del'>-		value = icalvalue_new_text ("2.0");</div><div class='del'>-		icalproperty_set_value (prop, value);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-</div><div class='del'>-		prop = icalproperty_new (ICAL_METHOD_PROPERTY);</div><div class='del'>-		value = icalvalue_new_text ("REQUEST");</div><div class='del'>-		icalproperty_set_value (prop, value);</div><div class='del'>-		icalcomponent_add_property (comp, prop);</div><div class='del'>-</div><div class='del'>-		icalcomponent_add_component (comp, priv-&gt;vevent);</div><div class='del'>-</div><div class='del'>-		ical_string = icalcomponent_as_ical_string (comp);</div><div class='del'>-		attach_data = CORBA_string_alloc (strlen (ical_string));</div><div class='del'>-		strcpy (attach_data, ical_string);</div><div class='del'>-</div><div class='del'>-		icalcomponent_remove_component (comp, priv-&gt;vevent);</div><div class='del'>-		icalcomponent_free (comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/********</div><div class='del'>-	 * This is for debugging.</div><div class='del'>-	 ********/</div><div class='del'>-	{</div><div class='del'>-		FILE *fp = fopen ("/home/jpavel/attach_data.icl", "w");</div><div class='del'>-</div><div class='del'>-		fputs (attach_data, fp);</div><div class='del'>-</div><div class='del'>-		fclose (fp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	Evolution_Composer_attach_data (composer_server, </div><div class='del'>-					content_type, filename, description,</div><div class='del'>-					show_inline, attach_data,</div><div class='del'>-					&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_printerr ("gui/e-meeting-edit.c: I couldn't attach data to the composer via CORBA! Aagh.\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	Evolution_Composer_show (composer_server, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_printerr ("gui/e-meeting-edit.c: I couldn't show the composer via CORBA! Aagh.\n");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* Let's free shit up. */</div><div class='del'>-</div><div class='del'>-	/* Beware--depending on whether CORBA_free is recursive, which I</div><div class='del'>-	   think is is, we might have memory leaks, in which case the code</div><div class='del'>-	   below is necessary. */</div><div class='del'>-#if 0</div><div class='del'>-	for (cntr = 0; cntr &lt; priv-&gt;numentries; cntr++) {</div><div class='del'>-		recipient = &amp;(to_list-&gt;_buffer[cntr]);</div><div class='del'>-		CORBA_free (recipient-&gt;name);</div><div class='del'>-		CORBA_free (recipient-&gt;address);</div><div class='del'>-		recipient-&gt;name = recipient-&gt;address = NULL;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (CORBA_sequence_get_release (to_list) != FALSE)</div><div class='del'>-		CORBA_free (to_list-&gt;_buffer);</div><div class='del'>-</div><div class='del'>-	CORBA_free (to_list);</div><div class='del'>-	CORBA_free (cc_list);</div><div class='del'>-	CORBA_free (bcc_list);</div><div class='del'>-</div><div class='del'>-	CORBA_free (subject);</div><div class='del'>-	CORBA_free (content_type);</div><div class='del'>-	CORBA_free (filename);</div><div class='del'>-	CORBA_free (description);</div><div class='del'>-	CORBA_free (attach_data);</div><div class='del'>-</div><div class='del'>-	/* bonobo_object_unref (BONOBO_OBJECT (bonobo_server));   */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-static void </div><div class='del'>-add_button_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	icalparameter *param;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	prop = icalproperty_new (ICAL_ATTENDEE_PROPERTY);</div><div class='del'>-	param = icalparameter_new_role (ICAL_ROLE_REQPARTICIPANT); </div><div class='del'>-	icalproperty_add_parameter (prop, param);</div><div class='del'>-	param = icalparameter_new_rsvp (TRUE); </div><div class='del'>-	icalproperty_add_parameter (prop, param);</div><div class='del'>-	param = icalparameter_new_partstat (ICAL_PARTSTAT_NEEDSACTION);</div><div class='del'>-	icalproperty_add_parameter (prop, param);</div><div class='del'>-</div><div class='del'>-	if (edit_attendee (prop, data) == TRUE) {</div><div class='del'>-		/* Let's add this property to our component and to the CList. */</div><div class='del'>-		icalcomponent_add_property (priv-&gt;vevent, prop);</div><div class='del'>-</div><div class='del'>-		/* The -1 indicates that we should add a new row. */</div><div class='del'>-		put_property_in_list (prop, -1, data);</div><div class='del'>-</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		icalproperty_free (prop);</div><div class='del'>-	}</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-delete_button_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;selected_row &lt; 0) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-		dialog = gnome_warning_dialog_parented ("You must select an entry to delete.",</div><div class='del'>-							GTK_WINDOW (priv-&gt;meeting_window));</div><div class='del'>-		gnome_dialog_run (GNOME_DIALOG(dialog));</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* Delete the associated property from the iCAL object. */</div><div class='del'>-		icalproperty *prop;</div><div class='del'>-</div><div class='del'>-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv-&gt;attendee_list),</div><div class='del'>-							       priv-&gt;selected_row);</div><div class='del'>-		icalcomponent_remove_property (priv-&gt;vevent, prop);</div><div class='del'>-		icalproperty_free (prop);</div><div class='del'>-</div><div class='del'>-		gtk_clist_remove (GTK_CLIST (priv-&gt;attendee_list), priv-&gt;selected_row);</div><div class='del'>-		priv-&gt;selected_row = -1;</div><div class='del'>-		priv-&gt;numentries--;</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-edit_button_clicked_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;selected_row &lt; 0) {</div><div class='del'>-		GtkWidget *dialog;</div><div class='del'>-</div><div class='del'>-		dialog = gnome_warning_dialog_parented ("You must select an entry to edit.",</div><div class='del'>-							GTK_WINDOW (priv-&gt;meeting_window));</div><div class='del'>-		gnome_dialog_run (GNOME_DIALOG(dialog));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		icalproperty *prop, *new_prop;</div><div class='del'>-		icalparameter *param;</div><div class='del'>-		icalvalue *value;</div><div class='del'>-		</div><div class='del'>-		prop = (icalproperty *)gtk_clist_get_row_data (GTK_CLIST (priv-&gt;attendee_list),</div><div class='del'>-							       priv-&gt;selected_row);</div><div class='del'>-</div><div class='del'>-		g_assert (prop != NULL);</div><div class='del'>-</div><div class='del'>-		new_prop = icalproperty_new_clone (prop);</div><div class='del'>-</div><div class='del'>-		if (edit_attendee (new_prop, data)) {</div><div class='del'>-			/* The user hit Okay. */</div><div class='del'>-			/*We need to synchronize the old property with the newly edited one.*/</div><div class='del'>-			value = icalvalue_new_clone (icalproperty_get_value (new_prop));</div><div class='del'>-			icalproperty_set_value (prop, value);</div><div class='del'>-</div><div class='del'>-			icalproperty_remove_parameter (prop, ICAL_ROLE_PARAMETER);</div><div class='del'>-			icalproperty_remove_parameter (prop, ICAL_RSVP_PARAMETER);</div><div class='del'>-			icalproperty_remove_parameter (prop, ICAL_PARTSTAT_PARAMETER);</div><div class='del'>-</div><div class='del'>-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_ROLE_PARAMETER));</div><div class='del'>-			g_assert (param != NULL);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_RSVP_PARAMETER));</div><div class='del'>-			g_assert (param != NULL);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-			param = icalparameter_new_clone (get_icalparam_by_type (new_prop, ICAL_PARTSTAT_PARAMETER));</div><div class='del'>-			g_assert (param != NULL);</div><div class='del'>-			icalproperty_add_parameter (prop, param);</div><div class='del'>-			</div><div class='del'>-			put_property_in_list (prop, priv-&gt;selected_row, data);</div><div class='del'>-			priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-		}</div><div class='del'>-		icalproperty_free (new_prop);</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'>-list_row_select_cb  (GtkWidget *widget,</div><div class='del'>-                     gint row,</div><div class='del'>-                     gint column,</div><div class='del'>-                     GdkEventButton *event,</div><div class='del'>-                     gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;selected_row = row;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-organizer_changed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *) ((EMeetingEditor *)data)-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect (GTK_OBJECT (priv-&gt;organizer_entry), priv-&gt;changed_signal_id);</div><div class='del'>-</div><div class='del'>-	priv-&gt;dirty = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* ------------------------------------------------------------ */</div><div class='del'>-/* --------------------- Exported Functions ------------------- */</div><div class='del'>-/* ------------------------------------------------------------ */</div><div class='del'>-</div><div class='del'>-EMeetingEditor * </div><div class='del'>-e_meeting_editor_new (CalComponent *comp, CalClient *client, EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditor *object;</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	object = (EMeetingEditor *)g_new(EMeetingEditor, 1);</div><div class='del'>-	</div><div class='del'>-	priv = (EMeetingEditorPrivate *) g_new0(EMeetingEditorPrivate, 1);</div><div class='del'>-	priv-&gt;selected_row = -1;</div><div class='del'>-	priv-&gt;comp = comp;</div><div class='del'>-	priv-&gt;client = client;</div><div class='del'>-	priv-&gt;icalcomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-	priv-&gt;ee = ee;</div><div class='del'>-	</div><div class='del'>-	object-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	return object;	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_meeting_editor_free (EMeetingEditor *editor)</div><div class='del'>-{</div><div class='del'>-	if (editor == NULL)</div><div class='del'>-		return;</div><div class='del'>-		</div><div class='del'>-	if (editor-&gt;priv != NULL)</div><div class='del'>-		g_free (editor-&gt;priv);</div><div class='del'>-	</div><div class='del'>-	g_free (editor);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_meeting_edit (EMeetingEditor *editor)</div><div class='del'>-{</div><div class='del'>-	EMeetingEditorPrivate *priv;</div><div class='del'>-	GtkWidget *add_button, *delete_button, *edit_button;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-	icalvalue *value;</div><div class='del'>-	gchar *text;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (editor != NULL);</div><div class='del'>-</div><div class='del'>-	priv = (EMeetingEditorPrivate *)editor-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv != NULL);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	priv-&gt;xml = glade_xml_new (EVOLUTION_GLADEDIR "/" E_MEETING_GLADE_XML, NULL);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;meeting_window =  glade_xml_get_widget (priv-&gt;xml, "meeting_window");</div><div class='del'>-	priv-&gt;attendee_list = glade_xml_get_widget (priv-&gt;xml, "attendee_list");</div><div class='del'>-	priv-&gt;role_entry = glade_xml_get_widget (priv-&gt;xml, "role_entry");</div><div class='del'>-	priv-&gt;rsvp_check = glade_xml_get_widget (priv-&gt;xml, "rsvp_check");</div><div class='del'>-	priv-&gt;schedule_button = glade_xml_get_widget (priv-&gt;xml, "schedule_button");</div><div class='del'>-	priv-&gt;send_button = glade_xml_get_widget (priv-&gt;xml, "send_button");</div><div class='del'>-</div><div class='del'>-	gtk_clist_set_column_justification (GTK_CLIST (priv-&gt;attendee_list), ROLE_COL, GTK_JUSTIFY_CENTER);</div><div class='del'>-	gtk_clist_set_column_justification (GTK_CLIST (priv-&gt;attendee_list), RSVP_COL, GTK_JUSTIFY_CENTER);</div><div class='del'>-	gtk_clist_set_column_justification (GTK_CLIST (priv-&gt;attendee_list), STATUS_COL, GTK_JUSTIFY_CENTER);</div><div class='del'>-</div><div class='del'>-        gtk_signal_connect (GTK_OBJECT (priv-&gt;meeting_window), "delete_event",</div><div class='del'>-                            GTK_SIGNAL_FUNC (window_delete_cb), editor);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (priv-&gt;meeting_window), "delete_event",</div><div class='del'>-				  GTK_SIGNAL_FUNC (window_destroy_cb), editor);</div><div class='del'>-</div><div class='del'>-        gtk_signal_connect (GTK_OBJECT (priv-&gt;meeting_window), "destroy_event",</div><div class='del'>-                            GTK_SIGNAL_FUNC (window_destroy_cb), editor);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;attendee_list), "select_row",</div><div class='del'>-			    GTK_SIGNAL_FUNC (list_row_select_cb), editor);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;schedule_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (schedule_button_clicked_cb), editor);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;send_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (send_button_clicked_cb), editor);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	add_button = glade_xml_get_widget (priv-&gt;xml, "add_button");</div><div class='del'>-	delete_button = glade_xml_get_widget (priv-&gt;xml, "delete_button");</div><div class='del'>-	edit_button = glade_xml_get_widget (priv-&gt;xml, "edit_button");</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (add_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (add_button_clicked_cb), editor);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (delete_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (delete_button_clicked_cb), editor);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (edit_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (edit_button_clicked_cb), editor);</div><div class='del'>-</div><div class='del'>-	priv-&gt;organizer_entry = glade_xml_get_widget (priv-&gt;xml, "organizer_entry");</div><div class='del'>-</div><div class='del'>-	if (icalcomponent_isa (priv-&gt;icalcomp) != ICAL_VEVENT_COMPONENT)</div><div class='del'>-		priv-&gt;vevent = icalcomponent_get_first_component(priv-&gt;icalcomp,ICAL_VEVENT_COMPONENT);</div><div class='del'>-	else</div><div class='del'>-		priv-&gt;vevent = priv-&gt;icalcomp;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;vevent != NULL);</div><div class='del'>-</div><div class='del'>-	/* Let's extract the organizer, if there is one. */</div><div class='del'>-        prop = icalcomponent_get_first_property (priv-&gt;vevent, ICAL_ORGANIZER_PROPERTY);</div><div class='del'>-</div><div class='del'>-	if (prop != NULL) {</div><div class='del'>-		gchar *buffer;</div><div class='del'>-</div><div class='del'>-	        value = icalproperty_get_value (prop);</div><div class='del'>-		buffer = g_strdup (icalvalue_as_ical_string (value));</div><div class='del'>-	        if (buffer != NULL) {</div><div class='del'>-			/* Strip off the MAILTO:, if it is present. */</div><div class='del'>-	        	text = strchr (buffer, ':');</div><div class='del'>-			if (text == NULL)</div><div class='del'>-				text = buffer;</div><div class='del'>-			else</div><div class='del'>-				text++;</div><div class='del'>-				</div><div class='del'>-			gtk_entry_set_text (GTK_ENTRY (priv-&gt;organizer_entry), text);</div><div class='del'>-			g_free (buffer);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;changed_signal_id = gtk_signal_connect (GTK_OBJECT (priv-&gt;organizer_entry), "changed",</div><div class='del'>-						      GTK_SIGNAL_FUNC (organizer_changed_cb), editor);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Let's go through the iCAL object, and create a list entry</div><div class='del'>-	   for each ATTENDEE property. */</div><div class='del'>-        for (prop = icalcomponent_get_first_property (priv-&gt;vevent, ICAL_ATTENDEE_PROPERTY);</div><div class='del'>-             prop != NULL;</div><div class='del'>-             prop = icalcomponent_get_next_property (priv-&gt;vevent, ICAL_ATTENDEE_PROPERTY))</div><div class='del'>-	{</div><div class='del'>-		put_property_in_list (prop, -1, editor);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (priv-&gt;meeting_window);</div><div class='del'>-</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;meeting_window != NULL)</div><div class='del'>-		gtk_widget_destroy (priv-&gt;meeting_window);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;edit_dialog != NULL)</div><div class='del'>-		gtk_widget_destroy (priv-&gt;edit_dialog);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (priv-&gt;xml));</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/e-meeting-edit.h b/calendar/gui/e-meeting-edit.h<br/>deleted file mode 100644<br/>index 953dd23428..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-meeting-edit.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-meeting-edit.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,46 +0,0 @@</div><div class='del'>-/* Evolution calendar - Meeting 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: Jesse Pavel &lt;jpavel@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 __E_MEETING_EDIT_H__</div><div class='del'>-#define __E_MEETING_EDIT_H__</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;cal-util/cal-component.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-#include "event-editor.h"</div><div class='del'>-</div><div class='del'>-typedef struct _EMeetingEditor EMeetingEditor;</div><div class='del'>-</div><div class='del'>-struct _EMeetingEditor {</div><div class='del'>-	gpointer priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EMeetingEditor * e_meeting_editor_new (CalComponent *comp, CalClient *client, </div><div class='del'>-				       EventEditor *ee);</div><div class='del'>-void e_meeting_edit (EMeetingEditor *editor);</div><div class='del'>-void e_meeting_editor_free (EMeetingEditor *editor);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /*  __E_MEETING_EDIT_H__  */</div><div class='del'>-</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 074aebe486..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-event-item.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-week-view-event-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,754 +0,0 @@</div><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 &lt;gal/e-text/e-text.h&gt;</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_small_min = 0;</div><div class='del'>-	icon_x = 0;</div><div class='del'>-</div><div class='del'>-	time_y = y1 + E_WEEK_VIEW_EVENT_BORDER_HEIGHT</div><div class='del'>-		+ E_WEEK_VIEW_EVENT_TEXT_Y_PAD + font-&gt;ascent;</div><div class='del'>-</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'>-</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'>-	CalComponent *comp;</div><div class='del'>-	GdkGC *gc;</div><div class='del'>-	gint num_icons = 0, icon_x_inc;</div><div class='del'>-	gboolean draw_reminder_icon = FALSE, draw_recurrence_icon = FALSE;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (GTK_WIDGET (GNOME_CANVAS_ITEM (wveitem)-&gt;canvas)-&gt;parent);</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				wveitem-&gt;event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + wveitem-&gt;span_num);</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-</div><div class='del'>-	gc = week_view-&gt;main_gc;</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_alarms (comp)) {</div><div class='del'>-		draw_reminder_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (cal_component_has_recurrences (comp)) {</div><div class='del'>-		draw_recurrence_icon = TRUE;</div><div class='del'>-		num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 10990324ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view-main-item.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-week-view-main-item.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,388 +0,0 @@</div><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;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt; num_days; day++) {</div><div class='del'>-		e_week_view_get_day_position (week_view, day,</div><div class='del'>-					      &amp;day_x, &amp;day_y,</div><div class='del'>-					      &amp;day_w, &amp;day_h);</div><div class='del'>-		/* Skip any days which are outside the area. */</div><div class='del'>-		if (day_x &lt; x + width &amp;&amp; day_x + day_w &gt;= x</div><div class='del'>-		    &amp;&amp; day_y &lt; y + height &amp;&amp; day_y + day_h &gt;= y) {</div><div class='del'>-			e_week_view_main_item_draw_day (wvmitem, day, &amp;date,</div><div class='del'>-							drawable,</div><div class='del'>-							day_x - x, day_y - y,</div><div class='del'>-							day_w, day_h);</div><div class='del'>-		}</div><div class='del'>-		g_date_add_days (&amp;date, 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_main_item_draw_day (EWeekViewMainItem *wvmitem,</div><div class='del'>-				gint		   day,</div><div class='del'>-				GDate		  *date,</div><div class='del'>-				GdkDrawable       *drawable,</div><div class='del'>-				gint		   x,</div><div class='del'>-				gint		   y,</div><div class='del'>-				gint		   width,</div><div class='del'>-				gint		   height)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-	GdkGC *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'>-	g_return_if_fail (gc != NULL);</div><div class='del'>-</div><div class='del'>-	month = g_date_month (date);</div><div class='del'>-	day_of_month = g_date_day (date);</div><div class='del'>-	line_y = y + E_WEEK_VIEW_DATE_T_PAD + font-&gt;ascent</div><div class='del'>-		+ font-&gt;descent	+ E_WEEK_VIEW_DATE_LINE_T_PAD;</div><div class='del'>-</div><div class='del'>-	/* Draw the background of the day. In the month view odd months are</div><div class='del'>-	   one color and even months another, so you can easily see when each</div><div class='del'>-	   month starts (defaults are white for odd - January, March, ... and</div><div class='del'>-	   light gray for even). In the week view the background is always the</div><div class='del'>-	   same color, the color used for the odd months in the month view. */</div><div class='del'>-	if (week_view-&gt;multi_week_view &amp;&amp; (month % 2 == 0))</div><div class='del'>-		bg_color = &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS];</div><div class='del'>-	else</div><div class='del'>-		bg_color = &amp;week_view-&gt;colors[E_WEEK_VIEW_COLOR_ODD_MONTHS];</div><div class='del'>-</div><div class='del'>-	gdk_gc_set_foreground (gc, bg_color);</div><div class='del'>-	gdk_draw_rectangle (drawable, gc, TRUE, x, y, width, height);</div><div class='del'>-</div><div class='del'>-	/* Draw the lines on the right and bottom of the cell. The canvas is</div><div class='del'>-	   sized so that the lines on the right &amp; bottom edges will be off the</div><div class='del'>-	   edge of the canvas, so we don't have to worry about them. */</div><div class='del'>-	right_edge = x + width - 1;</div><div class='del'>-	bottom_edge = y + height - 1;</div><div class='del'>-</div><div class='del'>-	gdk_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;multi_week_view)</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;multi_week_view) {</div><div class='del'>-		show_day_name = TRUE;</div><div class='del'>-		show_month_name = TRUE;</div><div class='del'>-	} else if (day == 0 || day_of_month == 1) {</div><div class='del'>-		show_month_name = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now find the longest form of the date that will fit. */</div><div class='del'>-	max_width = width - 4;</div><div class='del'>-	format_string = NULL;</div><div class='del'>-	if (show_day_name) {</div><div class='del'>-		if (week_view-&gt;max_day_width + week_view-&gt;digit_width * 2</div><div class='del'>-		    + week_view-&gt;space_width * 2</div><div class='del'>-		    + week_view-&gt;month_widths[month - 1] &lt; max_width)</div><div class='del'>-			/* strftime format %A = full weekday name, %d = day of</div><div class='del'>-			   month, %B = full month name. You can change the</div><div class='del'>-			   order but don't change the specifiers or add</div><div class='del'>-			   anything. */</div><div class='del'>-			format_string = _("%A %d %B");</div><div class='del'>-		else if (week_view-&gt;max_abbr_day_width</div><div class='del'>-			 + week_view-&gt;digit_width * 2</div><div class='del'>-			 + week_view-&gt;space_width * 2</div><div class='del'>-			 + week_view-&gt;abbr_month_widths[month - 1] &lt; max_width)</div><div class='del'>-			/* strftime format %a = abbreviated weekday name,</div><div class='del'>-			   %d = day of month, %b = abbreviated month name.</div><div class='del'>-			   You can change the order but don't change the</div><div class='del'>-			   specifiers or add anything. */</div><div class='del'>-			format_string = _("%a %d %b");</div><div class='del'>-	}</div><div class='del'>-	if (!format_string &amp;&amp; show_month_name) {</div><div class='del'>-		if (week_view-&gt;digit_width * 2 + week_view-&gt;space_width</div><div class='del'>-		    + week_view-&gt;month_widths[month - 1] &lt; max_width)</div><div class='del'>-			/* strftime format %d = day of month, %B = full</div><div class='del'>-			   month name. You can change the order but don't</div><div class='del'>-			   change the specifiers or add anything. */</div><div class='del'>-			format_string = _("%d %B");</div><div class='del'>-		else if (week_view-&gt;digit_width * 2 + week_view-&gt;space_width</div><div class='del'>-		    + week_view-&gt;abbr_month_widths[month - 1] &lt; max_width)</div><div class='del'>-			/* strftime format %d = day of month, %b = abbreviated</div><div class='del'>-			   month name. You can change the order but don't</div><div class='del'>-			   change the specifiers or add anything. */</div><div class='del'>-			format_string = _("%d %b");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_date_strftime (buffer, sizeof (buffer),</div><div class='del'>-			 format_string ? format_string : "%d", date);</div><div class='del'>-	date_width = gdk_string_width (font, buffer);</div><div class='del'>-	date_x = x + width - date_width - E_WEEK_VIEW_DATE_R_PAD;</div><div class='del'>-	date_x = MAX (date_x, x + 1);</div><div class='del'>-</div><div class='del'>-	if (selected)</div><div class='del'>-		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;multi_week_view) {</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 eadc3c9bd3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-week-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3182 +0,0 @@</div><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 &lt;gal/widgets/e-canvas.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-canvas-utils.h&gt;</div><div class='del'>-</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_queue_reload_events (EWeekView *week_view);</div><div class='del'>-static gboolean e_week_view_reload_events_idle_cb	(gpointer data);</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 gboolean e_week_view_add_event (CalComponent *comp,</div><div class='del'>-				       time_t	  start,</div><div class='del'>-				       time_t	  end,</div><div class='del'>-				       gpointer	  data);</div><div class='del'>-static void e_week_view_check_layout (EWeekView *week_view);</div><div class='del'>-static void e_week_view_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'>-#ifndef NO_WARNINGS</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'>-#endif</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'>-	GnomeCanvasGroup *canvas_group;</div><div class='del'>-	GtkObject *adjustment;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	GTK_WIDGET_SET_FLAGS (week_view, GTK_CAN_FOCUS);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;calendar = NULL;</div><div class='del'>-	week_view-&gt;client = NULL;</div><div class='del'>-</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'>-	week_view-&gt;reload_events_idle_id = 0;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;spans = NULL;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;multi_week_view = FALSE;</div><div class='del'>-	week_view-&gt;weeks_shown = 6;</div><div class='del'>-	week_view-&gt;rows = 6;</div><div class='del'>-	week_view-&gt;columns = 2;</div><div class='del'>-	week_view-&gt;compress_weekend = TRUE;</div><div class='del'>-</div><div class='del'>-	g_date_clear (&amp;week_view-&gt;base_date, 1);</div><div class='del'>-	g_date_clear (&amp;week_view-&gt;first_day_shown, 1);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;row_height = 10;</div><div class='del'>-	week_view-&gt;rows_per_cell = 1;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;selection_start_day = -1;</div><div class='del'>-	week_view-&gt;selection_drag_pos = E_WEEK_VIEW_DRAG_NONE;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;pressed_event_num = -1;</div><div class='del'>-	week_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;main_gc = NULL;</div><div class='del'>-</div><div class='del'>-	/* 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'>-</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 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'>-	e_week_view_free_events (week_view);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;reload_events_idle_id != 0) {</div><div class='del'>-		g_source_remove (week_view-&gt;reload_events_idle_id);</div><div class='del'>-		week_view-&gt;reload_events_idle_id = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view-&gt;client), week_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (week_view-&gt;client));</div><div class='del'>-		week_view-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;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'>-	GdkColormap *colormap;</div><div class='del'>-	gboolean success[E_WEEK_VIEW_COLOR_LAST];</div><div class='del'>-	gint nfailed;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;realize)(widget);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-	week_view-&gt;main_gc = gdk_gc_new (widget-&gt;window);</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (widget);</div><div class='del'>-</div><div class='del'>-	/* Allocate the colors. */</div><div class='del'>-	week_view-&gt;colors[E_WEEK_VIEW_COLOR_EVEN_MONTHS].red   = 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'>-	/* 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'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_unrealize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	GdkColormap *colormap;</div><div class='del'>-	gint i;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	gdk_gc_unref (week_view-&gt;main_gc);</div><div class='del'>-	week_view-&gt;main_gc = NULL;</div><div class='del'>-</div><div class='del'>-	colormap = gtk_widget_get_colormap (widget);</div><div class='del'>-	for (i = 0; i &lt; E_WEEK_VIEW_COLOR_LAST; i++)</div><div class='del'>-		gdk_colors_free (colormap, &amp;week_view-&gt;colors[i].pixel, 1, 0);</div><div class='del'>-</div><div class='del'>-	gdk_pixmap_unref (week_view-&gt;reminder_icon);</div><div class='del'>-	week_view-&gt;reminder_icon = NULL;</div><div class='del'>-	gdk_pixmap_unref (week_view-&gt;recurrence_icon);</div><div class='del'>-	week_view-&gt;recurrence_icon = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-		(*GTK_WIDGET_CLASS (parent_class)-&gt;unrealize)(widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_style_set (GtkWidget *widget,</div><div class='del'>-		      GtkStyle  *previous_style)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	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'>-	gdouble old_x2, old_y2, new_x2, new_y2;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	(*GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate) (widget, allocation);</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-</div><div class='del'>-	/* Set the scroll region of the top canvas to its allocated size. */</div><div class='del'>-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view-&gt;titles_canvas),</div><div class='del'>-					NULL, NULL, &amp;old_x2, &amp;old_y2);</div><div class='del'>-	new_x2 = week_view-&gt;titles_canvas-&gt;allocation.width - 1;</div><div class='del'>-	new_y2 = week_view-&gt;titles_canvas-&gt;allocation.height - 1;</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2)</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view-&gt;titles_canvas),</div><div class='del'>-						0, 0, new_x2, new_y2);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Set the scroll region of the main canvas to its allocated width,</div><div class='del'>-	   but with the height depending on the number of rows needed. */</div><div class='del'>-	gnome_canvas_get_scroll_region (GNOME_CANVAS (week_view-&gt;main_canvas),</div><div class='del'>-					NULL, NULL, &amp;old_x2, &amp;old_y2);</div><div class='del'>-	new_x2 = week_view-&gt;main_canvas-&gt;allocation.width - 1;</div><div class='del'>-	new_y2 = week_view-&gt;main_canvas-&gt;allocation.height - 1;</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2)</div><div class='del'>-		gnome_canvas_set_scroll_region (GNOME_CANVAS (week_view-&gt;main_canvas),</div><div class='del'>-						0, 0, new_x2, new_y2);</div><div class='del'>-</div><div class='del'>-	/* Flag that we need to reshape the events. */</div><div class='del'>-	if (old_x2 != new_x2 || old_y2 != new_y2) {</div><div class='del'>-		week_view-&gt;events_need_reshape = TRUE;</div><div class='del'>-		e_week_view_check_layout (week_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_recalc_cell_sizes (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	gfloat canvas_width, canvas_height, offset;</div><div class='del'>-	gint row, col;</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint width, height, time_width;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;multi_week_view) {</div><div class='del'>-		week_view-&gt;rows = week_view-&gt;weeks_shown * 2;</div><div class='del'>-		week_view-&gt;columns = week_view-&gt;compress_weekend ? 6 : 7;</div><div class='del'>-	} else {</div><div class='del'>-		week_view-&gt;rows = 6;</div><div class='del'>-		week_view-&gt;columns = 2;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the column sizes, using floating point so that pixels</div><div class='del'>-	   get divided evenly. Note that we use one more element than the</div><div class='del'>-	   number of columns, to make it easy to get the column widths.</div><div class='del'>-	   We also add one to the width so that the right border of the last</div><div class='del'>-	   column is off the edge of the displayed area. */</div><div class='del'>-	canvas_width = week_view-&gt;main_canvas-&gt;allocation.width + 1;</div><div class='del'>-	canvas_width /= week_view-&gt;columns;</div><div class='del'>-	offset = 0;</div><div class='del'>-	for (col = 0; col &lt;= week_view-&gt;columns; col++) {</div><div class='del'>-		week_view-&gt;col_offsets[col] = floor (offset + 0.5);</div><div class='del'>-		offset += canvas_width;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the cell widths based on the offsets. */</div><div class='del'>-	for (col = 0; col &lt; week_view-&gt;columns; col++) {</div><div class='del'>-		week_view-&gt;col_widths[col] = week_view-&gt;col_offsets[col + 1]</div><div class='del'>-			- week_view-&gt;col_offsets[col];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Now do the same for the row heights. */</div><div class='del'>-	canvas_height = week_view-&gt;main_canvas-&gt;allocation.height + 1;</div><div class='del'>-	canvas_height /= week_view-&gt;rows;</div><div class='del'>-	offset = 0;</div><div class='del'>-	for (row = 0; row &lt;= week_view-&gt;rows; row++) {</div><div class='del'>-		week_view-&gt;row_offsets[row] = floor (offset + 0.5);</div><div class='del'>-		offset += canvas_height;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Calculate the cell heights based on the offsets. */</div><div class='del'>-	for (row = 0; row &lt; week_view-&gt;rows; row++) {</div><div class='del'>-		week_view-&gt;row_heights[row] = week_view-&gt;row_offsets[row + 1]</div><div class='del'>-			- week_view-&gt;row_offsets[row];</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* If the font hasn't been set yet just return. */</div><div class='del'>-	widget = GTK_WIDGET (week_view);</div><div class='del'>-	if (!widget-&gt;style || ! widget-&gt;style-&gt;font)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	font = widget-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	/* Calculate the number of rows of events in each cell, for the large</div><div class='del'>-	   cells and the compressed weekend cells. */</div><div class='del'>-	if (week_view-&gt;multi_week_view) {</div><div class='del'>-		week_view-&gt;events_y_offset = E_WEEK_VIEW_DATE_T_PAD</div><div class='del'>-			+ font-&gt;ascent + font-&gt;descent</div><div class='del'>-			+ E_WEEK_VIEW_DATE_B_PAD;</div><div class='del'>-	} else {</div><div class='del'>-		week_view-&gt;events_y_offset = E_WEEK_VIEW_DATE_T_PAD</div><div class='del'>-			+ font-&gt;ascent + font-&gt;descent</div><div class='del'>-			+ E_WEEK_VIEW_DATE_LINE_T_PAD + 1</div><div class='del'>-			+ E_WEEK_VIEW_DATE_LINE_B_PAD;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	height = week_view-&gt;row_heights[0];</div><div class='del'>-	week_view-&gt;rows_per_cell = (height * 2 - week_view-&gt;events_y_offset)</div><div class='del'>-		/ (week_view-&gt;row_height + E_WEEK_VIEW_EVENT_Y_SPACING);</div><div class='del'>-	week_view-&gt;rows_per_cell = MIN (week_view-&gt;rows_per_cell,</div><div class='del'>-					E_WEEK_VIEW_MAX_ROWS_PER_CELL);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;rows_per_compressed_cell =</div><div class='del'>-		(height - week_view-&gt;events_y_offset)</div><div class='del'>-		/ (week_view-&gt;row_height + E_WEEK_VIEW_EVENT_Y_SPACING);</div><div class='del'>-	week_view-&gt;rows_per_compressed_cell = MIN (week_view-&gt;rows_per_compressed_cell,</div><div class='del'>-						   E_WEEK_VIEW_MAX_ROWS_PER_CELL);</div><div class='del'>-</div><div class='del'>-	/* Determine which time format to use, based on the width of the cells.</div><div class='del'>-	   We only allow the time to take up about half of the width. */</div><div class='del'>-	width = week_view-&gt;col_widths[0];</div><div class='del'>-</div><div class='del'>-	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'>-</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'>-/* Callback used when the calendar client finishes loading */</div><div class='del'>-static void</div><div class='del'>-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (status != CAL_CLIENT_LOAD_SUCCESS)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_week_view_queue_reload_events (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar client tells us that an object changed */</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'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	gint event_num, num_days;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	/* If we don't have a valid date set yet, just return. */</div><div class='del'>-	if (!g_date_valid (&amp;week_view-&gt;first_day_shown))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Get the event from the server. */</div><div class='del'>-	status = cal_client_get_object (week_view-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Everything is fine */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* The object is no longer in the server, so do nothing */</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We only care about events. */</div><div class='del'>-	if (cal_component_get_vtype (comp) != CAL_COMPONENT_EVENT) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "FIXME"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		/* Do this the long way every time for now */</div><div class='del'>-#if 0</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, comp);</div><div class='del'>-			gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-			gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-#endif</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;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-</div><div class='del'>-	cal_recur_generate_instances (comp,</div><div class='del'>-				      week_view-&gt;day_starts[0],</div><div class='del'>-				      week_view-&gt;day_starts[num_days],</div><div class='del'>-				      e_week_view_add_event,</div><div class='del'>-				      week_view);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	e_week_view_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'>-/* Callback used when the calendar client tells us that an object was removed */</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'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	e_week_view_foreach_event_with_uid (week_view, uid,</div><div class='del'>-					    e_week_view_remove_event_cb, NULL);</div><div class='del'>-</div><div class='del'>-	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'>-/**</div><div class='del'>- * e_week_view_set_cal_client:</div><div class='del'>- * @week_view: A week view.</div><div class='del'>- * @client: A calendar client interface object.</div><div class='del'>- *</div><div class='del'>- * Sets the calendar client interface object that a week view will monitor.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_week_view_set_cal_client	(EWeekView	*week_view,</div><div class='del'>-				 CalClient	*client)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (week_view != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (client == week_view-&gt;client)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (week_view-&gt;client), week_view);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (week_view-&gt;client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	week_view-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;client) {</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (week_view-&gt;client), "cal_loaded",</div><div class='del'>-				    GTK_SIGNAL_FUNC (cal_loaded_cb), week_view);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (week_view-&gt;client), "obj_updated",</div><div class='del'>-				    GTK_SIGNAL_FUNC (obj_updated_cb), week_view);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (week_view-&gt;client), "obj_removed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (obj_removed_cb), week_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_week_view_queue_reload_events (week_view);</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;multi_week_view) {</div><div class='del'>-		/* Find the number of days since the start of the month. */</div><div class='del'>-		day_offset = g_date_day (&amp;date) - 1;</div><div class='del'>-</div><div class='del'>-		/* Find the 1st 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_queue_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;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	num_days--;</div><div class='del'>-	week_view-&gt;selection_start_day = CLAMP (week_view-&gt;selection_start_day,</div><div class='del'>-						0, num_days);</div><div class='del'>-	week_view-&gt;selection_end_day = CLAMP (week_view-&gt;selection_end_day,</div><div class='del'>-					      week_view-&gt;selection_start_day,</div><div class='del'>-					      num_days);</div><div class='del'>-</div><div class='del'>-	/* Reset the adjustment value to 0 if the base address has changed.</div><div class='del'>-	   Note that we do this after updating first_day_shown so that our</div><div class='del'>-	   signal handler will not try to reload the events. */</div><div class='del'>-	if (update_adjustment_value)</div><div class='del'>-		gtk_adjustment_set_value (GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the selected time range. */</div><div class='del'>-void</div><div class='del'>-e_week_view_get_selected_time_range	(EWeekView	*week_view,</div><div class='del'>-					 time_t		*start_time,</div><div class='del'>-					 time_t		*end_time)</div><div class='del'>-{</div><div class='del'>-	gint start_day, end_day;</div><div class='del'>-</div><div class='del'>-	start_day = week_view-&gt;selection_start_day;</div><div class='del'>-	end_day = week_view-&gt;selection_end_day;</div><div class='del'>-</div><div class='del'>-	if (start_day == -1) {</div><div class='del'>-		start_day = 0;</div><div class='del'>-		end_day = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (start_time)</div><div class='del'>-		*start_time = week_view-&gt;day_starts[start_day];</div><div class='del'>-</div><div class='del'>-	if (end_time)</div><div class='del'>-		*end_time = week_view-&gt;day_starts[end_day + 1];</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Note that the returned date may be invalid if no date has been set yet. */</div><div class='del'>-void</div><div class='del'>-e_week_view_get_first_day_shown		(EWeekView	*week_view,</div><div class='del'>-					 GDate		*date)</div><div class='del'>-{</div><div class='del'>-	*date = week_view-&gt;first_day_shown;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets the first day shown in the view. It will be rounded down to the</div><div class='del'>-   nearest week. */</div><div class='del'>-void</div><div class='del'>-e_week_view_set_first_day_shown		(EWeekView	*week_view,</div><div class='del'>-					 GDate		*date)</div><div class='del'>-{</div><div class='del'>-	GDate base_date;</div><div class='del'>-	gint day_offset, num_days;</div><div class='del'>-	gboolean update_adjustment_value = FALSE;</div><div class='del'>-	guint32 old_selection_start_julian = 0, old_selection_end_julian = 0;</div><div class='del'>-	struct tm start_tm;</div><div class='del'>-	time_t start_time;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	/* Calculate the old selection range. */</div><div class='del'>-	if (week_view-&gt;selection_start_day != -1) {</div><div class='del'>-		old_selection_start_julian =</div><div class='del'>-			g_date_julian (&amp;week_view-&gt;base_date)</div><div class='del'>-			+ week_view-&gt;selection_start_day;</div><div class='del'>-		old_selection_end_julian =</div><div class='del'>-			g_date_julian (&amp;week_view-&gt;base_date)</div><div class='del'>-			+ week_view-&gt;selection_end_day;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find the 1st Monday at or before the given day. */</div><div class='del'>-	day_offset = g_date_weekday (date) - 1;</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'>-		g_date_to_struct_tm (&amp;base_date, &amp;start_tm);</div><div class='del'>-		start_time = mktime (&amp;start_tm);</div><div class='del'>-		e_week_view_recalc_day_starts (week_view, start_time);</div><div class='del'>-		e_week_view_queue_reload_events (week_view);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try to keep the previous selection, but if it is no longer shown</div><div class='del'>-	   just select the first day. */</div><div class='del'>-	if (week_view-&gt;selection_start_day != -1) {</div><div class='del'>-		week_view-&gt;selection_start_day = old_selection_start_julian</div><div class='del'>-			- g_date_julian (&amp;base_date);</div><div class='del'>-		week_view-&gt;selection_end_day = old_selection_end_julian</div><div class='del'>-			- g_date_julian (&amp;base_date);</div><div class='del'>-</div><div class='del'>-		/* Make sure the selection is valid. */</div><div class='del'>-		num_days = week_view-&gt;multi_week_view</div><div class='del'>-			? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-		num_days--;</div><div class='del'>-		week_view-&gt;selection_start_day =</div><div class='del'>-			CLAMP (week_view-&gt;selection_start_day, 0, num_days);</div><div class='del'>-		week_view-&gt;selection_end_day =</div><div class='del'>-			CLAMP (week_view-&gt;selection_end_day,</div><div class='del'>-			       week_view-&gt;selection_start_day,</div><div class='del'>-			       num_days);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Reset the adjustment value to 0 if the base address has changed.</div><div class='del'>-	   Note that we do this after updating first_day_shown so that our</div><div class='del'>-	   signal handler will not try to reload the events. */</div><div class='del'>-	if (update_adjustment_value)</div><div class='del'>-		gtk_adjustment_set_value (GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Recalculates the time_t corresponding to the start of each day. */</div><div class='del'>-static void</div><div class='del'>-e_week_view_recalc_day_starts (EWeekView *week_view,</div><div class='del'>-			       time_t lower)</div><div class='del'>-{</div><div class='del'>-	gint num_days, day;</div><div class='del'>-	time_t tmp_time;</div><div class='del'>-</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-</div><div class='del'>-	tmp_time = lower;</div><div class='del'>-	week_view-&gt;day_starts[0] = tmp_time;</div><div class='del'>-	for (day = 1; day &lt;= num_days; day++) {</div><div class='del'>-		tmp_time = time_add_day (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_multi_week_view	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;multi_week_view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_multi_week_view	(EWeekView	*week_view,</div><div class='del'>-				 gboolean	 multi_week_view)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adjustment;</div><div class='del'>-	gint page_increment, page_size;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;multi_week_view == multi_week_view)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;multi_week_view = multi_week_view;</div><div class='del'>-</div><div class='del'>-	if (multi_week_view) {</div><div class='del'>-		gtk_widget_show (week_view-&gt;titles_canvas);</div><div class='del'>-		page_increment = 4;</div><div class='del'>-		page_size = 5;</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_hide (week_view-&gt;titles_canvas);</div><div class='del'>-		page_increment = page_size = 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	adjustment = GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment;</div><div class='del'>-	adjustment-&gt;page_increment = page_increment;</div><div class='del'>-	adjustment-&gt;page_size = page_size;</div><div class='del'>-	gtk_adjustment_changed (adjustment);</div><div class='del'>-</div><div class='del'>-	/* 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_queue_reload_events (week_view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_week_view_get_weeks_shown	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), 1);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;weeks_shown;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_weeks_shown	(EWeekView	*week_view,</div><div class='del'>-				 gint		 weeks_shown)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adjustment;</div><div class='del'>-	gint page_increment, page_size;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	weeks_shown = MIN (weeks_shown, E_WEEK_VIEW_MAX_WEEKS);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;weeks_shown == weeks_shown)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;weeks_shown = weeks_shown;</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;multi_week_view) {</div><div class='del'>-		page_increment = 4;</div><div class='del'>-		page_size = 5;</div><div class='del'>-</div><div class='del'>-		adjustment = GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment;</div><div class='del'>-		adjustment-&gt;page_increment = page_increment;</div><div class='del'>-		adjustment-&gt;page_size = page_size;</div><div class='del'>-		gtk_adjustment_changed (adjustment);</div><div class='del'>-</div><div class='del'>-		/* FIXME: Need to change start date and adjustment value? */</div><div class='del'>-		e_week_view_recalc_day_starts (week_view,</div><div class='del'>-					       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_queue_reload_events (week_view);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_get_compress_weekend	(EWeekView	*week_view)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (week_view), FALSE);</div><div class='del'>-</div><div class='del'>-	return week_view-&gt;compress_weekend;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_set_compress_weekend	(EWeekView	*week_view,</div><div class='del'>-					 gboolean	 compress)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (E_IS_WEEK_VIEW (week_view));</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;compress_weekend == compress)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	week_view-&gt;compress_weekend = compress;</div><div class='del'>-</div><div class='del'>-	/* The option only affects the month view. */</div><div class='del'>-	if (!week_view-&gt;multi_week_view)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_week_view_recalc_cell_sizes (week_view);</div><div class='del'>-	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'>-#ifndef NO_WARNINGS</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_update_event_cb (EWeekView *week_view,</div><div class='del'>-			     gint event_num,</div><div class='del'>-			     gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint span_num;</div><div class='del'>-	gchar *text;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	comp = data;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	event-&gt;comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	for (span_num = 0; span_num &lt; event-&gt;num_spans; span_num++) {</div><div class='del'>-		span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-				       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-		if (span-&gt;text_item) {</div><div class='del'>-			CalComponentText t;</div><div class='del'>-</div><div class='del'>-			cal_component_get_summary (event-&gt;comp, &amp;t);</div><div class='del'>-			text = (char*) t.value;</div><div class='del'>-			gnome_canvas_item_set (span-&gt;text_item,</div><div class='del'>-					       "text", text ? text : "",</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			e_week_view_reshape_event_span (week_view, event_num,</div><div class='del'>-							span_num);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This calls a given function for each event instance that matches the given</div><div class='del'>-   uid. Note that it is safe for the callback to remove the event (since we</div><div class='del'>-   step backwards through the arrays). */</div><div class='del'>-static void</div><div class='del'>-e_week_view_foreach_event_with_uid (EWeekView *week_view,</div><div class='del'>-				    const gchar *uid,</div><div class='del'>-				    EWeekViewForeachEventCallback callback,</div><div class='del'>-				    gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	gint event_num;</div><div class='del'>-</div><div class='del'>-	for (event_num = week_view-&gt;events-&gt;len - 1;</div><div class='del'>-	     event_num &gt;= 0;</div><div class='del'>-	     event_num--) {</div><div class='del'>-		const char *u;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-		if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-			if (!(*callback) (week_view, event_num, data))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_remove_event_cb (EWeekView *week_view,</div><div class='del'>-			     gint event_num,</div><div class='del'>-			     gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	gint span_num;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-</div><div class='del'>-	/* If we were editing this event, set editing_event_num to -1 so</div><div class='del'>-	   on_editing_stopped doesn't try to update the event. */</div><div class='del'>-	if (week_view-&gt;editing_event_num == event_num)</div><div class='del'>-		week_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	/* We leave the span elements in the array, but set the canvas item</div><div class='del'>-	   pointers to NULL. */</div><div class='del'>-	for (span_num = 0; span_num &lt; event-&gt;num_spans; span_num++) {</div><div class='del'>-		span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-				       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-		if (span-&gt;text_item) {</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (span-&gt;text_item));</div><div class='del'>-			span-&gt;text_item = NULL;</div><div class='del'>-		}</div><div class='del'>-		if (span-&gt;background_item) {</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (span-&gt;background_item));</div><div class='del'>-			span-&gt;background_item = NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-</div><div class='del'>-	g_array_remove_index (week_view-&gt;events, event_num);</div><div class='del'>-	week_view-&gt;events_need_layout = TRUE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_week_view_get_day_position	(EWeekView	*week_view,</div><div class='del'>-				 gint		 day,</div><div class='del'>-				 gint		*day_x,</div><div class='del'>-				 gint		*day_y,</div><div class='del'>-				 gint		*day_w,</div><div class='del'>-				 gint		*day_h)</div><div class='del'>-{</div><div class='del'>-	gint 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;multi_week_view) {</div><div class='del'>-		g_return_if_fail (day &lt; week_view-&gt;weeks_shown * 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;multi_week_view) {</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'>-	/* Handle scroll wheel events */</div><div class='del'>-	if (event-&gt;button == 4 || event-&gt;button == 5) {</div><div class='del'>-		GtkAdjustment *adj = GTK_RANGE (week_view-&gt;vscrollbar)-&gt;adjustment;</div><div class='del'>-		gfloat new_value;</div><div class='del'>-</div><div class='del'>-		new_value = adj-&gt;value + ((event-&gt;button == 4) ?</div><div class='del'>-					  -adj-&gt;page_increment:</div><div class='del'>-					  adj-&gt;page_increment);</div><div class='del'>-		new_value = CLAMP (new_value, adj-&gt;lower, adj-&gt;upper - adj-&gt;page_size);</div><div class='del'>-		gtk_adjustment_set_value (adj, new_value);</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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;multi_week_view) {</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'>-/* This frees any events currently loaded, and queues a reload. */</div><div class='del'>-static void</div><div class='del'>-e_week_view_queue_reload_events (EWeekView *week_view)</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;reload_events_idle_id == 0) {</div><div class='del'>-		/* We'll use a low priority here, so the user can scroll</div><div class='del'>-		   the view quickly. */</div><div class='del'>-		week_view-&gt;reload_events_idle_id = g_idle_add_full</div><div class='del'>-			(G_PRIORITY_LOW,</div><div class='del'>-			 e_week_view_reload_events_idle_cb, week_view, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_reload_events_idle_cb	(gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (data), FALSE);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_ENTER ();</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	week_view-&gt;reload_events_idle_id = 0;</div><div class='del'>-</div><div class='del'>-	e_week_view_reload_events (week_view);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_LEAVE ();</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_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;client &amp;&amp; cal_client_is_loaded (week_view-&gt;client)))</div><div class='del'>-		return;</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;multi_week_view</div><div class='del'>-			? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-</div><div class='del'>-		cal_client_generate_instances (week_view-&gt;client,</div><div class='del'>-					       CALOBJ_TYPE_EVENT,</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'>-	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'>-	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, num_days, day;</div><div class='del'>-</div><div class='del'>-	/* Reset all our indices. */</div><div class='del'>-	week_view-&gt;pressed_event_num = -1;</div><div class='del'>-	week_view-&gt;pressed_span_num = -1;</div><div class='del'>-	week_view-&gt;editing_event_num = -1;</div><div class='del'>-	week_view-&gt;editing_span_num = -1;</div><div class='del'>-	week_view-&gt;popup_event_num = -1;</div><div class='del'>-</div><div class='del'>-	for (event_num = 0; event_num &lt; week_view-&gt;events-&gt;len; event_num++) {</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (event-&gt;comp));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_set_size (week_view-&gt;events, 0);</div><div class='del'>-</div><div class='del'>-	/* Destroy all the old canvas items. */</div><div class='del'>-	if (week_view-&gt;spans) {</div><div class='del'>-		for (span_num = 0; span_num &lt; week_view-&gt;spans-&gt;len;</div><div class='del'>-		     span_num++) {</div><div class='del'>-			span = &amp;g_array_index (week_view-&gt;spans,</div><div class='del'>-					       EWeekViewEventSpan, span_num);</div><div class='del'>-			if (span-&gt;background_item)</div><div class='del'>-				gtk_object_destroy (GTK_OBJECT (span-&gt;background_item));</div><div class='del'>-			if (span-&gt;text_item)</div><div class='del'>-				gtk_object_destroy (GTK_OBJECT (span-&gt;text_item));</div><div class='del'>-		}</div><div class='del'>-		g_array_free (week_view-&gt;spans, TRUE);</div><div class='del'>-		week_view-&gt;spans = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clear the number of rows used per day. */</div><div class='del'>-	num_days = week_view-&gt;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt;= num_days; day++) {</div><div class='del'>-		week_view-&gt;rows_per_day[day] = 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This adds one event to the view, adding it to the appropriate array. */</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_add_event (CalComponent *comp,</div><div class='del'>-		       time_t	  start,</div><div class='del'>-		       time_t	  end,</div><div class='del'>-		       gpointer	  data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent event;</div><div class='del'>-	gint num_days;</div><div class='del'>-	struct 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;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	g_print ("View start:%li end:%li  Event start:%li end:%li\n",</div><div class='del'>-		 week_view-&gt;day_starts[0], week_view-&gt;day_starts[num_days],</div><div class='del'>-		 start, end);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, TRUE);</div><div class='del'>-	g_return_val_if_fail (start &lt; week_view-&gt;day_starts[num_days], TRUE);</div><div class='del'>-	g_return_val_if_fail (end &gt; week_view-&gt;day_starts[0], TRUE);</div><div class='del'>-</div><div class='del'>-	start_tm = *(localtime (&amp;start));</div><div class='del'>-	end_tm = *(localtime (&amp;end));</div><div class='del'>-</div><div class='del'>-	event.comp = comp;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (event.comp));</div><div class='del'>-	event.start = start;</div><div class='del'>-	event.end = end;</div><div class='del'>-	event.spans_index = 0;</div><div class='del'>-	event.num_spans = 0;</div><div class='del'>-</div><div class='del'>-	event.start_minute = start_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'>-</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;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt;= num_days; day++) {</div><div class='del'>-		week_view-&gt;rows_per_day[day] = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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;multi_week_view ? week_view-&gt;weeks_shown * 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;multi_week_view ? week_view-&gt;weeks_shown * 7 : 7;</div><div class='del'>-	for (day = 0; day &lt; num_days; day++) {</div><div class='del'>-</div><div class='del'>-		is_weekend = (day % 7 &gt;= 5) ? TRUE : FALSE;</div><div class='del'>-		if (!is_weekend || (week_view-&gt;multi_week_view</div><div class='del'>-				    &amp;&amp; !week_view-&gt;compress_weekend))</div><div class='del'>-			max_rows = week_view-&gt;rows_per_cell;</div><div class='del'>-		else</div><div class='del'>-			max_rows = week_view-&gt;rows_per_compressed_cell;</div><div class='del'>-</div><div class='del'>-		/* Determine whether the jump button should be shown. */</div><div class='del'>-		if (week_view-&gt;rows_per_day[day] &lt;= max_rows) {</div><div class='del'>-			gnome_canvas_item_hide (week_view-&gt;jump_buttons[day]);</div><div class='del'>-		} else {</div><div class='del'>-			e_week_view_get_day_position (week_view, day,</div><div class='del'>-						      &amp;day_x, &amp;day_y,</div><div class='del'>-						      &amp;day_w, &amp;day_h);</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_set (week_view-&gt;jump_buttons[day],</div><div class='del'>-					       "GnomeCanvasPixbuf::x", (gdouble) (day_x + day_w - E_WEEK_VIEW_JUMP_BUTTON_X_PAD - E_WEEK_VIEW_JUMP_BUTTON_WIDTH),</div><div class='del'>-					       "GnomeCanvasPixbuf::y", (gdouble) (day_y + day_h - E_WEEK_VIEW_JUMP_BUTTON_Y_PAD - E_WEEK_VIEW_JUMP_BUTTON_HEIGHT),</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_show (week_view-&gt;jump_buttons[day]);</div><div class='del'>-			gnome_canvas_item_raise_to_top (week_view-&gt;jump_buttons[day]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (day = num_days; day &lt; E_WEEK_VIEW_MAX_WEEKS * 7; day++) {</div><div class='del'>-		gnome_canvas_item_hide (week_view-&gt;jump_buttons[day]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_reshape_event_span (EWeekView *week_view,</div><div class='del'>-				gint event_num,</div><div class='del'>-				gint span_num)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-	GdkFont *font;</div><div class='del'>-	gint span_x, span_y, span_w, num_icons, icons_width, time_width;</div><div class='del'>-	gint min_text_x, max_text_w, width;</div><div class='del'>-	gboolean show_icons = TRUE, use_max_width = FALSE;</div><div class='del'>-	gboolean one_day_event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gdouble text_x, text_y, text_w, text_h;</div><div class='del'>-	gchar *text, *end_of_line;</div><div class='del'>-	gint line_len, text_width;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + span_num);</div><div class='del'>-	comp = event-&gt;comp;</div><div class='del'>-	font = GTK_WIDGET (week_view)-&gt;style-&gt;font;</div><div class='del'>-</div><div class='del'>-	one_day_event = e_week_view_is_one_day_event (week_view, event_num);</div><div class='del'>-</div><div class='del'>-	/* If the span will not be visible destroy the canvas items and</div><div class='del'>-	   return. */</div><div class='del'>-	if (!e_week_view_get_span_position (week_view, event_num, span_num,</div><div class='del'>-					    &amp;span_x, &amp;span_y, &amp;span_w)) {</div><div class='del'>-		if (span-&gt;background_item)</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (span-&gt;background_item));</div><div class='del'>-		if (span-&gt;text_item)</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (span-&gt;text_item));</div><div class='del'>-		span-&gt;background_item = NULL;</div><div class='del'>-		span-&gt;text_item = NULL;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!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 (cal_component_has_alarms (comp))</div><div class='del'>-			num_icons++;</div><div class='del'>-		if (cal_component_has_recurrences (comp))</div><div class='del'>-			num_icons++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Create the background canvas item if necessary. */</div><div class='del'>-	if (!span-&gt;background_item) {</div><div class='del'>-		span-&gt;background_item =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view-&gt;main_canvas)-&gt;root),</div><div class='del'>-					       e_week_view_event_item_get_type (),</div><div class='del'>-					       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (span-&gt;background_item,</div><div class='del'>-			       "event_num", event_num,</div><div class='del'>-			       "span_num", span_num,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the text item if necessary. */</div><div class='del'>-	if (!span-&gt;text_item) {</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		cal_component_get_summary (comp, &amp;text);</div><div class='del'>-		span-&gt;text_item =</div><div class='del'>-			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view-&gt;main_canvas)-&gt;root),</div><div class='del'>-					       e_text_get_type (),</div><div class='del'>-					       "font_gdk", GTK_WIDGET (week_view)-&gt;style-&gt;font,</div><div class='del'>-					       "anchor", GTK_ANCHOR_NW,</div><div class='del'>-					       "clip", TRUE,</div><div class='del'>-#if 0</div><div class='del'>-					       "max_lines", 1,</div><div class='del'>-#endif</div><div class='del'>-					       "editable", TRUE,</div><div class='del'>-					       "text", text.value ? text.value : "",</div><div class='del'>-					       "use_ellipsis", TRUE,</div><div class='del'>-					       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;multi_week_view ? week_view-&gt;weeks_shown * 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;multi_week_view) {</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_queue_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 any current edit. */</div><div class='del'>-void</div><div class='del'>-e_week_view_stop_editing_event (EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *toplevel;</div><div class='del'>-</div><div class='del'>-	/* Check we are editing an event. */</div><div class='del'>-	if (week_view-&gt;editing_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Set focus to the toplevel so the item loses focus. */</div><div class='del'>-	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (week_view));</div><div class='del'>-	if (toplevel &amp;&amp; GTK_IS_WINDOW (toplevel))</div><div class='del'>-		gtk_window_set_focus (GTK_WINDOW (toplevel), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-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'>-	CalComponentText summary;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	/* Note: the item we are passed here isn't reliable, so we just stop</div><div class='del'>-	   the edit of whatever item was being edited. We also receive this</div><div class='del'>-	   event twice for some reason. */</div><div class='del'>-	event_num = week_view-&gt;editing_event_num;</div><div class='del'>-	span_num = week_view-&gt;editing_span_num;</div><div class='del'>-</div><div class='del'>-	/* If no item is being edited, just return. */</div><div class='del'>-	if (event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index + span_num);</div><div class='del'>-</div><div class='del'>-	/* Reset the edit fields. */</div><div class='del'>-	week_view-&gt;editing_event_num = -1;</div><div class='del'>-</div><div class='del'>-	/* Check that the event is still valid. */</div><div class='del'>-	cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-	if (!uid)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	gtk_object_get (GTK_OBJECT (span-&gt;text_item),</div><div class='del'>-			"text", &amp;text,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* Only update the summary if necessary. */</div><div class='del'>-	cal_component_get_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	if (text &amp;&amp; summary.value &amp;&amp; !strcmp (text, summary.value)) {</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'>-	summary.value = text;</div><div class='del'>-	cal_component_set_summary (event-&gt;comp, &amp;summary);</div><div class='del'>-	g_free (text);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;client, event-&gt;comp))</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'>-		const char *u;</div><div class='del'>-</div><div class='del'>-		event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-					event_num);</div><div class='del'>-</div><div class='del'>-		cal_component_get_uid (event-&gt;comp, &amp;u);</div><div class='del'>-		if (u &amp;&amp; !strcmp (uid, u)) {</div><div class='del'>-			*event_num_return = event_num;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_week_view_is_one_day_event	(EWeekView	*week_view,</div><div class='del'>-				 gint		 event_num)</div><div class='del'>-{</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	EWeekViewEventSpan *span;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent, event_num);</div><div class='del'>-	if (event-&gt;num_spans != 1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	span = &amp;g_array_index (week_view-&gt;spans, EWeekViewEventSpan,</div><div class='del'>-			       event-&gt;spans_index);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;start == week_view-&gt;day_starts[span-&gt;start_day]</div><div class='del'>-	    &amp;&amp; event-&gt;end == week_view-&gt;day_starts[span-&gt;start_day + 1])</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (span-&gt;num_days == 1</div><div class='del'>-	    &amp;&amp; event-&gt;start &gt;= week_view-&gt;day_starts[span-&gt;start_day]</div><div class='del'>-	    &amp;&amp; event-&gt;end &lt;= week_view-&gt;day_starts[span-&gt;start_day + 1])</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_week_view_key_press (GtkWidget *widget, GdkEventKey *event)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	gint event_num;</div><div class='del'>-	gchar *initial_text;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_WEEK_VIEW (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (event != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (widget);</div><div class='del'>-</div><div class='del'>-	/* The Escape key aborts a resize operation. */</div><div class='del'>-#if 0</div><div class='del'>-	if (week_view-&gt;resize_drag_pos != E_WEEK_VIEW_POS_NONE) {</div><div class='del'>-		if (event-&gt;keyval == GDK_Escape) {</div><div class='del'>-			e_week_view_abort_resize (week_view, event-&gt;time);</div><div class='del'>-		}</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;selection_start_day == -1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* We only want to start an edit with a return key or a simple</div><div class='del'>-	   character. */</div><div class='del'>-	if (event-&gt;keyval == GDK_Return) {</div><div class='del'>-		initial_text = NULL;</div><div class='del'>-	} else if ((event-&gt;keyval &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'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-	dtstart = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-	dtend = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet (dtstart, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-	*date.value = icaltime_from_timet (dtend, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;date);</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 (comp, dtstart, dtend, week_view);</div><div class='del'>-	e_week_view_check_layout (week_view);</div><div class='del'>-	gtk_widget_queue_draw (week_view-&gt;main_canvas);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	if (e_week_view_find_event_from_uid (week_view, uid, &amp;event_num)) {</div><div class='del'>-		e_week_view_start_editing_event (week_view, event_num, 0,</div><div class='del'>-						 initial_text);</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Couldn't find event to start editing.\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-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 (cal_component_has_recurrences (event-&gt;comp)) {</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'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	time_t dt;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-</div><div class='del'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	dt = week_view-&gt;day_starts[week_view-&gt;selection_start_day];</div><div class='del'>-	*date.value = icaltime_from_timet (dt, TRUE, FALSE);</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	dt = week_view-&gt;day_starts[week_view-&gt;selection_end_day + 1];</div><div class='del'>-	*date.value = icaltime_from_timet (dt, TRUE, FALSE);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_edit_object (week_view-&gt;calendar, comp);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_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;comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_delete_occurrence (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentDateTime *date=NULL;</div><div class='del'>-	GSList *list;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	/* We must duplicate the CalComponent, or we won't know it has changed</div><div class='del'>-	   when we get the "update_event" callback. */</div><div class='del'>-</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_component_get_exdate_list (comp, &amp;list);</div><div class='del'>-	list = g_slist_append (list, date);</div><div class='del'>-	date = g_new0 (CalComponentDateTime, 1);</div><div class='del'>-	date-&gt;value = g_new (struct icaltimetype, 1);</div><div class='del'>-	*date-&gt;value = icaltime_from_timet (event-&gt;start, TRUE, FALSE);</div><div class='del'>-	cal_component_set_exdate_list (comp, list);</div><div class='del'>-	cal_component_free_exdate_list (list);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_week_view_on_delete_occurrence(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_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'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	week_view = E_WEEK_VIEW (data);</div><div class='del'>-</div><div class='del'>-	if (week_view-&gt;popup_event_num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	event = &amp;g_array_index (week_view-&gt;events, EWeekViewEvent,</div><div class='del'>-				week_view-&gt;popup_event_num);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (event-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	/* We don't check the return value; FALSE can mean the object was not in</div><div class='del'>-	 * the server anyways.</div><div class='del'>-	 */</div><div class='del'>-	cal_client_remove_object (week_view-&gt;client, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_week_view_on_unrecur_appointment (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EWeekView *week_view;</div><div class='del'>-	EWeekViewEvent *event;</div><div class='del'>-	CalComponent *comp, *new_comp;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-	GSList *list;</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'>-	date.value = &amp;itt;</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	/* For the recurring object, we add a exception to get rid of the</div><div class='del'>-	   instance. */</div><div class='del'>-	comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_component_get_exdate_list (comp, &amp;list);</div><div class='del'>-	*date.value = icaltime_from_timet (event-&gt;start, TRUE, FALSE);</div><div class='del'>-	list = g_slist_append (list, &amp;date);</div><div class='del'>-	cal_component_set_exdate_list (comp, list);</div><div class='del'>-	g_slist_free (list);</div><div class='del'>-</div><div class='del'>-	/* For the unrecurred instance we duplicate the original object,</div><div class='del'>-	   create a new uid for it, get rid of the recurrence rules, and set</div><div class='del'>-	   the start &amp; end times to the instances times. */</div><div class='del'>-	new_comp = cal_component_clone (event-&gt;comp);</div><div class='del'>-	cal_component_set_uid (new_comp, cal_component_gen_uid ());</div><div class='del'>-	cal_component_set_rdate_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_rrule_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_exdate_list (new_comp, NULL);</div><div class='del'>-	cal_component_set_exrule_list (new_comp, NULL);</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet (event-&gt;start, TRUE, FALSE);</div><div class='del'>-	cal_component_set_dtstart (new_comp, &amp;date);</div><div class='del'>-	*date.value = icaltime_from_timet (event-&gt;end, TRUE, FALSE);</div><div class='del'>-	cal_component_set_dtend (new_comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	/* Now update both CalComponents. Note that we do this last since at</div><div class='del'>-	   present the updates happen synchronously so our event may disappear.</div><div class='del'>-	*/</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;client, comp))</div><div class='del'>-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (week_view-&gt;client, new_comp))</div><div class='del'>-		g_message ("e_week_view_on_unrecur_appointment(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (new_comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_week_view_on_jump_button_event (GnomeCanvasItem *item,</div><div class='del'>-				  GdkEvent *event,</div><div class='del'>-				  EWeekView *week_view)</div><div class='del'>-{</div><div class='del'>-	gint day;</div><div class='del'>-</div><div class='del'>-	if (event-&gt;type == GDK_BUTTON_PRESS) {</div><div class='del'>-		for (day = 0; day &lt; E_WEEK_VIEW_MAX_WEEKS * 7; day++) {</div><div class='del'>-			if (item == week_view-&gt;jump_buttons[day]) {</div><div class='del'>-				gnome_calendar_dayjump</div><div class='del'>-					(week_view-&gt;calendar,</div><div class='del'>-					 week_view-&gt;day_starts[day]);</div><div class='del'>-				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 e4d5ee72db..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/e-week-view.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/e-week-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,390 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-/* </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'>-   but we allow 6 for longer selections. */</div><div class='del'>-#define E_WEEK_VIEW_MAX_WEEKS		6</div><div class='del'>-</div><div class='del'>-/* The size of the reminder &amp; recurrence icons, and padding around them. */</div><div class='del'>-#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'>-	CalComponent *comp;</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-	guint16 start_minute;	/* Minutes from the start of the day. */</div><div class='del'>-	guint16 end_minute;</div><div class='del'>-	gint spans_index;</div><div class='del'>-	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'>-	/* Calendar client object we are monitoring */</div><div class='del'>-	CalClient *client;</div><div class='del'>-</div><div class='del'>-	/* The array of EWeekViewEvent elements. */</div><div class='del'>-	GArray *events;</div><div class='del'>-	gboolean events_sorted;</div><div class='del'>-	gboolean events_need_layout;</div><div class='del'>-	gboolean events_need_reshape;</div><div class='del'>-</div><div class='del'>-	/* The id of our idle function to reload all events. */</div><div class='del'>-	gint reload_events_idle_id;</div><div class='del'>-</div><div class='del'>-	/* An array of EWeekViewEventSpan elements. Each event has its own</div><div class='del'>-	   space within this array, and uses the spans_index and num_spans</div><div class='del'>-	   fields of the EWeekViewEvent struct to access it. */</div><div class='del'>-	GArray *spans;</div><div class='del'>-</div><div class='del'>-	/* The start of each day displayed. */</div><div class='del'>-	time_t day_starts[E_WEEK_VIEW_MAX_WEEKS * 7 + 1];</div><div class='del'>-</div><div class='del'>-	/* The base date, where the adjustment value is 0. */</div><div class='del'>-	GDate base_date;</div><div class='del'>-</div><div class='del'>-	/* The first day shown in the view. */</div><div class='del'>-	GDate first_day_shown;</div><div class='del'>-</div><div class='del'>-	/* If we are displaying multiple weeks in rows. If this is FALSE only</div><div class='del'>-	   one week is shown, with a different layout. */</div><div class='del'>-	gboolean multi_week_view;</div><div class='del'>-</div><div class='del'>-	/* How many weeks we are showing. This is only relevant if</div><div class='del'>-	   display_month is TRUE. */</div><div class='del'>-	gint weeks_shown;</div><div class='del'>-</div><div class='del'>-	/* If Sat &amp; Sun are compressed. Only applicable in month view, since</div><div class='del'>-	   they are always compressed into 1 cell in the week view. */</div><div class='del'>-	gboolean compress_weekend;</div><div class='del'>-</div><div class='del'>-	/* The vertical offset of the events from the top of the cells. */</div><div class='del'>-	gint events_y_offset;</div><div class='del'>-</div><div class='del'>-	/* The height of the events, not including spacing between them. */</div><div class='del'>-	gint row_height;</div><div class='del'>-</div><div class='del'>-	/* The number of rows of events in each cell. */</div><div class='del'>-	gint rows_per_cell;</div><div class='del'>-	gint rows_per_compressed_cell;</div><div class='del'>-</div><div class='del'>-	/* The number of rows we have used for each day (i.e. each cell) */</div><div class='del'>-	gint rows_per_day[E_WEEK_VIEW_MAX_WEEKS * 7];</div><div class='del'>-</div><div class='del'>-	/* If the small font is used for displaying the minutes. */</div><div class='del'>-	gboolean use_small_font;</div><div class='del'>-</div><div class='del'>-	/* Small font to display the minutes. */</div><div class='del'>-	GdkFont *small_font;</div><div class='del'>-</div><div class='del'>-	/* The widths of various pieces of text, used to determine which of</div><div class='del'>-	   several date formats to display, set in e_week_view_style_set(). */</div><div class='del'>-	gint space_width;		/* One space character ' '. */</div><div class='del'>-	gint colon_width;		/* Size of ':' in the font. */</div><div class='del'>-	gint slash_width;		/* Size of '/' in the font. */</div><div class='del'>-	gint digit_width;		/* Size of a '0' digit. */</div><div class='del'>-	gint small_digit_width;		/* Size of a small_font '0' digit. */</div><div class='del'>-	gint day_widths[7];		/* Monday first. */</div><div class='del'>-	gint max_day_width;</div><div class='del'>-	gint abbr_day_widths[7];</div><div class='del'>-	gint max_abbr_day_width;</div><div class='del'>-	gint month_widths[12];</div><div class='del'>-	gint max_month_width;</div><div class='del'>-	gint abbr_month_widths[12];</div><div class='del'>-	gint max_abbr_month_width;</div><div class='del'>-</div><div class='del'>-	/* The size of the main grid of days and of the cells. A row</div><div class='del'>-	   corresponds to a compressed day, so normal days usually take</div><div class='del'>-	   up 2 rows. Note that the offsets arrays have one more element</div><div class='del'>-	   than the widths/heights arrays since they also contain the</div><div class='del'>-	   right/bottom edge. */</div><div class='del'>-	gint rows;</div><div class='del'>-	gint columns;</div><div class='del'>-	gint col_widths[7];</div><div class='del'>-	gint col_offsets[8];</div><div class='del'>-	gint row_heights[E_WEEK_VIEW_MAX_WEEKS * 2];</div><div class='del'>-	gint row_offsets[E_WEEK_VIEW_MAX_WEEKS * 2 + 1];</div><div class='del'>-</div><div class='del'>-	/* This specifies which times we are showing for the events, depending</div><div class='del'>-	   on how much room is available. */</div><div class='del'>-	EWeekViewTimeFormat time_format;</div><div class='del'>-</div><div class='del'>-	/* The GC used for painting in different colors. */</div><div class='del'>-	GdkGC *main_gc;</div><div class='del'>-</div><div class='del'>-	/* The icons. */</div><div class='del'>-	GdkPixmap *reminder_icon;</div><div class='del'>-	GdkBitmap *reminder_mask;</div><div class='del'>-	GdkPixmap *recurrence_icon;</div><div class='del'>-	GdkBitmap *recurrence_mask;</div><div class='del'>-</div><div class='del'>-	/* Colors for drawing. */</div><div class='del'>-	GdkColor colors[E_WEEK_VIEW_COLOR_LAST];</div><div class='del'>-</div><div class='del'>-	/* The normal &amp; resizing cursors. */</div><div class='del'>-	GdkCursor *normal_cursor;</div><div class='del'>-	GdkCursor *move_cursor;</div><div class='del'>-	GdkCursor *resize_width_cursor;</div><div class='del'>-</div><div class='del'>-	/* This remembers the last cursor set on the window. */</div><div class='del'>-	GdkCursor *last_cursor_set;</div><div class='del'>-</div><div class='del'>-	/* The currently selected region, in days from the first day shown.</div><div class='del'>-	   If selection_start_day is -1 there is no current selection. */</div><div class='del'>-	gint selection_start_day;</div><div class='del'>-	gint selection_end_day;</div><div class='del'>-</div><div class='del'>-	/* This specifies which end of the selection is being dragged, or is</div><div class='del'>-	   E_WEEK_VIEW_DRAG_NONE if the selection isn't being dragged. */</div><div class='del'>-	EWeekViewDragPosition selection_drag_pos;</div><div class='del'>-</div><div class='del'>-	/* This is the event the mouse button was pressed on. If the button</div><div class='del'>-	   is released we start editing it, but if the mouse is dragged we set</div><div class='del'>-	   this to -1. */</div><div class='del'>-	gint pressed_event_num;</div><div class='del'>-	gint pressed_span_num;</div><div class='del'>-</div><div class='del'>-	/* The event span currently being edited. The num is -1 if no event is</div><div class='del'>-	   being edited. */</div><div class='del'>-	gint editing_event_num;</div><div class='del'>-	gint editing_span_num;</div><div class='del'>-</div><div class='del'>-	/* The event that the context menu is for. */</div><div class='del'>-	gint popup_event_num;</div><div class='del'>-</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'>-/* The first day shown. Note that it will be rounded down to the start of a</div><div class='del'>-   week when set. The returned value will be invalid if no date has been set</div><div class='del'>-   yet. */</div><div class='del'>-void	   e_week_view_get_first_day_shown	(EWeekView	*week_view,</div><div class='del'>-						 GDate		*date);</div><div class='del'>-void	   e_week_view_set_first_day_shown	(EWeekView	*week_view,</div><div class='del'>-						 GDate		*date);</div><div class='del'>-</div><div class='del'>-void       e_week_view_set_cal_client		(EWeekView	*week_view,</div><div class='del'>-						 CalClient	*client);</div><div class='del'>-</div><div class='del'>-/* The selected time range. The EWeekView will show the corresponding</div><div class='del'>-   month and the days between start_time and end_time will be selected.</div><div class='del'>-   To select a single day, use the same value for start_time &amp; end_time. */</div><div class='del'>-void       e_week_view_get_selected_time_range	(EWeekView	*week_view,</div><div class='del'>-						 time_t		*start_time,</div><div class='del'>-						 time_t		*end_time);</div><div class='del'>-void	   e_week_view_set_selected_time_range	(EWeekView	*week_view,</div><div class='del'>-						 time_t		 start_time,</div><div class='del'>-						 time_t		 end_time);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whether to display 1 week or 1 month (5 weeks). It defaults to 1 week. */</div><div class='del'>-gboolean   e_week_view_get_multi_week_view	(EWeekView	*week_view);</div><div class='del'>-void       e_week_view_set_multi_week_view	(EWeekView	*week_view,</div><div class='del'>-						 gboolean	 multi_week_view);</div><div class='del'>-</div><div class='del'>-/* The number of weeks shown in the multi-week view. */</div><div class='del'>-gint	   e_week_view_get_weeks_shown		(EWeekView	*week_view);</div><div class='del'>-void	   e_week_view_set_weeks_shown		(EWeekView	*week_view,</div><div class='del'>-						 gint		 weeks_shown);</div><div class='del'>-</div><div class='del'>-/* Whether the weekend (Sat/Sun) should be compressed into 1 cell in the Month</div><div class='del'>-   view. In the Week view they are always compressed. */</div><div class='del'>-gboolean   e_week_view_get_compress_weekend	(EWeekView	*week_view);</div><div class='del'>-void       e_week_view_set_compress_weekend	(EWeekView	*week_view,</div><div class='del'>-						 gboolean	 compress);</div><div class='del'>-</div><div class='del'>-/*</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 ed1a55af7d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/event-editor-dialog.glade?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/event-editor-dialog.glade</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1370 +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;visible&gt;False&lt;/visible&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;1&lt;/rows&gt;</div><div class='del'>-	  &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;row_spacing&gt;4&lt;/row_spacing&gt;</div><div class='del'>-	  &lt;column_spacing&gt;4&lt;/column_spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;label13&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Su_mmary:&lt;/label&gt;</div><div class='del'>-	    &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	    &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	    &lt;xalign&gt;7.45058e-09&lt;/xalign&gt;</div><div class='del'>-	    &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	    &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	    &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	    &lt;default_focus_target&gt;general-summary&lt;/default_focus_target&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;general-summary&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	    &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-	      &lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-	      &lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-	      &lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-	      &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	      &lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-	      &lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-	      &lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-	      &lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&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;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;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&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;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&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='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;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;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;start-time&lt;/name&gt;</div><div class='del'>-	      &lt;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;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;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;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;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;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_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-	  &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-	  &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-	  &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkText&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;description&lt;/name&gt;</div><div class='del'>-	    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	    &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	    &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;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;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;hbox6&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;2&lt;/border_width&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;classification-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;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;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;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-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'>-</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;True&lt;/xshrink&gt;</div><div class='del'>-	    &lt;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;True&lt;/xshrink&gt;</div><div class='del'>-	    &lt;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-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;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;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;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;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;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;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;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;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;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;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;False&lt;/xexpand&gt;</div><div class='del'>-	    &lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-	    &lt;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'>-</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;label42&lt;/name&gt;</div><div class='del'>-	&lt;label&gt;Reminder&lt;/label&gt;</div><div class='del'>-	&lt;justify&gt;GTK_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;vbox41&lt;/name&gt;</div><div class='del'>-	&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;frame26&lt;/name&gt;</div><div class='del'>-	  &lt;label&gt;Appointment Basics&lt;/label&gt;</div><div class='del'>-	  &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	  &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkTable&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;table9&lt;/name&gt;</div><div class='del'>-	    &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	    &lt;rows&gt;2&lt;/rows&gt;</div><div class='del'>-	    &lt;columns&gt;2&lt;/columns&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;row_spacing&gt;2&lt;/row_spacing&gt;</div><div class='del'>-	    &lt;column_spacing&gt;2&lt;/column_spacing&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label44&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;Su_mmary:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;default_focus_target&gt;recurrence-summary&lt;/default_focus_target&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;label45&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;_Starting date:&lt;/label&gt;</div><div class='del'>-	      &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-	      &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-	      &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-	      &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;0&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;1&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;1&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;2&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;False&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;False&lt;/xshrink&gt;</div><div class='del'>-		&lt;yshrink&gt;False&lt;/yshrink&gt;</div><div class='del'>-		&lt;xfill&gt;True&lt;/xfill&gt;</div><div class='del'>-		&lt;yfill&gt;False&lt;/yfill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkEntry&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;recurrence-summary&lt;/name&gt;</div><div class='del'>-	      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-	      &lt;editable&gt;True&lt;/editable&gt;</div><div class='del'>-	      &lt;text_visible&gt;True&lt;/text_visible&gt;</div><div class='del'>-	      &lt;text_max_length&gt;0&lt;/text_max_length&gt;</div><div class='del'>-	      &lt;text&gt;&lt;/text&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;left_attach&gt;1&lt;/left_attach&gt;</div><div class='del'>-		&lt;right_attach&gt;2&lt;/right_attach&gt;</div><div class='del'>-		&lt;top_attach&gt;0&lt;/top_attach&gt;</div><div class='del'>-		&lt;bottom_attach&gt;1&lt;/bottom_attach&gt;</div><div class='del'>-		&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		&lt;xexpand&gt;True&lt;/xexpand&gt;</div><div class='del'>-		&lt;yexpand&gt;False&lt;/yexpand&gt;</div><div class='del'>-		&lt;xshrink&gt;True&lt;/xshrink&gt;</div><div class='del'>-		&lt;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;alignment37&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;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;Custom&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;recurrence-starting-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;Fri, 22 Sep 2000 20:51:38 GMT&lt;/last_modification_time&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	&lt;widget&gt;</div><div class='del'>-	  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	  &lt;name&gt;vbox43&lt;/name&gt;</div><div class='del'>-	  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	  &lt;child&gt;</div><div class='del'>-	    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;widget&gt;</div><div class='del'>-	    &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	    &lt;name&gt;frame28&lt;/name&gt;</div><div class='del'>-	    &lt;label&gt;Recurrence Rule&lt;/label&gt;</div><div class='del'>-	    &lt;label_xalign&gt;0&lt;/label_xalign&gt;</div><div class='del'>-	    &lt;shadow_type&gt;GTK_SHADOW_ETCHED_IN&lt;/shadow_type&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;vbox47&lt;/name&gt;</div><div class='del'>-	      &lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-	      &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	      &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;hbox47&lt;/name&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-none&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;No recurrence&lt;/label&gt;</div><div class='del'>-		  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		  &lt;group&gt;recurrence-radio&lt;/group&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-simple&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;Simple recurrence&lt;/label&gt;</div><div class='del'>-		  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		  &lt;group&gt;recurrence-radio&lt;/group&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkRadioButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-custom&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;label&gt;Custom recurrence&lt;/label&gt;</div><div class='del'>-		  &lt;active&gt;False&lt;/active&gt;</div><div class='del'>-		  &lt;draw_indicator&gt;True&lt;/draw_indicator&gt;</div><div class='del'>-		  &lt;group&gt;recurrence-radio&lt;/group&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;recurrence-params&lt;/name&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;2&lt;/spacing&gt;</div><div class='del'>-		&lt;child&gt;</div><div class='del'>-		  &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		  &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		  &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		&lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;label46&lt;/name&gt;</div><div class='del'>-		  &lt;label&gt;Every&lt;/label&gt;</div><div class='del'>-		  &lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;xalign&gt;0&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-		  &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkSpinButton&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-interval-value&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;climb_rate&gt;1&lt;/climb_rate&gt;</div><div class='del'>-		  &lt;digits&gt;0&lt;/digits&gt;</div><div class='del'>-		  &lt;numeric&gt;True&lt;/numeric&gt;</div><div class='del'>-		  &lt;update_policy&gt;GTK_UPDATE_ALWAYS&lt;/update_policy&gt;</div><div class='del'>-		  &lt;snap&gt;False&lt;/snap&gt;</div><div class='del'>-		  &lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-		  &lt;value&gt;1&lt;/value&gt;</div><div class='del'>-		  &lt;lower&gt;1&lt;/lower&gt;</div><div class='del'>-		  &lt;upper&gt;10000&lt;/upper&gt;</div><div class='del'>-		  &lt;step&gt;1&lt;/step&gt;</div><div class='del'>-		  &lt;page&gt;10&lt;/page&gt;</div><div class='del'>-		  &lt;page_size&gt;10&lt;/page_size&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-interval-unit&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;items&gt;day(s)</div><div class='del'>-week(s)</div><div class='del'>-month(s)</div><div class='del'>-year(s)</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-		  &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-special&lt;/name&gt;</div><div class='del'>-		  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkOptionMenu&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-ending-menu&lt;/name&gt;</div><div class='del'>-		  &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		  &lt;items&gt;for</div><div class='del'>-until</div><div class='del'>-forever</div><div class='del'>-&lt;/items&gt;</div><div class='del'>-		  &lt;initial_choice&gt;0&lt;/initial_choice&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkAlignment&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;recurrence-ending-special&lt;/name&gt;</div><div class='del'>-		  &lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-		  &lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-		  &lt;xscale&gt;0&lt;/xscale&gt;</div><div class='del'>-		  &lt;yscale&gt;0&lt;/yscale&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;Placeholder&lt;/class&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><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;hbox45&lt;/name&gt;</div><div class='del'>-	    &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-	    &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-	    &lt;child&gt;</div><div class='del'>-	      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-	      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-	      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkFrame&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;frame24&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;False&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-	      &lt;widget&gt;</div><div class='del'>-		&lt;class&gt;GtkHBox&lt;/class&gt;</div><div class='del'>-		&lt;name&gt;hbox46&lt;/name&gt;</div><div class='del'>-		&lt;border_width&gt;4&lt;/border_width&gt;</div><div class='del'>-		&lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		&lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox44&lt;/name&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;recurrence-exception-add&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Add&lt;/label&gt;</div><div class='del'>-		    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;recurrence-exception-modify&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Modify&lt;/label&gt;</div><div class='del'>-		    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;GtkButton&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;recurrence-exception-delete&lt;/name&gt;</div><div class='del'>-		    &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		    &lt;label&gt;Delete&lt;/label&gt;</div><div class='del'>-		    &lt;relief&gt;GTK_RELIEF_NORMAL&lt;/relief&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;False&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;False&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-		&lt;widget&gt;</div><div class='del'>-		  &lt;class&gt;GtkVBox&lt;/class&gt;</div><div class='del'>-		  &lt;name&gt;vbox45&lt;/name&gt;</div><div class='del'>-		  &lt;homogeneous&gt;False&lt;/homogeneous&gt;</div><div class='del'>-		  &lt;spacing&gt;4&lt;/spacing&gt;</div><div class='del'>-		  &lt;child&gt;</div><div class='del'>-		    &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		    &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		    &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		  &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;widget&gt;</div><div class='del'>-		    &lt;class&gt;Custom&lt;/class&gt;</div><div class='del'>-		    &lt;name&gt;recurrence-exception-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;False&lt;/expand&gt;</div><div class='del'>-		      &lt;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;scrolledwindow10&lt;/name&gt;</div><div class='del'>-		    &lt;hscrollbar_policy&gt;GTK_POLICY_NEVER&lt;/hscrollbar_policy&gt;</div><div class='del'>-		    &lt;vscrollbar_policy&gt;GTK_POLICY_AUTOMATIC&lt;/vscrollbar_policy&gt;</div><div class='del'>-		    &lt;hupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/hupdate_policy&gt;</div><div class='del'>-		    &lt;vupdate_policy&gt;GTK_UPDATE_CONTINUOUS&lt;/vupdate_policy&gt;</div><div class='del'>-		    &lt;child&gt;</div><div class='del'>-		      &lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		      &lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		      &lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-		    &lt;/child&gt;</div><div class='del'>-</div><div class='del'>-		    &lt;widget&gt;</div><div class='del'>-		      &lt;class&gt;GtkCList&lt;/class&gt;</div><div class='del'>-		      &lt;name&gt;recurrence-exception-list&lt;/name&gt;</div><div class='del'>-		      &lt;can_focus&gt;True&lt;/can_focus&gt;</div><div class='del'>-		      &lt;columns&gt;1&lt;/columns&gt;</div><div class='del'>-		      &lt;column_widths&gt;80&lt;/column_widths&gt;</div><div class='del'>-		      &lt;selection_mode&gt;GTK_SELECTION_BROWSE&lt;/selection_mode&gt;</div><div class='del'>-		      &lt;show_titles&gt;False&lt;/show_titles&gt;</div><div class='del'>-		      &lt;shadow_type&gt;GTK_SHADOW_IN&lt;/shadow_type&gt;</div><div class='del'>-</div><div class='del'>-		      &lt;widget&gt;</div><div class='del'>-			&lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-			&lt;child_name&gt;CList:title&lt;/child_name&gt;</div><div class='del'>-			&lt;name&gt;label49&lt;/name&gt;</div><div class='del'>-			&lt;label&gt;label21&lt;/label&gt;</div><div class='del'>-			&lt;justify&gt;GTK_JUSTIFY_CENTER&lt;/justify&gt;</div><div class='del'>-			&lt;wrap&gt;False&lt;/wrap&gt;</div><div class='del'>-			&lt;xalign&gt;0.5&lt;/xalign&gt;</div><div class='del'>-			&lt;yalign&gt;0.5&lt;/yalign&gt;</div><div class='del'>-			&lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-			&lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-		      &lt;/widget&gt;</div><div class='del'>-		    &lt;/widget&gt;</div><div class='del'>-		  &lt;/widget&gt;</div><div class='del'>-		&lt;/widget&gt;</div><div class='del'>-	      &lt;/widget&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;widget&gt;</div><div class='del'>-	      &lt;class&gt;GtkLabel&lt;/class&gt;</div><div class='del'>-	      &lt;name&gt;recurrence-custom-warning&lt;/name&gt;</div><div class='del'>-	      &lt;label&gt;This appointment has custom recurrence rules that cannot be edited by Evolution.</div><div class='del'>-</div><div class='del'>-However, the appointment will recur at the appropriate time and will be displayed properly in the calendar views.&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&lt;/yalign&gt;</div><div class='del'>-	      &lt;xpad&gt;0&lt;/xpad&gt;</div><div class='del'>-	      &lt;ypad&gt;0&lt;/ypad&gt;</div><div class='del'>-	      &lt;child&gt;</div><div class='del'>-		&lt;padding&gt;0&lt;/padding&gt;</div><div class='del'>-		&lt;expand&gt;True&lt;/expand&gt;</div><div class='del'>-		&lt;fill&gt;True&lt;/fill&gt;</div><div class='del'>-	      &lt;/child&gt;</div><div class='del'>-	    &lt;/widget&gt;</div><div class='del'>-	  &lt;/widget&gt;</div><div class='del'>-	&lt;/widget&gt;</div><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;label43&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'>-&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 97a9366d66..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/event-editor-dialog.glade.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/event-editor-dialog.glade.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +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_("Su_mmary:");</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_("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_("Minutes");</div><div class='del'>-gchar *s = N_("Hours");</div><div class='del'>-gchar *s = N_("Days");</div><div class='del'>-gchar *s = N_("Minutes");</div><div class='del'>-gchar *s = N_("Hours");</div><div class='del'>-gchar *s = N_("Days");</div><div class='del'>-gchar *s = N_("Minutes");</div><div class='del'>-gchar *s = N_("Hours");</div><div class='del'>-gchar *s = N_("Days");</div><div class='del'>-gchar *s = N_("Minutes");</div><div class='del'>-gchar *s = N_("Hours");</div><div class='del'>-gchar *s = N_("Days");</div><div class='del'>-gchar *s = N_("_Display");</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_("_Audio");</div><div class='del'>-gchar *s = N_("Reminder");</div><div class='del'>-gchar *s = N_("Appointment Basics");</div><div class='del'>-gchar *s = N_("Su_mmary:");</div><div class='del'>-gchar *s = N_("_Starting date:");</div><div class='del'>-gchar *s = N_("Recurrence Rule");</div><div class='del'>-gchar *s = N_("No recurrence");</div><div class='del'>-gchar *s = N_("Simple recurrence");</div><div class='del'>-gchar *s = N_("Custom recurrence");</div><div class='del'>-gchar *s = N_("Every");</div><div class='del'>-gchar *s = N_("day(s)");</div><div class='del'>-gchar *s = N_("week(s)");</div><div class='del'>-gchar *s = N_("month(s)");</div><div class='del'>-gchar *s = N_("year(s)");</div><div class='del'>-gchar *s = N_("for");</div><div class='del'>-gchar *s = N_("until");</div><div class='del'>-gchar *s = N_("forever");</div><div class='del'>-gchar *s = N_("Exceptions");</div><div class='del'>-gchar *s = N_("Add");</div><div class='del'>-gchar *s = N_("Modify");</div><div class='del'>-gchar *s = N_("Delete");</div><div class='del'>-gchar *s = N_("label21");</div><div class='del'>-gchar *s = N_("This appointment has custom recurrence rules that cannot be edited by Evolution.\n"</div><div class='del'>-              "\n"</div><div class='del'>-              "However, the appointment will recur at the appropriate time and will be displayed properly in the calendar views.");</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 f1cbc1c624..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/event-editor.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/event-editor.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2633 +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;widgets/misc/e-dateedit.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "event-editor.h"</div><div class='del'>-#include "e-meeting-edit.h"</div><div class='del'>-#include "weekday-picker.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Options for monthly recurrences */</div><div class='del'>-enum month_day_options {</div><div class='del'>-	MONTH_DAY_NTH,</div><div class='del'>-	MONTH_DAY_MON,</div><div class='del'>-	MONTH_DAY_TUE,</div><div class='del'>-	MONTH_DAY_WED,</div><div class='del'>-	MONTH_DAY_THU,</div><div class='del'>-	MONTH_DAY_FRI,</div><div class='del'>-	MONTH_DAY_SAT,</div><div class='del'>-	MONTH_DAY_SUN</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int month_day_options_map[] = {</div><div class='del'>-	MONTH_DAY_NTH,</div><div class='del'>-	MONTH_DAY_MON,</div><div class='del'>-	MONTH_DAY_TUE,</div><div class='del'>-	MONTH_DAY_WED,</div><div class='del'>-	MONTH_DAY_THU,</div><div class='del'>-	MONTH_DAY_FRI,</div><div class='del'>-	MONTH_DAY_SAT,</div><div class='del'>-	MONTH_DAY_SUN,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EventEditorPrivate {</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'>-	BonoboUIComponent *uic;</div><div class='del'>-</div><div class='del'>-	/* Client to use */</div><div class='del'>-	CalClient *client;</div><div class='del'>-	</div><div class='del'>-	/* Calendar object/uid we are editing; this is an internal copy */</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	/* 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_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 *description;</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_summary;</div><div class='del'>-	GtkWidget *recurrence_starting_date;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_none;</div><div class='del'>-	GtkWidget *recurrence_simple;</div><div class='del'>-	GtkWidget *recurrence_custom;</div><div class='del'>-	GtkWidget *recurrence_custom_warning;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_params;</div><div class='del'>-	GtkWidget *recurrence_interval_value;</div><div class='del'>-	GtkWidget *recurrence_interval_unit;</div><div class='del'>-	GtkWidget *recurrence_special;</div><div class='del'>-	GtkWidget *recurrence_ending_menu;</div><div class='del'>-	GtkWidget *recurrence_ending_special;</div><div class='del'>-</div><div class='del'>-	/* For weekly recurrences, created by hand */</div><div class='del'>-	GtkWidget *recurrence_weekday_picker;</div><div class='del'>-	guint8 recurrence_weekday_day_mask;</div><div class='del'>-</div><div class='del'>-	/* For monthly recurrences, created by hand */</div><div class='del'>-	GtkWidget *recurrence_month_index_spin;</div><div class='del'>-	int recurrence_month_index;</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_month_day_menu;</div><div class='del'>-	enum month_day_options recurrence_month_day;</div><div class='del'>-</div><div class='del'>-	/* For ending date, created by hand */</div><div class='del'>-	GtkWidget *recurrence_ending_date_edit;</div><div class='del'>-	time_t recurrence_ending_date;</div><div class='del'>-</div><div class='del'>-	/* For ending count of ocurrences, created by hand */</div><div class='del'>-	GtkWidget *recurrence_ending_count_spin;</div><div class='del'>-	int recurrence_ending_count;</div><div class='del'>-</div><div class='del'>-	/* More widgets from the Glade file */</div><div class='del'>-</div><div class='del'>-	GtkWidget *recurrence_exception_date;</div><div class='del'>-	GtkWidget *recurrence_exception_list;</div><div class='del'>-	GtkWidget *recurrence_exception_add;</div><div class='del'>-	GtkWidget *recurrence_exception_modify;</div><div class='del'>-	GtkWidget *recurrence_exception_delete;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void event_editor_class_init (EventEditorClass *class);</div><div class='del'>-static void event_editor_init (EventEditor *ee);</div><div class='del'>-static void event_editor_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 date_changed_cb (EDateEdit *dedit, gpointer data);</div><div class='del'>-static void recurrence_exception_add_cb (GtkWidget *widget, EventEditor *ee);</div><div class='del'>-static void recurrence_exception_modify_cb (GtkWidget *widget, EventEditor *ee);</div><div class='del'>-static void recurrence_exception_delete_cb (GtkWidget *widget, EventEditor *ee);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_editor_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the #EventEditor class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Return value: The type ID of the #EventEditor class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-event_editor_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType event_editor_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!event_editor_type) {</div><div class='del'>-		static const GtkTypeInfo event_editor_info = {</div><div class='del'>-			"EventEditor",</div><div class='del'>-			sizeof (EventEditor),</div><div class='del'>-			sizeof (EventEditorClass),</div><div class='del'>-			(GtkClassInitFunc) event_editor_class_init,</div><div class='del'>-			(GtkObjectInitFunc) event_editor_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		event_editor_type = gtk_type_unique (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'>-	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'>-/* 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'>-/* 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;uic) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;uic));</div><div class='del'>-		priv-&gt;uic = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	free_exception_clist_data (GTK_CLIST (priv-&gt;recurrence_exception_list));</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;comp) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-		priv-&gt;comp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;client), ee);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-		priv-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;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_comp (CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	const char *summary;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	</div><div class='del'>-	if (!comp)</div><div class='del'>-		return g_strdup (_("Edit Appointment"));</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	if (text.value)</div><div class='del'>-		summary = text.value;</div><div class='del'>-	else</div><div class='del'>-		summary =  _("No summary");</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	type = cal_component_get_vtype (comp);</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		return g_strdup_printf (_("Appointment - %s"), summary);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		return g_strdup_printf (_("Task - %s"), summary);</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_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_comp(): Cannot handle object of type %d", type);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the special contents for weekly recurrences */</div><div class='del'>-static void</div><div class='del'>-make_recur_weekly_special (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_BIN (priv-&gt;recurrence_special)-&gt;child == NULL);</div><div class='del'>-	g_assert (priv-&gt;recurrence_weekday_picker == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the widgets */</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;recurrence_special), hbox);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("on"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (weekday_picker_new ());</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_weekday_picker = GTK_WIDGET (wp);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), GTK_WIDGET (wp), FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-</div><div class='del'>-	/* Set the weekdays */</div><div class='del'>-</div><div class='del'>-	weekday_picker_set_week_starts_on_monday (wp, week_starts_on_monday);</div><div class='del'>-	weekday_picker_set_days (wp, priv-&gt;recurrence_weekday_day_mask);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the option menu for the monthly recurrence days */</div><div class='del'>-static GtkWidget *</div><div class='del'>-make_recur_month_menu (void)</div><div class='del'>-{</div><div class='del'>-	static const char *options[] = {</div><div class='del'>-		N_("day"),</div><div class='del'>-		N_("Monday"),</div><div class='del'>-		N_("Tuesday"),</div><div class='del'>-		N_("Wednesday"),</div><div class='del'>-		N_("Thursday"),</div><div class='del'>-		N_("Friday"),</div><div class='del'>-		N_("Saturday"),</div><div class='del'>-		N_("Sunday")</div><div class='del'>-	};</div><div class='del'>-</div><div class='del'>-	GtkWidget *menu;</div><div class='del'>-	GtkWidget *omenu;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	menu = gtk_menu_new ();</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; sizeof (options) / sizeof (options[0]); i++) {</div><div class='del'>-		GtkWidget *item;</div><div class='del'>-</div><div class='del'>-		item = gtk_menu_item_new_with_label (_(options[i]));</div><div class='del'>-		gtk_menu_append (GTK_MENU (menu), item);</div><div class='del'>-		gtk_widget_show (item);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	omenu = gtk_option_menu_new ();</div><div class='del'>-	gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu);</div><div class='del'>-</div><div class='del'>-	return omenu;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the special contents for monthly recurrences */</div><div class='del'>-static void</div><div class='del'>-make_recur_monthly_special (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_BIN (priv-&gt;recurrence_special)-&gt;child == NULL);</div><div class='del'>-	g_assert (priv-&gt;recurrence_month_index_spin == NULL);</div><div class='del'>-	g_assert (priv-&gt;recurrence_month_day_menu == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the widgets */</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;recurrence_special), hbox);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("on the"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 31, 1, 10, 10));</div><div class='del'>-	priv-&gt;recurrence_month_index_spin = gtk_spin_button_new (adj, 1, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;recurrence_month_index_spin, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("th"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_month_day_menu = make_recur_month_menu ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;recurrence_month_day_menu, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-</div><div class='del'>-	/* Set the options */</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_month_index_spin, priv-&gt;recurrence_month_index);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;recurrence_month_day_menu,</div><div class='del'>-				  priv-&gt;recurrence_month_day,</div><div class='del'>-				  month_day_options_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const int recur_freq_map[] = {</div><div class='del'>-	ICAL_DAILY_RECURRENCE,</div><div class='del'>-	ICAL_WEEKLY_RECURRENCE,</div><div class='del'>-	ICAL_MONTHLY_RECURRENCE,</div><div class='del'>-	ICAL_YEARLY_RECURRENCE,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Changes the recurrence-special widget to match the interval units.</div><div class='del'>- *</div><div class='del'>- * For daily recurrences: nothing.</div><div class='del'>- * For weekly recurrences: weekday selector.</div><div class='del'>- * For monthly recurrences: "on the" &lt;nth&gt; [day, Weekday]</div><div class='del'>- * For yearly recurrences: nothing.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-make_recurrence_special (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	icalrecurrencetype_frequency frequency;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (GTK_BIN (priv-&gt;recurrence_special)-&gt;child != NULL) {</div><div class='del'>-		gtk_widget_destroy (GTK_BIN (priv-&gt;recurrence_special)-&gt;child);</div><div class='del'>-</div><div class='del'>-		priv-&gt;recurrence_weekday_picker = NULL;</div><div class='del'>-		priv-&gt;recurrence_month_index_spin = NULL;</div><div class='del'>-		priv-&gt;recurrence_month_day_menu = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	frequency = e_dialog_option_menu_get (priv-&gt;recurrence_interval_unit, recur_freq_map);</div><div class='del'>-</div><div class='del'>-	switch (frequency) {</div><div class='del'>-	case ICAL_DAILY_RECURRENCE:</div><div class='del'>-		gtk_widget_hide (priv-&gt;recurrence_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_WEEKLY_RECURRENCE:</div><div class='del'>-		make_recur_weekly_special (ee);</div><div class='del'>-		gtk_widget_show (priv-&gt;recurrence_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-		make_recur_monthly_special (ee);</div><div class='del'>-		gtk_widget_show (priv-&gt;recurrence_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-		gtk_widget_hide (priv-&gt;recurrence_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the special contents for "ending until" (end date) recurrences */</div><div class='del'>-static void</div><div class='del'>-make_recur_ending_until_special (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	EDateEdit *de;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_BIN (priv-&gt;recurrence_ending_special)-&gt;child == NULL);</div><div class='del'>-	g_assert (priv-&gt;recurrence_ending_date_edit == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the widget */</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_ending_date_edit = e_date_edit_new ();</div><div class='del'>-	de = E_DATE_EDIT (priv-&gt;recurrence_ending_date_edit);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_show_time (de, FALSE);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;recurrence_ending_special), GTK_WIDGET (de));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (GTK_WIDGET (de));</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_time (de, priv-&gt;recurrence_ending_date);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Creates the special contents for the ocurrence count case */</div><div class='del'>-static void</div><div class='del'>-make_recur_ending_count_special (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GtkWidget *hbox;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (GTK_BIN (priv-&gt;recurrence_ending_special)-&gt;child == NULL);</div><div class='del'>-	g_assert (priv-&gt;recurrence_ending_count_spin == NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the widgets */</div><div class='del'>-</div><div class='del'>-	hbox = gtk_hbox_new (FALSE, 2);</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;recurrence_ending_special), hbox);</div><div class='del'>-</div><div class='del'>-	adj = GTK_ADJUSTMENT (gtk_adjustment_new (1, 1, 10000, 1, 10, 10));</div><div class='del'>-	priv-&gt;recurrence_ending_count_spin = gtk_spin_button_new (adj, 1, 0);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), priv-&gt;recurrence_ending_count_spin, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	label = gtk_label_new (_("ocurrences"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (hbox);</div><div class='del'>-</div><div class='del'>-	/* Set the values */</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_ending_count_spin,</div><div class='del'>-			   priv-&gt;recurrence_ending_count);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum ending_type {</div><div class='del'>-	ENDING_FOR,</div><div class='del'>-	ENDING_UNTIL,</div><div class='del'>-	ENDING_FOREVER</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int ending_types_map[] = {</div><div class='del'>-	ENDING_FOR,</div><div class='del'>-	ENDING_UNTIL,</div><div class='del'>-	ENDING_FOREVER,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Changes the recurrence-ending-special widget to match the ending date option.</div><div class='del'>- *</div><div class='del'>- * For: &lt;n&gt; [days, weeks, months, years, occurrences]</div><div class='del'>- * Until: &lt;date selector&gt;</div><div class='del'>- * Forever: nothing.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-make_recurrence_ending_special (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	enum ending_type ending_type;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (GTK_BIN (priv-&gt;recurrence_ending_special)-&gt;child != NULL) {</div><div class='del'>-		gtk_widget_destroy (GTK_BIN (priv-&gt;recurrence_ending_special)-&gt;child);</div><div class='del'>-</div><div class='del'>-		priv-&gt;recurrence_ending_date_edit = NULL;</div><div class='del'>-		priv-&gt;recurrence_ending_count_spin = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ending_type = e_dialog_option_menu_get (priv-&gt;recurrence_ending_menu, ending_types_map);</div><div class='del'>-</div><div class='del'>-	switch (ending_type) {</div><div class='del'>-	case ENDING_FOR:</div><div class='del'>-		make_recur_ending_count_special (ee);</div><div class='del'>-		gtk_widget_show (priv-&gt;recurrence_ending_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENDING_UNTIL:</div><div class='del'>-		make_recur_ending_until_special (ee);</div><div class='del'>-		gtk_widget_show (priv-&gt;recurrence_ending_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENDING_FOREVER:</div><div class='del'>-		gtk_widget_hide (priv-&gt;recurrence_ending_special);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-enum recur_type {</div><div class='del'>-	RECUR_NONE,</div><div class='del'>-	RECUR_SIMPLE,</div><div class='del'>-	RECUR_CUSTOM</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const int recur_type_map[] = {</div><div class='del'>-	RECUR_NONE,</div><div class='del'>-	RECUR_SIMPLE,</div><div class='del'>-	RECUR_CUSTOM,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Sensitizes the recurrence widgets based on the state of the recurrence type</div><div class='del'>- * radio group.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-sensitize_recur_widgets (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	enum recur_type type;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	type = e_dialog_radio_get (priv-&gt;recurrence_none, recur_type_map);</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case RECUR_NONE:</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;recurrence_params, FALSE);</div><div class='del'>-		gtk_widget_hide (priv-&gt;recurrence_custom_warning);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_SIMPLE:</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;recurrence_params, TRUE);</div><div class='del'>-		gtk_widget_hide (priv-&gt;recurrence_custom_warning);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_CUSTOM:</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;recurrence_params, FALSE);</div><div class='del'>-		gtk_widget_show (priv-&gt;recurrence_custom_warning);</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 one of the recurrence type radio buttons is toggled.  We</div><div class='del'>- * enable or the recurrence parameters.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-recurrence_type_toggled_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'>-	sensitize_recur_widgets (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the recurrence interval option menu changes.  We need to</div><div class='del'>- * change the contents of the recurrence special widget.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-recur_interval_selection_done_cb (GtkMenuShell *menu_shell, 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'>-	make_recurrence_special (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the recurrence ending option menu changes.  We need to</div><div class='del'>- * change the contents of the ending special widget.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-recur_ending_selection_done_cb (GtkMenuShell *menu_shell, 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'>-	make_recurrence_ending_special (ee);</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_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;description = GW ("description");</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_summary = GW ("recurrence-summary");</div><div class='del'>-	priv-&gt;recurrence_starting_date = GW ("recurrence-starting-date");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_none = GW ("recurrence-none");</div><div class='del'>-	priv-&gt;recurrence_simple = GW ("recurrence-simple");</div><div class='del'>-	priv-&gt;recurrence_custom = GW ("recurrence-custom");</div><div class='del'>-	priv-&gt;recurrence_custom_warning = GW ("recurrence-custom-warning");</div><div class='del'>-	priv-&gt;recurrence_params = GW ("recurrence-params");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_interval_value = GW ("recurrence-interval-value");</div><div class='del'>-	priv-&gt;recurrence_interval_unit = GW ("recurrence-interval-unit");</div><div class='del'>-	priv-&gt;recurrence_special = GW ("recurrence-special");</div><div class='del'>-	priv-&gt;recurrence_ending_menu = GW ("recurrence-ending-menu");</div><div class='del'>-	priv-&gt;recurrence_ending_special = GW ("recurrence-ending-special");</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_exception_date = GW ("recurrence-exception-date");</div><div class='del'>-	priv-&gt;recurrence_exception_list = GW ("recurrence-exception-list");</div><div class='del'>-	priv-&gt;recurrence_exception_add = GW ("recurrence-exception-add");</div><div class='del'>-	priv-&gt;recurrence_exception_modify = GW ("recurrence-exception-modify");</div><div class='del'>-	priv-&gt;recurrence_exception_delete = GW ("recurrence-exception-delete");</div><div class='del'>-</div><div class='del'>-#undef GW</div><div class='del'>-</div><div class='del'>-	return (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;description</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_summary</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_starting_date</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_none</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_simple</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_custom</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_custom_warning</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_params</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_interval_value</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_interval_unit</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_special</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_ending_menu</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_ending_special</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exception_date</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exception_list</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exception_add</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exception_modify</div><div class='del'>-		&amp;&amp; priv-&gt;recurrence_exception_delete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Syncs the contents of two entry widgets, while blocking signals from each</div><div class='del'>- * other.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-sync_entries (GtkEditable *source, GtkEditable *dest)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (dest), source);</div><div class='del'>-</div><div class='del'>-	str = gtk_editable_get_chars (source, 0, -1);</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (dest), str);</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (dest), source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Syncs the contents of two date editor widgets, while blocking signals on the</div><div class='del'>- * specified data.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-sync_date_edits (EDateEdit *source, EDateEdit *dest)</div><div class='del'>-{</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (dest), source);</div><div class='del'>-</div><div class='del'>-	t = e_date_edit_get_time (source);</div><div class='del'>-	e_date_edit_set_time (dest, t);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (dest), source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when one of the general or recurrence summary entries change;</div><div class='del'>- * we sync the other entry to it.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-summary_changed_cb (GtkEditable *editable, gpointer data)</div><div class='del'>-{</div><div class='del'>-	sync_entries (editable, GTK_EDITABLE (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when one of the general or recurrence starting date widgets</div><div class='del'>- * change; we sync the other date editor to it.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-start_date_changed_cb (EDateEdit *de, gpointer data)</div><div class='del'>-{</div><div class='del'>-	sync_date_edits (de, E_DATE_EDIT (data));</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'>-	GtkWidget *menu;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Summary in the main and recurrence pages */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;general_summary), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (summary_changed_cb), priv-&gt;recurrence_summary);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_summary), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (summary_changed_cb), priv-&gt;general_summary);</div><div class='del'>-</div><div class='del'>-	/* Start dates in the main and recurrence pages */</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;start_time), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (start_date_changed_cb), priv-&gt;recurrence_starting_date);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_starting_date), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (start_date_changed_cb), priv-&gt;start_time);</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), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (date_changed_cb), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;end_time), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (date_changed_cb), 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_none), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_simple), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_custom), "toggled",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_type_toggled_cb), ee);</div><div class='del'>-</div><div class='del'>-	/* Recurrence units */</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;recurrence_interval_unit));</div><div class='del'>-	g_assert (menu != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recur_interval_selection_done_cb), ee);</div><div class='del'>-</div><div class='del'>-	/* Recurrence ending */</div><div class='del'>-</div><div class='del'>-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (priv-&gt;recurrence_ending_menu));</div><div class='del'>-	g_assert (menu != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (menu), "selection_done",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recur_ending_selection_done_cb), 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_add_cb), ee);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;recurrence_exception_modify), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (recurrence_exception_modify_cb), 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_delete_cb), ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const int classification_map[] = {</div><div class='del'>-	CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-	CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-	CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-	-1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#if 0</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'>-#endif</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'>-/* 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'>-	/* Summary, description */</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (priv-&gt;general_summary, NULL); /* will also change recur summary */</div><div class='del'>-	e_dialog_editable_set (priv-&gt;description, NULL);</div><div class='del'>-</div><div class='del'>-	/* Start and end times */</div><div class='del'>-</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_date_edit_set_time (E_DATE_EDIT (priv-&gt;start_time), now); /* will set recur start too */</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (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'>-#if 0</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'>-#endif</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,</div><div class='del'>-			    CAL_COMPONENT_CLASS_PRIVATE, classification_map);</div><div class='del'>-</div><div class='del'>-	/* Recurrences */</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_weekday_day_mask = 0;</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_month_index = 1;</div><div class='del'>-	priv-&gt;recurrence_month_day = MONTH_DAY_NTH;</div><div class='del'>-</div><div class='del'>-	e_dialog_radio_set (priv-&gt;recurrence_none, RECUR_NONE, recur_type_map);</div><div class='del'>-</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_interval_value, 1);</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;recurrence_interval_unit, ICAL_DAILY_RECURRENCE,</div><div class='del'>-				  recur_freq_map);</div><div class='del'>-</div><div class='del'>-	priv-&gt;recurrence_ending_date = time (NULL);</div><div class='del'>-	priv-&gt;recurrence_ending_count = 1;</div><div class='del'>-</div><div class='del'>-	e_dialog_option_menu_set (priv-&gt;recurrence_ending_menu, ENDING_FOREVER,</div><div class='del'>-				  ending_types_map);</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_exception_list));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the recurrence ending date widgets with the values from the calendar</div><div class='del'>- * component.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-fill_ending_date (EventEditor *ee, struct icalrecurrencetype *r)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (r-&gt;count == 0) {</div><div class='del'>-		if (r-&gt;until.year == 0) {</div><div class='del'>-			/* Forever */</div><div class='del'>-</div><div class='del'>-			e_dialog_option_menu_set (priv-&gt;recurrence_ending_menu,</div><div class='del'>-						  ENDING_FOREVER,</div><div class='del'>-						  ending_types_map);</div><div class='del'>-		} else {</div><div class='del'>-			/* Ending date */</div><div class='del'>-</div><div class='del'>-			priv-&gt;recurrence_ending_date = icaltime_as_timet (r-&gt;until);</div><div class='del'>-			e_dialog_option_menu_set (priv-&gt;recurrence_ending_menu,</div><div class='del'>-						  ENDING_UNTIL,</div><div class='del'>-						  ending_types_map);</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* Count of ocurrences */</div><div class='del'>-</div><div class='del'>-		priv-&gt;recurrence_ending_count = r-&gt;count;</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;recurrence_ending_menu,</div><div class='del'>-					  ENDING_FOR,</div><div class='del'>-					  ending_types_map);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	make_recurrence_ending_special (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Counts the number of elements in the by_xxx fields of an icalrecurrencetype */</div><div class='del'>-static int</div><div class='del'>-count_by_xxx (short *field, int max_elements)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; max_elements; i++)</div><div class='del'>-		if (field[i] == ICAL_RECURRENCE_ARRAY_MAX)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	return i;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills in the recurrence widgets with the values from the calendar component.</div><div class='del'>- * This function is particularly tricky because it has to discriminate between</div><div class='del'>- * recurrences we support for editing and the ones we don't.  We only support at</div><div class='del'>- * most one recurrence rule; no rdates or exrules (exdates are handled just fine</div><div class='del'>- * elsewhere).</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-fill_recurrence_widgets (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	GSList *rrule_list;</div><div class='del'>-	int len;</div><div class='del'>-	struct icalrecurrencetype *r;</div><div class='del'>-	int n_by_second, n_by_minute, n_by_hour;</div><div class='del'>-	int n_by_day, n_by_month_day, n_by_year_day;</div><div class='del'>-	int n_by_week_no, n_by_month, n_by_set_pos;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-	g_assert (priv-&gt;comp != NULL);</div><div class='del'>-</div><div class='del'>-	/* No recurrences? */</div><div class='del'>-</div><div class='del'>-	if (!cal_component_has_rdates (priv-&gt;comp)</div><div class='del'>-	    &amp;&amp; !cal_component_has_rrules (priv-&gt;comp)</div><div class='del'>-	    &amp;&amp; !cal_component_has_exrules (priv-&gt;comp)) {</div><div class='del'>-		e_dialog_radio_set (priv-&gt;recurrence_none, RECUR_NONE, recur_type_map);</div><div class='del'>-		sensitize_recur_widgets (ee);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* See if it is a custom set we don't support */</div><div class='del'>-</div><div class='del'>-	cal_component_get_rrule_list (priv-&gt;comp, &amp;rrule_list);</div><div class='del'>-	len = g_slist_length (rrule_list);</div><div class='del'>-</div><div class='del'>-	if (len &gt; 1</div><div class='del'>-	    || cal_component_has_rdates (priv-&gt;comp)</div><div class='del'>-	    || cal_component_has_exrules (priv-&gt;comp))</div><div class='del'>-		goto custom;</div><div class='del'>-</div><div class='del'>-	/* Down to one rule, so test that one */</div><div class='del'>-</div><div class='del'>-	g_assert (len == 1);</div><div class='del'>-	r = rrule_list-&gt;data;</div><div class='del'>-</div><div class='del'>-	/* Any funky frequency? */</div><div class='del'>-</div><div class='del'>-	if (r-&gt;freq == ICAL_SECONDLY_RECURRENCE</div><div class='del'>-	    || r-&gt;freq == ICAL_MINUTELY_RECURRENCE</div><div class='del'>-	    || r-&gt;freq == ICAL_HOURLY_RECURRENCE)</div><div class='del'>-		goto custom;</div><div class='del'>-</div><div class='del'>-	/* Any funky shit? */</div><div class='del'>-</div><div class='del'>-#define N_HAS_BY(field) (count_by_xxx (field, sizeof (field) / sizeof (field[0])))</div><div class='del'>-</div><div class='del'>-	n_by_second = N_HAS_BY (r-&gt;by_second);</div><div class='del'>-	n_by_minute = N_HAS_BY (r-&gt;by_minute);</div><div class='del'>-	n_by_hour = N_HAS_BY (r-&gt;by_hour);</div><div class='del'>-	n_by_day = N_HAS_BY (r-&gt;by_day);</div><div class='del'>-	n_by_month_day = N_HAS_BY (r-&gt;by_month_day);</div><div class='del'>-	n_by_year_day = N_HAS_BY (r-&gt;by_year_day);</div><div class='del'>-	n_by_week_no = N_HAS_BY (r-&gt;by_week_no);</div><div class='del'>-	n_by_month = N_HAS_BY (r-&gt;by_month);</div><div class='del'>-	n_by_set_pos = N_HAS_BY (r-&gt;by_set_pos);</div><div class='del'>-</div><div class='del'>-	if (n_by_second != 0</div><div class='del'>-	    || n_by_minute != 0</div><div class='del'>-	    || n_by_hour != 0)</div><div class='del'>-		goto custom;</div><div class='del'>-</div><div class='del'>-	/* Filter the funky shit based on the frequency; if there is nothing</div><div class='del'>-	 * weird we can actually set the widgets.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	switch (r-&gt;freq) {</div><div class='del'>-	case ICAL_DAILY_RECURRENCE:</div><div class='del'>-		if (n_by_day != 0</div><div class='del'>-		    || n_by_month_day != 0</div><div class='del'>-		    || n_by_year_day != 0</div><div class='del'>-		    || n_by_week_no != 0</div><div class='del'>-		    || n_by_month != 0</div><div class='del'>-		    || n_by_set_pos != 0)</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;recurrence_interval_unit, ICAL_DAILY_RECURRENCE,</div><div class='del'>-					  recur_freq_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_WEEKLY_RECURRENCE: {</div><div class='del'>-		int i;</div><div class='del'>-		guint8 day_mask;</div><div class='del'>-</div><div class='del'>-		if (n_by_month_day != 0</div><div class='del'>-		    || n_by_year_day != 0</div><div class='del'>-		    || n_by_week_no != 0</div><div class='del'>-		    || n_by_month != 0</div><div class='del'>-		    || n_by_set_pos != 0)</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		day_mask = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 8 &amp;&amp; r-&gt;by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) {</div><div class='del'>-			enum icalrecurrencetype_weekday weekday;</div><div class='del'>-			int pos;</div><div class='del'>-</div><div class='del'>-			weekday = icalrecurrencetype_day_day_of_week (r-&gt;by_day[i]);</div><div class='del'>-			pos = icalrecurrencetype_day_position (r-&gt;by_day[i]);</div><div class='del'>-</div><div class='del'>-			if (pos != 0)</div><div class='del'>-				goto custom;</div><div class='del'>-</div><div class='del'>-			switch (weekday) {</div><div class='del'>-			case ICAL_SUNDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 0;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_MONDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 1;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_TUESDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 2;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_WEDNESDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 3;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_THURSDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 4;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_FRIDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 5;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_SATURDAY_WEEKDAY:</div><div class='del'>-				day_mask |= 1 &lt;&lt; 6;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		priv-&gt;recurrence_weekday_day_mask = day_mask;</div><div class='del'>-</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;recurrence_interval_unit, ICAL_WEEKLY_RECURRENCE,</div><div class='del'>-					  recur_freq_map);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case ICAL_MONTHLY_RECURRENCE:</div><div class='del'>-		if (n_by_year_day != 0</div><div class='del'>-		    || n_by_week_no != 0</div><div class='del'>-		    || n_by_month != 0</div><div class='del'>-		    || n_by_set_pos != 0)</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		if (n_by_month_day == 1) {</div><div class='del'>-			int nth;</div><div class='del'>-</div><div class='del'>-			nth = r-&gt;by_month_day[0];</div><div class='del'>-			if (nth &lt; 1)</div><div class='del'>-				goto custom;</div><div class='del'>-</div><div class='del'>-			priv-&gt;recurrence_month_index = nth;</div><div class='del'>-			priv-&gt;recurrence_month_day = MONTH_DAY_NTH;</div><div class='del'>-		} else if (n_by_day == 1) {</div><div class='del'>-			enum icalrecurrencetype_weekday weekday;</div><div class='del'>-			int pos;</div><div class='del'>-			enum month_day_options month_day;</div><div class='del'>-</div><div class='del'>-			weekday = icalrecurrencetype_day_day_of_week (r-&gt;by_day[0]);</div><div class='del'>-			pos = icalrecurrencetype_day_position (r-&gt;by_day[0]);</div><div class='del'>-</div><div class='del'>-			if (pos &lt; 1)</div><div class='del'>-				goto custom;</div><div class='del'>-</div><div class='del'>-			switch (weekday) {</div><div class='del'>-			case ICAL_MONDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_MON;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_TUESDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_TUE;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_WEDNESDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_WED;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_THURSDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_THU;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_FRIDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_FRI;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_SATURDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_SAT;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case ICAL_SUNDAY_WEEKDAY:</div><div class='del'>-				month_day = MONTH_DAY_SUN;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				goto custom;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			priv-&gt;recurrence_month_index = pos;</div><div class='del'>-			priv-&gt;recurrence_month_day = month_day;</div><div class='del'>-		} else</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;recurrence_interval_unit, ICAL_MONTHLY_RECURRENCE,</div><div class='del'>-					  recur_freq_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-		if (n_by_day != 0</div><div class='del'>-		    || n_by_month_day != 0</div><div class='del'>-		    || n_by_year_day != 0</div><div class='del'>-		    || n_by_week_no != 0</div><div class='del'>-		    || n_by_month != 0</div><div class='del'>-		    || n_by_set_pos != 0)</div><div class='del'>-			goto custom;</div><div class='del'>-</div><div class='del'>-		e_dialog_option_menu_set (priv-&gt;recurrence_interval_unit, ICAL_YEARLY_RECURRENCE,</div><div class='del'>-					  recur_freq_map);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		goto custom;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we got here it means it is a simple recurrence */</div><div class='del'>-</div><div class='del'>-	e_dialog_radio_set (priv-&gt;recurrence_simple, RECUR_SIMPLE, recur_type_map);</div><div class='del'>-	sensitize_recur_widgets (ee);</div><div class='del'>-	make_recurrence_special (ee);</div><div class='del'>-	e_dialog_spin_set (priv-&gt;recurrence_interval_value, r-&gt;interval);</div><div class='del'>-</div><div class='del'>-	fill_ending_date (ee, r);</div><div class='del'>-</div><div class='del'>-	goto out;</div><div class='del'>-</div><div class='del'>- custom:</div><div class='del'>-</div><div class='del'>-	e_dialog_radio_set (priv-&gt;recurrence_custom, RECUR_CUSTOM, recur_type_map);</div><div class='del'>-	sensitize_recur_widgets (ee);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	cal_component_free_recur_list (rrule_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills in the widgets with the value from the calendar component */</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'>-	CalComponentText text;</div><div class='del'>-	CalComponentClassification cl;</div><div class='del'>-	CalComponentDateTime d;</div><div class='del'>-	GSList *list, *l;</div><div class='del'>-	time_t dtstart, dtend;</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;comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* Summary, description(s) */</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (priv-&gt;comp, &amp;text);</div><div class='del'>-	e_dialog_editable_set (priv-&gt;general_summary, text.value); /* will also set recur summary */</div><div class='del'>-</div><div class='del'>-	cal_component_get_description_list (priv-&gt;comp, &amp;l);</div><div class='del'>-	if (l) {</div><div class='del'>-		text = *(CalComponentText *)l-&gt;data;</div><div class='del'>-		e_dialog_editable_set (priv-&gt;description, text.value);</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (l);</div><div class='del'>-	</div><div class='del'>-	/* Start and end times */</div><div class='del'>-</div><div class='del'>-	/* All-day events are inclusive, i.e. if the end date shown is 2nd Feb</div><div class='del'>-	   then the event includes all of the 2nd Feb. We would normally show</div><div class='del'>-	   3rd Feb as the end date, since it really ends at midnight on 3rd,</div><div class='del'>-	   so we have to subtract a day so we only show the 2nd. */</div><div class='del'>-	cal_component_get_dtstart (priv-&gt;comp, &amp;d);</div><div class='del'>-	dtstart = icaltime_as_timet (*d.value);</div><div class='del'>-	cal_component_get_dtend (priv-&gt;comp, &amp;d);</div><div class='del'>-	dtend = icaltime_as_timet (*d.value);</div><div class='del'>-</div><div class='del'>-	if (time_day_begin (dtstart) == dtstart</div><div class='del'>-	    &amp;&amp; time_day_begin (dtend) == dtend) {</div><div class='del'>-		dtend = time_add_day (dtend, -1);</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'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;start_time), dtstart); /* will set recur start too */</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;end_time), 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'>-#if 0</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'>-#endif</div><div class='del'>-	/* Classification */</div><div class='del'>-</div><div class='del'>-	cal_component_get_classification (priv-&gt;comp, &amp;cl);</div><div class='del'>-</div><div class='del'>-	switch (cl) {</div><div class='del'>-	case CAL_COMPONENT_CLASS_PUBLIC:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_radio, CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-				    classification_map);</div><div class='del'>-	case CAL_COMPONENT_CLASS_PRIVATE:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_radio, CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-				    classification_map);</div><div class='del'>-	case CAL_COMPONENT_CLASS_CONFIDENTIAL:</div><div class='del'>-	    	e_dialog_radio_set (priv-&gt;classification_radio, CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-				    classification_map);</div><div class='del'>-	default:</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'>-	fill_recurrence_widgets (ee);</div><div class='del'>-</div><div class='del'>-	/* Exceptions list */</div><div class='del'>-</div><div class='del'>-	cal_component_get_exdate_list (priv-&gt;comp, &amp;list);</div><div class='del'>-</div><div class='del'>-	for (l = list; l; l = l-&gt;next) {</div><div class='del'>-		struct icaltimetype *t;</div><div class='del'>-		time_t ext;</div><div class='del'>-		</div><div class='del'>-		t = l-&gt;data;</div><div class='del'>-		ext = icaltime_as_timet (*t);</div><div class='del'>-		append_exception (ee, ext);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cal_component_free_exdate_list (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_editor_update_widgets:</div><div class='del'>- * @ee: An event editor.</div><div class='del'>- * </div><div class='del'>- * Causes an event editor dialog to re-read the values of its calendar component</div><div class='del'>- * object.  This function should be used if the #CalComponent is changed by</div><div class='del'>- * external means while it is open in the editor.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-event_editor_update_widgets (EventEditor *ee)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (ee != NULL);</div><div class='del'>-	g_return_if_fail (IS_EVENT_EDITOR (ee));</div><div class='del'>-</div><div class='del'>-	fill_widgets (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Decode the radio button group for classifications */</div><div class='del'>-static CalComponentClassification</div><div class='del'>-classification_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	return e_dialog_radio_get (widget, classification_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Encondes a position/weekday pair into the proper format for</div><div class='del'>- * icalrecurrencetype.by_day.</div><div class='del'>- */</div><div class='del'>-static short</div><div class='del'>-nth_weekday (int pos, icalrecurrencetype_weekday weekday)</div><div class='del'>-{</div><div class='del'>-	return (pos &lt;&lt; 3) | (int) weekday;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the simple recurrence data from the recurrence widgets and stores it in</div><div class='del'>- * the calendar component object.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-simple_recur_to_comp_object (EventEditor *ee, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	struct icalrecurrencetype r;</div><div class='del'>-	GSList l;</div><div class='del'>-	enum ending_type ending_type;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	icalrecurrencetype_clear (&amp;r);</div><div class='del'>-</div><div class='del'>-	/* Frequency, interval, week start */</div><div class='del'>-</div><div class='del'>-	r.freq = e_dialog_option_menu_get (priv-&gt;recurrence_interval_unit, recur_freq_map);</div><div class='del'>-	r.interval = e_dialog_spin_get_int (priv-&gt;recurrence_interval_value);</div><div class='del'>-	r.week_start = week_starts_on_monday ? ICAL_MONDAY_WEEKDAY : ICAL_SUNDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-	/* Frequency-specific data */</div><div class='del'>-</div><div class='del'>-	switch (r.freq) {</div><div class='del'>-	case ICAL_DAILY_RECURRENCE:</div><div class='del'>-		/* Nothing else is required */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ICAL_WEEKLY_RECURRENCE: {</div><div class='del'>-		guint8 day_mask;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		g_assert (GTK_BIN (priv-&gt;recurrence_special)-&gt;child != NULL);</div><div class='del'>-		g_assert (priv-&gt;recurrence_weekday_picker != NULL);</div><div class='del'>-		g_assert (IS_WEEKDAY_PICKER (priv-&gt;recurrence_weekday_picker));</div><div class='del'>-</div><div class='del'>-		day_mask = weekday_picker_get_days (WEEKDAY_PICKER (priv-&gt;recurrence_weekday_picker));</div><div class='del'>-</div><div class='del'>-		i = 0;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 0))</div><div class='del'>-			r.by_day[i++] = ICAL_SUNDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 1))</div><div class='del'>-			r.by_day[i++] = ICAL_MONDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 2))</div><div class='del'>-			r.by_day[i++] = ICAL_TUESDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 3))</div><div class='del'>-			r.by_day[i++] = ICAL_WEDNESDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 4))</div><div class='del'>-			r.by_day[i++] = ICAL_THURSDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 5))</div><div class='del'>-			r.by_day[i++] = ICAL_FRIDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		if (day_mask &amp; (1 &lt;&lt; 6))</div><div class='del'>-			r.by_day[i++] = ICAL_SATURDAY_WEEKDAY;</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case ICAL_MONTHLY_RECURRENCE: {</div><div class='del'>-		int day_index;</div><div class='del'>-		enum month_day_options month_day;</div><div class='del'>-</div><div class='del'>-		g_assert (GTK_BIN (priv-&gt;recurrence_special)-&gt;child != NULL);</div><div class='del'>-		g_assert (priv-&gt;recurrence_month_index_spin != NULL);</div><div class='del'>-		g_assert (GTK_IS_SPIN_BUTTON (priv-&gt;recurrence_month_index_spin));</div><div class='del'>-		g_assert (priv-&gt;recurrence_month_day_menu != NULL);</div><div class='del'>-		g_assert (GTK_IS_OPTION_MENU (priv-&gt;recurrence_month_day_menu));</div><div class='del'>-</div><div class='del'>-		day_index = e_dialog_spin_get_int (priv-&gt;recurrence_month_index_spin);</div><div class='del'>-		month_day = e_dialog_option_menu_get (priv-&gt;recurrence_month_day_menu,</div><div class='del'>-						      month_day_options_map);</div><div class='del'>-</div><div class='del'>-		switch (month_day) {</div><div class='del'>-		case MONTH_DAY_NTH:</div><div class='del'>-			r.by_month_day[0] = day_index;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_MON:</div><div class='del'>-			r.by_day[0] = nth_weekday (day_index, ICAL_MONDAY_WEEKDAY);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_TUE:</div><div class='del'>-			r.by_day[0] = nth_weekday (day_index, ICAL_TUESDAY_WEEKDAY);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_WED:</div><div class='del'>-			r.by_day[0] = nth_weekday (day_index, ICAL_WEDNESDAY_WEEKDAY);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_THU:</div><div class='del'>-			r.by_day[0] = nth_weekday (day_index, ICAL_THURSDAY_WEEKDAY);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_FRI:</div><div class='del'>-			r.by_day[0] = nth_weekday (day_index, ICAL_FRIDAY_WEEKDAY);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_SAT:</div><div class='del'>-			r.by_day[0] = nth_weekday (day_index, ICAL_SATURDAY_WEEKDAY);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MONTH_DAY_SUN:</div><div class='del'>-			r.by_day[0] = nth_weekday (day_index, ICAL_SUNDAY_WEEKDAY);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	case ICAL_YEARLY_RECURRENCE:</div><div class='del'>-		/* Nothing else is required */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ending date */</div><div class='del'>-</div><div class='del'>-	ending_type = e_dialog_option_menu_get (priv-&gt;recurrence_ending_menu, ending_types_map);</div><div class='del'>-</div><div class='del'>-	switch (ending_type) {</div><div class='del'>-	case ENDING_FOR:</div><div class='del'>-		g_assert (priv-&gt;recurrence_ending_count_spin != NULL);</div><div class='del'>-		g_assert (GTK_IS_SPIN_BUTTON (priv-&gt;recurrence_ending_count_spin));</div><div class='del'>-</div><div class='del'>-		r.count = e_dialog_spin_get_int (priv-&gt;recurrence_ending_count_spin);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENDING_UNTIL:</div><div class='del'>-		g_assert (priv-&gt;recurrence_ending_date_edit != NULL);</div><div class='del'>-		g_assert (E_IS_DATE_EDIT (priv-&gt;recurrence_ending_date_edit));</div><div class='del'>-</div><div class='del'>-		r.until = icaltime_from_timet (</div><div class='del'>-			e_date_edit_get_time (E_DATE_EDIT (priv-&gt;recurrence_ending_date_edit)),</div><div class='del'>-			TRUE, FALSE);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case ENDING_FOREVER:</div><div class='del'>-		/* Nothing to be done */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the recurrence */</div><div class='del'>-</div><div class='del'>-	l.data = &amp;r;</div><div class='del'>-	l.next = NULL;</div><div class='del'>-</div><div class='del'>-	cal_component_set_rrule_list (comp, &amp;l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the data from the recurrence widgets and stores it in the calendar</div><div class='del'>- * component object.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-recur_to_comp_object (EventEditor *ee, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	enum recur_type recur_type;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	recur_type = e_dialog_radio_get (priv-&gt;recurrence_none, recur_type_map);</div><div class='del'>-</div><div class='del'>-	switch (recur_type) {</div><div class='del'>-	case RECUR_NONE:</div><div class='del'>-		cal_component_set_rdate_list (comp, NULL);</div><div class='del'>-		cal_component_set_rrule_list (comp, NULL);</div><div class='del'>-		cal_component_set_exrule_list (comp, NULL);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_SIMPLE:</div><div class='del'>-		simple_recur_to_comp_object (ee, comp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case RECUR_CUSTOM:</div><div class='del'>-		/* We just keep whatever the component has currently */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the data from the widgets and stores it in the calendar component object */</div><div class='del'>-static void</div><div class='del'>-dialog_to_comp_object (EventEditor *ee, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	time_t t;</div><div class='del'>-	gboolean all_day_event;</div><div class='del'>-	GtkCList *exception_list;</div><div class='del'>-	GSList *list;</div><div class='del'>-	char *str;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (priv-&gt;general_summary);</div><div class='del'>-	if (strlen (str) == 0)</div><div class='del'>-		cal_component_set_summary (comp, NULL);</div><div class='del'>-	else {</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		text.value = str;</div><div class='del'>-		text.altrep = NULL;</div><div class='del'>-</div><div class='del'>-		cal_component_set_summary (comp, &amp;text);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Description */</div><div class='del'>-</div><div class='del'>-	str = e_dialog_editable_get (priv-&gt;description);</div><div class='del'>-	if (strlen (str) == 0)</div><div class='del'>-		cal_component_set_description_list (comp, NULL);</div><div class='del'>-	else {</div><div class='del'>-		GSList l;</div><div class='del'>-		CalComponentText text;</div><div class='del'>-</div><div class='del'>-		text.value = str;</div><div class='del'>-		text.altrep = NULL;</div><div class='del'>-		l.data = &amp;text;</div><div class='del'>-		l.next = NULL;</div><div class='del'>-</div><div class='del'>-		cal_component_set_description_list (comp, &amp;l);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Dates */</div><div class='del'>-	</div><div class='del'>-	date.value = g_new (struct icaltimetype, 1);</div><div class='del'>-	t = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;start_time));</div><div class='del'>-	*date.value = icaltime_from_timet (t, FALSE, FALSE);</div><div class='del'>-	date.tzid = NULL;</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	/* If the all_day toggle is set, the end date is inclusive of the</div><div class='del'>-	   entire day on which it points to. */</div><div class='del'>-	all_day_event = e_dialog_toggle_get (priv-&gt;all_day_event);</div><div class='del'>-	t = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;end_time));</div><div class='del'>-	if (all_day_event)</div><div class='del'>-		t = time_day_end (t);</div><div class='del'>-</div><div class='del'>-	*date.value = icaltime_from_timet (t, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-	g_free (date.value);</div><div class='del'>-</div><div class='del'>-#if 0</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'>-#endif</div><div class='del'>-</div><div class='del'>-	cal_component_set_classification (comp, classification_get (priv-&gt;classification_radio));</div><div class='del'>-</div><div class='del'>-	/* Recurrence information */</div><div class='del'>-	recur_to_comp_object (ee, comp);</div><div class='del'>-</div><div class='del'>-	/* Set exceptions */</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-	exception_list = GTK_CLIST (priv-&gt;recurrence_exception_list);</div><div class='del'>-	for (i = 0; i &lt; exception_list-&gt;rows; i++) {</div><div class='del'>-		struct icaltimetype *tt;</div><div class='del'>-		time_t *tim;</div><div class='del'>-		</div><div class='del'>-		tim = gtk_clist_get_row_data (exception_list, i);</div><div class='del'>-		tt = g_new0 (struct icaltimetype, 1);</div><div class='del'>-		*tt = icaltime_from_timet (*tim, FALSE, FALSE);</div><div class='del'>-		</div><div class='del'>-		list = g_slist_prepend (list, tt);</div><div class='del'>-	}</div><div class='del'>-	cal_component_set_exdate_list (comp, list);</div><div class='del'>-	if (list)</div><div class='del'>-		cal_component_free_exdate_list (list);</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Fills the calendar component object from the data in the widgets and commits</div><div class='del'>- * the component to the storage.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-save_event_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;comp)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	dialog_to_comp_object (ee, priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	title = make_title_from_comp (priv-&gt;comp);</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'>-	if (!cal_client_update_object (priv-&gt;client, priv-&gt;comp))</div><div class='del'>-		g_message ("save_event_object(): Could not update the object!");</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'>-	gtk_object_destroy (GTK_OBJECT (ee));</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'>-debug_xml_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee = EVENT_EDITOR (data);</div><div class='del'>-	EventEditorPrivate *priv = ee-&gt;priv;</div><div class='del'>-	</div><div class='del'>-	bonobo_window_dump (BONOBO_WINDOW (priv-&gt;app), "on demand");</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_event_object (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* File/Save and Close callback */</div><div class='del'>-static void</div><div class='del'>-file_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_event_object (ee);</div><div class='del'>-	close_dialog (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* File/Delete callback */</div><div class='del'>-static void</div><div class='del'>-file_delete_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-</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'>-	</div><div class='del'>-	g_return_if_fail (priv-&gt;comp);</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	/* We don't check the return value; FALSE can mean the object was not in</div><div class='del'>-	 * the server anyways.</div><div class='del'>-	 */</div><div class='del'>-	cal_client_remove_object (priv-&gt;client, uid);</div><div class='del'>-</div><div class='del'>-	close_dialog (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'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_EVENT_EDITOR (ee));</div><div class='del'>-</div><div class='del'>-	close_dialog (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-schedule_meeting_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	EMeetingEditor *editor;</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (IS_EVENT_EDITOR (ee));</div><div class='del'>-</div><div class='del'>-	priv = (EventEditorPrivate *)ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	editor = e_meeting_editor_new (priv-&gt;comp, priv-&gt;client, ee);</div><div class='del'>-	e_meeting_edit (editor);</div><div class='del'>-	e_meeting_editor_free (editor);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * NB. there is an insane amount of replication here between</div><div class='del'>- * this and the task-editor.</div><div class='del'>- */</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSave", file_save_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileDelete", file_delete_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileClose", file_close_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSaveAndClose", file_save_and_close_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("ActionScheduleMeeting", schedule_meeting_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("DebugDumpXml", debug_xml_cb),</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</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'>-	GtkWidget *bonobo_win;</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'>-	priv-&gt;uic = bonobo_ui_component_new ("event-editor-dialog");</div><div class='del'>-	if (!priv-&gt;uic) {</div><div class='del'>-		g_message ("task_editor_construct(): Could not create the UI component");</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Construct the app */</div><div class='del'>-	bonobo_win = bonobo_window_new ("event-editor-dialog", "Event Editor");</div><div class='del'>-</div><div class='del'>-	/* FIXME: The sucking bit */</div><div class='del'>-	{</div><div class='del'>-		GtkWidget *contents;</div><div class='del'>-</div><div class='del'>-		contents = gnome_dock_get_client_area (</div><div class='del'>-			GNOME_DOCK (GNOME_APP (priv-&gt;app)-&gt;dock));</div><div class='del'>-		if (!contents) {</div><div class='del'>-			g_message ("event_editor_construct(): Could not get contents");</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		gtk_widget_ref (contents);</div><div class='del'>-		gtk_container_remove (GTK_CONTAINER (contents-&gt;parent), contents);</div><div class='del'>-		bonobo_window_set_contents (BONOBO_WINDOW (bonobo_win), contents);</div><div class='del'>-		gtk_widget_destroy (priv-&gt;app);</div><div class='del'>-		priv-&gt;app = bonobo_win;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		BonoboUIContainer *container = bonobo_ui_container_new ();</div><div class='del'>-		bonobo_ui_container_set_win (container, BONOBO_WINDOW (priv-&gt;app));</div><div class='del'>-		bonobo_ui_component_set_container (</div><div class='del'>-			priv-&gt;uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (priv-&gt;uic, verbs, ee);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (priv-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-event-editor.xml",</div><div class='del'>-			       "evolution-event-editor");</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'>-</div><div class='del'>-	/* Add focus to the summary entry */</div><div class='del'>-	</div><div class='del'>-	gtk_widget_grab_focus (GTK_WIDGET (priv-&gt;general_summary));</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'>-/* 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'>-/* Callback used when the calendar client tells us that an object changed */</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'>-	EventEditor *ee;</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	const gchar *editing_uid;</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-</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'>-	</div><div class='del'>-	/* If we aren't showing the object which has been updated, return. */</div><div class='del'>-	if (!priv-&gt;comp)</div><div class='del'>-	  return;</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;editing_uid);</div><div class='del'>-	if (strcmp (uid, editing_uid))</div><div class='del'>-	  return;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	/* Get the event from the server. */</div><div class='del'>-	status = cal_client_get_object (priv-&gt;client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* Everything is fine */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_SYNTAX_ERROR:</div><div class='del'>-		g_message ("obj_updated_cb(): Syntax error when getting object `%s'", uid);</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case CAL_CLIENT_GET_NOT_FOUND:</div><div class='del'>-		/* The object is no longer in the server, so do nothing */</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	raise_and_focus (priv-&gt;app);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the calendar client tells us that an object was removed */</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'>-	EventEditor *ee;</div><div class='del'>-	EventEditorPrivate *priv;</div><div class='del'>-	const gchar *editing_uid;</div><div class='del'>-</div><div class='del'>-	ee = EVENT_EDITOR (data);</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'>-</div><div class='del'>-	/* If we aren't showing the object which has been updated, return. */</div><div class='del'>-	if (!priv-&gt;comp)</div><div class='del'>-	  return;</div><div class='del'>-	cal_component_get_uid (priv-&gt;comp, &amp;editing_uid);</div><div class='del'>-	if (strcmp (uid, editing_uid))</div><div class='del'>-	  return;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	raise_and_focus (priv-&gt;app);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_editor_set_cal_client:</div><div class='del'>- * @ee: An event editor.</div><div class='del'>- * @client: Calendar client.</div><div class='del'>- * </div><div class='del'>- * Sets the calendar client than an event editor will use for updating its</div><div class='del'>- * calendar components.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-event_editor_set_cal_client (EventEditor *ee, CalClient *client)</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'>-</div><div class='del'>-	if (client == priv-&gt;client)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (IS_CAL_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	if (client)</div><div class='del'>-		g_return_if_fail (cal_client_is_loaded (client));	</div><div class='del'>-	</div><div class='del'>-	if (client)</div><div class='del'>-		gtk_object_ref (GTK_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_signal_disconnect_by_data (GTK_OBJECT (priv-&gt;client), ee);</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	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), ee);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "obj_removed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (obj_removed_cb), ee);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_editor_get_cal_client:</div><div class='del'>- * @ee: An event editor.</div><div class='del'>- * </div><div class='del'>- * Queries the calendar client that an event editor is using to update its</div><div class='del'>- * calendar components.</div><div class='del'>- * </div><div class='del'>- * Return value: A calendar client object.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-event_editor_get_cal_client (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'>-	return priv-&gt;client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * event_editor_set_event_object:</div><div class='del'>- * @ee: An event editor.</div><div class='del'>- * @comp: 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_event_object (EventEditor *ee, CalComponent *comp)</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'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;comp) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;comp));</div><div class='del'>-		priv-&gt;comp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (comp) {</div><div class='del'>-		priv-&gt;comp = cal_component_clone (comp);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	title = make_title_from_comp (priv-&gt;comp);</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'>-/**</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 = NULL;</div><div class='del'>-	GtkWidget *alarm_unit = NULL;</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'>-/* Checks if the day range occupies a single whole day, and if so, check. the</div><div class='del'>- * "all day event" 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'>-	time_t start_begin_day, end_begin_day;</div><div class='del'>-	struct tm tm_start, tm_end;</div><div class='del'>-	gboolean all_day;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	ev_start = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;start_time));</div><div class='del'>-	ev_end = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;end_time));</div><div class='del'>-</div><div class='del'>-	start_begin_day = time_day_begin (ev_start);</div><div class='del'>-	end_begin_day = time_day_begin (ev_end);</div><div class='del'>-</div><div class='del'>-	tm_start = *localtime (&amp;start_begin_day);</div><div class='del'>-	tm_end = *localtime (&amp;end_begin_day);</div><div class='del'>-</div><div class='del'>-	tm_end.tm_mday--;</div><div class='del'>-	if (mktime (&amp;tm_start) == mktime (&amp;tm_end))</div><div class='del'>-		all_day = TRUE;</div><div class='del'>-	else</div><div class='del'>-		all_day = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;all_day_event), ee);</div><div class='del'>-</div><div class='del'>-	e_dialog_toggle_set (priv-&gt;all_day_event, all_day);</div><div class='del'>-</div><div class='del'>-	gtk_signal_handler_unblock_by_data (GTK_OBJECT (priv-&gt;all_day_event), ee);</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 start_tm, end_tm;</div><div class='del'>-	time_t start_t, end_t;</div><div class='del'>-	gboolean all_day;</div><div class='del'>-</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If the all_day toggle is set, the end date is inclusive of the</div><div class='del'>-	   entire day on which it points to. */</div><div class='del'>-	all_day = GTK_TOGGLE_BUTTON (toggle)-&gt;active;</div><div class='del'>-</div><div class='del'>-	start_t = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;start_time));</div><div class='del'>-	start_tm = *localtime (&amp;start_t);</div><div class='del'>-	start_tm.tm_min  = 0;</div><div class='del'>-	start_tm.tm_sec  = 0;</div><div class='del'>-</div><div class='del'>-	if (all_day)</div><div class='del'>-		start_tm.tm_hour = 0;</div><div class='del'>-	else</div><div class='del'>-		start_tm.tm_hour = day_begin;</div><div class='del'>-</div><div class='del'>-	/* will set recur start too */</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;start_time), mktime (&amp;start_tm));</div><div class='del'>-</div><div class='del'>-	end_t = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;end_time));</div><div class='del'>-	end_tm = *localtime (&amp;end_t);</div><div class='del'>-	end_tm.tm_min  = 0;</div><div class='del'>-	end_tm.tm_sec  = 0;</div><div class='del'>-</div><div class='del'>-	if (all_day) {</div><div class='del'>-		/* mktime() will fix this if we go past the end of the month.*/</div><div class='del'>-		end_tm.tm_hour = 0;</div><div class='del'>-	} else {</div><div class='del'>-		if (end_tm.tm_year == start_tm.tm_year</div><div class='del'>-		    &amp;&amp; end_tm.tm_mon == start_tm.tm_mon</div><div class='del'>-		    &amp;&amp; end_tm.tm_mday == start_tm.tm_mday</div><div class='del'>-		    &amp;&amp; end_tm.tm_hour &lt;= start_tm.tm_hour)</div><div class='del'>-			end_tm.tm_hour = start_tm.tm_hour + 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (priv-&gt;start_time), !all_day);</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (priv-&gt;end_time), !all_day);</div><div class='del'>-	e_date_edit_set_time (E_DATE_EDIT (priv-&gt;end_time), mktime (&amp;end_tm));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used when the start or end date widgets change.  We check that the</div><div class='del'>- * start date &lt; end date and we set the "all day event" button as appropriate.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-date_changed_cb (EDateEdit *dedit, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EventEditor *ee;</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'>-	ee = EVENT_EDITOR (data);</div><div class='del'>-	priv = ee-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Ensure that start &lt; end */</div><div class='del'>-</div><div class='del'>-	start = e_date_edit_get_time (E_DATE_EDIT (priv-&gt;start_time));</div><div class='del'>-	end = e_date_edit_get_time (E_DATE_EDIT (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 (dedit) == priv-&gt;start_time) {</div><div class='del'>-			/* Modify the end time */</div><div class='del'>-</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'>-			tm_end.tm_hour = tm_start.tm_hour + 1;</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'>-</div><div class='del'>-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;end_time), ee);</div><div class='del'>-			e_date_edit_set_time (E_DATE_EDIT (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 (dedit) == priv-&gt;end_time) {</div><div class='del'>-			/* Modify the start time */</div><div class='del'>-</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'>-			tm_start.tm_hour = tm_end.tm_hour - 1;</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'>-</div><div class='del'>-			gtk_signal_handler_block_by_data (GTK_OBJECT (priv-&gt;start_time), ee);</div><div class='del'>-			e_date_edit_set_time (E_DATE_EDIT (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'>-		} else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Set the "all day event" button as appropriate */</div><div class='del'>-</div><div class='del'>-	check_all_day (ee);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a static string out of an exception date */</div><div class='del'>-static char *</div><div class='del'>-get_exception_string (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'>-/* Appends an exception date to the list */</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'>-	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_exception_list);</div><div class='del'>-</div><div class='del'>-	c[0] = get_exception_string (t);</div><div class='del'>-	i = e_utf8_gtk_clist_append (clist, c);</div><div class='del'>-</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 (priv-&gt;recurrence_exception_modify, TRUE);</div><div class='del'>-	gtk_widget_set_sensitive (priv-&gt;recurrence_exception_delete, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback for the "add exception" button */</div><div class='del'>-static void</div><div class='del'>-recurrence_exception_add_cb (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_date_edit_get_time (E_DATE_EDIT (priv-&gt;recurrence_exception_date));</div><div class='del'>-	append_exception (ee, t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "modify exception" button */</div><div class='del'>-static void</div><div class='del'>-recurrence_exception_modify_cb (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_exception_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_date_edit_get_time (E_DATE_EDIT (priv-&gt;recurrence_exception_date));</div><div class='del'>-</div><div class='del'>-	e_utf8_gtk_clist_set_text (clist, sel, 0, get_exception_string (*t));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "delete exception" button */</div><div class='del'>-static void</div><div class='del'>-recurrence_exception_delete_cb (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_exception_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'>-	if (clist-&gt;rows &gt; 0)</div><div class='del'>-		gtk_clist_select_row (clist, sel, 0);</div><div class='del'>-	else {</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;recurrence_exception_modify, FALSE);</div><div class='del'>-		gtk_widget_set_sensitive (priv-&gt;recurrence_exception_delete, FALSE);</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_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'>-	GtkWidget *dedit;</div><div class='del'>-</div><div class='del'>-	dedit = e_date_edit_new ();</div><div class='del'>-	/* FIXME: Set other options. */</div><div class='del'>-	e_date_edit_set_show_time (E_DATE_EDIT (dedit), show_time);</div><div class='del'>-	e_date_edit_set_time_popup_range (E_DATE_EDIT (dedit), 8, 18);</div><div class='del'>-	return dedit;</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'>-   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 0c7e1f34c7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/event-editor.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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'>-typedef struct _EventEditorPrivate EventEditorPrivate;</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'>-	EventEditorPrivate *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'>-</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_cal_client (EventEditor *ee, CalClient *client);</div><div class='del'>-CalClient *event_editor_get_cal_client (EventEditor *ee);</div><div class='del'>-</div><div class='del'>-void event_editor_set_event_object (EventEditor *ee, CalComponent *comp);</div><div class='del'>-</div><div class='del'>-void event_editor_focus (EventEditor *ee);</div><div class='del'>-</div><div class='del'>-void event_editor_update_widgets (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 7ebe2b5f8e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/evolution-calendar-control.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/evolution-calendar-control.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</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'>-	e_cursors_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.oafinfo b/calendar/gui/evolution-calendar.oafinfo<br/>deleted file mode 100644<br/>index 74fb43af70..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/evolution-calendar.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/evolution-calendar.oafinfo</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,89 +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:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"</div><div class='del'>-            type="exe"</div><div class='del'>-            location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/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 calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad"</div><div class='del'>-            type="factory"</div><div class='del'>-            location="OAFIID:control-factory:e_itipview:10441fcf-9a4f-4bf9-a026-d50b5462d45a"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Bonobo/Control:1.0"/&gt;</div><div class='del'>-	        &lt;item value="IDL:Bonobo/PersistStream:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="bonobo:supported_mime_types" type="stringv"&gt;</div><div class='del'>-		&lt;item value="text/calendar"/&gt;</div><div class='del'>-		&lt;item value="text/x-calendar"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="name" type="string"</div><div class='del'>-		       value="Evolution calendar iTip/iMip viewer"/&gt;</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-                       value="Factory for the calendar iTip view control"/&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID: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_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-calendar.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="evolution-calendar"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME: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 Calendar Summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-executive-summary-component:evolution-calendar:c80742c0-c7ae-4f53-9df2-33221864729c"</div><div class='del'>-	    type="factory"</div><div class='del'>-	    location="OAFIID:evolution-executive-summary-component-factory:evolution-calendar:6b45a890-fbc0-4f20-97d8-b8e344c059af"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-		       value="Evolution calendar executive summary component."/&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/getdate.y b/calendar/gui/getdate.y<br/>deleted file mode 100644<br/>index 43917089d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/getdate.y?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/getdate.y</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1004 +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 (void);</div><div class='del'>-static int yyerror (char *s);</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(char *p, struct timeb *now);</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 bf03383769..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gncal-todo.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/gncal-todo.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,266 +0,0 @@</div><div class='del'>-/* To-do widget for gncal</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 The Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;federico@helixcode.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "event-editor.h"</div><div class='del'>-#include "gncal-todo.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'>-</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'>-	CalComponent *comp;</div><div class='del'>-	CalClient *cal_client;</div><div class='del'>-	GnomeDateEdit *due_date;</div><div class='del'>-	GtkEditable *entry;</div><div class='del'>-	GtkSpinButton *priority;</div><div class='del'>-	GtkText *comment;</div><div class='del'>-	CalComponentText *text = g_new0 (CalComponentText, 1);</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	GSList *l;</div><div class='del'>-	gchar *t;</div><div class='del'>-	time_t d;</div><div class='del'>-	int p;</div><div class='del'>-</div><div class='del'>-	comp = gtk_object_get_user_data (GTK_OBJECT (dialog));</div><div class='del'>-</div><div class='del'>-	cal_client = (CalClient*) (gtk_object_get_data (GTK_OBJECT (dialog), "cal_client"));</div><div class='del'>-</div><div class='del'>-	/* Due date */</div><div class='del'>-	due_date = GNOME_DATE_EDIT (gtk_object_get_data(GTK_OBJECT(dialog), "due_date"));</div><div class='del'>-	d = gnome_date_edit_get_date (due_date);</div><div class='del'>-	date.value = g_new0 (struct icaltimetype, 1);</div><div class='del'>-	*date.value = icaltime_from_timet (d, 1, TRUE);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;date);</div><div class='del'>-</div><div class='del'>-	/* Summary */</div><div class='del'>-	entry = GTK_EDITABLE (gtk_object_get_data (GTK_OBJECT (dialog), "summary_entry"));</div><div class='del'>-	t = gtk_editable_get_chars (entry, 0, -1);</div><div class='del'>-	text-&gt;value = t;</div><div class='del'>-	cal_component_set_summary (comp, text);</div><div class='del'>-	g_free (t);</div><div class='del'>-</div><div class='del'>-	/* Priority */</div><div class='del'>-	priority = GTK_SPIN_BUTTON (gtk_object_get_data(GTK_OBJECT(dialog), "priority"));</div><div class='del'>-	p = gtk_spin_button_get_value_as_int (priority);</div><div class='del'>-	cal_component_set_priority (comp, &amp;p);</div><div class='del'>-</div><div class='del'>-	/* Comment */</div><div class='del'>-	cal_component_get_comment_list (comp, &amp;l);</div><div class='del'>-	comment = GTK_TEXT(gtk_object_get_data (GTK_OBJECT(dialog), "comment"));</div><div class='del'>-	t = gtk_editable_get_chars (entry, 0, -1);</div><div class='del'>-	text-&gt;value = t;</div><div class='del'>-	l = g_slist_append (l, text);</div><div class='del'>-	cal_component_set_comment_list (comp, l);</div><div class='del'>-	cal_component_free_text_list (l);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_update_object (cal_client, comp))</div><div class='del'>-		g_message ("ok_button(): Could not update the object!");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	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'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	comp = gtk_object_get_user_data (GTK_OBJECT (dialog));</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</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 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'>-/* I've hacked this so we can use it separate from the rest of GncalTodo.</div><div class='del'>-   This whole file will go once we've got the new editor working. */</div><div class='del'>-void</div><div class='del'>-gncal_todo_edit (CalClient *client, CalComponent *comp)</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'>-	GtkWidget *entry;</div><div class='del'>-	gboolean new;</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	CalComponentDateTime date;</div><div class='del'>-	GSList *l;</div><div class='del'>-	time_t d;</div><div class='del'>-	gint *p;</div><div class='del'>-</div><div class='del'>-	new = (CAL_COMPONENT_NO_TYPE == cal_component_get_vtype (comp));</div><div class='del'>-	if (new)</div><div class='del'>-		cal_component_set_new_vtype (comp, CAL_COMPONENT_TODO);</div><div class='del'>-</div><div class='del'>-	dialog = gnome_dialog_new (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'>-#if 0</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'>-#endif</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'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	e_utf8_gtk_entry_set_text (GTK_ENTRY (entry), text.value);</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'>-	cal_component_get_dtend (comp, &amp;date);</div><div class='del'>-	/* FIXME: Does GnomeDateEdit support no time set? */</div><div class='del'>-	if (date.value)</div><div class='del'>-	  d = icaltime_as_timet (*date.value);</div><div class='del'>-	else</div><div class='del'>-	  d = time (NULL);</div><div class='del'>-	due_entry = date_edit_new (d, 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'>-	cal_component_get_priority (comp, &amp;p);</div><div class='del'>-	gtk_spin_button_set_value (GTK_SPIN_BUTTON (pri_spin), (gfloat) *p);</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'>-	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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "FIX ME"</div><div class='del'>-#endif</div><div class='del'>-	/* Need to handle multiple comments */</div><div class='del'>-	cal_component_get_comment_list (comp, &amp;l);</div><div class='del'>-	if (l) {</div><div class='del'>-		CalComponentText text = *(CalComponentText*)l-&gt;data;</div><div class='del'>-</div><div class='del'>-		gtk_text_insert(GTK_TEXT(comment_text), NULL, NULL, NULL,</div><div class='del'>-				text.value, strlen(text.value));</div><div class='del'>-	}</div><div class='del'>-	cal_component_free_text_list (l);</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'>-	gtk_object_set_user_data (GTK_OBJECT (dialog), comp);</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (dialog), "cal_client", client);</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='head'>diff --git a/calendar/gui/gncal-todo.h b/calendar/gui/gncal-todo.h<br/>deleted file mode 100644<br/>index a48f8ce47d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gncal-todo.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/gncal-todo.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-/* To-do widget for gncal</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 The Free Software Foundation</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena &lt;federico@helixcode.com&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;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void gncal_todo_edit (CalClient *client, CalComponent *comp);</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 379bbfec95..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-cal.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/gnome-cal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2307 +0,0 @@</div><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'>- * 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'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;gnome.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;gnome.h&gt;</div><div class='del'>-#include &lt;gal/e-paned/e-hpaned.h&gt;</div><div class='del'>-#include &lt;gal/e-paned/e-vpaned.h&gt;</div><div class='del'>-#include &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-calendar-table.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 "gnome-cal.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* These must match the page numbers in the GtkNotebook. */</div><div class='del'>-typedef enum {</div><div class='del'>-	VIEW_NOT_SET = -1,</div><div class='del'>-	VIEW_DAY = 0,</div><div class='del'>-	VIEW_WORK_WEEK,</div><div class='del'>-	VIEW_WEEK,</div><div class='del'>-	VIEW_MONTH</div><div class='del'>-} ViewType;</div><div class='del'>-</div><div class='del'>-/* States for the calendar loading and creation state machine */</div><div class='del'>-typedef enum {</div><div class='del'>-	LOAD_STATE_NOT_LOADED,</div><div class='del'>-	LOAD_STATE_WAIT_LOAD,</div><div class='del'>-	LOAD_STATE_WAIT_LOAD_BEFORE_CREATE,</div><div class='del'>-	LOAD_STATE_WAIT_CREATE,</div><div class='del'>-	LOAD_STATE_LOADED</div><div class='del'>-} LoadState;</div><div class='del'>-</div><div class='del'>-/* Private part of the GnomeCalendar structure */</div><div class='del'>-struct _GnomeCalendarPrivate {</div><div class='del'>-	CalClient   *client;</div><div class='del'>-</div><div class='del'>-	/* Loading state; we can be loading or creating a calendar */</div><div class='del'>-	LoadState load_state;</div><div class='del'>-</div><div class='del'>-	/* URI being loaded, NULL if we are not being loaded */</div><div class='del'>-	char *loading_uri;</div><div class='del'>-</div><div class='del'>-	/* Mapping of component UIDs to event editors */</div><div class='del'>-	GHashTable  *object_editor_hash;</div><div class='del'>-</div><div class='del'>-	/* This is the last selection explicitly selected by the user. We try</div><div class='del'>-	   to keep it the same when we switch views, but we may have to alter</div><div class='del'>-	   it depending on the view (e.g. the week views only select days, so</div><div class='del'>-	   any times are lost. */</div><div class='del'>-	time_t      selection_start_time;</div><div class='del'>-	time_t      selection_end_time;</div><div class='del'>-</div><div class='del'>-	/* Widgets */</div><div class='del'>-</div><div class='del'>-	GtkWidget   *hpane;</div><div class='del'>-	GtkWidget   *notebook;</div><div class='del'>-	GtkWidget   *vpane;</div><div class='del'>-	ECalendar   *date_navigator;</div><div class='del'>-	GtkWidget   *todo;</div><div class='del'>-</div><div class='del'>-	GtkWidget   *day_view;</div><div class='del'>-	GtkWidget   *work_week_view;</div><div class='del'>-	GtkWidget   *week_view;</div><div class='del'>-	GtkWidget   *month_view;</div><div class='del'>-</div><div class='del'>-	/* These are the toolbar radio buttons for switching views. */</div><div class='del'>-	GtkWidget   *day_button;</div><div class='del'>-	GtkWidget   *work_week_button;</div><div class='del'>-	GtkWidget   *week_button;</div><div class='del'>-	GtkWidget   *month_button;</div><div class='del'>-</div><div class='del'>-	/* This is the view currently shown. We use it to keep track of the</div><div class='del'>-	   positions of the panes. range_selected is TRUE if a range of dates</div><div class='del'>-	   was selected in the date navigator to show the view. */</div><div class='del'>-	ViewType current_view_type;</div><div class='del'>-	gboolean range_selected;</div><div class='del'>-</div><div class='del'>-	/* These are the saved positions of the panes. They are multiples of</div><div class='del'>-	   calendar month widths &amp; heights in the date navigator, so that they</div><div class='del'>-	   will work OK after theme changes. */</div><div class='del'>-	gfloat	     hpane_pos;</div><div class='del'>-	gfloat	     vpane_pos;</div><div class='del'>-	gfloat	     hpane_pos_month_view;</div><div class='del'>-	gfloat	     vpane_pos_month_view;</div><div class='del'>-</div><div class='del'>-	/* The signal handler id for our GtkCalendar "day_selected" handler. */</div><div class='del'>-	guint	     day_selected_id;</div><div class='del'>-</div><div class='del'>-	/* 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'>-};</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_set_view_internal	(GnomeCalendar	*gcal,</div><div class='del'>-						 char		*page_name,</div><div class='del'>-						 gboolean	 range_selected,</div><div class='del'>-						 gboolean	 focus);</div><div class='del'>-static void gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal);</div><div class='del'>-static void gnome_calendar_update_view_times (GnomeCalendar *gcal);</div><div class='del'>-static void gnome_calendar_update_date_navigator (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-static void gnome_calendar_on_date_navigator_style_set (GtkWidget *widget,</div><div class='del'>-							GtkStyle  *previous_style,</div><div class='del'>-							gpointer data);</div><div class='del'>-static void gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal);</div><div class='del'>-static void gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,</div><div class='del'>-							    GtkAllocation *allocation,</div><div class='del'>-							    gpointer data);</div><div class='del'>-static void gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,</div><div class='del'>-								 GnomeCalendar *gcal);</div><div class='del'>-static void gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,</div><div class='del'>-								GnomeCalendar    *gcal);</div><div class='del'>-static gboolean gnome_calendar_get_days_shown	(GnomeCalendar	*gcal,</div><div class='del'>-						 GDate		*start_date,</div><div class='del'>-						 gint		*days_shown);</div><div class='del'>-</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'>-GtkType</div><div class='del'>-gnome_calendar_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType gnome_calendar_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!gnome_calendar_type) {</div><div class='del'>-		static const GtkTypeInfo gnome_calendar_info = {</div><div class='del'>-			"GnomeCalendar",</div><div class='del'>-			sizeof (GnomeCalendar),</div><div class='del'>-			sizeof (GnomeCalendarClass),</div><div class='del'>-			(GtkClassInitFunc) gnome_calendar_class_init,</div><div class='del'>-			(GtkObjectInitFunc) gnome_calendar_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		gnome_calendar_type = gtk_type_unique (GTK_TYPE_VBOX, &amp;gnome_calendar_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return gnome_calendar_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the gnome calendar */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_class_init (GnomeCalendarClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GTK_TYPE_VBOX);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = gnome_calendar_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_widgets (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *w;</div><div class='del'>-	gchar *filename;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* The main HPaned, with the notebook of calendar views on the left</div><div class='del'>-	   and the ECalendar and ToDo list on the right. */</div><div class='del'>-	priv-&gt;hpane = e_hpaned_new ();</div><div class='del'>-	gtk_widget_show (priv-&gt;hpane);</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (gcal), priv-&gt;hpane, TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	/* The Notebook containing the 4 calendar views. */</div><div class='del'>-	priv-&gt;notebook = gtk_notebook_new ();</div><div class='del'>-	gtk_notebook_set_show_border (GTK_NOTEBOOK (priv-&gt;notebook), FALSE);</div><div class='del'>-	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv-&gt;notebook), FALSE);</div><div class='del'>-	gtk_widget_show (priv-&gt;notebook);</div><div class='del'>-	e_paned_pack1 (E_PANED (priv-&gt;hpane), priv-&gt;notebook, TRUE, TRUE);</div><div class='del'>-</div><div class='del'>-	/* The VPaned widget, to contain the GtkCalendar &amp; ToDo list. */</div><div class='del'>-	priv-&gt;vpane = e_vpaned_new ();</div><div class='del'>-	gtk_widget_show (priv-&gt;vpane);</div><div class='del'>-	e_paned_pack2 (E_PANED (priv-&gt;hpane), priv-&gt;vpane, FALSE, TRUE);</div><div class='del'>-</div><div class='del'>-	/* The ECalendar. */</div><div class='del'>-	w = e_calendar_new ();</div><div class='del'>-	priv-&gt;date_navigator = E_CALENDAR (w);</div><div class='del'>-	gtk_widget_show (w);</div><div class='del'>-	e_paned_pack1 (E_PANED (priv-&gt;vpane), w, FALSE, TRUE);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;date_navigator),</div><div class='del'>-			    "style_set",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_style_set),</div><div class='del'>-			    gcal);</div><div class='del'>-	gtk_signal_connect_after (GTK_OBJECT (priv-&gt;date_navigator),</div><div class='del'>-				  "size_allocate",</div><div class='del'>-				  (GtkSignalFunc) gnome_calendar_on_date_navigator_size_allocate,</div><div class='del'>-				  gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			    "selection_changed",</div><div class='del'>-			    (GtkSignalFunc) gnome_calendar_on_date_navigator_selection_changed,</div><div class='del'>-			    gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			    "date_range_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (gnome_calendar_on_date_navigator_date_range_changed),</div><div class='del'>-			    gcal);</div><div class='del'>-</div><div class='del'>-	/* The ToDo list. */</div><div class='del'>-	priv-&gt;todo = e_calendar_table_new ();</div><div class='del'>-	e_paned_pack2 (E_PANED (priv-&gt;vpane), priv-&gt;todo, TRUE, TRUE);</div><div class='del'>-	gtk_widget_show (priv-&gt;todo);</div><div class='del'>-</div><div class='del'>-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);</div><div class='del'>-	e_calendar_table_load_state (E_CALENDAR_TABLE (priv-&gt;todo), filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	/* The Day View. */</div><div class='del'>-	priv-&gt;day_view = e_day_view_new ();</div><div class='del'>-	e_day_view_set_calendar (E_DAY_VIEW (priv-&gt;day_view), gcal);</div><div class='del'>-	gtk_widget_show (priv-&gt;day_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (priv-&gt;notebook),</div><div class='del'>-				  priv-&gt;day_view, gtk_label_new (""));</div><div class='del'>-</div><div class='del'>-	/* The Work Week View. */</div><div class='del'>-	priv-&gt;work_week_view = e_day_view_new ();</div><div class='del'>-	e_day_view_set_work_week_view (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				       TRUE);</div><div class='del'>-	e_day_view_set_days_shown (E_DAY_VIEW (priv-&gt;work_week_view), 5);</div><div class='del'>-	e_day_view_set_calendar (E_DAY_VIEW (priv-&gt;work_week_view), gcal);</div><div class='del'>-	gtk_widget_show (priv-&gt;work_week_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (priv-&gt;notebook),</div><div class='del'>-				  priv-&gt;work_week_view, gtk_label_new (""));</div><div class='del'>-</div><div class='del'>-	/* The Week View. */</div><div class='del'>-	priv-&gt;week_view = e_week_view_new ();</div><div class='del'>-	e_week_view_set_calendar (E_WEEK_VIEW (priv-&gt;week_view), gcal);</div><div class='del'>-	gtk_widget_show (priv-&gt;week_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (priv-&gt;notebook),</div><div class='del'>-				  priv-&gt;week_view, gtk_label_new (""));</div><div class='del'>-</div><div class='del'>-	/* The Month View. */</div><div class='del'>-	priv-&gt;month_view = e_week_view_new ();</div><div class='del'>-	e_week_view_set_calendar (E_WEEK_VIEW (priv-&gt;month_view), gcal);</div><div class='del'>-	e_week_view_set_multi_week_view (E_WEEK_VIEW (priv-&gt;month_view), TRUE);</div><div class='del'>-	gtk_widget_show (priv-&gt;month_view);</div><div class='del'>-	gtk_notebook_append_page (GTK_NOTEBOOK (priv-&gt;notebook),</div><div class='del'>-				  priv-&gt;month_view, gtk_label_new (""));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_config_settings (gcal, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the gnome calendar */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_init (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (GnomeCalendarPrivate, 1);</div><div class='del'>-	gcal-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-</div><div class='del'>-	priv-&gt;object_editor_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	priv-&gt;alarms = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	priv-&gt;current_view_type = VIEW_NOT_SET;</div><div class='del'>-	priv-&gt;range_selected = FALSE;</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = time_day_begin (time (NULL));</div><div class='del'>-	priv-&gt;selection_end_time = time_add_day (priv-&gt;selection_start_time, 1);</div><div class='del'>-</div><div class='del'>-	setup_widgets (gcal);</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'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gchar *filename;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (object));</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (object);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Save the TaskPad layout. */</div><div class='del'>-	filename = g_strdup_printf ("%s/config/TaskPad", evolution_dir);</div><div class='del'>-	e_calendar_table_save_state (E_CALENDAR_TABLE (priv-&gt;todo), filename);</div><div class='del'>-	g_free (filename);</div><div class='del'>-</div><div class='del'>-	priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;loading_uri) {</div><div class='del'>-		g_free (priv-&gt;loading_uri);</div><div class='del'>-		priv-&gt;loading_uri = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;client) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (priv-&gt;client));</div><div class='del'>-		priv-&gt;client = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;alarms, free_object_alarms, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;alarms);</div><div class='del'>-	priv-&gt;alarms = NULL;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;object_editor_hash, free_uid, NULL);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;object_editor_hash);</div><div class='del'>-	priv-&gt;object_editor_hash = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	gcal-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-get_current_page (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return GTK_NOTEBOOK (priv-&gt;notebook)-&gt;cur_page-&gt;child;</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'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	page = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	if (page == priv-&gt;day_view)</div><div class='del'>-		return "dayview";</div><div class='del'>-	else if (page == priv-&gt;work_week_view)</div><div class='del'>-		return "workweekview";</div><div class='del'>-	else if (page == priv-&gt;week_view)</div><div class='del'>-		return "weekview";</div><div class='del'>-	else if (page == priv-&gt;month_view)</div><div class='del'>-		return "monthview";</div><div class='del'>-	else {</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (new_time != -1);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = time_day_begin (new_time);</div><div class='del'>-	priv-&gt;selection_end_time = time_add_day (priv-&gt;selection_start_time, 1);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_view_times (gcal);</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_update_view_times (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	page = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	if (page == priv-&gt;day_view || page == priv-&gt;work_week_view) {</div><div class='del'>-		e_day_view_set_selected_time_range (E_DAY_VIEW (page),</div><div class='del'>-						    priv-&gt;selection_start_time,</div><div class='del'>-						    priv-&gt;selection_end_time);</div><div class='del'>-	} else if (page == priv-&gt;week_view || page == priv-&gt;month_view) {</div><div class='del'>-		e_week_view_set_selected_time_range (E_WEEK_VIEW (page),</div><div class='del'>-						     priv-&gt;selection_start_time,</div><div class='del'>-						     priv-&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'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *cp;</div><div class='del'>-	time_t start_time, end_time;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cp = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	start_time = priv-&gt;selection_start_time;</div><div class='del'>-	end_time = priv-&gt;selection_end_time;</div><div class='del'>-</div><div class='del'>-	if (cp == priv-&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 == priv-&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 == priv-&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 == priv-&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'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = start_time;</div><div class='del'>-	priv-&gt;selection_end_time = end_time;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_view_times (gcal);</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_next (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_direction (gcal, 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_previous (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_direction (gcal, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_dayjump (GnomeCalendar *gcal, time_t time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = time_day_begin (time);</div><div class='del'>-	priv-&gt;selection_end_time = time_add_day (priv-&gt;selection_start_time, 1);</div><div class='del'>-	if (priv-&gt;day_button)</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv-&gt;day_button), TRUE);</div><div class='del'>-	else</div><div class='del'>-		gnome_calendar_set_view (gcal, "dayview", FALSE, TRUE);</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'>-	gtk_widget_grab_focus (get_current_page (gcal));</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,</div><div class='del'>-				 char		*page_name,</div><div class='del'>-				 gboolean	 range_selected,</div><div class='del'>-				 gboolean	 focus)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (page_name != NULL);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view_internal (gcal, page_name, range_selected, focus);</div><div class='del'>-	gnome_calendar_update_view_times (gcal);</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This sets the view without changing the selection or updating the date</div><div class='del'>-   navigator. If a range of dates isn't selected it will also reset the number</div><div class='del'>-   of days/weeks shown to the default (i.e. 1 day for the day view or 5 weeks</div><div class='del'>-   for the month view). */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_set_view_internal	(GnomeCalendar	*gcal,</div><div class='del'>-					 char		*page_name,</div><div class='del'>-					 gboolean	 range_selected,</div><div class='del'>-					 gboolean	 focus)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	int view;</div><div class='del'>-	gboolean round_selection;</div><div class='del'>-	GtkWidget *focus_widget;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	round_selection = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (page_name, "dayview")) {</div><div class='del'>-		view = VIEW_DAY;</div><div class='del'>-		focus_widget = priv-&gt;day_view;</div><div class='del'>-</div><div class='del'>-		if (!range_selected)</div><div class='del'>-			e_day_view_set_days_shown (E_DAY_VIEW (priv-&gt;day_view), 1);</div><div class='del'>-	} else if (!strcmp (page_name, "workweekview")) {</div><div class='del'>-		view = VIEW_WORK_WEEK;</div><div class='del'>-		focus_widget = priv-&gt;work_week_view;</div><div class='del'>-	} else if (!strcmp (page_name, "weekview")) {</div><div class='del'>-		view = VIEW_WEEK;</div><div class='del'>-		focus_widget = priv-&gt;week_view;</div><div class='del'>-		round_selection = TRUE;</div><div class='del'>-	} else if (!strcmp (page_name, "monthview")) {</div><div class='del'>-		view = VIEW_MONTH;</div><div class='del'>-		focus_widget = priv-&gt;month_view;</div><div class='del'>-</div><div class='del'>-		if (!range_selected)</div><div class='del'>-			e_week_view_set_weeks_shown (E_WEEK_VIEW (priv-&gt;month_view), 5);</div><div class='del'>-		round_selection = TRUE;</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Unknown calendar view: %s", page_name);</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;current_view_type = view;</div><div class='del'>-	priv-&gt;range_selected = range_selected;</div><div class='del'>-</div><div class='del'>-	calendar_config_set_default_view (view);</div><div class='del'>-</div><div class='del'>-	gtk_notebook_set_page (GTK_NOTEBOOK (priv-&gt;notebook), view);</div><div class='del'>-</div><div class='del'>-	if (focus)</div><div class='del'>-		gtk_widget_grab_focus (focus_widget);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_pane_positions (gcal);</div><div class='del'>-</div><div class='del'>-	/* For the week &amp; month views we want the selection in the date</div><div class='del'>-	   navigator to be rounded to the nearest week when the arrow buttons</div><div class='del'>-	   are pressed to move to the previous/next month. */</div><div class='del'>-	gtk_object_set (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			"round_selection_when_moving", round_selection,</div><div class='del'>-			NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_set_pane_positions	(GnomeCalendar	*gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gint top_border, bottom_border, left_border, right_border;</div><div class='del'>-	gint col_width, row_height;</div><div class='del'>-	gfloat right_pane_width, top_pane_height;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Get the size of the calendar month width &amp; height. */</div><div class='del'>-	e_calendar_get_border_size (priv-&gt;date_navigator,</div><div class='del'>-				    &amp;top_border, &amp;bottom_border,</div><div class='del'>-				    &amp;left_border, &amp;right_border);</div><div class='del'>-	gtk_object_get (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			"row_height", &amp;row_height,</div><div class='del'>-			"column_width", &amp;col_width,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;current_view_type == VIEW_MONTH &amp;&amp; !priv-&gt;range_selected) {</div><div class='del'>-		right_pane_width = priv-&gt;hpane_pos_month_view;</div><div class='del'>-		top_pane_height = priv-&gt;vpane_pos_month_view;</div><div class='del'>-	} else {</div><div class='del'>-		right_pane_width = priv-&gt;hpane_pos;</div><div class='del'>-		top_pane_height = priv-&gt;vpane_pos;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* We add the borders before multiplying due to the way we are using</div><div class='del'>-	   the EPaned quantum feature. */</div><div class='del'>-	if (right_pane_width &lt; 0.001)</div><div class='del'>-		right_pane_width = 0.0;</div><div class='del'>-	else</div><div class='del'>-		right_pane_width = (right_pane_width * (col_width + left_border + right_border)</div><div class='del'>-				    + 0.5);</div><div class='del'>-	if (top_pane_height &lt; 0.001)</div><div class='del'>-		top_pane_height = 0.0;</div><div class='del'>-	else</div><div class='del'>-		top_pane_height = (top_pane_height * (row_height + top_border + bottom_border)</div><div class='del'>-				   + 0.5);</div><div class='del'>-</div><div class='del'>-	e_paned_set_position (E_PANED (priv-&gt;hpane), -1);</div><div class='del'>-	e_paned_set_position (E_PANED (priv-&gt;vpane), -1);</div><div class='del'>-</div><div class='del'>-	/* We add one to each dimension since we can't use 0. */</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_usize (priv-&gt;vpane, right_pane_width + 1, -2);</div><div class='del'>-	gtk_widget_set_usize (GTK_WIDGET (priv-&gt;date_navigator), -2, top_pane_height + 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</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'>-#endif</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, CalComponent *comp, 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'>-#if 0</div><div class='del'>-	cal_component_get_uid (comp, &amp;ai.uid);</div><div class='del'>-	ai.type = audio ? ALARM_AUDIO : ALARM_DISPLAY;</div><div class='del'>-#endif</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'>-struct alarm_notify_closure {</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	CalComponent *comp;</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;comp, 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'>-		gnome_calendar_edit_object (c-&gt;gcal, c-&gt;comp);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (c-&gt;comp));</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, CalComponent *comp, 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'>-	gtk_object_ref (GTK_OBJECT (comp));</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;comp = comp;</div><div class='del'>-	c-&gt;occur = occur;</div><div class='del'>-</div><div class='del'>-	result = alarm_notify_dialog (trigger, occur, comp, 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'>-		gtk_object_unref (GTK_OBJECT (comp));</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, CalComponent *comp, 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'>-	CalComponentAlarmAction 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'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalClientGetStatus status;</div><div class='del'>-	const char *uid;</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'>-	priv = c-&gt;gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Fetch the object */</div><div class='del'>-</div><div class='del'>-	status = cal_client_get_object (priv-&gt;client, c-&gt;uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-	switch (status) {</div><div class='del'>-	case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-		/* 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 (comp != 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 CAL_COMPONENT_ALARM_EMAIL:</div><div class='del'>-#if 0</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'>-#endif</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_ALARM_PROCEDURE:</div><div class='del'>-#if 0</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'>-#endif</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_ALARM_DISPLAY:</div><div class='del'>-#if 0</div><div class='del'>-		g_assert (ico-&gt;dalarm.enabled);</div><div class='del'>-#endif</div><div class='del'>-		display_notification (trigger, c-&gt;occur, comp, c-&gt;gcal);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_ALARM_AUDIO:</div><div class='del'>-#if 0</div><div class='del'>-		g_assert (ico-&gt;aalarm.enabled);</div><div class='del'>-#endif</div><div class='del'>-		audio_notification (trigger, c-&gt;occur, comp, c-&gt;gcal);</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'>-	/* Remove the alarm from the hash table */</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	oa = g_hash_table_lookup (priv-&gt;alarms, 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 (priv-&gt;alarms, 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'>-	gtk_object_unref (GTK_OBJECT (comp));</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 *gcal, CalAlarmInstance *ai)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</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'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	c = g_new (struct trigger_alarm_closure, 1);</div><div class='del'>-	c-&gt;gcal = gcal;</div><div class='del'>-	c-&gt;uid = g_strdup (ai-&gt;uid);</div><div class='del'>-#if 0</div><div class='del'>-	c-&gt;type = ai-&gt;type;</div><div class='del'>-#endif</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 (priv-&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 (priv-&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'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	cal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&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'>-	GnomeCalendarPrivate *priv;</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'>-	priv = gcal-&gt;priv;</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 (priv-&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'>-	priv-&gt;midnight_alarm_refresh_id = alarm_add (end_of_day, midnight_refresh_cb, gcal, NULL);</div><div class='del'>-	if (!priv-&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'>-/* Loads the initial data into the calendar; this should be called right after</div><div class='del'>- * the cal_loaded signal from the client is invoked.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-initial_load (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	load_alarms (gcal);</div><div class='del'>-	gnome_calendar_tag_calendar (gcal, priv-&gt;date_navigator);</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'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	ObjectAlarms *oa;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	oa = g_hash_table_lookup (priv-&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 (priv-&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'>-	GnomeCalendarPrivate *priv;</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'>-	priv = gcal-&gt;priv;</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 (priv-&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'>-/* Displays an error to indicate that loading a calendar failed */</div><div class='del'>-static void</div><div class='del'>-load_error (GnomeCalendar *gcal, const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("Could not load the calendar in `%s'"), uri);</div><div class='del'>-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays an error to indicate that creating a calendar failed */</div><div class='del'>-static void</div><div class='del'>-create_error (GnomeCalendar *gcal, const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("Could not create a calendar in `%s'"), uri);</div><div class='del'>-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Displays an error to indicate that the specified URI method is not supported */</div><div class='del'>-static void</div><div class='del'>-method_error (GnomeCalendar *gcal, const char *uri)</div><div class='del'>-{</div><div class='del'>-	char *msg;</div><div class='del'>-</div><div class='del'>-	msg = g_strdup_printf (_("The method required to load `%s' is not supported"), uri);</div><div class='del'>-	gnome_error_dialog_parented (msg, GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (gcal))));</div><div class='del'>-	g_free (msg);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback from the calendar client when a calendar is loaded */</div><div class='del'>-static void</div><div class='del'>-cal_loaded_cb (CalClient *client, CalClientLoadStatus status, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gboolean free_uri;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;load_state != LOAD_STATE_NOT_LOADED &amp;&amp; priv-&gt;load_state != LOAD_STATE_LOADED);</div><div class='del'>-	g_assert (priv-&gt;loading_uri != NULL);</div><div class='del'>-</div><div class='del'>-	free_uri = TRUE;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;load_state) {</div><div class='del'>-	case LOAD_STATE_WAIT_LOAD:</div><div class='del'>-		if (status == CAL_CLIENT_LOAD_SUCCESS) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_LOADED;</div><div class='del'>-			initial_load (gcal);</div><div class='del'>-		} else if (status == CAL_CLIENT_LOAD_ERROR) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-			load_error (gcal, priv-&gt;loading_uri);</div><div class='del'>-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-			method_error (gcal, priv-&gt;loading_uri);</div><div class='del'>-		} else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case LOAD_STATE_WAIT_LOAD_BEFORE_CREATE:</div><div class='del'>-		if (status == CAL_CLIENT_LOAD_SUCCESS) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_LOADED;</div><div class='del'>-			initial_load (gcal);</div><div class='del'>-		} else if (status == CAL_CLIENT_LOAD_ERROR) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_WAIT_CREATE;</div><div class='del'>-			free_uri = FALSE;</div><div class='del'>-</div><div class='del'>-			if (!cal_client_create_calendar (priv-&gt;client, priv-&gt;loading_uri)) {</div><div class='del'>-				priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-				free_uri = TRUE;</div><div class='del'>-				g_message ("cal_loaded_cb(): Could not issue the create request");</div><div class='del'>-			}</div><div class='del'>-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-			method_error (gcal, priv-&gt;loading_uri);</div><div class='del'>-		} else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case LOAD_STATE_WAIT_CREATE:</div><div class='del'>-		if (status == CAL_CLIENT_LOAD_SUCCESS) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_LOADED;</div><div class='del'>-			initial_load (gcal);</div><div class='del'>-		} else if (status == CAL_CLIENT_LOAD_ERROR) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-			create_error (gcal, priv-&gt;loading_uri);</div><div class='del'>-		} else if (status == CAL_CLIENT_LOAD_IN_USE) {</div><div class='del'>-			/* Someone created the URI while we were issuing the</div><div class='del'>-			 * create request, so we just try to reload.</div><div class='del'>-			 */</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_WAIT_LOAD;</div><div class='del'>-			free_uri = FALSE;</div><div class='del'>-</div><div class='del'>-			if (!cal_client_load_calendar (priv-&gt;client, priv-&gt;loading_uri)) {</div><div class='del'>-				priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-				free_uri = TRUE;</div><div class='del'>-				g_message ("cal_loaded_cb(): Could not issue the load request");</div><div class='del'>-			}</div><div class='del'>-		} else if (status == CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED) {</div><div class='del'>-			priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-			method_error (gcal, priv-&gt;loading_uri);</div><div class='del'>-		} else</div><div class='del'>-			g_assert_not_reached ();</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'>-	if (free_uri) {</div><div class='del'>-		g_free (priv-&gt;loading_uri);</div><div class='del'>-		priv-&gt;loading_uri = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback from the calendar client when an object is updated */</div><div class='del'>-static void</div><div class='del'>-obj_updated_cb (CalClient *client, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	remove_alarms_for_object (gcal, uid);</div><div class='del'>-	add_alarms_for_object (gcal, uid);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_tag_calendar (gcal, priv-&gt;date_navigator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback from the calendar client when an object is removed */</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'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	remove_alarms_for_object (gcal, uid);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_tag_calendar (gcal, priv-&gt;date_navigator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-gnome_calendar_construct (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gint view;</div><div class='del'>-	gchar *page;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;client = cal_client_new ();</div><div class='del'>-	if (!priv-&gt;client)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "cal_loaded",</div><div class='del'>-			    GTK_SIGNAL_FUNC (cal_loaded_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "obj_updated",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_updated_cb), gcal);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;client), "obj_removed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (obj_removed_cb), gcal);</div><div class='del'>-</div><div class='del'>-	e_calendar_table_set_cal_client (E_CALENDAR_TABLE (priv-&gt;todo), priv-&gt;client);</div><div class='del'>-</div><div class='del'>-	e_day_view_set_cal_client (E_DAY_VIEW (priv-&gt;day_view), priv-&gt;client);</div><div class='del'>-	e_day_view_set_cal_client (E_DAY_VIEW (priv-&gt;work_week_view), priv-&gt;client);</div><div class='del'>-	e_week_view_set_cal_client (E_WEEK_VIEW (priv-&gt;week_view), priv-&gt;client);</div><div class='del'>-	e_week_view_set_cal_client (E_WEEK_VIEW (priv-&gt;month_view), priv-&gt;client);</div><div class='del'>-</div><div class='del'>-	view = calendar_config_get_default_view ();</div><div class='del'>-	switch (view) {</div><div class='del'>-	case 1:</div><div class='del'>-		page = "workweekview";</div><div class='del'>-		break;</div><div class='del'>-	case 2:</div><div class='del'>-		page = "weekview";</div><div class='del'>-		break;</div><div class='del'>-	case 3:</div><div class='del'>-		page = "monthview";</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		page = "dayview";</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_view (gcal, page, FALSE, FALSE);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-gnome_calendar_new (void)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-</div><div class='del'>-	gcal = gtk_type_new (gnome_calendar_get_type ());</div><div class='del'>-</div><div class='del'>-	if (!gnome_calendar_construct (gcal)) {</div><div class='del'>-		g_message ("gnome_calendar_new(): Could not construct the calendar GUI");</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (gcal));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_get_cal_client:</div><div class='del'>- * @gcal: A calendar view.</div><div class='del'>- * </div><div class='del'>- * Queries the calendar client interface object that a calendar view is using.</div><div class='del'>- * </div><div class='del'>- * Return value: A calendar client interface object.</div><div class='del'>- **/</div><div class='del'>-CalClient *</div><div class='del'>-gnome_calendar_get_cal_client (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-gnome_calendar_open (GnomeCalendar *gcal, char *file, GnomeCalendarOpenMode gcom)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (gcal != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);</div><div class='del'>-	g_return_val_if_fail (file != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&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_assert (priv-&gt;loading_uri == NULL);</div><div class='del'>-</div><div class='del'>-	priv-&gt;loading_uri = g_strdup (file);</div><div class='del'>-</div><div class='del'>-	if (gcom == CALENDAR_OPEN)</div><div class='del'>-		priv-&gt;load_state = LOAD_STATE_WAIT_LOAD;</div><div class='del'>-	else if (gcom == CALENDAR_OPEN_OR_CREATE)</div><div class='del'>-		priv-&gt;load_state = LOAD_STATE_WAIT_LOAD_BEFORE_CREATE;</div><div class='del'>-	else {</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'>-	if (!cal_client_load_calendar (priv-&gt;client, file)) {</div><div class='del'>-		priv-&gt;load_state = LOAD_STATE_NOT_LOADED;</div><div class='del'>-		g_free (priv-&gt;loading_uri);</div><div class='del'>-		priv-&gt;loading_uri = NULL;</div><div class='del'>-</div><div class='del'>-		g_message ("gnome_calendar_open(): Could not issue the request");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</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'>-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'>-struct calendar_tag_closure</div><div class='del'>-{</div><div class='del'>-	ECalendarItem *calitem;</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'>-/* Marks the specified range in a GtkCalendar */</div><div class='del'>-static gboolean</div><div class='del'>-gnome_calendar_tag_calendar_cb (CalComponent *comp,</div><div class='del'>-				time_t istart,</div><div class='del'>-				time_t iend,</div><div class='del'>-				gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct calendar_tag_closure *c = data;</div><div class='del'>-	time_t t;</div><div class='del'>-</div><div class='del'>-	t = time_day_begin (istart);</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'>-</div><div class='del'>-		e_calendar_item_mark_day (c-&gt;calitem, tm.tm_year + 1900,</div><div class='del'>-					  tm.tm_mon, tm.tm_mday,</div><div class='del'>-					  E_CALENDAR_ITEM_MARK_BOLD);</div><div class='del'>-</div><div class='del'>-		t = time_day_end (t);</div><div class='del'>-	} while (t &lt; iend);</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'>- * 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 *gcal, ECalendar *ecal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	struct calendar_tag_closure c;</div><div class='del'>-	gint start_year, start_month, start_day;</div><div class='del'>-	gint end_year, end_month, end_day;</div><div class='del'>-	struct tm start_tm = { 0 }, end_tm = { 0 };</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 (ecal != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_CALENDAR (ecal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If the ECalendar isn't visible, we just return. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (ecal))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_calendar_item_clear_marks (ecal-&gt;calitem);</div><div class='del'>-</div><div class='del'>-	if (!cal_client_is_loaded (priv-&gt;client))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_calendar_item_get_date_range	(ecal-&gt;calitem,</div><div class='del'>-					 &amp;start_year, &amp;start_month, &amp;start_day,</div><div class='del'>-					 &amp;end_year, &amp;end_month, &amp;end_day);</div><div class='del'>-</div><div class='del'>-	start_tm.tm_year = start_year - 1900;</div><div class='del'>-	start_tm.tm_mon = start_month;</div><div class='del'>-	start_tm.tm_mday = start_day;</div><div class='del'>-	start_tm.tm_hour = 0;</div><div class='del'>-	start_tm.tm_min = 0;</div><div class='del'>-	start_tm.tm_sec = 0;</div><div class='del'>-	start_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	end_tm.tm_year = end_year - 1900;</div><div class='del'>-	end_tm.tm_mon = end_month;</div><div class='del'>-	end_tm.tm_mday = end_day;</div><div class='del'>-	end_tm.tm_hour = 0;</div><div class='del'>-	end_tm.tm_min = 0;</div><div class='del'>-	end_tm.tm_sec = 0;</div><div class='del'>-	end_tm.tm_isdst = -1;</div><div class='del'>-</div><div class='del'>-	c.calitem = ecal-&gt;calitem;</div><div class='del'>-	c.start_time = mktime (&amp;start_tm);</div><div class='del'>-	c.end_time = mktime (&amp;end_tm);</div><div class='del'>-</div><div class='del'>-	cal_client_generate_instances (priv-&gt;client, CALOBJ_TYPE_EVENT,</div><div class='del'>-				       c.start_time, c.end_time,</div><div class='del'>-				       gnome_calendar_tag_calendar_cb, &amp;c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Tells the calendar to reload all config settings.</div><div class='del'>-   If initializing is TRUE it sets the pane positions as well. (We don't</div><div class='del'>-   want to reset the pane positions after the user clicks 'Apply' in the</div><div class='del'>-   preferences dialog.) */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_update_config_settings (GnomeCalendar *gcal,</div><div class='del'>-				       gboolean	      initializing)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	CalWeekdays working_days;</div><div class='del'>-	gint week_start_day, time_divisions;</div><div class='del'>-	gint start_hour, start_minute, end_hour, end_minute;</div><div class='del'>-	gboolean use_24_hour, show_event_end, compress_weekend;</div><div class='del'>-	gboolean dnav_show_week_no;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	working_days = calendar_config_get_working_days ();</div><div class='del'>-	/* CalWeekdays and EDayViewDays use the same bit-masks, so we can</div><div class='del'>-	   use the same value. */</div><div class='del'>-	e_day_view_set_working_days (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				     (EDayViewDays) working_days);</div><div class='del'>-	e_day_view_set_working_days (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				     (EDayViewDays) working_days);</div><div class='del'>-</div><div class='del'>-	/* Note that this is 0 (Sun) to 6 (Sat). */</div><div class='del'>-	week_start_day = calendar_config_get_week_start_day ();</div><div class='del'>-	/* FIXME: Add support for these. */</div><div class='del'>-#if 0</div><div class='del'>-	e_day_view_set_week_start_day (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				       week_start_day);</div><div class='del'>-	e_day_view_set_week_start_day (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				       week_start_day);</div><div class='del'>-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-					week_start_day);</div><div class='del'>-	e_week_view_set_week_start_day (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					week_start_day);</div><div class='del'>-#endif</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (priv-&gt;date_navigator)-&gt;calitem),</div><div class='del'>-			       "week_start_day", (week_start_day + 6) % 7,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	start_hour = calendar_config_get_day_start_hour ();</div><div class='del'>-	start_minute = calendar_config_get_day_start_minute ();</div><div class='del'>-	end_hour = calendar_config_get_day_end_hour ();</div><div class='del'>-	end_minute = calendar_config_get_day_end_minute ();</div><div class='del'>-	e_day_view_set_working_day (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				    start_hour, start_minute,</div><div class='del'>-				    end_hour, end_minute);</div><div class='del'>-	e_day_view_set_working_day (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				    start_hour, start_minute,</div><div class='del'>-				    end_hour, end_minute);</div><div class='del'>-</div><div class='del'>-	use_24_hour = calendar_config_get_24_hour_format ();</div><div class='del'>-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				       use_24_hour);</div><div class='del'>-	e_day_view_set_24_hour_format (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				       use_24_hour);</div><div class='del'>-	/* FIXME: Add support for these. */</div><div class='del'>-#if 0</div><div class='del'>-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-					use_24_hour);</div><div class='del'>-	e_week_view_set_24_hour_format (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					use_24_hour);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	time_divisions = calendar_config_get_time_divisions ();</div><div class='del'>-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				     time_divisions);</div><div class='del'>-	e_day_view_set_mins_per_row (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				     time_divisions);</div><div class='del'>-</div><div class='del'>-	show_event_end = calendar_config_get_show_event_end ();</div><div class='del'>-	/* FIXME: Add support for these. */</div><div class='del'>-#if 0</div><div class='del'>-	e_day_view_set_show_event_end (E_DAY_VIEW (priv-&gt;day_view),</div><div class='del'>-				       show_event_end);</div><div class='del'>-	e_day_view_set_show_event_end (E_DAY_VIEW (priv-&gt;work_week_view),</div><div class='del'>-				       show_event_end);</div><div class='del'>-	e_week_view_set_show_event_end (E_WEEK_VIEW (priv-&gt;week_view),</div><div class='del'>-					show_event_end);</div><div class='del'>-	e_week_view_set_show_event_end (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					show_event_end);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	compress_weekend = calendar_config_get_compress_weekend ();</div><div class='del'>-	e_week_view_set_compress_weekend (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					  compress_weekend);</div><div class='del'>-</div><div class='del'>-	dnav_show_week_no = calendar_config_get_dnav_show_week_no ();</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (E_CALENDAR (priv-&gt;date_navigator)-&gt;calitem),</div><div class='del'>-			       "show_week_numbers", dnav_show_week_no,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	if (initializing) {</div><div class='del'>-		priv-&gt;hpane_pos = calendar_config_get_hpane_pos ();</div><div class='del'>-		priv-&gt;vpane_pos = calendar_config_get_vpane_pos ();</div><div class='del'>-		priv-&gt;hpane_pos_month_view = calendar_config_get_month_hpane_pos ();</div><div class='del'>-		priv-&gt;vpane_pos_month_view = calendar_config_get_month_vpane_pos ();</div><div class='del'>-	} else {</div><div class='del'>-		gnome_calendar_update_paned_quanta (gcal);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FIXME: These are for the old config code and will be removed eventually.</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'>-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'>-#if 0</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'>-#endif</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'>-</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'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,</div><div class='del'>-					time_t	       start_time,</div><div class='del'>-					time_t	       end_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;selection_start_time = start_time;</div><div class='del'>-	priv-&gt;selection_end_time = end_time;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * gnome_calendar_get_selected_time_range:</div><div class='del'>- * @gcal: A calendar view.</div><div class='del'>- * @start_time: Return value for the start of the time selection.</div><div class='del'>- * @end_time: Return value for the end of the time selection.</div><div class='del'>- * </div><div class='del'>- * Queries the time selection range on the calendar view.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,</div><div class='del'>-					time_t	 *start_time,</div><div class='del'>-					time_t	 *end_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (start_time)</div><div class='del'>-		*start_time = priv-&gt;selection_start_time;</div><div class='del'>-</div><div class='del'>-	if (end_time)</div><div class='del'>-		*end_time = priv-&gt;selection_end_time;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Callback used when an event editor finishes editing an object */</div><div class='del'>-static void</div><div class='del'>-released_event_object_cb (EventEditor *ee, const char *uid, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</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'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	result = g_hash_table_lookup_extended (priv-&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 (priv-&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'>-</div><div class='del'>-/* Callback used when an event editor dialog is closed */</div><div class='del'>-struct editor_closure</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	char *uid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-editor_closed_cb (GtkWidget *widget, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	struct editor_closure *ec;</div><div class='del'>-	gboolean result;</div><div class='del'>-	gpointer orig_key;</div><div class='del'>-	char *orig_uid;</div><div class='del'>-</div><div class='del'>-	g_print ("editor_closed_cb ()\n");</div><div class='del'>-</div><div class='del'>-	ec = (struct editor_closure *)data;</div><div class='del'>-	gcal = ec-&gt;gcal;</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	result = g_hash_table_lookup_extended (priv-&gt;object_editor_hash, ec-&gt;uid, &amp;orig_key, NULL);</div><div class='del'>-	g_assert (result != FALSE);</div><div class='del'>-</div><div class='del'>-	orig_uid = orig_key;</div><div class='del'>-</div><div class='del'>-	g_hash_table_remove (priv-&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'>-void</div><div class='del'>-gnome_calendar_edit_object (GnomeCalendar *gcal, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	EventEditor *ee;</div><div class='del'>-	struct editor_closure *ec;</div><div class='del'>-	const char *uid;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (comp != NULL);</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	ee = g_hash_table_lookup (priv-&gt;object_editor_hash, uid);</div><div class='del'>-	if (!ee) {</div><div class='del'>-		ec = g_new0 (struct editor_closure, 1);</div><div class='del'>-</div><div class='del'>-		ee = event_editor_new ();</div><div class='del'>-		if (!ee) {</div><div class='del'>-			g_message ("gnome_calendar_edit_object(): Could not create the event editor");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ec-&gt;gcal = gcal;</div><div class='del'>-		ec-&gt;uid = g_strdup (uid);</div><div class='del'>-</div><div class='del'>-		g_hash_table_insert (priv-&gt;object_editor_hash, ec-&gt;uid, ee);</div><div class='del'>-</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (ee), "destroy",</div><div class='del'>-				    GTK_SIGNAL_FUNC (editor_closed_cb),</div><div class='del'>-				    ec);</div><div class='del'>-</div><div class='del'>-		event_editor_set_cal_client (EVENT_EDITOR (ee), priv-&gt;client);</div><div class='del'>-		event_editor_set_event_object (EVENT_EDITOR (ee), comp);</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'>-/**</div><div class='del'>- * gnome_calendar_new_appointment:</div><div class='del'>- * @gcal: An Evolution calendar.</div><div class='del'>- *</div><div class='del'>- * Opens an event editor dialog for a new appointment.  The appointment's start</div><div class='del'>- * and end times are set to the currently selected time range in the calendar</div><div class='del'>- * views.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-gnome_calendar_new_appointment (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	time_t dtstart, dtend;</div><div class='del'>-	CalComponentDateTime dt;</div><div class='del'>-	struct icaltimetype itt;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-</div><div class='del'>-	gnome_calendar_get_current_time_range (gcal, &amp;dtstart, &amp;dtend);</div><div class='del'>-	dt.value = &amp;itt;</div><div class='del'>-	dt.tzid = NULL;</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	cal_component_set_new_vtype (comp, CAL_COMPONENT_EVENT);</div><div class='del'>-</div><div class='del'>-	itt = icaltime_from_timet (dtstart, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtstart (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	itt = icaltime_from_timet (dtend, FALSE, FALSE);</div><div class='del'>-	cal_component_set_dtend (comp, &amp;dt);</div><div class='del'>-</div><div class='del'>-	cal_component_commit_sequence (comp);</div><div class='del'>-</div><div class='del'>-	gnome_calendar_edit_object (gcal, comp);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the selected time range for the current view. Note that this may be</div><div class='del'>-   different from the fields in the GnomeCalendar, since the view may clip</div><div class='del'>-   this or choose a more appropriate time. */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_get_current_time_range (GnomeCalendar *gcal,</div><div class='del'>-				       time_t	 *start_time,</div><div class='del'>-				       time_t	 *end_time)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	page = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	if (page == priv-&gt;day_view || page == priv-&gt;work_week_view)</div><div class='del'>-		e_day_view_get_selected_time_range (E_DAY_VIEW (page), start_time, end_time);</div><div class='del'>-	else if (page == priv-&gt;week_view || page == priv-&gt;month_view)</div><div class='del'>-		e_week_view_get_selected_time_range (E_WEEK_VIEW (page), start_time, end_time);</div><div class='del'>-	else {</div><div class='del'>-		g_message ("My penguin is gone!");</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* This updates the month shown and the days selected in the calendar, if</div><div class='del'>-   necessary. */</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_update_date_navigator (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GDate start_date, end_date;</div><div class='del'>-	gint days_shown;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* If the ECalendar isn't visible, we just return. */</div><div class='del'>-	if (!GTK_WIDGET_VISIBLE (priv-&gt;date_navigator))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (gnome_calendar_get_days_shown (gcal, &amp;start_date, &amp;days_shown)) {</div><div class='del'>-		end_date = start_date;</div><div class='del'>-		g_date_add_days (&amp;end_date, days_shown - 1);</div><div class='del'>-</div><div class='del'>-		e_calendar_item_set_selection (priv-&gt;date_navigator-&gt;calitem,</div><div class='del'>-					       &amp;start_date, &amp;end_date);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-gnome_calendar_get_days_shown	(GnomeCalendar	*gcal,</div><div class='del'>-				 GDate		*start_date,</div><div class='del'>-				 gint		*days_shown)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *page;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	page = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	if (page == priv-&gt;day_view || page == priv-&gt;work_week_view) {</div><div class='del'>-		g_date_clear (start_date, 1);</div><div class='del'>-		g_date_set_time (start_date, E_DAY_VIEW (page)-&gt;lower);</div><div class='del'>-		*days_shown = e_day_view_get_days_shown (E_DAY_VIEW (page));</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else if (page == priv-&gt;week_view || page == priv-&gt;month_view) {</div><div class='del'>-		*start_date = E_WEEK_VIEW (page)-&gt;first_day_shown;</div><div class='del'>-		if (e_week_view_get_multi_week_view (E_WEEK_VIEW (page)))</div><div class='del'>-			*days_shown = e_week_view_get_weeks_shown (E_WEEK_VIEW (page)) * 7;</div><div class='del'>-		else</div><div class='del'>-			*days_shown = 7;</div><div class='del'>-</div><div class='del'>-		return TRUE;</div><div class='del'>-	} else {</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'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_date_navigator_selection_changed (ECalendarItem    *calitem,</div><div class='del'>-						    GnomeCalendar    *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GDate start_date, end_date, new_start_date, new_end_date;</div><div class='del'>-	gint days_shown, new_days_shown;</div><div class='del'>-	gint start_year, start_month, start_day;</div><div class='del'>-	gint end_year, end_month, end_day;</div><div class='del'>-	gboolean starts_on_week_start_day;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	starts_on_week_start_day = FALSE;</div><div class='del'>-</div><div class='del'>-	if (!gnome_calendar_get_days_shown (gcal, &amp;start_date, &amp;days_shown))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	end_date = start_date;</div><div class='del'>-	g_date_add_days (&amp;end_date, days_shown - 1);</div><div class='del'>-</div><div class='del'>-	e_calendar_item_get_selection (calitem, &amp;new_start_date, &amp;new_end_date);</div><div class='del'>-</div><div class='del'>-	/* If the selection hasn't changed just return. */</div><div class='del'>-	if (!g_date_compare (&amp;start_date, &amp;new_start_date)</div><div class='del'>-	    &amp;&amp; !g_date_compare (&amp;end_date, &amp;new_end_date))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	new_days_shown = g_date_julian (&amp;new_end_date) - g_date_julian (&amp;new_start_date) + 1;</div><div class='del'>-</div><div class='del'>-	/* FIXME: This assumes weeks start on Monday for now. */</div><div class='del'>-	if (g_date_weekday (&amp;new_start_date) - 1 == 0)</div><div class='del'>-		starts_on_week_start_day = TRUE;</div><div class='del'>-</div><div class='del'>-	/* Switch views as appropriate, and change the number of days or weeks</div><div class='del'>-	   shown. */</div><div class='del'>-	if (new_days_shown &gt; 9) {</div><div class='del'>-		e_week_view_set_weeks_shown (E_WEEK_VIEW (priv-&gt;month_view),</div><div class='del'>-					     (new_days_shown + 6) / 7);</div><div class='del'>-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv-&gt;month_view), &amp;new_start_date);</div><div class='del'>-</div><div class='del'>-		gnome_calendar_set_view_internal (gcal, "monthview", TRUE, FALSE);</div><div class='del'>-		gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-	} else if (new_days_shown == 7 &amp;&amp; starts_on_week_start_day) {</div><div class='del'>-		e_week_view_set_first_day_shown (E_WEEK_VIEW (priv-&gt;week_view), &amp;new_start_date);</div><div class='del'>-</div><div class='del'>-		gnome_calendar_set_view_internal (gcal, "weekview", TRUE, FALSE);</div><div class='del'>-		gnome_calendar_update_date_navigator (gcal);</div><div class='del'>-	} else {</div><div class='del'>-		start_year = g_date_year (&amp;new_start_date);</div><div class='del'>-		start_month = g_date_month (&amp;new_start_date) - 1;</div><div class='del'>-		start_day = g_date_day (&amp;new_start_date);</div><div class='del'>-		end_year = g_date_year (&amp;new_end_date);</div><div class='del'>-		end_month = g_date_month (&amp;new_end_date) - 1;</div><div class='del'>-		end_day = g_date_day (&amp;new_end_date);</div><div class='del'>-</div><div class='del'>-		tm.tm_year = start_year - 1900;</div><div class='del'>-		tm.tm_mon  = start_month;</div><div class='del'>-		tm.tm_mday = start_day;</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'>-		priv-&gt;selection_start_time = mktime (&amp;tm);</div><div class='del'>-</div><div class='del'>-		tm.tm_year = end_year - 1900;</div><div class='del'>-		tm.tm_mon  = end_month;</div><div class='del'>-		tm.tm_mday = end_day + 1; /* mktime() will normalize this. */</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'>-		priv-&gt;selection_end_time = mktime (&amp;tm);</div><div class='del'>-</div><div class='del'>-		e_day_view_set_days_shown (E_DAY_VIEW (priv-&gt;day_view), new_days_shown);</div><div class='del'>-		gnome_calendar_set_view (gcal, "dayview", TRUE, FALSE);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_calendar_update_view_buttons (gcal);</div><div class='del'>-	gtk_widget_grab_focus (get_current_page (gcal));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_date_navigator_date_range_changed (ECalendarItem *calitem,</div><div class='del'>-						     GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	gnome_calendar_tag_calendar (gcal, priv-&gt;date_navigator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_date_navigator_style_set (GtkWidget     *widget,</div><div class='del'>-					    GtkStyle      *previous_style,</div><div class='del'>-					    gpointer       data)</div><div class='del'>-{</div><div class='del'>-	gnome_calendar_update_paned_quanta (GNOME_CALENDAR (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_update_paned_quanta (GnomeCalendar	*gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gint row_height, col_width;</div><div class='del'>-	gint top_border, bottom_border, left_border, right_border;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	e_calendar_get_border_size (priv-&gt;date_navigator,</div><div class='del'>-				    &amp;top_border, &amp;bottom_border,</div><div class='del'>-				    &amp;left_border, &amp;right_border);</div><div class='del'>-	gtk_object_get (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-			"row_height", &amp;row_height,</div><div class='del'>-			"column_width", &amp;col_width,</div><div class='del'>-			NULL);</div><div class='del'>-</div><div class='del'>-	/* The EPaned quantum feature works better if we add on the calendar</div><div class='del'>-	   borders to the quantum size. Otherwise if you shrink the date</div><div class='del'>-	   navigator you get left with the border widths/heights which looks</div><div class='del'>-	   bad. EPaned should be more flexible really. */</div><div class='del'>-	col_width += left_border + right_border;</div><div class='del'>-	row_height += top_border + bottom_border;</div><div class='del'>-</div><div class='del'>-	/* We don't have to use the EPaned quantum feature. We could just let</div><div class='del'>-	   the calendar expand to fill the allocated space, showing as many</div><div class='del'>-	   months as will fit. But for that to work nicely the EPaned should</div><div class='del'>-	   resize the widgets as the bar is dragged. Otherwise the user has</div><div class='del'>-	   to mess around to get the number of months that they want. */</div><div class='del'>-#if 1</div><div class='del'>-	gtk_object_set (GTK_OBJECT (priv-&gt;hpane),</div><div class='del'>-			"quantum", (guint) col_width,</div><div class='del'>-			NULL);</div><div class='del'>-	gtk_object_set (GTK_OBJECT (priv-&gt;vpane),</div><div class='del'>-			"quantum", (guint) row_height,</div><div class='del'>-			NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	gnome_calendar_set_pane_positions (gcal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-gnome_calendar_on_date_navigator_size_allocate (GtkWidget     *widget,</div><div class='del'>-						GtkAllocation *allocation,</div><div class='del'>-						gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendar *gcal;</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	gint width, height, row_height, col_width;</div><div class='del'>-	gint top_border, bottom_border, left_border, right_border;</div><div class='del'>-	gfloat hpane_pos, vpane_pos;</div><div class='del'>-</div><div class='del'>-	gcal = GNOME_CALENDAR (data);</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;current_view_type != VIEW_NOT_SET) {</div><div class='del'>-		e_calendar_get_border_size (priv-&gt;date_navigator,</div><div class='del'>-					    &amp;top_border, &amp;bottom_border,</div><div class='del'>-					    &amp;left_border, &amp;right_border);</div><div class='del'>-		gtk_object_get (GTK_OBJECT (priv-&gt;date_navigator-&gt;calitem),</div><div class='del'>-				"row_height", &amp;row_height,</div><div class='del'>-				"column_width", &amp;col_width,</div><div class='del'>-				NULL);</div><div class='del'>-</div><div class='del'>-		/* We subtract one from each dimension since we added 1 in</div><div class='del'>-		   gnome_calendar_set_view_internal(). */</div><div class='del'>-		width = allocation-&gt;width - 1;</div><div class='del'>-		height = allocation-&gt;height - 1;</div><div class='del'>-</div><div class='del'>-		/* We add the border sizes to work around the EPaned</div><div class='del'>-		   quantized feature. */</div><div class='del'>-		col_width += left_border + right_border;</div><div class='del'>-		row_height += top_border + bottom_border;</div><div class='del'>-</div><div class='del'>-		hpane_pos = (gfloat) width / col_width;</div><div class='del'>-		vpane_pos = (gfloat) height / row_height;</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;current_view_type == VIEW_MONTH</div><div class='del'>-		    &amp;&amp; !priv-&gt;range_selected) {</div><div class='del'>-			priv-&gt;hpane_pos_month_view = hpane_pos;</div><div class='del'>-			priv-&gt;vpane_pos_month_view = vpane_pos;</div><div class='del'>-			calendar_config_set_month_hpane_pos (hpane_pos);</div><div class='del'>-			calendar_config_set_month_vpane_pos (vpane_pos);</div><div class='del'>-		} else {</div><div class='del'>-			priv-&gt;hpane_pos = hpane_pos;</div><div class='del'>-			priv-&gt;vpane_pos = vpane_pos;</div><div class='del'>-			calendar_config_set_hpane_pos (hpane_pos);</div><div class='del'>-			calendar_config_set_vpane_pos (vpane_pos);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,</div><div class='del'>-				 GtkWidget	*day_button,</div><div class='del'>-				 GtkWidget	*work_week_button,</div><div class='del'>-				 GtkWidget	*week_button,</div><div class='del'>-				 GtkWidget	*month_button)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (gcal != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_CALENDAR (gcal));</div><div class='del'>-	g_return_if_fail (day_button != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (day_button));</div><div class='del'>-	g_return_if_fail (work_week_button != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (work_week_button));</div><div class='del'>-	g_return_if_fail (week_button != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (week_button));</div><div class='del'>-	g_return_if_fail (month_button != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (month_button));</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;day_button = day_button;</div><div class='del'>-	priv-&gt;work_week_button = work_week_button;</div><div class='del'>-	priv-&gt;week_button = week_button;</div><div class='del'>-	priv-&gt;month_button = month_button;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This makes the appropriate radio button in the toolbar active.  It blocks the</div><div class='del'>- * signals so that we can do a clean setup without affecting the views.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-gnome_calendar_update_view_buttons (GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-	GtkWidget *page, *button;</div><div class='del'>-</div><div class='del'>-	priv = gcal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	page = get_current_page (gcal);</div><div class='del'>-</div><div class='del'>-	if (page == priv-&gt;day_view)</div><div class='del'>-		button = priv-&gt;day_button;</div><div class='del'>-	else if (page == priv-&gt;work_week_view)</div><div class='del'>-		button = priv-&gt;work_week_button;</div><div class='del'>-	else if (page == priv-&gt;week_view)</div><div class='del'>-		button = priv-&gt;week_button;</div><div class='del'>-	else if (page == priv-&gt;month_view)</div><div class='del'>-		button = priv-&gt;month_button;</div><div class='del'>-	else {</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (button) {</div><div class='del'>-		gtk_signal_handler_block_by_data (GTK_OBJECT (button), gcal);</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);</div><div class='del'>-		gtk_signal_handler_unblock_by_data (GTK_OBJECT (button), gcal);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h<br/>deleted file mode 100644<br/>index 2474e92bea..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/gnome-cal.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/gnome-cal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,138 +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/gtkvbox.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;widgets/misc/e-calendar.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define GNOME_TYPE_CALENDAR            (gnome_calendar_get_type ())</div><div class='del'>-#define GNOME_CALENDAR(obj)            (GTK_CHECK_CAST ((obj), GNOME_TYPE_CALENDAR, GnomeCalendar))</div><div class='del'>-#define GNOME_CALENDAR_CLASS(klass)    (GTK_CHECK_CAST_CLASS ((klass), GNOME_TYPE_CALENDAR,	\</div><div class='del'>-					GnomeCalendarClass))</div><div class='del'>-#define GNOME_IS_CALENDAR(obj)         (GTK_CHECK_TYPE ((obj), GNOME_TYPE_CALENDAR))</div><div class='del'>-#define GNOME_IS_CALENDAR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GNOME_TYPE_CALENDAR))</div><div class='del'>-</div><div class='del'>-typedef struct _GnomeCalendar GnomeCalendar;</div><div class='del'>-typedef struct _GnomeCalendarClass GnomeCalendarClass;</div><div class='del'>-typedef struct _GnomeCalendarPrivate GnomeCalendarPrivate;</div><div class='del'>-</div><div class='del'>-struct _GnomeCalendar {</div><div class='del'>-	GtkVBox vbox;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	GnomeCalendarPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _GnomeCalendarClass {</div><div class='del'>-	GtkVBoxClass parent_class;</div><div class='del'>-};</div><div class='del'>-</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'>-GtkType    gnome_calendar_get_type         	(void);</div><div class='del'>-GtkWidget *gnome_calendar_construct		(GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-GtkWidget *gnome_calendar_new			(void);</div><div class='del'>-</div><div class='del'>-CalClient *gnome_calendar_get_cal_client	(GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-gboolean   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 *gcal,</div><div class='del'>-						 ECalendar     *ecal);</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'>-						 gboolean	 reset_range_shown,</div><div class='del'>-						 gboolean	 focus);</div><div class='del'>-</div><div class='del'>-void	   gnome_calendar_set_selected_time_range (GnomeCalendar *gcal,</div><div class='del'>-						   time_t	  start_time,</div><div class='del'>-						   time_t	  end_time);</div><div class='del'>-void	   gnome_calendar_get_selected_time_range (GnomeCalendar *gcal,</div><div class='del'>-						   time_t	 *start_time,</div><div class='del'>-						   time_t	 *end_time);</div><div class='del'>-</div><div class='del'>-void       gnome_calendar_edit_object           (GnomeCalendar *gcal,</div><div class='del'>-						 CalComponent  *comp);</div><div class='del'>-</div><div class='del'>-void       gnome_calendar_new_appointment       (GnomeCalendar *gcal);</div><div class='del'>-</div><div class='del'>-/* Returns the selected time range for the current view. Note that this may be</div><div class='del'>-   different from the fields in the GnomeCalendar, since the view may clip</div><div class='del'>-   this or choose a more appropriate time. */</div><div class='del'>-void	   gnome_calendar_get_current_time_range (GnomeCalendar *gcal,</div><div class='del'>-						  time_t	 *start_time,</div><div class='del'>-						  time_t	 *end_time);</div><div class='del'>-</div><div class='del'>-/* Tells the calendar to reload all config settings. initializing should be</div><div class='del'>-   TRUE when we are setting the config settings for the first time. */</div><div class='del'>-void	   gnome_calendar_update_config_settings (GnomeCalendar *gcal,</div><div class='del'>-						  gboolean	 initializing);</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * FIXME: These are for the old config code and will be removed eventually.</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</div><div class='del'>-   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</div><div class='del'>-   time to update the views. */</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</div><div class='del'>-   time to update the views. */</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'>-void	   gnome_calendar_set_view_buttons	(GnomeCalendar	*gcal,</div><div class='del'>-						 GtkWidget	*day_button,</div><div class='del'>-						 GtkWidget	*work_week_button,</div><div class='del'>-						 GtkWidget	*week_button,</div><div class='del'>-						 GtkWidget	*month_button);</div><div class='del'>-</div><div class='del'>-/* This makes the appropriate radio button in the toolbar active.</div><div class='del'>-   It sets the ignore_view_button_clicks flag so the "clicked" signal handlers</div><div class='del'>-   just return without doing anything. */</div><div class='del'>-void	   gnome_calendar_update_view_buttons	(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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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.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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 07e75e5d3d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/goto.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/goto.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,332 +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'>-	time_t start_time;</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'>-	gnome_calendar_get_selected_time_range (gnome_calendar, &amp;start_time, NULL);</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;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'>-	time_t start_time;</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'>-	gnome_calendar_get_selected_time_range (gnome_calendar, &amp;start_time, NULL);</div><div class='del'>-</div><div class='del'>-	tm = *localtime (&amp;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/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/main.c b/calendar/gui/main.c<br/>deleted file mode 100644<br/>index 95b9ddf64d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/main.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,91 +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'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-cursors.h&gt;</div><div class='del'>-#include "alarm.h"</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "calendar-config.h"</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "control-factory.h"</div><div class='del'>-#include "e-itip-control.h"</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'>-	/* 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'>-</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'>-#ifdef ENABLE_NLS</div><div class='del'>-	bindtextdomain(PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-	textdomain(PACKAGE);</div><div class='del'>-#endif</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'>-	e_cursors_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'>-	e_itip_control_factory_init ();</div><div class='del'>-</div><div class='del'>-	bonobo_main ();</div><div class='del'>-</div><div class='del'>-	calendar_config_write_on_exit ();</div><div class='del'>-</div><div class='del'>-	fprintf (stderr, "main(): Out of bonobo_main(), we are dying cleanly.  Have a nice day.\n");</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 1b90d390dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/mark.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/mark.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,300 +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'>-/* Closure data */</div><div class='del'>-struct minfo</div><div class='del'>-{</div><div class='del'>-	GnomeMonthItem *mitem;</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'>-</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'>-static gboolean</div><div class='del'>-mark_month_item_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)</div><div class='del'>-{</div><div class='del'>-	struct minfo *mi = (struct minfo *)data;</div><div class='del'>-</div><div class='del'>-	mark_event_in_month (mi-&gt;mitem, MAX (istart, mi-&gt;start), MIN (iend, mi-&gt;end));</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'>-mark_month_item (GnomeMonthItem *mitem, GnomeCalendar *gcal)</div><div class='del'>-{</div><div class='del'>-	CalClient *client;</div><div class='del'>-	struct minfo mi;</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'>-	client = gnome_calendar_get_cal_client (gcal);</div><div class='del'>-</div><div class='del'>-	mi.mitem = mitem;</div><div class='del'>-	mi.start = time_month_begin (time_from_day (mitem-&gt;year, mitem-&gt;month, 1));</div><div class='del'>-	mi.end = time_month_end (mi.start);</div><div class='del'>-	</div><div class='del'>-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, mi.start, mi.end,</div><div class='del'>-				       mark_month_item_cb, &amp;mi);</div><div class='del'>-}</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='del'>-</div><div class='del'>-</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 21c76151d5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/monthview.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/monthview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * monthview_xpm[] = {</div><div class='del'>-"24 24 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #666666",</div><div class='del'>-"#	c #919191",</div><div class='del'>-"$	c #F2F1ED",</div><div class='del'>-"%	c #D8D8D4",</div><div class='del'>-"....................... ",</div><div class='del'>-".+++++++++++++++++++++. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+####################. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+####################. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+####################. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".+$$$#$$$#$$$#$$$#$$$#. ",</div><div class='del'>-".%###################@. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/calendar/gui/popup-menu.c b/calendar/gui/popup-menu.c<br/>deleted file mode 100644<br/>index 86821dcb4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/popup-menu.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 &lt;gal/widgets/e-gui-utils.h&gt;</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 90d6161886..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/print.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/print.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1315 +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-dialog.h&gt;</div><div class='del'>-#include &lt;e-util/e-dialog-widgets.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;cal-util/timeutil.h&gt;</div><div class='del'>-#include "calendar-commands.h"</div><div class='del'>-#include "gnome-cal.h"</div><div class='del'>-#include "print.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* 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'>-struct pdinfo</div><div class='del'>-{</div><div class='del'>-	GList *slots;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct psinfo</div><div class='del'>-{</div><div class='del'>-	GList *events;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct ptinfo</div><div class='del'>-{</div><div class='del'>-	GList *todos;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct einfo</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-	time_t start;</div><div class='del'>-	time_t end;</div><div class='del'>-	int count;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</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 - gnome_font_get_size (font));</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-gnome_font_get_size(font)-gnome_font_get_size(font)*0.4, linewidth, 0.9);</div><div class='del'>-		print_border(pc, *l, *r, *t-gnome_font_get_size(font)-gnome_font_get_size(font)*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-=gnome_font_get_size(font)*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'>-	CalClient *client;</div><div class='del'>-	GnomeFont *font, *font_bold, *font_normal;</div><div class='del'>-	time_t now, next;</div><div class='del'>-	int x, y;</div><div class='del'>-	int days[42];</div><div class='del'>-	int day;</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'>-	client = gnome_calendar_get_cal_client (gcal);</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-gnome_font_get_size(font)*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 - gnome_font_get_size (font));</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-gnome_font_get_size(font_bold));</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 *uids;</div><div class='del'>-</div><div class='del'>-				sprintf(buf, "%d", day);</div><div class='del'>-</div><div class='del'>-				/* this is a slow messy way to do this ... but easy ... */</div><div class='del'>-				uids = cal_client_get_objects_in_range (client,</div><div class='del'>-									CALOBJ_TYPE_EVENT,</div><div class='del'>-									now, time_day_end (now));</div><div class='del'>-				font = uids ? font_bold : font_normal;</div><div class='del'>-				cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-				next = time_add_day(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+gnome_font_get_size(font)-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+gnome_font_get_size(font), 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, const char *text,</div><div class='del'>-	   double left, double right, double top, double bottom, double indent)</div><div class='del'>-{</div><div class='del'>-	double maxwidth = right-left;</div><div class='del'>-	double width;</div><div class='del'>-	const char *p;</div><div class='del'>-	char *wordstart;</div><div class='del'>-	int c;</div><div class='del'>-	char *outbuffer, *o, *outbuffendmarker;</div><div class='del'>-	int outbufflen;</div><div class='del'>-	int dump=0;</div><div class='del'>-	int first=1;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(text!=NULL, top);</div><div class='del'>-</div><div class='del'>-	if (top&lt;bottom) {</div><div class='del'>-		/* too much to fit in appointment printout */</div><div class='del'>-		return top;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	outbufflen = 1024;</div><div class='del'>-	outbuffer = g_malloc(outbufflen);</div><div class='del'>-	outbuffendmarker = outbuffer+outbufflen-2;</div><div class='del'>-</div><div class='del'>-	top -= gnome_font_get_size (font);</div><div class='del'>-	gnome_print_setfont (pc, font);</div><div class='del'>-</div><div class='del'>-	width=0;</div><div class='del'>-	p = text;</div><div class='del'>-	wordstart = outbuffer;</div><div class='del'>-	o = outbuffer;</div><div class='del'>-	while ((c=*p)) {</div><div class='del'>-		if (c=='\n') {</div><div class='del'>-			wordstart=o;</div><div class='del'>-			dump=1;</div><div class='del'>-		} else {</div><div class='del'>-			/* grow output buffer if required */</div><div class='del'>-			if (o&gt;=outbuffendmarker) {</div><div class='del'>-				char *newbuf;</div><div class='del'>-				outbufflen*=2;</div><div class='del'>-				newbuf = g_realloc(outbuffer, outbufflen);</div><div class='del'>-				o = newbuf+(o-outbuffer);</div><div class='del'>-				wordstart = newbuf+(o-outbuffer);</div><div class='del'>-				outbuffer = newbuf;</div><div class='del'>-				outbuffendmarker = outbuffer+outbufflen-2;</div><div class='del'>-			}</div><div class='del'>-			*o++=c;</div><div class='del'>-			if (c==' ')</div><div class='del'>-				wordstart = o;</div><div class='del'>-			width+=gnome_font_get_glyph_width(font, gnome_font_lookup_default (font, c));</div><div class='del'>-			if (width&gt;maxwidth)</div><div class='del'>-				dump=1;</div><div class='del'>-			else</div><div class='del'>-				dump=0;</div><div class='del'>-		}</div><div class='del'>-		if (dump) {</div><div class='del'>-			if (wordstart==outbuffer)</div><div class='del'>-				wordstart=o;</div><div class='del'>-			c=*wordstart;</div><div class='del'>-			*wordstart=0;</div><div class='del'>-			gnome_print_moveto(pc, left, top);</div><div class='del'>-			gnome_print_show(pc, outbuffer);</div><div class='del'>-			*wordstart=c;</div><div class='del'>-			memcpy(outbuffer, wordstart, o-wordstart);</div><div class='del'>-			width = gnome_font_get_width_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 -= gnome_font_get_size (font);</div><div class='del'>-			if (top&lt;bottom) {</div><div class='del'>-				/* too much to fit, drop the rest */</div><div class='del'>-				g_free(outbuffer);</div><div class='del'>-				return top;</div><div class='del'>-			}</div><div class='del'>-			if (first) {</div><div class='del'>-				left += indent;</div><div class='del'>-				maxwidth -= indent;</div><div class='del'>-				first=0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		p++;</div><div class='del'>-	}</div><div class='del'>-	if (dump==0) {</div><div class='del'>-		*o=0;</div><div class='del'>-		gnome_print_moveto(pc, left, top);</div><div class='del'>-		gnome_print_show(pc, outbuffer);</div><div class='del'>-		top -= gnome_font_get_size (font);</div><div class='del'>-	}</div><div class='del'>-	g_free(outbuffer);</div><div class='del'>-	return top;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Print Day Details</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-print_day_details_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	GList *l, *col = NULL;</div><div class='del'>-	struct pdinfo *pdi = (struct pdinfo *)data;</div><div class='del'>-	struct einfo *ei;</div><div class='del'>-</div><div class='del'>-	ei = g_new (struct einfo, 1);</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	ei-&gt;text = g_strdup (text.value);</div><div class='del'>-</div><div class='del'>-	ei-&gt;start = istart;</div><div class='del'>-	ei-&gt;end = iend;</div><div class='del'>-	ei-&gt;count = 0;</div><div class='del'>-</div><div class='del'>-	for (l = pdi-&gt;slots; l; l = l-&gt;next) {</div><div class='del'>-		struct einfo *testei;</div><div class='del'>-</div><div class='del'>-		col = (GList *)l-&gt;data;</div><div class='del'>-		testei = (struct einfo *)col-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (ei-&gt;start &gt;= testei-&gt;end) {</div><div class='del'>-			col = g_list_prepend (col, ei);</div><div class='del'>-			l-&gt;data = col;</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		testei-&gt;count++;</div><div class='del'>-		ei-&gt;count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	col = NULL;</div><div class='del'>-	col = g_list_prepend (col, ei);</div><div class='del'>-	pdi-&gt;slots = g_list_append (pdi-&gt;slots, col);</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'>-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'>-	CalClient *client;</div><div class='del'>-	struct pdinfo pdi;</div><div class='del'>-	time_t start, end;</div><div class='del'>-	GList *l;</div><div class='del'>-	int num_slots, 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'>-	client = gnome_calendar_get_cal_client (gcal);</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'>-	pdi.slots = NULL;</div><div class='del'>-</div><div class='del'>-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,</div><div class='del'>-				       print_day_details_cb, &amp;pdi);</div><div class='del'>-</div><div class='del'>-	num_slots = g_list_length (pdi.slots);</div><div class='del'>-	slot_width = (right-left-width)/num_slots;</div><div class='del'>-</div><div class='del'>-	for (i = num_slots, l = pdi.slots; l; i--, l = l-&gt;next) {</div><div class='del'>-		GList *e = (GList *)l-&gt;data;</div><div class='del'>-</div><div class='del'>-		for (; e; e = e-&gt;next) {</div><div class='del'>-			struct einfo *ei = (struct einfo *)e-&gt;data;</div><div class='del'>-</div><div class='del'>-			y = top - (top - bottom) * (ei-&gt;start - start) / (end - start) - 1;</div><div class='del'>-			yend = top - (top - bottom) * (ei-&gt;end - start) / (end - start) + 1;</div><div class='del'>-			x = left + width + slot_width * (num_slots - 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'>-			if (i == 0)</div><div class='del'>-				xend = x + (num_slots - ei-&gt;count) * slot_width - 2;</div><div class='del'>-			else</div><div class='del'>-				xend = x + 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, ei-&gt;text, x, xend, y, yend, 0);</div><div class='del'>-</div><div class='del'>-			g_free (ei);</div><div class='del'>-		}</div><div class='del'>-		g_list_free (e);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (pdi.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'>-/*</div><div class='del'>- * Print Day Summary</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 gboolean</div><div class='del'>-print_day_summary_cb (CalComponent *comp, time_t istart, time_t iend, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalComponentText text;</div><div class='del'>-	struct psinfo *psi = (struct psinfo *)data;</div><div class='del'>-	struct einfo *ei;</div><div class='del'>-</div><div class='del'>-	ei = g_new (struct einfo, 1);</div><div class='del'>-</div><div class='del'>-	cal_component_get_summary (comp, &amp;text);</div><div class='del'>-	ei-&gt;text = g_strdup (text.value);</div><div class='del'>-</div><div class='del'>-	ei-&gt;start = istart;</div><div class='del'>-	ei-&gt;end = iend;</div><div class='del'>-	ei-&gt;count = 0;</div><div class='del'>-</div><div class='del'>-	psi-&gt;events = g_list_append (psi-&gt;events, ei);</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'>-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'>-	CalClient *client;</div><div class='del'>-	struct psinfo psi;</div><div class='del'>-	time_t start, end;</div><div class='del'>-	GList *l;</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'>-	client = gnome_calendar_get_cal_client (gcal);</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'>-	psi.events = NULL;</div><div class='del'>-</div><div class='del'>-	cal_client_generate_instances (client, CALOBJ_TYPE_EVENT, start, end,</div><div class='del'>-				       print_day_summary_cb, &amp;psi);</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 (l = psi.events; l; l = l-&gt;next) {</div><div class='del'>-		struct einfo *ei = (struct einfo *)l-&gt;data;</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 - gnome_font_get_size (font_summary) &lt; bottom)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		tm = *localtime (&amp;ei-&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 - gnome_font_get_size (font_summary));</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;ei-&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 - gnome_font_get_size (font_summary));</div><div class='del'>-			gnome_print_show (pc, buf);</div><div class='del'>-</div><div class='del'>-			y = bound_text (pc, font_summary, ei-&gt;text,</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, ei-&gt;text,</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 += gnome_font_get_size (font_summary) - inc;</div><div class='del'>-</div><div class='del'>-		g_free (ei);</div><div class='del'>-	}</div><div class='del'>-	g_list_free (psi.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-gnome_font_get_size(font_days));</div><div class='del'>-	}</div><div class='del'>-	top -= gnome_font_get_size(font_days)*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'>-	CalClient *client;</div><div class='del'>-	GList *uids;</div><div class='del'>-	GList *l;</div><div class='del'>-	GnomeFont *font_summary;</div><div class='del'>-	double y, yend, x, xend;</div><div class='del'>-</div><div class='del'>-	client = gnome_calendar_get_cal_client (gcal);</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, _("Tasks"), 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'>-	uids = cal_client_get_uids (client, CALOBJ_TYPE_TODO);</div><div class='del'>-</div><div class='del'>-	for (l = uids; l; l = l-&gt;next) {</div><div class='del'>-		char *uid;</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		CalClientGetStatus status;</div><div class='del'>-		CalComponentText summary;</div><div class='del'>-</div><div class='del'>-		uid = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		status = cal_client_get_object (client, uid, &amp;comp);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAL_CLIENT_GET_SUCCESS:</div><div class='del'>-			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 ("print_todo_details(): Syntax error while getting object `%s'",</div><div class='del'>-				   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'>-		cal_component_get_summary (comp, &amp;summary);</div><div class='del'>-</div><div class='del'>-		if (!summary.value)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		x = left;</div><div class='del'>-		xend = right - 2;</div><div class='del'>-</div><div class='del'>-		if (y &lt; bottom)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		y = bound_text (pc, font_summary, summary.value, x + 2, xend, y, yend, 0);</div><div class='del'>-		y += gnome_font_get_size (font_summary);</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'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</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'>-	char str1[512];</div><div class='del'>-	char str2[512];</div><div class='del'>-	struct tm tm;</div><div class='del'>-	time_t week_begin, week_end;</div><div class='del'>-	struct tm week_begin_tm, week_end_tm;</div><div class='del'>-</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'>-	if (week_begin_tm.tm_mon == week_end_tm.tm_mon) {</div><div class='del'>-		strftime (str1, sizeof (str1), _("%a %b %d"), &amp;week_begin_tm);</div><div class='del'>-		strftime (str2, sizeof (str2), _("%a %d %Y"), &amp;week_end_tm);</div><div class='del'>-	} else {</div><div class='del'>-		if (week_begin_tm.tm_year == week_end_tm.tm_year) {</div><div class='del'>-			strftime (str1, sizeof (str1), _("%a %b %d"), &amp;week_begin_tm);</div><div class='del'>-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &amp;week_end_tm);</div><div class='del'>-		} else {</div><div class='del'>-			strftime (str1, sizeof (str1), _("%a %b %d %Y"), &amp;week_begin_tm);</div><div class='del'>-			strftime (str2, sizeof (str2), _("%a %b %d %Y"), &amp;week_end_tm);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_snprintf (text, sizeof (text), _("Current week (%s - %s)"), str1, str2);</div><div class='del'>-</div><div class='del'>-	radio = gtk_radio_button_new_with_label (group, text);</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Month */</div><div class='del'>-</div><div class='del'>-	strftime (text, sizeof (text), _("Current month (%b %Y)"), &amp;tm);</div><div class='del'>-	radio = gtk_radio_button_new_with_label (group, text);</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (box), radio, FALSE, FALSE, 0);</div><div class='del'>-</div><div class='del'>-	/* Year */</div><div class='del'>-</div><div class='del'>-	strftime (text, sizeof (text), _("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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 e7e75c6c9b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/prop.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/prop.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,941 +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'>-#if 0</div><div class='del'>-static void prop_apply_alarms (void);</div><div class='del'>-#endif</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'>-#if 0</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'>-#endif</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'>-#if 0</div><div class='del'>-		prop_apply_alarms ();</div><div class='del'>-#endif</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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "FIX ME"</div><div class='del'>-#endif</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'>-#if 0</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'>-  //	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'>-	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'>-#endif</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 bb34fa4568..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/recur.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/recur.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * recur_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #333366",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    ..   .....  ",</div><div class='del'>-"  ...    ....   ",</div><div class='del'>-"  ..     ....   ",</div><div class='del'>-" ..      .....  ",</div><div class='del'>-" ..      .  ..  ",</div><div class='del'>-" ..         ..  ",</div><div class='del'>-" ..  .      ..  ",</div><div class='del'>-" .....      ..  ",</div><div class='del'>-"  ....     ..   ",</div><div class='del'>-"  ....    ...   ",</div><div class='del'>-" .....   ..     ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/calendar/gui/task-assigned-to.xpm b/calendar/gui/task-assigned-to.xpm<br/>deleted file mode 100644<br/>index 082be648bb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/task-assigned-to.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/task-assigned-to.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * task_assigned_to_xpm[] = {</div><div class='del'>-"16 16 11 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F3F3F3",</div><div class='del'>-"#	c #CCCCCC",</div><div class='del'>-"$	c #B2B2B2",</div><div class='del'>-"%	c #ECECEC",</div><div class='del'>-"&amp;	c #ABCCAB",</div><div class='del'>-"*	c #768E76",</div><div class='del'>-"=	c #5E705E",</div><div class='del'>-"-	c #EEEEEE",</div><div class='del'>-"                ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-" .++++++++++@.  ",</div><div class='del'>-" .+#########$.  ",</div><div class='del'>-" .+%%%%%%%..$.  ",</div><div class='del'>-" .+#######.&amp;..  ",</div><div class='del'>-" .+%%......&amp;&amp;.  ",</div><div class='del'>-" .+##.&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;. ",</div><div class='del'>-" .+%%.&amp;*&amp;*&amp;*&amp;*&amp;.",</div><div class='del'>-" .+##.========. ",</div><div class='del'>-" .+%%......==.  ",</div><div class='del'>-" .+#######.=..  ",</div><div class='del'>-" .+%%%%%%%..$.  ",</div><div class='del'>-" .-$$$$$$$$$$.  ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/calendar/gui/task-assigned.xpm b/calendar/gui/task-assigned.xpm<br/>deleted file mode 100644<br/>index 9a66304103..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/task-assigned.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/task-assigned.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,30 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * task_assigned_xpm[] = {</div><div class='del'>-"16 16 11 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F3F3F3",</div><div class='del'>-"#	c #CCCCCC",</div><div class='del'>-"$	c #B2B2B2",</div><div class='del'>-"%	c #ECECEC",</div><div class='del'>-"&amp;	c #FFCC66",</div><div class='del'>-"*	c #CC9933",</div><div class='del'>-"=	c #996600",</div><div class='del'>-"-	c #EEEEEE",</div><div class='del'>-"                ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-" .++++++++++@.  ",</div><div class='del'>-" .+##..#####$.  ",</div><div class='del'>-" .+%%.&amp;.%%%%$.  ",</div><div class='del'>-"......&amp;&amp;.###$.  ",</div><div class='del'>-".&amp;&amp;&amp;&amp;&amp;&amp;&amp;&amp;.%%$.  ",</div><div class='del'>-".&amp;*&amp;*&amp;*&amp;*&amp;.#$.  ",</div><div class='del'>-".========.#%$.  ",</div><div class='del'>-"......==.###$.  ",</div><div class='del'>-" .###.=.#%%%$.  ",</div><div class='del'>-" .+##..#####$.  ",</div><div class='del'>-" .+%%##%%%%%$.  ",</div><div class='del'>-" .-$$$$$$$$$$.  ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/calendar/gui/task-recurring.xpm b/calendar/gui/task-recurring.xpm<br/>deleted file mode 100644<br/>index 29b78d84c7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/task-recurring.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/task-recurring.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * task_recurring_xpm[] = {</div><div class='del'>-"16 16 2 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #333366",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"    ..   .....  ",</div><div class='del'>-"  ...    ....   ",</div><div class='del'>-"  ..     ....   ",</div><div class='del'>-" ..      .....  ",</div><div class='del'>-" ..      .  ..  ",</div><div class='del'>-" ..         ..  ",</div><div class='del'>-" ..  .      ..  ",</div><div class='del'>-" .....      ..  ",</div><div class='del'>-"  ....     ..   ",</div><div class='del'>-"  ....    ...   ",</div><div class='del'>-" .....   ..     ",</div><div class='del'>-"                ",</div><div class='del'>-"                ",</div><div class='del'>-"                "};</div><div class='head'>diff --git a/calendar/gui/task.xpm b/calendar/gui/task.xpm<br/>deleted file mode 100644<br/>index 84f5cf5e65..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/task.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/task.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * task_xpm[] = {</div><div class='del'>-"16 16 13 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F3F3F3",</div><div class='del'>-"#	c #CCCCCC",</div><div class='del'>-"$	c #B2B2B2",</div><div class='del'>-"%	c #ECECEC",</div><div class='del'>-"&amp;	c #993333",</div><div class='del'>-"*	c #660000",</div><div class='del'>-"=	c #999999",</div><div class='del'>-"-	c #666666",</div><div class='del'>-";	c #663333",</div><div class='del'>-"&gt;	c #EEEEEE",</div><div class='del'>-"                ",</div><div class='del'>-"  ...........   ",</div><div class='del'>-" .++++++++++@.  ",</div><div class='del'>-" .+#########$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .+#######&amp;*$.  ",</div><div class='del'>-" .+%%%%%%&amp;*=$.  ",</div><div class='del'>-" .+#&amp;=##&amp;*-#$.  ",</div><div class='del'>-" .+%&amp;&amp;%&amp;*=#%$.  ",</div><div class='del'>-" .+#;&amp;&amp;*-=##$.  ",</div><div class='del'>-" .+%-&amp;*-=%%%$.  ",</div><div class='del'>-" .+#=--=####$.  ",</div><div class='del'>-" .+%%%%%%%%%$.  ",</div><div class='del'>-" .&gt;$$$$$$$$$$.  ",</div><div class='del'>-"  ...........   ",</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/weekday-picker.c b/calendar/gui/weekday-picker.c<br/>deleted file mode 100644<br/>index a9a0d50c7c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/weekday-picker.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/weekday-picker.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,536 +0,0 @@</div><div class='del'>-/* Evolution calendar - Week day picker widget</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'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-text.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-#include "weekday-picker.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define PADDING 2</div><div class='del'>-</div><div class='del'>-/* Private part of the WeekdayPicker structure */</div><div class='del'>-struct _WeekdayPickerPrivate {</div><div class='del'>-	/* Selected days; see weekday_picker_set_days() */</div><div class='del'>-	guint8 day_mask;</div><div class='del'>-</div><div class='del'>-	/* Metrics */</div><div class='del'>-	int font_ascent, font_descent;</div><div class='del'>-	int max_letter_width;</div><div class='del'>-</div><div class='del'>-	/* Components */</div><div class='del'>-	GnomeCanvasItem *boxes[7];</div><div class='del'>-	GnomeCanvasItem *labels[7];</div><div class='del'>-</div><div class='del'>-	/* Whether the week starts on Monday or Sunday */</div><div class='del'>-	guint week_starts_on_monday : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void weekday_picker_class_init (WeekdayPickerClass *class);</div><div class='del'>-static void weekday_picker_init (WeekdayPicker *wp);</div><div class='del'>-static void weekday_picker_finalize (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static void weekday_picker_realize (GtkWidget *widget);</div><div class='del'>-static void weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition);</div><div class='del'>-static void weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation);</div><div class='del'>-static void weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_get_type:</div><div class='del'>- * </div><div class='del'>- * Registers the #WeekdayPicker class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #WeekdayPicker class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-weekday_picker_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType weekday_picker_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!weekday_picker_type) {</div><div class='del'>-		static const GtkTypeInfo weekday_picker_info = {</div><div class='del'>-			"WeekdayPicker",</div><div class='del'>-			sizeof (WeekdayPicker),</div><div class='del'>-			sizeof (WeekdayPickerClass),</div><div class='del'>-			(GtkClassInitFunc) weekday_picker_class_init,</div><div class='del'>-			(GtkObjectInitFunc) weekday_picker_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		weekday_picker_type = gtk_type_unique (GNOME_TYPE_CANVAS, &amp;weekday_picker_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return weekday_picker_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_class_init (WeekdayPickerClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	widget_class = (GtkWidgetClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (GNOME_TYPE_CANVAS);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = weekday_picker_finalize;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;realize = weekday_picker_realize;</div><div class='del'>-	widget_class-&gt;size_request = weekday_picker_size_request;</div><div class='del'>-	widget_class-&gt;size_allocate = weekday_picker_size_allocate;</div><div class='del'>-	widget_class-&gt;style_set = weekday_picker_style_set;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for the day items */</div><div class='del'>-static gint</div><div class='del'>-day_event_cb (GnomeCanvasItem *item, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-	guint8 day_mask;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (data);</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (!(event-&gt;type == GDK_BUTTON_PRESS &amp;&amp; event-&gt;button.button == 1))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Find which box was clicked */</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++)</div><div class='del'>-		if (priv-&gt;boxes[i] == item || priv-&gt;labels[i] == item)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-	g_assert (i != 7);</div><div class='del'>-</div><div class='del'>-	/* Turn on that day */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;week_starts_on_monday) {</div><div class='del'>-		if (i == 6)</div><div class='del'>-			i = 0;</div><div class='del'>-		else</div><div class='del'>-			i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;day_mask &amp; (0x1 &lt;&lt; i))</div><div class='del'>-		day_mask = priv-&gt;day_mask &amp; ~(0x1 &lt;&lt; i);</div><div class='del'>-	else</div><div class='del'>-		day_mask = priv-&gt;day_mask | (0x1 &lt;&lt; i);</div><div class='del'>-</div><div class='del'>-	weekday_picker_set_days (wp, day_mask);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Creates the canvas items for the weekday picker.  The items are empty until</div><div class='del'>- * they are configured elsewhere.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-create_items (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	GnomeCanvasGroup *parent;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	parent = gnome_canvas_root (GNOME_CANVAS (wp));</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		priv-&gt;boxes[i] = gnome_canvas_item_new (parent,</div><div class='del'>-							GNOME_TYPE_CANVAS_RECT,</div><div class='del'>-							NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;boxes[i]), "event",</div><div class='del'>-				    GTK_SIGNAL_FUNC (day_event_cb),</div><div class='del'>-				    wp);</div><div class='del'>-</div><div class='del'>-		priv-&gt;labels[i] = gnome_canvas_item_new (parent,</div><div class='del'>-							 GNOME_TYPE_CANVAS_TEXT,</div><div class='del'>-							 NULL);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (priv-&gt;labels[i]), "event",</div><div class='del'>-				    GTK_SIGNAL_FUNC (day_event_cb),</div><div class='del'>-				    wp);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_init (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (WeekdayPickerPrivate, 1);</div><div class='del'>-</div><div class='del'>-	wp-&gt;priv = priv;</div><div class='del'>-</div><div class='del'>-	create_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Finalize handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_WEEKDAY_PICKER (object));</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (object);</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	wp-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;finalize)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;finalize) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-colorize_items (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	GdkColor *outline;</div><div class='del'>-	GdkColor *fill, *sel_fill;</div><div class='del'>-	GdkColor *text_fill, *sel_text_fill;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	outline = &amp;GTK_WIDGET (wp)-&gt;style-&gt;fg[GTK_WIDGET_STATE (wp)];</div><div class='del'>-</div><div class='del'>-	fill = &amp;GTK_WIDGET (wp)-&gt;style-&gt;base[GTK_WIDGET_STATE (wp)];</div><div class='del'>-	text_fill = &amp;GTK_WIDGET (wp)-&gt;style-&gt;fg[GTK_WIDGET_STATE (wp)];</div><div class='del'>-</div><div class='del'>-	sel_fill = &amp;GTK_WIDGET (wp)-&gt;style-&gt;bg[GTK_STATE_SELECTED];</div><div class='del'>-	sel_text_fill = &amp;GTK_WIDGET (wp)-&gt;style-&gt;fg[GTK_STATE_SELECTED];</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;week_starts_on_monday) {</div><div class='del'>-		GdkColor *f, *t;</div><div class='del'>-</div><div class='del'>-		for (i = 1; i &lt; 7; i++) {</div><div class='del'>-			if (priv-&gt;day_mask &amp; (0x1 &lt;&lt; i)) {</div><div class='del'>-				f = sel_fill;</div><div class='del'>-				t = sel_text_fill;</div><div class='del'>-			} else {</div><div class='del'>-				f = fill;</div><div class='del'>-				t = text_fill;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_set (priv-&gt;boxes[i - 1],</div><div class='del'>-					       "fill_color_gdk", f,</div><div class='del'>-					       "outline_color_gdk", outline,</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_set (priv-&gt;labels[i - 1],</div><div class='del'>-					       "fill_color_gdk", t,</div><div class='del'>-					       NULL);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;day_mask &amp; (0x1 &lt;&lt; 0)) {</div><div class='del'>-			f = sel_fill;</div><div class='del'>-			t = sel_text_fill;</div><div class='del'>-		} else {</div><div class='del'>-			f = fill;</div><div class='del'>-			t = text_fill;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		gnome_canvas_item_set (priv-&gt;boxes[6],</div><div class='del'>-				       "fill_color_gdk", f,</div><div class='del'>-				       "outline_color_gdk", outline,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (priv-&gt;labels[6],</div><div class='del'>-				       "fill_color_gdk", t,</div><div class='del'>-				       NULL);</div><div class='del'>-	} else {</div><div class='del'>-		GdkColor *f, *t;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; 7; i++) {</div><div class='del'>-			if (priv-&gt;day_mask &amp; (0x1 &lt;&lt; i)) {</div><div class='del'>-				f = sel_fill;</div><div class='del'>-				t = sel_text_fill;</div><div class='del'>-			} else {</div><div class='del'>-				f = fill;</div><div class='del'>-				t = text_fill;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_set (priv-&gt;boxes[i],</div><div class='del'>-					       "fill_color_gdk", f,</div><div class='del'>-					       "outline_color_gdk", outline,</div><div class='del'>-					       NULL);</div><div class='del'>-</div><div class='del'>-			gnome_canvas_item_set (priv-&gt;labels[i],</div><div class='del'>-					       "fill_color_gdk", t,</div><div class='del'>-					       NULL);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Configures the items in the weekday picker by setting their attributes. */</div><div class='del'>-static void</div><div class='del'>-configure_items (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	int width, height;</div><div class='del'>-	int box_width;</div><div class='del'>-	const char *str;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	width = GTK_WIDGET (wp)-&gt;allocation.width;</div><div class='del'>-	height = GTK_WIDGET (wp)-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	box_width = (width - 1) / 7;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;week_starts_on_monday)</div><div class='del'>-		str = _("MTWTFSS");</div><div class='del'>-	else</div><div class='del'>-		str = _("SMTWTFS");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 7; i++) {</div><div class='del'>-		char *c;</div><div class='del'>-</div><div class='del'>-		gnome_canvas_item_set (priv-&gt;boxes[i],</div><div class='del'>-				       "x1", (double) (i * box_width),</div><div class='del'>-				       "y1", (double) 0,</div><div class='del'>-				       "x2", (double) ((i + 1) * box_width),</div><div class='del'>-				       "y2", (double) (height - 1),</div><div class='del'>-				       "width_pixels", 0,</div><div class='del'>-				       NULL);</div><div class='del'>-</div><div class='del'>-		c = g_strndup (str + i, 1);</div><div class='del'>-		gnome_canvas_item_set (priv-&gt;labels[i],</div><div class='del'>-				       "text", c,</div><div class='del'>-				       "font_gdk", GTK_WIDGET (wp)-&gt;style-&gt;font,</div><div class='del'>-				       "x", (double) (i * box_width) + box_width / 2.0,</div><div class='del'>-				       "y", (double) (1 + PADDING),</div><div class='del'>-				       "anchor", GTK_ANCHOR_N,</div><div class='del'>-				       NULL);</div><div class='del'>-		g_free (c);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	colorize_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Realize handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (widget);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;realize) (widget);</div><div class='del'>-</div><div class='del'>-	configure_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Size_request handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_size_request (GtkWidget *widget, GtkRequisition *requisition)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (widget);</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	requisition-&gt;width = (priv-&gt;max_letter_width + 2 * PADDING + 1) * 7 + 1;</div><div class='del'>-	requisition-&gt;height = (priv-&gt;font_ascent + priv-&gt;font_descent + 2 * PADDING + 2);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Size_allocate handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_size_allocate (GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (widget);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate) (widget, allocation);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (wp),</div><div class='del'>-					0, 0, allocation-&gt;width, allocation-&gt;height);</div><div class='del'>-</div><div class='del'>-	configure_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Style_set handler for the weekday picker */</div><div class='del'>-static void</div><div class='del'>-weekday_picker_style_set (GtkWidget *widget, GtkStyle *previous_style)</div><div class='del'>-{</div><div class='del'>-	WeekdayPicker *wp;</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-	int max_width;</div><div class='del'>-	const char *str;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	wp = WEEKDAY_PICKER (widget);</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;font_ascent = widget-&gt;style-&gt;font-&gt;ascent;</div><div class='del'>-	priv-&gt;font_descent = widget-&gt;style-&gt;font-&gt;descent;</div><div class='del'>-</div><div class='del'>-	max_width = 0;</div><div class='del'>-</div><div class='del'>-	str = _("SMTWTFS");</div><div class='del'>-	len = strlen (str);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		int w;</div><div class='del'>-</div><div class='del'>-		w = gdk_char_measure (widget-&gt;style-&gt;font, str[i]);</div><div class='del'>-		if (w &gt; max_width)</div><div class='del'>-			max_width = w;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	priv-&gt;max_letter_width = max_width;</div><div class='del'>-</div><div class='del'>-	configure_items (wp);</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;style_set)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;style_set) (widget, previous_style);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_new:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Creates a new weekday picker widget.</div><div class='del'>- * </div><div class='del'>- * Return value: A newly-created weekday picker.</div><div class='del'>- **/</div><div class='del'>-GtkWidget *</div><div class='del'>-weekday_picker_new (void)</div><div class='del'>-{</div><div class='del'>-	return gtk_type_new (TYPE_WEEKDAY_PICKER);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_set_days:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * @day_mask: Bitmask with the days to be selected.</div><div class='del'>- * </div><div class='del'>- * Sets the days that are selected in a weekday picker.  In the @day_mask,</div><div class='del'>- * Sunday is bit 0, Monday is bit 1, etc.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (wp != NULL);</div><div class='del'>-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;day_mask = day_mask;</div><div class='del'>-	colorize_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_get_days:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * </div><div class='del'>- * Queries the days that are selected in a weekday picker.</div><div class='del'>- * </div><div class='del'>- * Return value: Bit mask of selected days.  Sunday is bit 0, Monday is bit 1,</div><div class='del'>- * etc.</div><div class='del'>- **/</div><div class='del'>-guint8</div><div class='del'>-weekday_picker_get_days (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (wp != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), 0);</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-	return priv-&gt;day_mask;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_set_week_starts_on_monday:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * @on_monday: Whether weeks start on Monday.</div><div class='del'>- * </div><div class='del'>- * Sets whether a weekday picker should display weeks as starting on monday.</div><div class='del'>- * The default setting is to make Sunday the first day of the week.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-weekday_picker_set_week_starts_on_monday (WeekdayPicker *wp, gboolean on_monday)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (wp != NULL);</div><div class='del'>-	g_return_if_fail (IS_WEEKDAY_PICKER (wp));</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-	priv-&gt;week_starts_on_monday = on_monday ? TRUE : FALSE;</div><div class='del'>-</div><div class='del'>-	configure_items (wp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * weekday_picker_get_week_starts_on_monday:</div><div class='del'>- * @wp: A weekday picker.</div><div class='del'>- * </div><div class='del'>- * Queries whether a weekday picker is set to show weeks as starting on Monday.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if weeks start on monday, FALSE if on Sunday.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-weekday_picker_get_week_starts_on_monday (WeekdayPicker *wp)</div><div class='del'>-{</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (wp != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_WEEKDAY_PICKER (wp), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = wp-&gt;priv;</div><div class='del'>-	return priv-&gt;week_starts_on_monday;</div><div class='del'>-}</div><div class='head'>diff --git a/calendar/gui/weekday-picker.h b/calendar/gui/weekday-picker.h<br/>deleted file mode 100644<br/>index df053a1f6f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/weekday-picker.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/weekday-picker.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* Evolution calendar - Week day picker widget</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 WEEKDAY_PICKER_H</div><div class='del'>-#define WEEKDAY_PICKER_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define TYPE_WEEKDAY_PICKER            (weekday_picker_get_type ())</div><div class='del'>-#define WEEKDAY_PICKER(obj)            (GTK_CHECK_CAST ((obj), TYPE_WEEKDAY_PICKER, WeekdayPicker))</div><div class='del'>-#define WEEKDAY_PICKER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), TYPE_WEEKDAY_PICKER,	\</div><div class='del'>-					WeekdayPickerClass))</div><div class='del'>-#define IS_WEEKDAY_PICKER(obj)         (GTK_CHECK_TYPE ((obj), TYPE_WEEKDAY_PICKER))</div><div class='del'>-#define IS_WEEKDAY_PICKER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TYPE_WEEKDAY_PICKER))</div><div class='del'>-</div><div class='del'>-typedef struct _WeekdayPicker WeekdayPicker;</div><div class='del'>-typedef struct _WeekdayPickerClass WeekdayPickerClass;</div><div class='del'>-typedef struct _WeekdayPickerPrivate WeekdayPickerPrivate;</div><div class='del'>-</div><div class='del'>-struct _WeekdayPicker {</div><div class='del'>-	GnomeCanvas canvas;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	WeekdayPickerPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _WeekdayPickerClass {</div><div class='del'>-	GnomeCanvasClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType weekday_picker_get_type (void);</div><div class='del'>-</div><div class='del'>-GtkWidget *weekday_picker_new (void);</div><div class='del'>-</div><div class='del'>-void weekday_picker_set_days (WeekdayPicker *wp, guint8 day_mask);</div><div class='del'>-guint8 weekday_picker_get_days (WeekdayPicker *wp);</div><div class='del'>-</div><div class='del'>-void weekday_picker_set_week_starts_on_monday (WeekdayPicker *wp, gboolean on_monday);</div><div class='del'>-gboolean weekday_picker_get_week_starts_on_monday (WeekdayPicker *wp);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/gui/weekview.xpm b/calendar/gui/weekview.xpm<br/>deleted file mode 100644<br/>index 869b9e722a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/weekview.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/weekview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * weekview_xpm[] = {</div><div class='del'>-"24 24 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D8D8D4",</div><div class='del'>-"#	c #F2F1ED",</div><div class='del'>-"$	c #919191",</div><div class='del'>-"%	c #666666",</div><div class='del'>-"....................... ",</div><div class='del'>-".++++++++++@++++++++++. ",</div><div class='del'>-".+#..$.$###$#..$.$###$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+$$$$$$$$$$$$$$$$$$$$. ",</div><div class='del'>-".+#..$.$###$#..$.$###$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+$$$$$$$$$$$$$$$$$$$$. ",</div><div class='del'>-".+#..$.$###$#..$.$###$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$$$$$$$$$$$. ",</div><div class='del'>-".+#########$#..$.$###$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".+#########$#########$. ",</div><div class='del'>-".@$$$$$$$$$%$$$$$$$$$%. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/calendar/gui/workweekview.xpm b/calendar/gui/workweekview.xpm<br/>deleted file mode 100644<br/>index 35cceedbdc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/workweekview.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/workweekview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * workweekview_xpm[] = {</div><div class='del'>-"24 24 7 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #D8D8D4",</div><div class='del'>-"#	c #B5B4AF",</div><div class='del'>-"$	c #666666",</div><div class='del'>-"%	c #F2F1ED",</div><div class='del'>-"....................... ",</div><div class='del'>-".++++@+++@+++@+++@++++. ",</div><div class='del'>-".+###$###$###$###$###$. ",</div><div class='del'>-".+###$###$###$###$###$. ",</div><div class='del'>-".@$$$$$$$$$$$$$$$$$$$$. ",</div><div class='del'>-".++++#+++#+++#+++#+++#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".+%%%#%%%#%%%#%%%#%%%#. ",</div><div class='del'>-".@###$###$###$###$####. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/calendar/gui/yearview.xpm b/calendar/gui/yearview.xpm<br/>deleted file mode 100644<br/>index 0d4fa4135b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/gui/yearview.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/gui/yearview.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,44 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * yearview_xpm[] = {</div><div class='del'>-"24 24 17 1",</div><div class='del'>-" 	c None",</div><div class='del'>-".	c #000000",</div><div class='del'>-"+	c #FFFFFF",</div><div class='del'>-"@	c #F2F1ED",</div><div class='del'>-"#	c #AAA9A6",</div><div class='del'>-"$	c #D7D6D2",</div><div class='del'>-"%	c #92918E",</div><div class='del'>-"&amp;	c #B7B6B3",</div><div class='del'>-"*	c #CBCAC6",</div><div class='del'>-"=	c #919191",</div><div class='del'>-"-	c #888785",</div><div class='del'>-";	c #B6B6B2",</div><div class='del'>-"&gt;	c #888884",</div><div class='del'>-",	c #C1C1BD",</div><div class='del'>-"'	c #A7A6A3",</div><div class='del'>-")	c #D8D8D4",</div><div class='del'>-"!	c #666666",</div><div class='del'>-"....................... ",</div><div class='del'>-".+++++++++++++++++++++. ",</div><div class='del'>-".+@@@@@@@#$%&amp;*@@@@@@@=. ",</div><div class='del'>-".+@@@@@@@-;&gt;,'@@@@@@@=. ",</div><div class='del'>-".+====================. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@=. ",</div><div class='del'>-".+===@===@===@===@====. ",</div><div class='del'>-".+)=)@)=)@)=)@)=)@)=)=. ",</div><div class='del'>-".+=)=@=)=@=)=@=)=@=)==. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@=. ",</div><div class='del'>-".+===@===@===@===@====. ",</div><div class='del'>-".+)=)@)=)@)=)@)=)@)=)=. ",</div><div class='del'>-".+=)=@=)=@=)=@=)=@=)==. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@=. ",</div><div class='del'>-".+===@===@===@===@====. ",</div><div class='del'>-".+)=)@)=)@)=)@)=)@)=)=. ",</div><div class='del'>-".+=)=@=)=@=)=@=)=@=)==. ",</div><div class='del'>-".+@@@@@@@@@@@@@@@@@@@=. ",</div><div class='del'>-".+===@===@===@===@====. ",</div><div class='del'>-".+)=)@)=)@)=)@)=)@)=)=. ",</div><div class='del'>-".+=)=@=)=@=)=@=)=@=)==. ",</div><div class='del'>-".)===================!. ",</div><div class='del'>-"....................... ",</div><div class='del'>-"                        "};</div><div class='head'>diff --git a/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 ab80ff8702..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/idl/evolution-calendar.idl?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/idl/evolution-calendar.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +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_ANY     = 0x07;</div><div class='del'>-</div><div class='del'>-	/* Types of object changes made */</div><div class='del'>-	typedef long CalObjChangeType;</div><div class='del'>-	const CalObjChangeType UPDATED = 1 &lt;&lt; 0;</div><div class='del'>-	const CalObjChangeType REMOVED = 1 &lt;&lt; 1;</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 object change */</div><div class='del'>-	struct CalObjChange {</div><div class='del'>-		CalObjUID uid;</div><div class='del'>-		CalObjChangeType type;</div><div class='del'>-	};</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'>-	typedef sequence&lt;CalObjChange&gt; CalObjChangeSeq;</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 a list of UIDs that changed based on object type */</div><div class='del'>-		CalObjChangeSeq get_changed_uids (in CalObjType type, in Time_t since);</div><div class='del'>-</div><div class='del'>-		/* Gets a list of objects that occur or recur in the specified time range */</div><div class='del'>-		CalObjUIDSeq get_objects_in_range (in CalObjType type, </div><div class='del'>-						   in Time_t start, in Time_t end)</div><div class='del'>-			raises (InvalidRange);</div><div class='del'>-</div><div class='del'>-		/* Gets 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'>-</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 ac51a554db..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-.pure</div><div class='del'>-*.la</div><div class='del'>-*.lo</div><div class='del'>-evolution-calendar-stubs.c</div><div class='del'>-evolution-calendar-skels.c</div><div class='del'>-evolution-calendar-common.c</div><div class='del'>-evolution-calendar.h</div><div class='head'>diff --git a/calendar/pcs/Makefile.am b/calendar/pcs/Makefile.am<br/>deleted file mode 100644<br/>index 5ca12eff6e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,42 +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_VFS_GNOME_CFLAGS)			\</div><div class='del'>-        -DGNOMELOCALEDIR=\""$(localedir)"\"</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-file.c	\</div><div class='del'>-	cal-backend-file.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'>-BUILT_SOURCES = $(CORBA_GENERATED)</div><div class='del'>-CLEANFILES += $(BUILT_SOURCES)</div><div class='head'>diff --git a/calendar/pcs/cal-backend-file.c b/calendar/pcs/cal-backend-file.c<br/>deleted file mode 100644<br/>index 715e1e70bc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend-file.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/cal-backend-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1099 +0,0 @@</div><div class='del'>-/* Evolution calendar - iCalendar file backend</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-util/cal-recur.h"</div><div class='del'>-#include "cal-backend-file.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Private part of the CalBackendFile structure */</div><div class='del'>-struct _CalBackendFilePrivate {</div><div class='del'>-	/* URI where the calendar data is stored */</div><div class='del'>-	GnomeVFSURI *uri;</div><div class='del'>-</div><div class='del'>-	/* List of Cal objects with their listeners */</div><div class='del'>-	GList *clients;</div><div class='del'>-</div><div class='del'>-	/* Toplevel VCALENDAR component */</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	/* All the CalComponent objects in the calendar, hashed by UID.  The</div><div class='del'>-	 * hash key *is* the uid returned by cal_component_get_uid(); it is not</div><div class='del'>-	 * copied, so don't free it when you remove an object from the hash</div><div class='del'>-	 * table.</div><div class='del'>-	 */</div><div class='del'>-	GHashTable *comp_uid_hash;</div><div class='del'>-</div><div class='del'>-	/* All event, to-do, and journal components in the calendar; they are</div><div class='del'>-	 * here just for easy access (i.e. so that you don't have to iterate</div><div class='del'>-	 * over the comp_uid_hash).  If you need *all* the components in the</div><div class='del'>-	 * calendar, iterate over the hash instead.</div><div class='del'>-	 */</div><div class='del'>-	GList *events;</div><div class='del'>-	GList *todos;</div><div class='del'>-	GList *journals;</div><div class='del'>-</div><div class='del'>-	/* Idle handler for saving the calendar when it is dirty */</div><div class='del'>-	guint idle_id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void cal_backend_file_class_init (CalBackendFileClass *class);</div><div class='del'>-static void cal_backend_file_init (CalBackendFile *cbfile);</div><div class='del'>-static void cal_backend_file_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GnomeVFSURI *cal_backend_file_get_uri (CalBackend *backend);</div><div class='del'>-static void cal_backend_file_add_cal (CalBackend *backend, Cal *cal);</div><div class='del'>-static CalBackendLoadStatus cal_backend_file_load (CalBackend *backend, GnomeVFSURI *uri);</div><div class='del'>-static void cal_backend_file_create (CalBackend *backend, GnomeVFSURI *uri);</div><div class='del'>-</div><div class='del'>-static int cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type);</div><div class='del'>-static char *cal_backend_file_get_object (CalBackend *backend, const char *uid);</div><div class='del'>-static CalObjType cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid);</div><div class='del'>-static GList *cal_backend_file_get_uids (CalBackend *backend, CalObjType type);</div><div class='del'>-static GList *cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,</div><div class='del'>-						     time_t start, time_t end);</div><div class='del'>-static GList *cal_backend_file_get_alarms_in_range (CalBackend *backend, time_t start, time_t end);</div><div class='del'>-static gboolean cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,</div><div class='del'>-							time_t start, time_t end,</div><div class='del'>-							GList **alarms);</div><div class='del'>-static gboolean cal_backend_file_update_object (CalBackend *backend, const char *uid,</div><div class='del'>-					       const char *calobj);</div><div class='del'>-static gboolean cal_backend_file_remove_object (CalBackend *backend, const char *uid);</div><div class='del'>-</div><div class='del'>-static CalBackendClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_file_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the #CalBackendFile class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the #CalBackendFile class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-cal_backend_file_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType cal_backend_file_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!cal_backend_file_type) {</div><div class='del'>-		static const GtkTypeInfo cal_backend_file_info = {</div><div class='del'>-			"CalBackendFile",</div><div class='del'>-			sizeof (CalBackendFile),</div><div class='del'>-			sizeof (CalBackendFileClass),</div><div class='del'>-			(GtkClassInitFunc) cal_backend_file_class_init,</div><div class='del'>-			(GtkObjectInitFunc) cal_backend_file_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		cal_backend_file_type = gtk_type_unique (CAL_BACKEND_TYPE, &amp;cal_backend_file_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cal_backend_file_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Class initialization function for the file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_class_init (CalBackendFileClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	CalBackendClass *backend_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-	backend_class = (CalBackendClass *) class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (CAL_BACKEND_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = cal_backend_file_destroy;</div><div class='del'>-</div><div class='del'>-	backend_class-&gt;get_uri = cal_backend_file_get_uri;</div><div class='del'>-	backend_class-&gt;add_cal = cal_backend_file_add_cal;</div><div class='del'>-	backend_class-&gt;load = cal_backend_file_load;</div><div class='del'>-	backend_class-&gt;create = cal_backend_file_create;</div><div class='del'>-	backend_class-&gt;get_n_objects = cal_backend_file_get_n_objects;</div><div class='del'>-	backend_class-&gt;get_object = cal_backend_file_get_object;</div><div class='del'>-	backend_class-&gt;get_type_by_uid = cal_backend_file_get_type_by_uid;</div><div class='del'>-	backend_class-&gt;get_uids = cal_backend_file_get_uids;</div><div class='del'>-	backend_class-&gt;get_objects_in_range = cal_backend_file_get_objects_in_range;</div><div class='del'>-	backend_class-&gt;get_alarms_in_range = cal_backend_file_get_alarms_in_range;</div><div class='del'>-	backend_class-&gt;get_alarms_for_object = cal_backend_file_get_alarms_for_object;</div><div class='del'>-	backend_class-&gt;update_object = cal_backend_file_update_object;</div><div class='del'>-	backend_class-&gt;remove_object = cal_backend_file_remove_object;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Object initialization function for the file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_init (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new0 (CalBackendFilePrivate, 1);</div><div class='del'>-	cbfile-&gt;priv = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* g_hash_table_foreach() callback to destroy a CalComponent */</div><div class='del'>-static void</div><div class='del'>-free_cal_component (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	comp = CAL_COMPONENT (value);</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Saves the calendar data */</div><div class='del'>-static void</div><div class='del'>-save (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GnomeVFSHandle *handle = NULL;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-	GnomeVFSFileSize out;</div><div class='del'>-	gchar *tmp;</div><div class='del'>-	char *buf;</div><div class='del'>-	</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-	g_assert (priv-&gt;uri != NULL);</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	/* Make a backup copy of the file if it exists */</div><div class='del'>-	tmp = gnome_vfs_uri_to_string (priv-&gt;uri, GNOME_VFS_URI_HIDE_NONE);</div><div class='del'>-	if (tmp) {</div><div class='del'>-		GnomeVFSURI *backup_uri;</div><div class='del'>-		gchar *backup_uristr;</div><div class='del'>-		</div><div class='del'>-		backup_uristr = g_strconcat (tmp, "~", NULL);</div><div class='del'>-		backup_uri = gnome_vfs_uri_new (backup_uristr);</div><div class='del'>-		</div><div class='del'>-		result = gnome_vfs_move_uri (priv-&gt;uri, backup_uri, TRUE);</div><div class='del'>-		gnome_vfs_uri_unref (backup_uri);</div><div class='del'>-		</div><div class='del'>-		g_free (tmp);</div><div class='del'>-		g_free (backup_uristr);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Now write the new file out */</div><div class='del'>-	result = gnome_vfs_create_uri (&amp;handle, priv-&gt;uri, </div><div class='del'>-				       GNOME_VFS_OPEN_WRITE,</div><div class='del'>-				       FALSE, 0666);</div><div class='del'>-	</div><div class='del'>-	if (result != GNOME_VFS_OK)</div><div class='del'>-		goto error;</div><div class='del'>-	</div><div class='del'>-	buf = icalcomponent_as_ical_string (priv-&gt;icalcomp);</div><div class='del'>-	result = gnome_vfs_write (handle, buf, strlen (buf) * sizeof (char), &amp;out);</div><div class='del'>-</div><div class='del'>-	if (result != GNOME_VFS_OK)</div><div class='del'>-		goto error;</div><div class='del'>-</div><div class='del'>-	gnome_vfs_close (handle);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-	</div><div class='del'>- error:</div><div class='del'>-	g_warning ("Error writing calendar file.");</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (object != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND_FILE (object));</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (object);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;clients == NULL);</div><div class='del'>-</div><div class='del'>-	/* Save if necessary */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;idle_id != 0) {</div><div class='del'>-		save (cbfile);</div><div class='del'>-		g_source_remove (priv-&gt;idle_id);</div><div class='del'>-		priv-&gt;idle_id = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;uri) {</div><div class='del'>-		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'>-	if (priv-&gt;comp_uid_hash) {</div><div class='del'>-		g_hash_table_foreach (priv-&gt;comp_uid_hash, </div><div class='del'>-				      free_cal_component, NULL);</div><div class='del'>-		g_hash_table_destroy (priv-&gt;comp_uid_hash);</div><div class='del'>-		priv-&gt;comp_uid_hash = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (priv-&gt;events);</div><div class='del'>-	g_list_free (priv-&gt;todos);</div><div class='del'>-	g_list_free (priv-&gt;journals);</div><div class='del'>-</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'>-	if (priv-&gt;icalcomp) {</div><div class='del'>-		icalcomponent_free (priv-&gt;icalcomp);</div><div class='del'>-		priv-&gt;icalcomp = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	cbfile-&gt;priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Looks up a component by its UID on the backend's component hash table */</div><div class='del'>-static CalComponent *</div><div class='del'>-lookup_component (CalBackendFile *cbfile, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp = g_hash_table_lookup (priv-&gt;comp_uid_hash, uid);</div><div class='del'>-</div><div class='del'>-	return comp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Calendar backend methods */</div><div class='del'>-</div><div class='del'>-/* Get_uri handler for the file backend */</div><div class='del'>-static GnomeVFSURI *</div><div class='del'>-cal_backend_file_get_uri (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-	g_assert (priv-&gt;uri != NULL);</div><div class='del'>-</div><div class='del'>-	return 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'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *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'>-	cbfile = CAL_BACKEND_FILE (data);</div><div class='del'>-	priv = cbfile-&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 (cbfile));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Add_cal handler for the file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_add_cal (CalBackend *backend, Cal *cal)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp != NULL);</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'>-/* Idle handler; we save the calendar since it is dirty */</div><div class='del'>-static gboolean</div><div class='del'>-save_idle (gpointer data)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (data);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	save (cbfile);</div><div class='del'>-</div><div class='del'>-	priv-&gt;idle_id = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Marks the file backend as dirty and queues a save operation */</div><div class='del'>-static void</div><div class='del'>-mark_dirty (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;idle_id != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	priv-&gt;idle_id = g_idle_add (save_idle, cbfile);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Checks if the specified component has a duplicated UID and if so changes it */</div><div class='del'>-static void</div><div class='del'>-check_dup_uid (CalBackendFile *cbfile, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *old_comp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	char *new_uid;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	old_comp = g_hash_table_lookup (priv-&gt;comp_uid_hash, uid);</div><div class='del'>-	if (!old_comp)</div><div class='del'>-		return; /* Everything is fine */</div><div class='del'>-</div><div class='del'>-	g_message ("check_dup_uid(): Got object with duplicated UID `%s', changing it...", uid);</div><div class='del'>-</div><div class='del'>-	new_uid = cal_component_gen_uid ();</div><div class='del'>-	cal_component_set_uid (comp, new_uid);</div><div class='del'>-	g_free (new_uid);</div><div class='del'>-</div><div class='del'>-	/* FIXME: I think we need to reset the SEQUENCE property and reset the</div><div class='del'>-	 * CREATED/DTSTAMP/LAST-MODIFIED.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	mark_dirty (cbfile);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Tries to add an icalcomponent to the file backend.  We only store the objects</div><div class='del'>- * of the types we support; all others just remain in the toplevel component so</div><div class='del'>- * that we don't lose them.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-add_component (CalBackendFile *cbfile, CalComponent *comp, gboolean add_to_toplevel)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList **list;</div><div class='del'>-	const char *uid;</div><div class='del'>-	</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	switch (cal_component_get_vtype (comp)) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		list = &amp;priv-&gt;events;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		list = &amp;priv-&gt;todos;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		list = &amp;priv-&gt;journals;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ensure that the UID is unique; some broken implementations spit</div><div class='del'>-	 * components with duplicated UIDs.</div><div class='del'>-	 */</div><div class='del'>-	check_dup_uid (cbfile, comp);</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	g_hash_table_insert (priv-&gt;comp_uid_hash, (char *)uid, comp);</div><div class='del'>-</div><div class='del'>-	*list = g_list_prepend (*list, comp);</div><div class='del'>-</div><div class='del'>-	/* Put the object in the toplevel component if required */</div><div class='del'>-</div><div class='del'>-	if (add_to_toplevel) {</div><div class='del'>-		icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-		icalcomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-		g_assert (icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-		icalcomponent_add_component (priv-&gt;icalcomp, icalcomp);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Removes a component from the backend's hash and lists.  Does not perform</div><div class='del'>- * notification on the clients.  Also removes the component from the toplevel</div><div class='del'>- * icalcomponent.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-remove_component (CalBackendFile *cbfile, CalComponent *comp)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	const char *uid;</div><div class='del'>-	GList **list, *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove the icalcomp from the toplevel */</div><div class='del'>-</div><div class='del'>-	icalcomp = cal_component_get_icalcomponent (comp);</div><div class='del'>-	g_assert (icalcomp != NULL);</div><div class='del'>-</div><div class='del'>-	icalcomponent_remove_component (priv-&gt;icalcomp, icalcomp);</div><div class='del'>-</div><div class='del'>-	/* Remove it from our mapping */</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-	g_hash_table_remove (priv-&gt;comp_uid_hash, uid);</div><div class='del'>-	</div><div class='del'>-	switch (cal_component_get_vtype (comp)) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		list = &amp;priv-&gt;events;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		list = &amp;priv-&gt;todos;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		list = &amp;priv-&gt;journals;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-                /* Make the compiler shut up. */</div><div class='del'>-	        list = NULL;</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	l = g_list_find (*list, comp);</div><div class='del'>-	g_assert (l != NULL);</div><div class='del'>-</div><div class='del'>-	*list = g_list_remove_link (*list, l);</div><div class='del'>-	g_list_free_1 (l);</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Scans the toplevel VCALENDAR component and stores the objects it finds */</div><div class='del'>-static void</div><div class='del'>-scan_vcalendar (CalBackendFile *cbfile)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-	g_assert (priv-&gt;icalcomp != NULL);</div><div class='del'>-	g_assert (priv-&gt;comp_uid_hash != NULL);</div><div class='del'>-</div><div class='del'>-	for (icalcomp = icalcomponent_get_first_component (priv-&gt;icalcomp, ICAL_ANY_COMPONENT);</div><div class='del'>-	     icalcomp;</div><div class='del'>-	     icalcomp = icalcomponent_get_next_component (priv-&gt;icalcomp, ICAL_ANY_COMPONENT)) {</div><div class='del'>-		icalcomponent_kind kind;</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-</div><div class='del'>-		kind = icalcomponent_isa (icalcomp);</div><div class='del'>-</div><div class='del'>-		if (!(kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-		      || kind == ICAL_VTODO_COMPONENT</div><div class='del'>-		      || kind == ICAL_VJOURNAL_COMPONENT))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		comp = cal_component_new ();</div><div class='del'>-</div><div class='del'>-		if (!cal_component_set_icalcomponent (comp, icalcomp))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		add_component (cbfile, comp, FALSE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used from icalparser_parse() */</div><div class='del'>-static char *</div><div class='del'>-get_line (char *s, size_t size, void *data)</div><div class='del'>-{</div><div class='del'>-	FILE *file;</div><div class='del'>-</div><div class='del'>-	file = data;</div><div class='del'>-	return fgets (s, size, file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Load handler for the file backend */</div><div class='del'>-static CalBackendLoadStatus</div><div class='del'>-cal_backend_file_load (CalBackend *backend, GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	char *str_uri;</div><div class='del'>-	FILE *file;</div><div class='del'>-	icalparser *parser;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp == NULL, CAL_BACKEND_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'>-	if (!gnome_vfs_uri_is_local (uri))</div><div class='del'>-		return CAL_BACKEND_LOAD_ERROR;</div><div class='del'>-</div><div class='del'>-	str_uri = gnome_vfs_uri_to_string (uri,</div><div class='del'>-					   (GNOME_VFS_URI_HIDE_USER_NAME</div><div class='del'>-					    | GNOME_VFS_URI_HIDE_PASSWORD</div><div class='del'>-					    | GNOME_VFS_URI_HIDE_HOST_NAME</div><div class='del'>-					    | GNOME_VFS_URI_HIDE_HOST_PORT</div><div class='del'>-					    | GNOME_VFS_URI_HIDE_TOPLEVEL_METHOD));</div><div class='del'>-</div><div class='del'>-	/* Load! */</div><div class='del'>-	file = fopen (str_uri, "r");</div><div class='del'>-	g_free (str_uri);</div><div class='del'>-</div><div class='del'>-	if (!file)</div><div class='del'>-		return CAL_BACKEND_LOAD_ERROR;</div><div class='del'>-</div><div class='del'>-	parser = icalparser_new ();</div><div class='del'>-	icalparser_set_gen_data (parser, file);</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse (parser, get_line);</div><div class='del'>-	icalparser_free (parser);</div><div class='del'>-</div><div class='del'>-	if (fclose (file) != 0)</div><div class='del'>-		return CAL_BACKEND_LOAD_ERROR;</div><div class='del'>-</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		return CAL_BACKEND_LOAD_ERROR;</div><div class='del'>-</div><div class='del'>-	/* FIXME: should we try to demangle XROOT components and individual</div><div class='del'>-         * components as well?</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (icalcomponent_isa (icalcomp) != ICAL_VCALENDAR_COMPONENT)</div><div class='del'>-		return CAL_BACKEND_LOAD_ERROR;</div><div class='del'>-</div><div class='del'>-	priv-&gt;icalcomp = icalcomp;</div><div class='del'>-</div><div class='del'>-	priv-&gt;comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	scan_vcalendar (cbfile);</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-	if (priv-&gt;uri)</div><div class='del'>-		gnome_vfs_uri_unref (priv-&gt;uri);</div><div class='del'>-	</div><div class='del'>-	gnome_vfs_uri_ref (uri);</div><div class='del'>-	priv-&gt;uri = uri;</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 file backend */</div><div class='del'>-static void</div><div class='del'>-cal_backend_file_create (CalBackend *backend, GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icalproperty *prop;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;icalcomp == NULL);</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;icalcomp == NULL);</div><div class='del'>-	priv-&gt;icalcomp = icalcomponent_new (ICAL_VCALENDAR_COMPONENT);</div><div class='del'>-</div><div class='del'>-	/* RFC 2445, section 4.7.1 */</div><div class='del'>-	prop = icalproperty_new_calscale ("GREGORIAN");</div><div class='del'>-	icalcomponent_add_property (priv-&gt;icalcomp, prop);</div><div class='del'>-</div><div class='del'>-	/* RFC 2445, section 4.7.3 */</div><div class='del'>-	prop = icalproperty_new_prodid ("-//Helix Code//NONSGML Evolution Calendar//EN");</div><div class='del'>-	icalcomponent_add_property (priv-&gt;icalcomp, prop);</div><div class='del'>-</div><div class='del'>-	/* RFC 2445, section 4.7.4 */</div><div class='del'>-	prop = icalproperty_new_version ("2.0");</div><div class='del'>-	icalcomponent_add_property (priv-&gt;icalcomp, prop);</div><div class='del'>-</div><div class='del'>-	/* Create our internal data */</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;comp_uid_hash == NULL);</div><div class='del'>-	priv-&gt;comp_uid_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	/* Clean up */</div><div class='del'>-	if (priv-&gt;uri)</div><div class='del'>-		gnome_vfs_uri_unref (priv-&gt;uri);</div><div class='del'>-	</div><div class='del'>-	gnome_vfs_uri_ref (uri);</div><div class='del'>-	priv-&gt;uri = uri;</div><div class='del'>-</div><div class='del'>-	mark_dirty (cbfile);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_n_objects handler for the file backend */</div><div class='del'>-static int</div><div class='del'>-cal_backend_file_get_n_objects (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, -1);</div><div class='del'>-</div><div class='del'>-	n = 0;</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_EVENT)</div><div class='del'>-		n += g_list_length (priv-&gt;events);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_TODO)</div><div class='del'>-		n += g_list_length (priv-&gt;todos);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_JOURNAL)</div><div class='del'>-		n += g_list_length (priv-&gt;journals);</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_object handler for the file backend */</div><div class='del'>-static char *</div><div class='del'>-cal_backend_file_get_object (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-	g_assert (priv-&gt;comp_uid_hash != NULL);</div><div class='del'>-</div><div class='del'>-	comp = lookup_component (cbfile, uid);</div><div class='del'>-</div><div class='del'>-	if (!comp)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return cal_component_get_as_string (comp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CalObjType</div><div class='del'>-cal_backend_file_get_type_by_uid (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	CalComponentVType type;</div><div class='del'>-	</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	comp = lookup_component (cbfile, uid);</div><div class='del'>-	if (!comp)</div><div class='del'>-		return CAL_COMPONENT_NO_TYPE;</div><div class='del'>-	</div><div class='del'>-	type = cal_component_get_vtype (comp);</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAL_COMPONENT_EVENT:</div><div class='del'>-		return CALOBJ_TYPE_EVENT;</div><div class='del'>-	case CAL_COMPONENT_TODO:</div><div class='del'>-		return CALOBJ_TYPE_TODO;</div><div class='del'>-	case CAL_COMPONENT_JOURNAL:</div><div class='del'>-		return CALOBJ_TYPE_JOURNAL;</div><div class='del'>-	default:</div><div class='del'>-		return CAL_COMPONENT_NO_TYPE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Builds a list of UIDs from a list of CalComponent objects */</div><div class='del'>-static void</div><div class='del'>-build_uids_list (GList **list, GList *components)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = components; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-		const char *uid;</div><div class='del'>-</div><div class='del'>-		comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-		cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-		*list = g_list_prepend (*list, g_strdup (uid));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_uids handler for the file backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_file_get_uids (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	list = NULL;</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_EVENT)</div><div class='del'>-		build_uids_list (&amp;list, priv-&gt;events);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_TODO)</div><div class='del'>-		build_uids_list (&amp;list, priv-&gt;todos);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_JOURNAL)</div><div class='del'>-		build_uids_list (&amp;list, priv-&gt;journals);</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback used from cal_recur_generate_instances(); adds the component's UID</div><div class='del'>- * to our hash table.</div><div class='del'>- */</div><div class='del'>-static gboolean</div><div class='del'>-add_instance (CalComponent *comp, time_t start, time_t end, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GHashTable *uid_hash;</div><div class='del'>-	const char *uid;</div><div class='del'>-	const char *old_uid;</div><div class='del'>-</div><div class='del'>-	uid_hash = data;</div><div class='del'>-</div><div class='del'>-	/* We only care that the component's UID is listed in the hash table;</div><div class='del'>-	 * that's why we only allow generation of one instance (i.e. return</div><div class='del'>-	 * FALSE every time).</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;uid);</div><div class='del'>-</div><div class='del'>-	old_uid = g_hash_table_lookup (uid_hash, uid);</div><div class='del'>-	if (old_uid)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (uid_hash, (char *) uid, NULL);</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Populates a hash table with the UIDs of the components that occur or recur</div><div class='del'>- * within a specific time range.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-get_instances_in_range (GHashTable *uid_hash, GList *components, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	for (l = components; l; l = l-&gt;next) {</div><div class='del'>-		CalComponent *comp;</div><div class='del'>-</div><div class='del'>-		comp = CAL_COMPONENT (l-&gt;data);</div><div class='del'>-		cal_recur_generate_instances (comp, start, end, add_instance, uid_hash);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Used from g_hash_table_foreach(), adds a UID from the hash table to our list */</div><div class='del'>-static void</div><div class='del'>-add_uid_to_list (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GList **list;</div><div class='del'>-	const char *uid;</div><div class='del'>-	char *uid_copy;</div><div class='del'>-</div><div class='del'>-	list = data;</div><div class='del'>-</div><div class='del'>-	uid = key;</div><div class='del'>-	uid_copy = g_strdup (uid);</div><div class='del'>-</div><div class='del'>-	*list = g_list_prepend (*list, uid_copy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_objects_in_range handler for the file backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_file_get_objects_in_range (CalBackend *backend, CalObjType type,</div><div class='del'>-				       time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *event_list;</div><div class='del'>-	GHashTable *uid_hash;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	uid_hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_EVENT)</div><div class='del'>-		get_instances_in_range (uid_hash, priv-&gt;events, start, end);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_TODO)</div><div class='del'>-		get_instances_in_range (uid_hash, priv-&gt;todos, start, end);</div><div class='del'>-</div><div class='del'>-	if (type &amp; CALOBJ_TYPE_JOURNAL)</div><div class='del'>-		get_instances_in_range (uid_hash, priv-&gt;journals, start, end);</div><div class='del'>-</div><div class='del'>-	event_list = NULL;</div><div class='del'>-	g_hash_table_foreach (uid_hash, add_uid_to_list, &amp;event_list);</div><div class='del'>-	g_hash_table_destroy (uid_hash);</div><div class='del'>-</div><div class='del'>-	return event_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_alarms_in_range handler for the file backend */</div><div class='del'>-static GList *</div><div class='del'>-cal_backend_file_get_alarms_in_range (CalBackend *backend, time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	/* FIXME: have to deal with an unknown number of alarms; we can't just</div><div class='del'>-	 * do the same thing as in cal-backend-imc.</div><div class='del'>-	 */</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_alarms_for_object handler for the file backend */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_file_get_alarms_for_object (CalBackend *backend, const char *uid,</div><div class='del'>-					time_t start, time_t end,</div><div class='del'>-					GList **alarms)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, 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'>-	/* FIXME */</div><div class='del'>-</div><div class='del'>-	*alarms = NULL;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Notifies a backend's clients that an object was updated */</div><div class='del'>-static void</div><div class='del'>-notify_update (CalBackendFile *cbfile, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	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 (CalBackendFile *cbfile, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	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 file backend */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_file_update_object (CalBackend *backend, const char *uid, const char *calobj)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	icalcomponent *icalcomp;</div><div class='del'>-	icalcomponent_kind kind;</div><div class='del'>-	CalComponent *old_comp;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-	const char *comp_uid;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (calobj != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	/* Pull the component from the string and ensure that it is sane */</div><div class='del'>-</div><div class='del'>-	icalcomp = icalparser_parse_string ((char *) calobj);</div><div class='del'>-</div><div class='del'>-	if (!icalcomp)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	kind = icalcomponent_isa (icalcomp);</div><div class='del'>-</div><div class='del'>-	if (!(kind == ICAL_VEVENT_COMPONENT</div><div class='del'>-	      || kind == ICAL_VTODO_COMPONENT</div><div class='del'>-	      || kind == ICAL_VJOURNAL_COMPONENT)) {</div><div class='del'>-		/* We don't support this type of component */</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	comp = cal_component_new ();</div><div class='del'>-	if (!cal_component_set_icalcomponent (comp, icalcomp)) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		icalcomponent_free (icalcomp);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Check the UID for sanity's sake */</div><div class='del'>-</div><div class='del'>-	cal_component_get_uid (comp, &amp;comp_uid);</div><div class='del'>-</div><div class='del'>-	if (strcmp (uid, comp_uid) != 0) {</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (comp));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update the component */</div><div class='del'>-</div><div class='del'>-	old_comp = lookup_component (cbfile, uid);</div><div class='del'>-</div><div class='del'>-	if (old_comp)</div><div class='del'>-		remove_component (cbfile, old_comp);</div><div class='del'>-</div><div class='del'>-	add_component (cbfile, comp, TRUE);</div><div class='del'>-</div><div class='del'>-	mark_dirty (cbfile);</div><div class='del'>-</div><div class='del'>-	/* FIXME: do the notification asynchronously */</div><div class='del'>-	notify_update (cbfile, comp_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 file backend */</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_file_remove_object (CalBackend *backend, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CalBackendFile *cbfile;</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-	CalComponent *comp;</div><div class='del'>-</div><div class='del'>-	cbfile = CAL_BACKEND_FILE (backend);</div><div class='del'>-	priv = cbfile-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (priv-&gt;icalcomp != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (uid != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	comp = lookup_component (cbfile, uid);</div><div class='del'>-	if (!comp)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	remove_component (cbfile, comp);</div><div class='del'>-	mark_dirty (cbfile);</div><div class='del'>-</div><div class='del'>-	/* FIXME: do the notification asynchronously */</div><div class='del'>-	notify_remove (cbfile, uid);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/pcs/cal-backend-file.h b/calendar/pcs/cal-backend-file.h<br/>deleted file mode 100644<br/>index 376790751c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend-file.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/cal-backend-file.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* Evolution calendar - iCalendar file backend</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 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_FILE_H</div><div class='del'>-#define CAL_BACKEND_FILE_H</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include "cal-backend.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAL_BACKEND_FILE_TYPE            (cal_backend_file_get_type ())</div><div class='del'>-#define CAL_BACKEND_FILE(obj)            (GTK_CHECK_CAST ((obj), CAL_BACKEND_FILE_TYPE,		\</div><div class='del'>-					  CalBackendFile))</div><div class='del'>-#define CAL_BACKEND_FILE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_BACKEND_FILE_TYPE,	\</div><div class='del'>-					  CalBackendFileClass))</div><div class='del'>-#define IS_CAL_BACKEND_FILE(obj)         (GTK_CHECK_TYPE ((obj), CAL_BACKEND_FILE_TYPE))</div><div class='del'>-#define IS_CAL_BACKEND_FILE_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_BACKEND_FILE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CalBackendFile CalBackendFile;</div><div class='del'>-typedef struct _CalBackendFileClass CalBackendFileClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CalBackendFilePrivate CalBackendFilePrivate;</div><div class='del'>-</div><div class='del'>-struct _CalBackendFile {</div><div class='del'>-	CalBackend backend;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalBackendFilePrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CalBackendFileClass {</div><div class='del'>-	CalBackendClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType cal_backend_file_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/calendar/pcs/cal-backend.c b/calendar/pcs/cal-backend.c<br/>deleted file mode 100644<br/>index b2b16b2c9e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/cal-backend.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,767 +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'>- * Authors: Federico Mena-Quintero &lt;federico@helixcode.com&gt;</div><div class='del'>- *          JP Rosevear &lt;jpr@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/gtk.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;gnome-xml/parserInternals.h&gt;</div><div class='del'>-#include &lt;gnome-xml/xmlmemory.h&gt;</div><div class='del'>-</div><div class='del'>-#include "cal-backend.h"</div><div class='del'>-#include "libversit/vcc.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signal IDs */</div><div class='del'>-enum {</div><div class='del'>-	LAST_CLIENT_GONE,</div><div class='del'>-	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'>-static void cal_backend_init (CalBackend *backend);</div><div class='del'>-static void cal_backend_destroy (GtkObject *object);</div><div class='del'>-static gboolean cal_backend_log_sync (CalBackend *backend);</div><div class='del'>-static GHashTable *cal_backend_get_log_entries (CalBackend *backend, </div><div class='del'>-						CalObjType type,</div><div class='del'>-						time_t since);</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) cal_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'>-		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'>-	object_class-&gt;destroy = cal_backend_destroy;</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'>-/* Per instance initialization function */</div><div class='del'>-static void</div><div class='del'>-cal_backend_init (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	backend-&gt;uri = NULL;</div><div class='del'>-	backend-&gt;entries = NULL;</div><div class='del'>-	backend-&gt;timer = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_backend_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	CalBackend *backend;</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 (object));</div><div class='del'>-</div><div class='del'>-	backend = CAL_BACKEND (object);</div><div class='del'>-</div><div class='del'>-	if (backend-&gt;timer != -1) {</div><div class='del'>-		gtk_timeout_remove (backend-&gt;timer);</div><div class='del'>-		backend-&gt;timer = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- 	if (backend-&gt;uri) {</div><div class='del'>-		cal_backend_log_sync (backend);</div><div class='del'>-		gnome_vfs_uri_unref (backend-&gt;uri);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</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'>-static void</div><div class='del'>-cal_backend_set_uri (CalBackend *backend, GnomeVFSURI *uri)</div><div class='del'>-{</div><div class='del'>-	if (backend-&gt;uri)</div><div class='del'>-		gnome_vfs_uri_unref (backend-&gt;uri);</div><div class='del'>-</div><div class='del'>-	if (backend-&gt;timer != -1)</div><div class='del'>-		gtk_timeout_remove (backend-&gt;timer);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_ref (uri);</div><div class='del'>-	backend-&gt;uri = uri;</div><div class='del'>-	backend-&gt;timer = gtk_timeout_add (60000, </div><div class='del'>-					  (GtkFunction)cal_backend_log_sync, </div><div class='del'>-					  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'>-	CalBackendLoadStatus result;</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'>-	result =  (* CLASS (backend)-&gt;load) (backend, uri);</div><div class='del'>-</div><div class='del'>-	/* Remember the URI for saving the log file in the same dir and add</div><div class='del'>-	 * a timeout handler so for saving pending entries sometimes */</div><div class='del'>-	if (result == CAL_BACKEND_LOAD_SUCCESS)</div><div class='del'>-		cal_backend_set_uri (backend, uri);</div><div class='del'>-	</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_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'>-	/* Remember the URI for saving the log file in the same dir and add</div><div class='del'>-	 * a timeout handler so for saving pending entries sometimes */</div><div class='del'>-	cal_backend_set_uri (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.  The list should be</div><div class='del'>- * freed using the cal_obj_uid_list_free() function.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_backend_get_uids (CalBackend *backend, CalObjType type)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_uids != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_uids) (backend, type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_backend_foreach_changed (gpointer key, gpointer value, gpointer data) </div><div class='del'>-{</div><div class='del'>-	GList **list = data;</div><div class='del'>-	</div><div class='del'>-	*list = g_list_append (*list, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_changed_uids:</div><div class='del'>- * @backend: </div><div class='del'>- * @type: </div><div class='del'>- * @since: </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'>-GList *</div><div class='del'>-cal_backend_get_changed_uids (CalBackend *backend, CalObjType type, time_t since) </div><div class='del'>-{</div><div class='del'>-	GHashTable *hash;</div><div class='del'>-	GList *uids = NULL;</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'>-	hash = cal_backend_get_log_entries (backend, type, since);</div><div class='del'>-</div><div class='del'>-	if (hash)</div><div class='del'>-		g_hash_table_foreach (hash, cal_backend_foreach_changed, &amp;uids);</div><div class='del'>-	</div><div class='del'>-	return uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_objects_in_range:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * @type: Bitmask with types of objects to return.</div><div class='del'>- * @start: Start time for query.</div><div class='del'>- * @end: End time for query.</div><div class='del'>- * </div><div class='del'>- * Builds a list of unique identifiers corresponding to calendar objects of the</div><div class='del'>- * specified type that occur or recur within the specified time range.</div><div class='del'>- * </div><div class='del'>- * Return value: A list of UID strings.  The list should be freed using the</div><div class='del'>- * cal_obj_uid_list_free() function.</div><div class='del'>- **/</div><div class='del'>-GList *</div><div class='del'>-cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,</div><div class='del'>-				  time_t start, time_t end)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (backend != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-	g_return_val_if_fail (start != -1 &amp;&amp; end != -1, NULL);</div><div class='del'>-	g_return_val_if_fail (start &lt;= end, NULL);</div><div class='del'>-</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_objects_in_range != NULL);</div><div class='del'>-	return (* CLASS (backend)-&gt;get_objects_in_range) (backend, type, start, end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_get_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'>-/* Internal logging stuff */</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_BACKEND_UPDATED,</div><div class='del'>-	CAL_BACKEND_REMOVED</div><div class='del'>-} CalBackendLogEntryType;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *uid;</div><div class='del'>-	CalObjType type;</div><div class='del'>-	</div><div class='del'>-	CalBackendLogEntryType event_type;</div><div class='del'>-</div><div class='del'>-	time_t time_stamp;</div><div class='del'>-} CalBackendLogEntry;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CalObjType type;</div><div class='del'>-	time_t since;</div><div class='del'>-</div><div class='del'>-	gboolean in_valid_timestamp;</div><div class='del'>-	</div><div class='del'>-	GHashTable *hash;</div><div class='del'>-} CalBackendParseState;</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-cal_backend_log_name (GnomeVFSURI *uri)</div><div class='del'>-{	</div><div class='del'>-	const gchar *path;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	</div><div class='del'>-	path = gnome_vfs_uri_get_path (uri);</div><div class='del'>-	filename = g_strdup_printf ("%s.log.xml", path);</div><div class='del'>-</div><div class='del'>-	return filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_backend_set_node_timet (xmlNodePtr node, const char *name, time_t t)</div><div class='del'>-{</div><div class='del'>-	char *tstring;</div><div class='del'>-	</div><div class='del'>-	tstring = g_strdup_printf ("%ld", t);</div><div class='del'>-	xmlSetProp (node, name, tstring);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_backend_log_entry (CalBackend *backend, </div><div class='del'>-		       const char *uid,</div><div class='del'>-		       CalObjType cot,</div><div class='del'>-		       CalBackendLogEntryType type)</div><div class='del'>-{</div><div class='del'>-	CalBackendLogEntry *entry = g_new0 (CalBackendLogEntry, 1);</div><div class='del'>-	</div><div class='del'>-	g_assert (CLASS (backend)-&gt;get_type_by_uid != NULL);</div><div class='del'>-</div><div class='del'>-	/* Only log todos and events */</div><div class='del'>-	if (cot != CALOBJ_TYPE_EVENT &amp;&amp; cot != CALOBJ_TYPE_TODO)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	entry = g_new0 (CalBackendLogEntry, 1);</div><div class='del'>-	entry-&gt;uid = g_strdup (uid);</div><div class='del'>-	entry-&gt;type = cot;</div><div class='del'>-	entry-&gt;event_type = type;	</div><div class='del'>-	entry-&gt;time_stamp = time (NULL);</div><div class='del'>-</div><div class='del'>-	/* Append so they get stored in chronological order */</div><div class='del'>-	backend-&gt;entries = g_slist_append (backend-&gt;entries, entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cal_backend_log_sync (CalBackend *backend)</div><div class='del'>-{	</div><div class='del'>-	xmlDocPtr doc;</div><div class='del'>-	xmlNodePtr tnode;</div><div class='del'>-	gchar *filename;</div><div class='del'>-	GSList *l;</div><div class='del'>-	int ret;</div><div class='del'>-	time_t start_time = (time_t) - 1;</div><div class='del'>-	time_t end_time = (time_t) - 1;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (backend-&gt;uri != NULL, FALSE);</div><div class='del'>-	</div><div class='del'>-	if (backend-&gt;entries == NULL)</div><div class='del'>-		return TRUE;</div><div class='del'>-	</div><div class='del'>-	filename = cal_backend_log_name (backend-&gt;uri);</div><div class='del'>-	</div><div class='del'>-	doc = xmlParseFile (filename);</div><div class='del'>-	if (doc == NULL) {</div><div class='del'>-		/* Create the document */</div><div class='del'>-		doc = xmlNewDoc ("1.0");</div><div class='del'>-		if (doc == NULL) {</div><div class='del'>-			g_warning ("Log file could not be created\n");</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		</div><div class='del'>-		doc-&gt;root = xmlNewDocNode(doc, NULL, "CalendarLog", NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tnode = xmlNewChild (doc-&gt;root, NULL, "timestamp", NULL);</div><div class='del'>-	for (l = backend-&gt;entries; l != NULL; l = l-&gt;next) {</div><div class='del'>-		xmlNodePtr node;</div><div class='del'>-		CalBackendLogEntry *entry;</div><div class='del'>-		</div><div class='del'>-		entry = (CalBackendLogEntry *)l-&gt;data;</div><div class='del'>-		node = xmlNewChild (tnode, NULL, "status", NULL);</div><div class='del'>-</div><div class='del'>-		xmlSetProp (node, "uid", entry-&gt;uid);</div><div class='del'>-		</div><div class='del'>-		switch (entry-&gt;type) {</div><div class='del'>-		case CALOBJ_TYPE_EVENT:</div><div class='del'>-			xmlSetProp (node, "type", "event");</div><div class='del'>-			break;</div><div class='del'>-		case CALOBJ_TYPE_TODO:</div><div class='del'>-			xmlSetProp (node, "type", "todo");</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		switch (entry-&gt;event_type) {</div><div class='del'>-		case (CAL_BACKEND_UPDATED):</div><div class='del'>-			xmlSetProp (node, "operation", "updated");</div><div class='del'>-			break;</div><div class='del'>-		case (CAL_BACKEND_REMOVED):</div><div class='del'>-			xmlSetProp (node, "operation", "removed");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (start_time == (time_t) - 1 </div><div class='del'>-		    || entry-&gt;time_stamp &lt; start_time)</div><div class='del'>-			start_time = entry-&gt;time_stamp;</div><div class='del'>-</div><div class='del'>-		if (end_time == (time_t) - 1 </div><div class='del'>-		    || entry-&gt;time_stamp &gt; end_time)</div><div class='del'>-			end_time = entry-&gt;time_stamp;</div><div class='del'>-</div><div class='del'>-		g_free (entry);</div><div class='del'>-	}</div><div class='del'>-	cal_backend_set_node_timet (tnode, "start", start_time);</div><div class='del'>-	cal_backend_set_node_timet (tnode, "end", end_time);</div><div class='del'>-</div><div class='del'>-	g_slist_free (backend-&gt;entries);</div><div class='del'>-	backend-&gt;entries = NULL;</div><div class='del'>-	</div><div class='del'>-	/* Write the file */</div><div class='del'>-	xmlSetDocCompressMode (doc, 0);</div><div class='del'>-	ret = xmlSaveFile (filename, doc);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		g_warning ("Log file could not be saved\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	xmlFreeDoc (doc);</div><div class='del'>-</div><div class='del'>-	g_free (filename);</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'>-cal_backend_log_sax_start_element (CalBackendParseState *state, const CHAR *name, </div><div class='del'>-				   const CHAR **attrs)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp (name, "timestamp")) {</div><div class='del'>-		while (attrs &amp;&amp; *attrs != NULL) {</div><div class='del'>-			const xmlChar **val = attrs;</div><div class='del'>-			</div><div class='del'>-			val++;</div><div class='del'>-			if (!strcmp (*attrs, "start")) {</div><div class='del'>-				time_t start = (time_t)strtoul (*val, NULL, 0);</div><div class='del'>-				</div><div class='del'>-				if (start &gt;= state-&gt;since) </div><div class='del'>-					state-&gt;in_valid_timestamp = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}	</div><div class='del'>-			attrs = ++val;</div><div class='del'>-		}		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (state-&gt;in_valid_timestamp &amp;&amp; !strcmp (name, "status")) {</div><div class='del'>-		CalObjChange *coc = g_new0 (CalObjChange, 1);</div><div class='del'>-		CalObjType cot = 0;</div><div class='del'>-</div><div class='del'>-		while (attrs &amp;&amp; *attrs != NULL) {</div><div class='del'>-			const xmlChar **val = attrs;</div><div class='del'>-</div><div class='del'>-			</div><div class='del'>-			val++;</div><div class='del'>-			if (!strcmp (*attrs, "uid")) </div><div class='del'>-				coc-&gt;uid = g_strdup (*val);</div><div class='del'>-			</div><div class='del'>-			if (!strcmp (*attrs, "type")) {</div><div class='del'>-				if (!strcmp (*val, "event"))</div><div class='del'>-					cot = CALOBJ_TYPE_EVENT;</div><div class='del'>-				else if (!strcmp (*val, "todo"))</div><div class='del'>-					cot = CALOBJ_TYPE_TODO;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!strcmp (*attrs, "operation")) {</div><div class='del'>-				if (!strcmp (*val, "updated"))</div><div class='del'>-					coc-&gt;type = CALOBJ_UPDATED;</div><div class='del'>-				else if (!strcmp (*val, "removed"))</div><div class='del'>-					coc-&gt;type = CALOBJ_REMOVED;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			attrs = ++val;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (state-&gt;type == CALOBJ_TYPE_ANY || state-&gt;type == cot)</div><div class='del'>-			g_hash_table_insert (state-&gt;hash, coc-&gt;uid, coc);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cal_backend_log_sax_end_element (CalBackendParseState *state, const CHAR *name)</div><div class='del'>-{</div><div class='del'>-	if (!strcmp (name, "timestamp")) {</div><div class='del'>-		state-&gt;in_valid_timestamp = FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GHashTable *</div><div class='del'>-cal_backend_get_log_entries (CalBackend *backend, CalObjType type, time_t since)</div><div class='del'>-{</div><div class='del'>-	xmlSAXHandler handler;</div><div class='del'>-	CalBackendParseState state;</div><div class='del'>-	GHashTable *hash;</div><div class='del'>-	char *filename;</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 (backend-&gt;uri != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), NULL);</div><div class='del'>-</div><div class='del'>-	if (!cal_backend_log_sync (backend))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	memset (&amp;handler, 0, sizeof (xmlSAXHandler));</div><div class='del'>-	handler.startElement = (startElementSAXFunc)cal_backend_log_sax_start_element;</div><div class='del'>-	handler.endElement = (endElementSAXFunc)cal_backend_log_sax_end_element;</div><div class='del'>-</div><div class='del'>-	hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	</div><div class='del'>-	state.type = type;</div><div class='del'>-	state.since = since;</div><div class='del'>-	state.in_valid_timestamp = FALSE;</div><div class='del'>-	state.hash = hash;</div><div class='del'>-</div><div class='del'>-	filename = cal_backend_log_name (backend-&gt;uri);	</div><div class='del'>-	if (xmlSAXUserParseFile (&amp;handler, &amp;state, filename) &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	return hash;</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 or one</div><div class='del'>- * with an unsupported type.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-cal_backend_update_object (CalBackend *backend, const char *uid, const char *calobj)</div><div class='del'>-{</div><div class='del'>-	CalObjType cot;</div><div class='del'>-	gboolean result;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);</div><div class='del'>-	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'>-	result =  (* CLASS (backend)-&gt;update_object) (backend, uid, calobj);</div><div class='del'>-</div><div class='del'>-	if (result) {</div><div class='del'>-		cot = (* CLASS (backend)-&gt;get_type_by_uid) (backend, uid);</div><div class='del'>-		cal_backend_log_entry (backend, uid, cot, CAL_BACKEND_UPDATED);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_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'>-	CalObjType cot;</div><div class='del'>-	gboolean result;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (backend != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_CAL_BACKEND (backend), FALSE);</div><div class='del'>-	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'>-	cot = (* CLASS (backend)-&gt;get_type_by_uid) (backend, uid);</div><div class='del'>-	result = (* CLASS (backend)-&gt;remove_object) (backend, uid);</div><div class='del'>-</div><div class='del'>-	if (result)</div><div class='del'>-		cal_backend_log_entry (backend, uid, cot, CAL_BACKEND_REMOVED);</div><div class='del'>-</div><div class='del'>-	return result;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_backend_last_client_gone:</div><div class='del'>- * @backend: A calendar backend.</div><div class='del'>- * </div><div class='del'>- * Emits the "last_client_gone" signal of a calendar backend.  This function is</div><div class='del'>- * to be used only by backend implementations.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-cal_backend_last_client_gone (CalBackend *backend)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (backend != NULL);</div><div class='del'>-	g_return_if_fail (IS_CAL_BACKEND (backend));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (backend), cal_backend_signals[LAST_CLIENT_GONE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/calendar/pcs/cal-backend.h b/calendar/pcs/cal-backend.h<br/>deleted file mode 100644<br/>index 44262c10ca..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-backend.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/cal-backend.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'>-/* 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 &lt;cal-util/cal-component.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'>-	GnomeVFSURI *uri;</div><div class='del'>-	GSList *entries;</div><div class='del'>-	guint timer;</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'>-	CalObjType(* get_type_by_uid) (CalBackend *backend, const char *uid);</div><div class='del'>-	GList *(* get_uids) (CalBackend *backend, CalObjType type);</div><div class='del'>-	GList *(* get_objects_in_range) (CalBackend *backend, CalObjType type,</div><div class='del'>-					 time_t start, time_t end);</div><div class='del'>-	GList *(* get_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_changed_uids (CalBackend *backend, CalObjType type, time_t since);</div><div class='del'>-</div><div class='del'>-GList *cal_backend_get_objects_in_range (CalBackend *backend, CalObjType type,</div><div class='del'>-					 time_t start, time_t end);</div><div class='del'>-</div><div class='del'>-GList *cal_backend_get_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'>-</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 a67f8b777f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-factory.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/cal-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,858 +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;stdio.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'>-struct _CalFactoryPrivate {</div><div class='del'>-	/* Hash table from URI method strings to GtkType * for backend class types */</div><div class='del'>-	GHashTable *methods;</div><div class='del'>-</div><div class='del'>-	/* Hash table from GnomeVFSURI structures to CalBackend objects */</div><div class='del'>-	GHashTable *backends;</div><div class='del'>-};</div><div class='del'>-</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'>-	g_assert (uri != NULL);</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'>-	fprintf (stderr, "backend_last_client_gone_cb() called!\n");</div><div class='del'>-</div><div class='del'>-	factory = CAL_FACTORY (data);</div><div class='del'>-	priv = factory-&gt;priv;</div><div class='del'>-</div><div class='del'>-	/* Remove the backend from the hash table */</div><div class='del'>-</div><div class='del'>-	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'>-	g_assert (jd-&gt;uri != NULL);</div><div class='del'>-</div><div class='del'>-	/* Check the URI */</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'>-	if (!uri) {</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_fn(): Could not notify the listener!");</div><div class='del'>-</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		goto out;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Look up the backend and create it if needed */</div><div class='del'>-</div><div class='del'>-	backend = lookup_backend (factory, uri);</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'>-	gnome_vfs_uri_unref (uri);</div><div class='del'>-</div><div class='del'>-	if (backend)</div><div class='del'>-		add_calendar_client (factory, backend, listener);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	CORBA_Object_release (listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("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'>-	g_assert (jd-&gt;uri != NULL);</div><div class='del'>-</div><div class='del'>-	/* Check the URI */</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'>-	if (!uri) {</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'>-		goto out;</div><div class='del'>-	}</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'>-		add_calendar_client (factory, backend, listener);</div><div class='del'>-</div><div class='del'>-	gnome_vfs_uri_unref (uri);</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	CORBA_Object_release (listener, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		g_message ("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'>-	unsigned char *p;</div><div class='del'>-</div><div class='del'>-	str = g_strdup (s);</div><div class='del'>-	for (p = str; *p; p++)</div><div class='del'>-		if (isalpha (*p))</div><div class='del'>-			*p = tolower (*p);</div><div class='del'>-</div><div class='del'>-	return str;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * cal_factory_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 9405a05ef8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal-factory.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/cal-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +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'>-typedef struct _CalFactoryPrivate CalFactoryPrivate;</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'>-	CalFactoryPrivate *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 35d98abd64..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/cal.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,766 +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'>-struct _CalPrivate {</div><div class='del'>-	/* Our backend */</div><div class='del'>-	CalBackend *backend;</div><div class='del'>-</div><div class='del'>-	/* Listener on the client we notify */</div><div class='del'>-	Evolution_Calendar_Listener listener;</div><div class='del'>-};</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'>-/* Converts a calendar object type from its CORBA representation to our own</div><div class='del'>- * representation.</div><div class='del'>- */</div><div class='del'>-static CalObjType</div><div class='del'>-uncorba_obj_type (Evolution_Calendar_CalObjType type)</div><div class='del'>-{</div><div class='del'>-	return (((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'>-}</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'>-	t = uncorba_obj_type (type);</div><div class='del'>-	n = cal_backend_get_n_objects (priv-&gt;backend, t);</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_object method */</div><div class='del'>-static 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'>-static Evolution_Calendar_CalObjUIDSeq *</div><div class='del'>-build_uid_seq (GList *uids)</div><div class='del'>-{</div><div class='del'>-	Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	GList *l;</div><div class='del'>-	int n, i;</div><div class='del'>-</div><div class='del'>-	n = g_list_length (uids);</div><div class='del'>-</div><div class='del'>-	seq = 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'>-		seq-&gt;_buffer[i] = CORBA_string_dup (uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_uids method */</div><div class='del'>-static 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;</div><div class='del'>-	Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	int t;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t = uncorba_obj_type (type);</div><div class='del'>-</div><div class='del'>-	uids = cal_backend_get_uids (priv-&gt;backend, t);</div><div class='del'>-	seq = build_uid_seq (uids);</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Evolution_Calendar_CalObjChangeSeq *</div><div class='del'>-build_change_seq (GList *changes)</div><div class='del'>-{</div><div class='del'>-	GList *l;</div><div class='del'>-	int n, i;</div><div class='del'>-	Evolution_Calendar_CalObjChangeSeq *seq;</div><div class='del'>-</div><div class='del'>-	n = g_list_length (changes);</div><div class='del'>-</div><div class='del'>-	seq = Evolution_Calendar_CalObjChangeSeq__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_CalObjChange_allocbuf (n);</div><div class='del'>-</div><div class='del'>-	/* Fill the sequence */</div><div class='del'>-	for (i = 0, l = changes; l; i++, l = l-&gt;next) {</div><div class='del'>-		CalObjChange *c;</div><div class='del'>-		Evolution_Calendar_CalObjChange *corba_c;</div><div class='del'>-</div><div class='del'>-		c = l-&gt;data;</div><div class='del'>-		corba_c = &amp;seq-&gt;_buffer[i];</div><div class='del'>-</div><div class='del'>-		corba_c-&gt;uid = CORBA_string_dup (c-&gt;uid);</div><div class='del'>-		corba_c-&gt;type = c-&gt;type;</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_changed_uids method */</div><div class='del'>-static Evolution_Calendar_CalObjChangeSeq *</div><div class='del'>-Cal_get_changed_uids (PortableServer_Servant servant,</div><div class='del'>-		      Evolution_Calendar_CalObjType type,</div><div class='del'>-		      Evolution_Calendar_Time_t since,</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 *changes;</div><div class='del'>-	Evolution_Calendar_CalObjChangeSeq *seq;</div><div class='del'>-	int t;</div><div class='del'>-	time_t s;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t = uncorba_obj_type (type);</div><div class='del'>-	s = (time_t) since;</div><div class='del'>-	</div><div class='del'>-	changes = cal_backend_get_changed_uids (priv-&gt;backend, t, s);</div><div class='del'>-	seq = build_change_seq (changes);</div><div class='del'>-</div><div class='del'>-	cal_obj_change_list_free (changes);</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Cal::get_objects_in_range method */</div><div class='del'>-static Evolution_Calendar_CalObjUIDSeq *</div><div class='del'>-Cal_get_objects_in_range (PortableServer_Servant servant,</div><div class='del'>-			  Evolution_Calendar_CalObjType type,</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'>-	int t;</div><div class='del'>-	time_t t_start, t_end;</div><div class='del'>-	Evolution_Calendar_CalObjUIDSeq *seq;</div><div class='del'>-	GList *uids;</div><div class='del'>-</div><div class='del'>-	cal = CAL (bonobo_object_from_servant (servant));</div><div class='del'>-	priv = cal-&gt;priv;</div><div class='del'>-</div><div class='del'>-	t = uncorba_obj_type (type);</div><div class='del'>-	t_start = (time_t) start;</div><div class='del'>-	t_end = (time_t) end;</div><div class='del'>-</div><div class='del'>-	if (t_start &gt; t_end || t_start == -1 || t_end == -1) {</div><div class='del'>-		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'>-	uids = cal_backend_get_objects_in_range (priv-&gt;backend, t, t_start, t_end);</div><div class='del'>-	seq = build_uid_seq (uids);</div><div class='del'>-</div><div class='del'>-	cal_obj_uid_list_free (uids);</div><div class='del'>-</div><div class='del'>-	return seq;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</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'>-#endif</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'>-#if 0</div><div class='del'>-		corba_ai-&gt;type = corba_alarm_type (ai-&gt;type);</div><div class='del'>-#endif</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_changed_uids = Cal_get_changed_uids;</div><div class='del'>-	epv-&gt;get_objects_in_range = Cal_get_objects_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, (char *) 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, (char *) 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 2b17278573..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/calendar/pcs/cal.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>calendar/pcs/cal.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +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'>-typedef struct _CalPrivate CalPrivate;</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'>-	CalPrivate *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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 521f6065df..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/.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'>-temp-test</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 1c413b0ab0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7150 +0,0 @@</div><div class='del'>-2000-11-03  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_msgid_generate): new function,</div><div class='del'>-	generates simple message/content id</div><div class='del'>-</div><div class='del'>-2000-11-04  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Set the</div><div class='del'>-	preface/postface from the parser into the multipart object.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (camel_multipart_set_postface): Function to</div><div class='del'>-	set the postface text on a multipart.</div><div class='del'>-	(camel_multipart_set_preface): Similarly for preface text.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_content): If we scan until a</div><div class='del'>-	boundary, then we do not include the \n that starts the boundary</div><div class='del'>-	line in the content.</div><div class='del'>-	(struct _header_scan_stack): Added a ByteArray to store the</div><div class='del'>-	multipart pre/post-text as we're scanning.</div><div class='del'>-	(folder_pull_part): Free pre/posttext if they are allocated.</div><div class='del'>-	(folder_scan_step): Build into the pre/posttext arrays as we</div><div class='del'>-	encounter data.</div><div class='del'>-	(camel_mime_parser_preface): REturn the multipart preface text, if</div><div class='del'>-	there is any scanned.</div><div class='del'>-	(camel_mime_parser_postface): Likewise for postface text.</div><div class='del'>-	(byte_array_to_string): helper function for above.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Change</div><div class='del'>-	the from line to be "\nFrom ..." always, so no need to</div><div class='del'>-	check/append a \n to messages.</div><div class='del'>-	(mbox_append_message): Open the output stream with append mode</div><div class='del'>-	[assuming this is more efficient than seeking to the end]</div><div class='del'>-	And dont prepend \n  on the From line if its the first in the</div><div class='del'>-	mbox.</div><div class='del'>-	(mbox_append_message): Pass the offset of the real start of the</div><div class='del'>-	"From " line when we perform the update (which may != 'seek')</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete): Removed the terminating</div><div class='del'>-	NUL 'fix'.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_read): Added some debug.</div><div class='del'>-	(do_flush): And here.</div><div class='del'>-	(do_write): And here too.</div><div class='del'>-	(do_write): ARGH!!! ARGH!  Ok, so the filter stream was writing a</div><div class='del'>-	different number of bytes than the requester was asking it to</div><div class='del'>-	write (because of filtering, of course!).  So instead of returning</div><div class='del'>-	the true number of written bytes, we'll return what they asked us</div><div class='del'>-	to write - unless there is an error in which case we return -1.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_close): Sigh, forgot to make</div><div class='del'>-	it unsigned.  I think this is actually a gcc bug as (48 &gt;&gt; 2)</div><div class='del'>-	somehow ended up negative, when it obviously should not, even if</div><div class='del'>-	the data load was signed.</div><div class='del'>-</div><div class='del'>-2000-11-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c: Undo my incorrect fix - I misunderstood danw -</div><div class='del'>-	sorry!</div><div class='del'>-</div><div class='del'>-2000-11-03  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_expunge):</div><div class='del'>-	Unbreak this.</div><div class='del'>-</div><div class='del'>-2000-11-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_to_string): If show_pass, then base64 the</div><div class='del'>-	password before writing it to the output string.</div><div class='del'>-	(camel_url_new): Assume password has been base64 encoded and</div><div class='del'>-	decode accordingly.</div><div class='del'>-</div><div class='del'>-2000-11-03  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Add an "url_flags" field to CamelProvider.</div><div class='del'>-	Move the CAMEL_SERVICE_URL_* defines here and remove the SERVICE_</div><div class='del'>-	part of the name.</div><div class='del'>-</div><div class='del'>-	* camel-service.h: Remove CAMEL_SERVICE_URL_* flags and</div><div class='del'>-	service-&gt;url_flags field.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (check_url, get_path): Get URL flags from</div><div class='del'>-	service-&gt;provider, update for changed flag names.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-provider.c: Add URL flags to provider</div><div class='del'>-	structures.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-{store,transport}.c, camel-remote-store.c:</div><div class='del'>-	Remove service-&gt;url_flags initialization.</div><div class='del'>-</div><div class='del'>-2000-11-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Quote</div><div class='del'>-	foldernames when sending to the IMAP server because the folder</div><div class='del'>-	name might contain spaces.</div><div class='del'>-</div><div class='del'>-2000-11-02  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Merged in camel-incremental-branch.</div><div class='del'>-</div><div class='del'>-2000-11-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Remove old</div><div class='del'>-	subbed folders from hash table after freeing them.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_full_name): Deal</div><div class='del'>-	correctly with namespace == ""</div><div class='del'>-</div><div class='del'>-2000-11-01  Gediminas Paulauskas  &lt;menesis@delfi.lt&gt;</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c, camel-charset-map-private.h: synced all charsets</div><div class='del'>-	with ones found in libunicode. Just include more "iso/*.h" and rebuild</div><div class='del'>-	...private.h with this.</div><div class='del'>-	</div><div class='del'>-2000-10-31  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (service_disconnect): Add a new argument, clean,</div><div class='del'>-	that says whether or not to try to disconnect cleanly.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_send_string, remote_send_stream,</div><div class='del'>-	remote_recv_line): disconnect uncleanly on failure to prevent</div><div class='del'>-	infinite loops when providers would normally send commands from</div><div class='del'>-	disconnect(). Remove some unneeded CamelException goo.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_disconnect): </div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_disconnect): </div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_disconnect):</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Don't send</div><div class='del'>-	QUIT/LOGOUT if !clean.</div><div class='del'>-</div><div class='del'>-2000-10-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-auth.c: New file with code for IMAP</div><div class='del'>-	authentication mechanisms. (Currently just krb4, and without</div><div class='del'>-	integrity/privacy protection).</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: Add camel-imap-auth.[ch] and krb4</div><div class='del'>-	CFLAGS/LDFLAGS</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (connect_to_server): Split out</div><div class='del'>-	from imap_connect. Just does the basic connect and CAPABILITY</div><div class='del'>-	check. Redo the CAPABILITY code more robustly.</div><div class='del'>-	(query_auth_types_connected): Do this right rather than punting to</div><div class='del'>-	query_auth_types_generic. Check for KERBEROS_V4 if compiled with</div><div class='del'>-	krb4 support.</div><div class='del'>-	(query_auth_types_generic): Mention KERBEROS_V4 if compiled with</div><div class='del'>-	krb4 support.</div><div class='del'>-	(imap_connect): Use connect_to_server().</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_step, base64_encode_close):</div><div class='del'>-	Take an additional argument, "break_lines", saying whether or not</div><div class='del'>-	to add '\n's to the output.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (set_boundary): </div><div class='del'>-	* camel-mime-filter-basic.c (filter, complete): Update for base64</div><div class='del'>-	api change.</div><div class='del'>-</div><div class='del'>-2000-10-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Improved IMAP namespace handling: leave the namespace in the</div><div class='del'>-	folder names rather than constantly prepending it and stripping it</div><div class='del'>-	off. Also some subscription fixes.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): Fix for the case where</div><div class='del'>-	@top isn't in @folders.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Add</div><div class='del'>-	a "short_name" argument rather than figuring it out ourselves.</div><div class='del'>-	(imap_get_full_name): Implementation of CamelFolder::get_full_name</div><div class='del'>-	that strips off namespace so the user doesn't have to see it.</div><div class='del'>-	(imap_append_message, imap_copy_message_to, imap_move_message_to):</div><div class='del'>-	Use folder-&gt;full_name rather than calling</div><div class='del'>-	camel_imap_store_get_folder_path.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):</div><div class='del'>-	Update this: make @flags a bitmask and @sep a char rather than a</div><div class='del'>-	string. Make all of the out arguments optional. Handle literals in</div><div class='del'>-	the server response.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Do a better</div><div class='del'>-	job of getting the correct dir_sep for the namespace we're using.</div><div class='del'>-	Construct a base_url here that will be used by get_folder_info.</div><div class='del'>-	(camel_imap_store_folder_path): Removed</div><div class='del'>-	(imap_folder_exists): Add an argument to return the short name of</div><div class='del'>-	the folder (parsed out of the LIST response). Update for</div><div class='del'>-	imap_parse_list_response change.</div><div class='del'>-	(get_folder): Update for the various other changes.</div><div class='del'>-	(get_folder_info): Update for the various other changes. Be more</div><div class='del'>-	consistent about the returned layout: put everything underneath</div><div class='del'>-	the "namespace" directory, including INBOX, even if it doesn't</div><div class='del'>-	belong there. Don't destroy the list of subscribed folders until</div><div class='del'>-	we've actually gotten the new list.</div><div class='del'>-	(folder_subscribed, subscribe_folder, unsubscribe_folder): Use</div><div class='del'>-	folder_name directly rather than camel_imap_store_folder_Path.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Update</div><div class='del'>-	for folder name changes.</div><div class='del'>-</div><div class='del'>-2000-10-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: Remove md5-utils.h include since it's not part of Camel</div><div class='del'>-	any more.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: Kill some warnings.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.c</div><div class='del'>-	(camel_nntp_get_grouplist_from_file, camel_nntp_grouplist_save):</div><div class='del'>-	Clean up warnings about time_t casts.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Remove unused md5-utils.h</div><div class='del'>-	include.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Undefine the "_" macro</div><div class='del'>-	defined by krb4's des.h when compiling with krb support.</div><div class='del'>-	Fix md5-utils.h include.</div><div class='del'>-</div><div class='del'>-2000-10-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_param_list_format_append): Only quote</div><div class='del'>-	Content-type parameters when the quoting is mandatory, and deal</div><div class='del'>-	with embedded quotes/backslashes when quoting.</div><div class='del'>-</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/Makefile.am: Tidy up build</div><div class='del'>-</div><div class='del'>-	* providers/smtp/Makefile.am: ditto	</div><div class='del'>-	</div><div class='del'>-	* Makefile.am:  Move md5-utils.[hc] to e-util because the </div><div class='del'>-	addressbook is going to use md5 hashes for pilot syncing.</div><div class='del'>-	Maybe the calendar conduits as well because this is a good idea</div><div class='del'>-	Chris had.</div><div class='del'>-</div><div class='del'>-2000-10-26  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-exceptions-list.def: Add newline to kill warnings.</div><div class='del'>-	</div><div class='del'>-2000-10-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Fix folder</div><div class='del'>-	listing code infinite loop.</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Add a "parent" field to CamelFolderInfo.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_folder_info_build): Deal with "parent"</div><div class='del'>-	(camel_store_folder_subscribed, camel_store_subscribe_folder,</div><div class='del'>-	camel_store_unsubscribe_folder): Add g_return_if_fails checking</div><div class='del'>-	that the folder supports subscriptions.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (folder_subscribed,</div><div class='del'>-	subscribe_folder, unsubscribe_folder): Remove "+ 1"s since the</div><div class='del'>-	mail subscribe UI won't prepend / to the folder names now.</div><div class='del'>-	(get_folder_info): Clear the "parent" field of the folderinfos</div><div class='del'>-	when removing an empty top level.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_folder_subscribed,</div><div class='del'>-	nntp_store_subscribe_folder, nntp_store_unsubscribe_folder):</div><div class='del'>-	Remove "+ 1"s since the mail subscribe UI won't prepend / to the</div><div class='del'>-	folder names now.</div><div class='del'>-</div><div class='del'>-2000-10-24  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h: add subscribed_folders.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_class_init):</div><div class='del'>-	fill in vtable entries for subscription functions.</div><div class='del'>-	(camel_imap_store_finalize): new function, so we can free up our</div><div class='del'>-	subscribed_folders hashtable.</div><div class='del'>-	(camel_imap_store_init): set CAMEL_STORE_SUBSCRIPTIONS in the</div><div class='del'>-	CamelStore flags, and create our subscribed_folders hashtable.</div><div class='del'>-	(camel_imap_store_get_type): camel_imap_store_finalize is our</div><div class='del'>-	finalize function.</div><div class='del'>-	(get_folder_info): if we're looking at subscribed_only, clear out</div><div class='del'>-	the subscribed_folders hashtable, use LSUB instead of LIST, and</div><div class='del'>-	insert folder paths (prepended by their namespace if there is one)</div><div class='del'>-	into subscribed_folders.  INBOX subscription support needs work,</div><div class='del'>-	since we always show it, regardless of it's subscribed state.</div><div class='del'>-	(folder_subscribed): new function.  just look up the folder_path</div><div class='del'>-	in the hashtable.</div><div class='del'>-	(subscribe_folder): new function.  use the imap SUBSCRIBE command,</div><div class='del'>-	and if successful add it to the hashtable.</div><div class='del'>-	(unsubscribe_folder): new function.  use the imap UNSUBSCRIBE</div><div class='del'>-	command, and if successful remove it from the hashtable.</div><div class='del'>-</div><div class='del'>-2000-10-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Fill in the</div><div class='del'>-	message_count and unread_message_count flags (if !fast).</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.h: #include gnome-i18n.h (and gnome-defs.h since</div><div class='del'>-	the former depends on it.)</div><div class='del'>-</div><div class='del'>-	* *: Add lots of _() and N_().</div><div class='del'>-</div><div class='del'>-2000-10-23  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add</div><div class='del'>-	camel-nntp-types.h.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_untagged): Fix a</div><div class='del'>-	"how could this have been working before" memory overrun bug</div><div class='del'>-	found by Vlad.</div><div class='del'>-</div><div class='del'>-	* camel-op-queue.[ch], camel-thread-proxy.[ch]: These should have</div><div class='del'>-	gone away a long time ago.</div><div class='del'>-</div><div class='del'>-2000-10-20  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): re-enable the nntp provider.</div><div class='del'>-</div><div class='del'>-2000-10-20  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (build_folder_info): add</div><div class='del'>-	function to build a tree from the nntp group names (using '.' as a</div><div class='del'>-	heirarchy separator.)  #ifdefed INFO_AS_TREE only.</div><div class='del'>-	(build_folder_info_from_grouplist): if INFO_AS_TREE is selected,</div><div class='del'>-	call build_folder_info instead of appending a new CamelFolderInfo</div><div class='del'>-	to our list.</div><div class='del'>-	(ensure_news_dir_exists): use e_mkdir_hier instead of failing if a</div><div class='del'>-	parent directory (~/evolution/news generally) isn't there.</div><div class='del'>-</div><div class='del'>-2000-10-19  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c: #include &lt;sys/types.h&gt; before &lt;regex.h&gt;</div><div class='del'>-</div><div class='del'>-2000-10-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response):</div><div class='del'>-	Fix a bug with "INBOX" (or anything else with NIL hierarchy</div><div class='del'>-	separator) as the namespace.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Emit</div><div class='del'>-	message_changed and folder_changed as appropriate.</div><div class='del'>-</div><div class='del'>-2000-10-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_refresh_info): Update comment here</div><div class='del'>-	so refresh_info isn't just for reconnects any more. Make the</div><div class='del'>-	default implementation a no-op rather than an error.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c: Move refresh_info impl into</div><div class='del'>-	camel_nntp_folder_new, since it would have leaked memory and not</div><div class='del'>-	done anything useful if it was called later.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: Remove no-longer-necessary</div><div class='del'>-	refresh_info impl.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Update imap_folder-&gt;exists, but don't actually load the new</div><div class='del'>-	messages. This is a temporary workaround to deal with the IMAP</div><div class='del'>-	provider stealing the message list focus at annoying times.</div><div class='del'>-	(imap_copy_message_to, imap_move_message_to): Emit a</div><div class='del'>-	folder_changed by hand, for now.</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add</div><div class='del'>-	`camel-imap-stream.h'.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Add `camel-charset-map.h'</div><div class='del'>-	and `camel-charset-map-private.h'.</div><div class='del'>-</div><div class='del'>-2000-10-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_description): The correct</div><div class='del'>-	fix this time - the description should be encoded here and not in</div><div class='del'>-	the camel-medium layer.</div><div class='del'>-</div><div class='del'>-2000-10-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_add_update): Fixed the</div><div class='del'>-	changeset logic, which was completely wrong.</div><div class='del'>-</div><div class='del'>-2000-10-27  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode_step): Removed is_blank() stuff.</div><div class='del'>-	(header_decode_init): When we set the 'space' bit, dont clear all</div><div class='del'>-	the others.</div><div class='del'>-	(quoted_encode): Put back the safemask.  Yes we totally need it,</div><div class='del'>-	see rfc 2047 section 5, parts (1) and (3).</div><div class='del'>-	(CHARS_PSPECIAL): Remove '=' and '_' from the list of allowed</div><div class='del'>-	characters (this is an allowed list, not a not-allowed list, like</div><div class='del'>-	the ESPECIAL).</div><div class='del'>-	(camel_mime_special_table): Updated for fixes to definitions.</div><div class='del'>-	(CHARS_ESPECIAL): Added '_' to list of characters that should be</div><div class='del'>-	encoded.</div><div class='del'>-</div><div class='del'>-2000-10-26  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):</div><div class='del'>-	Use the new camel_folder_change_info_* stuff to build the update</div><div class='del'>-	diff, rather than doing it ourselves.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_add_source): Add a</div><div class='del'>-	'source' list, used to create change lists.</div><div class='del'>-	(camel_folder_change_info_add_source_list): Add a list of uid's,</div><div class='del'>-	convenience function.</div><div class='del'>-	(camel_folder_change_info_add_update): Add a uid to the list of</div><div class='del'>-	uid's in the new updated list.</div><div class='del'>-	(camel_folder_change_info_add_update_list): Add a bunch of uid's</div><div class='del'>-	at once for the same purpose.</div><div class='del'>-	(camel_folder_change_info_build_diff): Take the source list, the</div><div class='del'>-	update list, and find the differences, building on the added or</div><div class='del'>-	removed list as appropriate.</div><div class='del'>-</div><div class='del'>-2000-10-20  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (removed_uids): REnamed from</div><div class='del'>-	add_uid.</div><div class='del'>-	(camel_mbox_summary_update): Oops, fix the reversed logic for</div><div class='del'>-	determining the uid changesets.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (message_changed): Oops, we want to change the</div><div class='del'>-	uid, not add it.</div><div class='del'>-</div><div class='del'>-2000-10-19  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Added a</div><div class='del'>-	change list argument, and add expunged uid's to it.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_init): Setup the change list.</div><div class='del'>-	(mh_finalize): And free it.</div><div class='del'>-	(mh_sync): Track changes, and send a folder_changed signal as</div><div class='del'>-	appropriate.</div><div class='del'>-	(mh_expunge): Likewise.</div><div class='del'>-	(mh_append_message): Add the new uid to the change list and</div><div class='del'>-	trigger a folder_changed event.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):</div><div class='del'>-	Setup a mbox list of changes structure.</div><div class='del'>-	(mbox_finalize): And free it.</div><div class='del'>-	(mbox_expunge): Include the change list with the folder_changed</div><div class='del'>-	event, and clear it off.</div><div class='del'>-	(mbox_sync): And the same for when we are just syncing the folder.</div><div class='del'>-	(mbox_append_message): And do the same here, after we've updated</div><div class='del'>-	the folder.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_build_from): Use gmtime_r to get the time</div><div class='del'>-	thread-safely.</div><div class='del'>-	(camel_mbox_summary_sync): Added a changeinfo argument.  Add any</div><div class='del'>-	removed or changed messages to the changelists as appropriate.</div><div class='del'>-	(camel_mbox_summary_update): Added a changeinfo argument.</div><div class='del'>-	Genereate a list of added/removed uid's based on the difference</div><div class='del'>-	before and after rebuilding the summary.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_change_info_new):</div><div class='del'>-	(camel_folder_change_info_add_uid): </div><div class='del'>-	(change_info_add_uid): </div><div class='del'>-	(camel_folder_change_info_remove_uid): </div><div class='del'>-	(camel_folder_change_info_change_uid): </div><div class='del'>-	(change_info_clear): </div><div class='del'>-	(camel_folder_change_info_clear): </div><div class='del'>-	(camel_folder_change_info_free):</div><div class='del'>-	(change_info_cat): </div><div class='del'>-	(camel_folder_change_info_cat):  Bunch of utility functions for</div><div class='del'>-	working with change info lists.</div><div class='del'>-	(camel_folder_init): Init the change info list.</div><div class='del'>-	(camel_folder_finalize): And free it.</div><div class='del'>-	(thaw): Changed to pass through a list of changes, or to get the</div><div class='del'>-	changed message uids from the camelfolderchangeinfo struct, and</div><div class='del'>-	reset it.</div><div class='del'>-	(folder_changed): Add the changed lists to the frozen change list</div><div class='del'>-	if we are frozen.</div><div class='del'>-	(message_changed): Add the message to the changed list if we are</div><div class='del'>-	in the frozen state.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (CamelFolderChangeInfo): New structure to hold</div><div class='del'>-	information for the folder_changed event.</div><div class='del'>-</div><div class='del'>-2000-10-18  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete): Put a zero at the start</div><div class='del'>-	of the outbuf.</div><div class='del'>-</div><div class='del'>-2000-10-18  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (add_header): No, we must not encode the</div><div class='del'>-	headers here.  These interfaces ARE raw interfaces as they are</div><div class='del'>-	defined in camel_medium.  Also removed a bogus/meaningless FIXME.</div><div class='del'>-	(set_header): Likewise here, we must not.</div><div class='del'>-	(process_header): Removed another bogus comment.</div><div class='del'>-</div><div class='del'>-	* camel-object.c (shared_is_of_type): Comment out the spitting of</div><div class='del'>-	a big warning when we're trying to determine types from code.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(message_info_new_from_parser): Only call ibex funcitons if we</div><div class='del'>-	have an index.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-summary.c (camel_mh_summary_add): Only</div><div class='del'>-	call ibex functions if we have an index.</div><div class='del'>-	(remove_summary): Likewise.</div><div class='del'>-	(camel_mh_summary_check): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder):</div><div class='del'>-	get_folder -&gt; flags argument.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-store.c (vee_get_folder): create-&gt;flags.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (get_folder): Changed create</div><div class='del'>-	-&gt; flags.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Added flags</div><div class='del'>-	argument.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (camel_mh_folder_new): Added</div><div class='del'>-	flags argument, and fixed code appropriately.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-store.c (get_folder): Added flags argument.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (message_body_contains): Perform a regex</div><div class='del'>-	match on the contents of messages.  This wont quite work yet as</div><div class='del'>-	message contents are encoded when written to a stream.</div><div class='del'>-	(build_match_regex): Converts a number of strings into a regex</div><div class='del'>-	matching pattern, escaping special chars.</div><div class='del'>-	(match_message): match a single message from a folder, by uid.</div><div class='del'>-	Slow.</div><div class='del'>-	(search_body_contains): Changed to support matching where no index</div><div class='del'>-	is supplied.  Matches are performed by retrieving message</div><div class='del'>-	contents, etc.</div><div class='del'>-	() WTF?  camel should not be including any widget headers.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (camel_mbox_folder_new):</div><div class='del'>-	Added flags argument.</div><div class='del'>-	(mbox_refresh_info): Changed into a NOP, the refresh info code</div><div class='del'>-	moved into the new function.</div><div class='del'>-	(camel_mbox_folder_new): If we have an index requested, build one,</div><div class='del'>-	otherwise, remove an old one, or just dont do anything.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Changed create</div><div class='del'>-	to flags, changed code to suit.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Changed create to flags.</div><div class='del'>-	(get_folder_internal): And here.</div><div class='del'>-	(get_folder): And here too.</div><div class='del'>-</div><div class='del'>-	* camel-store.h (camel_store_get_folder): Change the create</div><div class='del'>-	argument to be a flags argument.</div><div class='del'>-</div><div class='del'>-2000-10-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_refresh_info): Remove</div><div class='del'>-	cached info at the end of the summary when the folder shrinks</div><div class='del'>-	between sessions. Also remove an untrue comment.</div><div class='del'>-	(camel_imap_folder_new): Move the summary creation to after the</div><div class='del'>-	folder selection again, since it depends on the uidvalidity</div><div class='del'>-	having been set.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Fix up</div><div class='del'>-	summary_file to not include the namespace twice.</div><div class='del'>-</div><div class='del'>-2000-10-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (set_header): Encode the header value.</div><div class='del'>-	(add_header): Same.</div><div class='del'>-</div><div class='del'>-2000-10-17  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter.c: Added some malloc check debugging stuff.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c</div><div class='del'>-	(struct _header_scan_state): Removed top_part, top_start, and</div><div class='del'>-	pending.  I can't even remember why they were there, and they're</div><div class='del'>-	not used anymore.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Forgot to up the space here</div><div class='del'>-	too.</div><div class='del'>-</div><div class='del'>-2000-10-14  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (complete): Ok, so we hit a fixme, 3x</div><div class='del'>-	just wasn't enough for some sequences.</div><div class='del'>-</div><div class='del'>-2000-10-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(imap_read_response): Don't imap_next_word(respbuf + 2), instead</div><div class='del'>-	use imap_next_word(respbuf) or else we'll skip over the second</div><div class='del'>-	token.</div><div class='del'>-</div><div class='del'>-2000-10-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c</div><div class='del'>-	(camel_imap_response_extract): Don't free 'resp' as it doesn't</div><div class='del'>-	point to the beginning of the allocated data, instead free</div><div class='del'>-	response-&gt;untagged-&gt;pdata[i]. Also, if '*resp' is equal to a space</div><div class='del'>-	character, then set resp = imap_next_word (resp) rather than</div><div class='del'>-	expecting resp++ to work (there's a list broken IMAP daemons that</div><div class='del'>-	like to put extra spaces between tokens).</div><div class='del'>-	(imap_read_response): Don't expect 'respbuf+2' to be where the</div><div class='del'>-	untagged number response to start (see above fix for an</div><div class='del'>-	explanation).</div><div class='del'>-</div><div class='del'>-2000-10-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (get_path): when using the construct (flags &amp;</div><div class='del'>-	CAMEL_SERVICE_URL_NEED_*) make sure to do ((flags &amp;</div><div class='del'>-	CAMEL_SERVICE_URL_NEED_*) == CAMEL_SERVICE_URL_NEED_*)</div><div class='del'>-	(check_url): same.</div><div class='del'>-</div><div class='del'>-2000-10-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Only send</div><div class='del'>-	the LOGOUT command if the store is connected.</div><div class='del'>-	(imap_connect): Set the 'connected' state to TRUE when we</div><div class='del'>-	successfully connect.</div><div class='del'>-	(get_folder_info): if (!topfi), 'topfi' was allocated but then</div><div class='del'>-	'fi' was set. I think Dan meant to set topfi since fi is an</div><div class='del'>-	uninitialized value at this point.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (imap_read_response): Check</div><div class='del'>-	for the untagged BYE response and set the 'connected' state to</div><div class='del'>-	FALSE if we receive the BYE response. Return NULL if we get a BYE</div><div class='del'>-	response.</div><div class='del'>-</div><div class='del'>-2000-10-16  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): Deal with</div><div class='del'>-	the possibility of not getting a LIST response back for the top</div><div class='del'>-	level.</div><div class='del'>-</div><div class='del'>-2000-10-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Simple subclass of</div><div class='del'>-	CamelFolderSummary that also keeps a UIDVALIDITY value (and</div><div class='del'>-	doesn't, for the moment, build content info).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c:</div><div class='del'>-	(various): Use a CamelImapSummary to store/fetch summary info.</div><div class='del'>-	(camel_imap_folder_new): Take a path to a file to use for the</div><div class='del'>-	summary. Set the folder's permanent_flags correctly according to</div><div class='del'>-	the server response. Read in the summary (checking the</div><div class='del'>-	UIDVALIDITY) and update it if it's out of date.</div><div class='del'>-	(imap_refresh_info): Just fetch UIDs and flags. If the UIDs all</div><div class='del'>-	match, update the flags as needed and be done with it. Otherwise,</div><div class='del'>-	delete messages that have been expunged from the server and fetch</div><div class='del'>-	full summary info for any new messages.</div><div class='del'>-	(imap_sync): Save the summary to disk.</div><div class='del'>-	(imap_update_summary): Renamed from imap_get_summary_internal. Can</div><div class='del'>-	now be told to get summary for only a subset of messages. Use</div><div class='del'>-	camel-mime-utils functions rather than rolling our own header</div><div class='del'>-	parsing.</div><div class='del'>-	(imap_get_message_info_internal): Merged into imap_update_summary.</div><div class='del'>-	(imap_set_message_flags): Don't marked the message FOLDER_FLAGGED</div><div class='del'>-	if we're not actually changing the value of any of the flags.</div><div class='del'>-	(camel_imap_folder_changed): Deal with EXISTS rather than RECENT.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Call</div><div class='del'>-	camel_session_get_storage_path and save the value.</div><div class='del'>-	(get_folder): Create a local directory to store summary</div><div class='del'>-	information and pass a summary file name to camel_imap_folder_new.</div><div class='del'>-	Don't call camel_folder_refresh_info from here any more since</div><div class='del'>-	camel_imap_folder_new does it again.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Add a</div><div class='del'>-	special case to this to make it possible to get the repsonses from</div><div class='del'>-	a SELECT and still have store-&gt;current_folder be updated</div><div class='del'>-	correctly.</div><div class='del'>-	(imap_read_response): parse EXISTS rather than RECENT</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_storage_path): Use</div><div class='del'>-	e_mkdir_hier.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_remove_index): New</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_append_parse): fix this.</div><div class='del'>-	(camel-mime-parser.c doesn't use this code because of the MEMPOOL</div><div class='del'>-	optimization, so nothing was ever actually calling it before.)</div><div class='del'>-</div><div class='del'>-2000-10-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h (struct _CamelMimePart): Removed</div><div class='del'>-	temp_message_buffer, and content_input_stream fields which seem to</div><div class='del'>-	have come from nowhere, and are unused.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Added a note about touching this file.</div><div class='del'>-	Nobody is to touch it without asking me first.  That goes for you</div><div class='del'>-	too Jeff.</div><div class='del'>-	(header_decode_text): In what way is this broken?</div><div class='del'>-</div><div class='del'>-2000-10-10  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):</div><div class='del'>-	Fix camel_summary_* function rename</div><div class='del'>-	(imap_get_message_info_internal): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_finalise): Fixed a spelling mistake.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_summary_format_address): Uh, why</div><div class='del'>-	do we encode and then decode here ... sigh.  This is not the way</div><div class='del'>-	to fix this.</div><div class='del'>-	(camel_folder_summary_format_address): Renamed to a proper name,</div><div class='del'>-	this was only supposed to be a private function.</div><div class='del'>-	(camel_folder_summary_format_string): Likewise.  Oh i see why it</div><div class='del'>-	was made public, code reuse by cut &amp; paste.  Joy.</div><div class='del'>-</div><div class='del'>-2000-10-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_unsubscribe_folder): remove the leading '/'.</div><div class='del'>-	(nntp_store_subscribe_folder): same.</div><div class='del'>-	(nntp_store_folder_subscribed): same.</div><div class='del'>-</div><div class='del'>-2000-10-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_move_message_to): Quote</div><div class='del'>-	the mailbox name as it may contain spaces.</div><div class='del'>-	(imap_copy_message_to): Same.</div><div class='del'>-</div><div class='del'>-2000-10-10  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(build_folder_info_from_grouplist): fill in message_count and</div><div class='del'>-	unread_message_count properly.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.h: reformat.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.c</div><div class='del'>-	(camel_nntp_get_grouplist_from_file): remove spew.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c</div><div class='del'>-	(camel_nntp_newsrc_group_get_num_articles_read): new function.</div><div class='del'>-	(camel_nntp_newsrc_group_get_highest_article_read): robustification.</div><div class='del'>-</div><div class='del'>-2000-10-10  Joe Shaw  &lt;joe@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c </div><div class='del'>-	(parse_list_response_as_folder_info): Check before dereferencing the</div><div class='del'>-	sep pointer.</div><div class='del'>-</div><div class='del'>-2000-10-10  Jacob "Ulysses" Berkman  &lt;jacob@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-*.c: teach camel about "its" vs. "it's"</div><div class='del'>-</div><div class='del'>-2000-10-09  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (finalize): write out the</div><div class='del'>-	newsrc.</div><div class='del'>-	(nntp_store_get_name): if @brief, just return host.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c: robustification and bug</div><div class='del'>-	fixes.</div><div class='del'>-</div><div class='del'>-2000-10-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_summary_format_address): Decode</div><div class='del'>-	the resulting string.</div><div class='del'>-</div><div class='del'>-2000-10-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.c: new file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-grouplist.h: new file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-types.h: new file.</div><div class='del'>-</div><div class='del'>-2000-10-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode): Fix so that we don't encode</div><div class='del'>-	every single char in the word. Also, do we need a safemask? I</div><div class='del'>-	don't see why we would.</div><div class='del'>-	(header_encode_string): Don't strip off the last char!!</div><div class='del'>-</div><div class='del'>-2000-10-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): add</div><div class='del'>-	camel-nntp-grouplist.h</div><div class='del'>-	(libcamelnntp_la_SOURCES): add camel-nntp-grouplist.c</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: add our own hash functions</div><div class='del'>-	for nntp urls.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c</div><div class='del'>-	(camel_nntp_newsrc_group_is_subscribed): new function.</div><div class='del'>-	(camel_nntp_newsrc_subscribe_group): new function.</div><div class='del'>-	(camel_nntp_newsrc_unsubscribe_group): new function.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.h: add prototypes for</div><div class='del'>-	_group_is_subscribed, _subscribe_group, and _unsubscribe_group.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(build_folder_info_from_grouplist): new function.</div><div class='del'>-	(nntp_store_get_folder_info): add subscribed_only_parameter.  if</div><div class='del'>-	it's FALSE, load the grouplist and call</div><div class='del'>-	build_folder_info_from_grouplist.</div><div class='del'>-	(nntp_store_folder_subscribed): implement.</div><div class='del'>-	(nntp_store_subscribe_folder): implement.</div><div class='del'>-	(nntp_store_unsubscribe_folder): implement.</div><div class='del'>-	(camel_nntp_store_init): add CAMEL_STORE_SUBSCRIPTIONS to the</div><div class='del'>-	store's flags.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-store.c (get_folder_info): add</div><div class='del'>-	subscribed_only parameter.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder_info): add</div><div class='del'>-	subscribed_only parameter.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_info): add</div><div class='del'>-	subscribed_only parameter.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_supports_subscriptions): new function.</div><div class='del'>-	(camel_store_folder_subscribed): new function.</div><div class='del'>-	(camel_store_subscribe_folder): new function.</div><div class='del'>-	(camel_store_unsubscribe_folder): new function.</div><div class='del'>-</div><div class='del'>-	* camel-store.h: add prototypes and virtual functions for the</div><div class='del'>-	subscribe implementation.  also, add a subscribed_only argument to</div><div class='del'>-	camel_store_get_folder_info.</div><div class='del'>-</div><div class='del'>-2000-10-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_format_append): Encode</div><div class='del'>-	the name part of the address and don't quote the name.</div><div class='del'>-	(header_decode_text): Rewrote from scratch, the old code was badly</div><div class='del'>-	broken.</div><div class='del'>-</div><div class='del'>-2000-10-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use the</div><div class='del'>-	camel_address_encode function again.</div><div class='del'>-	(camel_mime_message_set_from): Same.</div><div class='del'>-</div><div class='del'>-2000-10-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode_step): Modified to not encode</div><div class='del'>-	space chars in the middle of a line.</div><div class='del'>-	(isblank): New macro if we're not on a system with the GNU isblank</div><div class='del'>-	extension.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_from): Reversed my</div><div class='del'>-	changes, don't header_encode_phrase - it generates broken headers.</div><div class='del'>-	(camel_mime_message_set_reply_to): Same.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (camel_nntp_get_headers):</div><div class='del'>-	revert to old method (only use XOVER if OVER is supported.)</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): handle the case where the</div><div class='del'>-	OVER extension isn't listed but LIST OVERVIEW.FMT works (again,</div><div class='del'>-	INN 2.2).  enable the OVER extension in this case.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): return a</div><div class='del'>-	gboolean so we can tell if this command worked.  we can't key off</div><div class='del'>-	the OVER extension being present because at least one server (INN</div><div class='del'>-	2.2) doesn't report the OVER extension but implements the XOVER</div><div class='del'>-	command.  This could of course just be because I'm a loser for</div><div class='del'>-	thinking they were related in the first place.</div><div class='del'>-	(camel_nntp_get_headers): always try XOVER first, and if it fails</div><div class='del'>-	revert to the slow method.</div><div class='del'>-</div><div class='del'>-2000-10-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a case where</div><div class='del'>-	a variable was free'd and then possibly used in an error message.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c</div><div class='del'>-	(camel_provider_module_init): news: -&gt; nntp:.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (nntp_store_get_folder_info):</div><div class='del'>-	use "nntp:" instead of "news:" since "news:" urls aren't supposed</div><div class='del'>-	to have host/user/port info in them.  also, if there's a user</div><div class='del'>-	defined in the url, put it in the urls for our folders.</div><div class='del'>-</div><div class='del'>-2000-10-04  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-auth.c (camel_nntp_auth_authenticate):</div><div class='del'>-	borrow some code from the imap provider to query the user for</div><div class='del'>-	their password, and pass the user/passwd to nntp.  be extra</div><div class='del'>-	paranoid and zero out the password before freeing it.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_init): add</div><div class='del'>-	ALLOW_USER/ALLOW_PASSWORD/ALLOW_AUTH to the url flags.</div><div class='del'>-	(nntp_store_query_auth_types_generic): return our list of</div><div class='del'>-	auth_types.</div><div class='del'>-	(nntp_store_query_auth_types_connected): broken, return same as in</div><div class='del'>-	query_auth_types_generic.</div><div class='del'>-</div><div class='del'>-2000-10-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): IMAP4</div><div class='del'>-	(pre-rev1) doesn't support the 'LIST "" ""' idiom, so don't use</div><div class='del'>-	it. Just assume the dir_sep is '/'. Shrug.</div><div class='del'>-</div><div class='del'>-2000-10-04  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_reply_to): Use</div><div class='del'>-	header_encode_phrase instead.</div><div class='del'>-	(camel_mime_message_set_from): Same.</div><div class='del'>-</div><div class='del'>-2000-10-04  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_is): Handle the case</div><div class='del'>-	where ct != NULL, but type and subtype are, and also match that</div><div class='del'>-	against text/plain.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Bump summary file version.</div><div class='del'>-	(message_info_save): Save the size from the messageinfo.</div><div class='del'>-	(message_info_load): Load the size from the summary file.</div><div class='del'>-	(message_info_load): Fixed up the time_t saving/loading.  There</div><div class='del'>-	was a reason the warning was left there ... obviously nobody could</div><div class='del'>-	read the comment "/* warnings, leave them here */", why do i even</div><div class='del'>-	bother.</div><div class='del'>-	(camel_folder_summary_decode_time_t): Decode a time_t value from</div><div class='del'>-	the summary file.</div><div class='del'>-	(camel_folder_summary_encode_time_t): Encode a time_t value to the</div><div class='del'>-	summary file.</div><div class='del'>-</div><div class='del'>-2000-10-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c (camel_imap_command): Quote</div><div class='del'>-	the mailbox name when sending a SELECT request otherwise mailboxes</div><div class='del'>-	with spaces in their names will cause problems.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_reply_to): encode</div><div class='del'>-	before setting.</div><div class='del'>-	(camel_mime_message_set_from): Same.</div><div class='del'>-</div><div class='del'>-2000-10-03  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-command.c: New file containing</div><div class='del'>-	camel_imap_command and friends. Major camel_imap_command rewrite</div><div class='del'>-	to remove duplicated code, make the parsing of literals be</div><div class='del'>-	more safe/correct, deal with RECENT/EXPUNGE responses more</div><div class='del'>-	consistently, and make it possible to implement the AUTHENTICATE</div><div class='del'>-	command.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_nstring): New</div><div class='del'>-	function, to parse an IMAP "nstring".</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Move command stuff to</div><div class='del'>-	camel-imap-command.c. Update for camel_imap_command changes.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Update for</div><div class='del'>-	camel_imap_command changes.</div><div class='del'>-	(imap_append_message): CRLF filter the message before sending it.</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: Add camel-imap-command.[ch], remove</div><div class='del'>-	camel-imap-stream.[ch] for now.</div><div class='del'>-</div><div class='del'>-2000-10-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_has_8bit_parts): New</div><div class='del'>-	convenience function to determine if there are any 8bit mime parts</div><div class='del'>-	in a mime message.</div><div class='del'>-	(camel_mime_message_encode_8bit_parts): New convenience function</div><div class='del'>-	to recursively reencode all 8bit mime parts to either</div><div class='del'>-	quoted-printable or base64 depending on which would be the best</div><div class='del'>-	encoding for that part.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): If the mime</div><div class='del'>-	message contains 8bit parts and the server doesn't support 8bit</div><div class='del'>-	transfers, reencode those parts before proceding with the send.</div><div class='del'>-	(smtp_mail): If the mime message contains 8bit parts and the</div><div class='del'>-	server supports the 8BITMIME extension to SMTP, notify the server</div><div class='del'>-	that we'll be sending it 8bit mime parts.</div><div class='del'>-	(_send_to): Find out if the message contains 8bit parts.</div><div class='del'>-</div><div class='del'>-2000-10-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (_send_to): Use the</div><div class='del'>-	CamelInternetAddress parser.</div><div class='del'>-	(smtp_get_email_addr_from_text): deprecated.</div><div class='del'>-</div><div class='del'>-2000-10-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Remove default_ports.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Get default_port from</div><div class='del'>-	CamelRemoteStore rather than CamelProvider.</div><div class='del'>-</div><div class='del'>-	* providers/{imap,nntp,pop3}/camel-*-store.c: Initialize</div><div class='del'>-	CamelRemoteStore::default_port</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-provider.c: Remove default_ports.</div><div class='del'>-</div><div class='del'>-2000-10-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: Remove</div><div class='del'>-	camel_folder_{get,free}_subfolder_info, as we want to be able to</div><div class='del'>-	scan the whole subfolder tree without having to open any folders,</div><div class='del'>-	so this needs to be in CamelStore. Remove can_hold_folders and</div><div class='del'>-	can_hold_messages flags; things that don't hold messages are no</div><div class='del'>-	longer considered CamelFolders.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[ch]: Remove CamelFolderInfo stuff.</div><div class='del'>-</div><div class='del'>-	* camel-store.[ch]: Add camel_store_{get,free}_folder_info, as</div><div class='del'>-	well as camel_store_free_folder_info_full and ..._nop for default</div><div class='del'>-	implementations, and camel_folder_info_free and</div><div class='del'>-	camel_folder_info_build as convenience functions. Turn</div><div class='del'>-	CamelFolderInfo into a tree structure and also add an "url"</div><div class='del'>-	member.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-folder.c: Remove subfolder_info and can_hold</div><div class='del'>-	stuff.</div><div class='del'>-	* providers/*/camel-*-store.c: Add folder_info stuff.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_summary_free): Free the</div><div class='del'>-	summary elements with camel_message_info_free, not</div><div class='del'>-	camel_folder_info_free. Oops.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c: const poison</div><div class='del'>-</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Fixed some memory leaks.</div><div class='del'>-	(camel_smtp_transport_init): Initialize supports_8bit to FALSE.</div><div class='del'>-	(smtp_helo): If server supports 8bit, set supports_8bit to TRUE.</div><div class='del'>-</div><div class='del'>-	* camel-transport.h (struct _CamelTransport): Added variable</div><div class='del'>-	gboolean supports_8bit (we'll need this eventually? - see bugzilla</div><div class='del'>-	bug #53)</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c</div><div class='del'>-	(smtp_get_email_addr_from_text): Ugh, no wonder people were</div><div class='del'>-	getting illegal seek warnings *sigh*. I guess I can only blame</div><div class='del'>-	myself for this one though :-(</div><div class='del'>-</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (_send_to): Don't send the</div><div class='del'>-	recipient data through smtp_get_email_addr_from_text - this is a</div><div class='del'>-	complete waste. In fact, we don't want to have to use that</div><div class='del'>-	function ever.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c, camel-address.c: Added some gtk-doc</div><div class='del'>-	comments.</div><div class='del'>-	</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-mime-utils.c (header_encode_string): Make sure to add the</div><div class='del'>-	space char after an encoded word when the encoding is iso-8859-1.</div><div class='del'>-</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): When</div><div class='del'>-	getting a literal string response, don't include the \r\n after</div><div class='del'>-	the closing } (as in: "... {798}\r\n...")</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Same.</div><div class='del'>-</div><div class='del'>-2000-09-28  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_fold): New function to fold headers.</div><div class='del'>-</div><div class='del'>-2000-09-27  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): If we had an empty</div><div class='del'>-	header, then it must be end of the headers too.</div><div class='del'>-	(folder_scan_init): No we dont need to init the outbuf with a nul</div><div class='del'>-	terminator.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_set_uid): New</div><div class='del'>-	function to reset the uid to a higher value.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):</div><div class='del'>-	"something failed (yo!)" what sort of crap is this?  Fixed all the</div><div class='del'>-	indenting again, what wanker keeps running stuff through indent?</div><div class='del'>-	(message_info_new): Check the uid we loaded off the disk, if it</div><div class='del'>-	existed already, assign a new one.  If it didn't then make sure</div><div class='del'>-	the nextuid is higher.</div><div class='del'>-</div><div class='del'>-	* camel-charset-map.c: New file, used to build a large unicode</div><div class='del'>-	decoding mapping table, and use it to determine what is the</div><div class='del'>-	lowest charset a given word can be encoded with.  Uses tables from</div><div class='del'>-	libunicode's source.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): Use</div><div class='del'>-	header_phrase_encode to properly encode the fullname, as required.</div><div class='del'>-	refixed indenting.  Who keeps doing that?</div><div class='del'>-	(camel_internet_address_find_address): Changed fatal return/warnings</div><div class='del'>-	into assertions.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_append_parse): Check : explicitly</div><div class='del'>-	(removed from is_fieldname() macro).</div><div class='del'>-	(camel_mime_special_table): Changed to short, so we can represent</div><div class='del'>-	more bit types.</div><div class='del'>-	(quoted_encode): Take a mask of the safe chars for this encoding.</div><div class='del'>-	(header_address_decode): Removed a #warning that makes no sense</div><div class='del'>-	anymore.</div><div class='del'>-	(header_decode_date): Fixed the 'broken date' parser code, if it</div><div class='del'>-	ever decoded it it just threw away the result.</div><div class='del'>-	(header_encode_string): Use better charset matching for encoding</div><div class='del'>-	strings as well.</div><div class='del'>-</div><div class='del'>-2000-08-31  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Save</div><div class='del'>-	the index if we do a sync.</div><div class='del'>-	(camel_mh_summary_check): Save the index here too.  Probably.</div><div class='del'>-</div><div class='del'>-2000-09-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Return untagged data in a GPtrArray rather than a string, since it</div><div class='del'>-	saves processing time and is much easier to deal with for several</div><div class='del'>-	commands. Update for camel_imap_folder_changed change.</div><div class='del'>-	(camel_imap_fetch_command): Update for camel_imap_folder_changed</div><div class='del'>-	change.</div><div class='del'>-	(imap_connect, imap_folder_exists): Update for</div><div class='del'>-	camel_imap_command_extended change.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_message_count_internal,</div><div class='del'>-	imap_get_subfolder_info_internal, imap_search_by_expression):</div><div class='del'>-	Update for camel_imap_command_extended change.</div><div class='del'>-</div><div class='del'>-	(imap_get_summary_internal, imap_get_message_info_internal): Use</div><div class='del'>-	camel_imap_fetch_command here now to get around the</div><div class='del'>-	camel_imap_command_extended change.</div><div class='del'>-</div><div class='del'>-	(camel_imap_folder_changed): turn expunged into a GArray of ints</div><div class='del'>-	rather than a GPtrArray of strings representing ints.</div><div class='del'>-</div><div class='del'>-2000-09-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_message_count_internal): Quote the folder name as it may</div><div class='del'>-	contain spaces.</div><div class='del'>-	(imap_get_subfolder_info_internal): Same.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): Do</div><div class='del'>-	proper unquoting for folder names.</div><div class='del'>-	(func_get_current_date): Implemented.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(imap_folder_exists): Quote the folder name as it may have spaces.</div><div class='del'>-	(imap_create): Same.</div><div class='del'>-	(check_current_folder): Same.</div><div class='del'>-</div><div class='del'>-2000-09-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_info_internal): The root folder's name is "",</div><div class='del'>-	not the namespace.</div><div class='del'>-	(camel_imap_folder_new): constify folder_name.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Create the</div><div class='del'>-	folder with folder_name, not folder_path.</div><div class='del'>-	(camel_imap_command_preliminary): Don't free cmdid here.</div><div class='del'>-</div><div class='del'>-2000-09-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_create_flag_list): New</div><div class='del'>-	function to convert Camel flags to an IMAP flag_list.</div><div class='del'>-	(imap_parse_flag_list): Contrariwise.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_*): Make</div><div class='del'>-	the @ret arg actually optional, as (mostly) documented.</div><div class='del'>-	(various): Don't pass "&amp;result" to camel_imap_command_* if we're</div><div class='del'>-	just going to immediately free it. Don't record status if we're</div><div class='del'>-	not going to look at it.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Likewise.</div><div class='del'>-	(imap_summary_free): Use camel_folder_info_free.</div><div class='del'>-	(imap_sync): Use imap_create_flag_list. Clear</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_FLAGGED after syncing so we don't keep</div><div class='del'>-	re-syncing.</div><div class='del'>-	(imap_append_message): Use imap_create_flag_list. Don't leak the</div><div class='del'>-	memstream if the append fails.</div><div class='del'>-	(imap_move_message_to): Use camel_folder_delete_message rather</div><div class='del'>-	than doing it by hand.</div><div class='del'>-	(imap_get_summary_internal, imap_get_message_info_internal): Use</div><div class='del'>-	imap_parse_flag_list and header_raw_clear.</div><div class='del'>-	(camel_imap_folder_changed): Use camel_message_info_free.</div><div class='del'>-</div><div class='del'>-2000-09-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder_name): INBOX is</div><div class='del'>-	case-insensitive.</div><div class='del'>-	(get_root_folder_name): Make the root folder "" rather than "/".</div><div class='del'>-	(get_folder): Update for root folder name change.</div><div class='del'>-	(camel_imap_store_get_toplevel_dir): Removed. (Unused, unneeded.)</div><div class='del'>-	(camel_imap_store_folder_path): New function to turn a Camel</div><div class='del'>-	folder name into the corresponding namespaced IMAP path.</div><div class='del'>-	(imap_folder_exists): Make this take a store and a path rather</div><div class='del'>-	than a folder.</div><div class='del'>-	(imap_create): Likewise</div><div class='del'>-	(get_folder): Update for camel_imap_store_folder_path and other</div><div class='del'>-	changes.</div><div class='del'>-	(check_current_folder): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Change a bunch of CamelStore</div><div class='del'>-	variables to CamelImapStore (and add a few more) to prevent excess</div><div class='del'>-	gratuitous casting. Use camel_imap_store_folder_path where</div><div class='del'>-	appropriate.</div><div class='del'>-	(camel_imap_folder_new): Update for root folder name change.</div><div class='del'>-</div><div class='del'>-2000-09-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Use the</div><div class='del'>-	linewrap filter to achieve full RFC0821 compliance.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-linewrap.[c,h]: New mime-filter to word-wrap.</div><div class='del'>-</div><div class='del'>-2000-09-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): When encoding the</div><div class='del'>-	internet address, quote the name as the name may have commas or</div><div class='del'>-	any other token which may later confuse our address parser.</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_info_internal): Fix the case where INBOX</div><div class='del'>-	isn't returned in the folder listing.</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: (init): Removed</div><div class='del'>-	(camel_folder_init, camel_folder_construct): New object init</div><div class='del'>-	function and public object constructor to replace the old init</div><div class='del'>-	method in a more Gtk-like fashion.</div><div class='del'>-</div><div class='del'>-	(get_parent_folder, camel_folder_get_parent_folder): Removed. No</div><div class='del'>-	CamelFolder subclass was ever setting the parent_folder member, no</div><div class='del'>-	code has ever needed to look at it, and fixing it would actually</div><div class='del'>-	be pretty hard.</div><div class='del'>-</div><div class='del'>-	(get_subfolder_info, camel_folder_get_subfolder_info): Renamed</div><div class='del'>-	from ..._names. Deals in CamelFolderInfo now.</div><div class='del'>-	(free_subfolder_info, camel_folder_free_subfolder_info): Likewise.</div><div class='del'>-</div><div class='del'>-	(get_subfolder, camel_folder_get_subfolder): Removed.</div><div class='del'>-	CamelFolderInfo contains the subfolder's full name, so this is</div><div class='del'>-	unnecessary now, and removing it lets us get rid of the</div><div class='del'>-	CamelFolder separator member, which is needed for the default</div><div class='del'>-	implementation of this function, but not otherwise needed for most</div><div class='del'>-	providers.</div><div class='del'>-</div><div class='del'>-	Also, lots of code style fixes.</div><div class='del'>-</div><div class='del'>-	* providers/*: Update CamelFolder subclasses for changes, although</div><div class='del'>-	none of them fill in the message counts in the CamelFolderInfo</div><div class='del'>-	yet.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c, camel-folder-search.h,</div><div class='del'>-	camel-remote-store.c, providers/imap/camel-imap-folder.c,</div><div class='del'>-	providers/imap/camel-imap-store.c: Fixed the #include lines to</div><div class='del'>-	deal properly with gal.</div><div class='del'>-</div><div class='del'>-2000-09-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: update CamelFolderInfo</div><div class='del'>-	* camel-folder-summary.c (camel_folder_info_free): New function to</div><div class='del'>-	free the contents of a CamelFolderInfo</div><div class='del'>-</div><div class='del'>-2000-09-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Set camel_verbose_debug to TRUE if</div><div class='del'>-	CAMEL_VERBOSE_DEBUG is set in the environment.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_send_line, remote_recv_line): only</div><div class='del'>-	log if camel_verbose_debug is TRUE.</div><div class='del'>-</div><div class='del'>-2000-09-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Don't use</div><div class='del'>-	dir_sep as top-level directory, use "/".</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Get rid of</div><div class='del'>-	unused variable.</div><div class='del'>-</div><div class='del'>-2000-09-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Don't look at</div><div class='del'>-	the response of the command. camel_imap_command_extended()</div><div class='del'>-	processes EXPUNGE responses itself, so if we do it here too we</div><div class='del'>-	remove twice as many summary items as we should.</div><div class='del'>-</div><div class='del'>-2000-09-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_folder_exists): Rewrote</div><div class='del'>-	to take a third argument (gboolean *selectable) so that we can</div><div class='del'>-	find out if the folder is selectable or not as we look to see if</div><div class='del'>-	it exists. Also, don't use EXAMINE because that will not work on</div><div class='del'>-	non-selectable folders, so use LIST instead.</div><div class='del'>-	(get_folder): Check to see if the folder exists even vefore</div><div class='del'>-	calling imap_create as this will save time. If the folder does</div><div class='del'>-	exist, find out if it's selectable. Moved the call to refresh_info</div><div class='del'>-	here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_uids): Check for a</div><div class='del'>-	NULL summary.</div><div class='del'>-	(camel_imap_folder_new): Don't call refresh_info here - call it in</div><div class='del'>-	get_folder() because we don't know if this folder even exists on</div><div class='del'>-	the server yet! And even if it does, we don't know if it can hold</div><div class='del'>-	messages or not yet.</div><div class='del'>-</div><div class='del'>-2000-09-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): Make sure *datalength is</div><div class='del'>-	&gt; 0 before calling camel_mime_filter_filter otherwise we will get</div><div class='del'>-	a segfault if the filter calls iconv().</div><div class='del'>-</div><div class='del'>-2000-09-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-auth.c,</div><div class='del'>-	providers/nntp/camel-nntp-auth.h: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-09-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_storage_path): Make this not</div><div class='del'>-	leak.</div><div class='del'>-	</div><div class='del'>-2000-09-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_new): Make this take a path to a</div><div class='del'>-	directory that Camel can use for its own nefarious purposes.</div><div class='del'>-	(camel_session_get_storage_path): New function to return a path</div><div class='del'>-	that a service can use for its own nefarious sub-purposes.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_get_path): New method (and</div><div class='del'>-	useful default implementation) to get a (relative) pathname</div><div class='del'>-	corresponding to the service.</div><div class='del'>-</div><div class='del'>-2000-09-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server): Make KPOP</div><div class='del'>-	work again.</div><div class='del'>-</div><div class='del'>-2000-09-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_get_received_date):</div><div class='del'>-	Implemented (someone added these to camel-mime-message.h but never</div><div class='del'>-	implemented them!!) - though it may not be right.</div><div class='del'>-	(camel_mime_message_get_sent_date): Same.</div><div class='del'>-</div><div class='del'>-2000-09-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_get_filename): If a MIME part</div><div class='del'>-	has no Content-Disposition, but does have a "name" on the</div><div class='del'>-	Content-Type, return that as the filename.</div><div class='del'>-	(process_header): strstrip the Content-Description</div><div class='del'>-</div><div class='del'>-2000-09-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): care about</div><div class='del'>-	response code.</div><div class='del'>-	(get_HEAD_headers): same.</div><div class='del'>-	(camel_nntp_get_headers): same.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.h: get rid of</div><div class='del'>-	CAMEL_NNTP_OK/ERR/FAIL.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_extensions): take CamelException arg and</div><div class='del'>-	pass along to camel_nntp_command.</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): same.</div><div class='del'>-	(nntp_store_connect): convert to using constants in</div><div class='del'>-	camel-nntp-resp-codes.h</div><div class='del'>-	(nntp_store_get_folder): make use of camel_nntp_folder_new.</div><div class='del'>-	(camel_nntp_command_send_recv): new function to deal with auth</div><div class='del'>-	challenge.</div><div class='del'>-	(camel_nntp_command): split out most of this function into</div><div class='del'>-	camel_nntp_command_send_recv.  also, return the actual response</div><div class='del'>-	code instead of CAMEL_NNTP_OK/ERR/FAIL.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-resp-codes.h: new file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.h: prototype for</div><div class='del'>-	camel_nntp_folder_new.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (camel_nntp_folder_new): new</div><div class='del'>-	convenience function.</div><div class='del'>-	(nntp_folder_get_message): care more about the actual response</div><div class='del'>-	code.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add</div><div class='del'>-	camel-nntp-auth.c.</div><div class='del'>-	(libcamelnntpinclude_HEADERS): add camel-nntp-auth.h.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-auth.h: new file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-auth.c: new file.</div><div class='del'>-</div><div class='del'>-2000-09-05  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_folder_exists): Don't free the</div><div class='del'>-	result on error; the exception will have the relevant info.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Check for</div><div class='del'>-	exceptions here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Check the exception</div><div class='del'>-	on the refresh_folders call.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h: Clean up some now-unused fields.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Call unicode_init again, now that libunicode</div><div class='del'>-	will not initialize itself twice.</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search (search_header_contains): Use e_utf8_strstrcase</div><div class='del'>-</div><div class='del'>-2000-09-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c: Removed some unused</div><div class='del'>-	functions.</div><div class='del'>-</div><div class='del'>-2000-09-01  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): Initialize</div><div class='del'>-	the statically-allocated CamelException so that it doesn't contain</div><div class='del'>-	junk data that camel_exception_set() may try to free.</div><div class='del'>-	(camel_nntp_store_get_extensions): Same.</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): Same.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Typo</div><div class='del'>-	fix (if (*ret) -&gt; if (ret)).</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set the</div><div class='del'>-	port # back to what was specified ASAP, so that the hash of</div><div class='del'>-	the URL doesn't change (which causes a failure in</div><div class='del'>-	service_cache_remove that leads to a segfault).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Clear the </div><div class='del'>-	exception after a failed LOGIN so that it doesn't pass through</div><div class='del'>-	to the upper level and make mail think that the login failed.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): As above.</div><div class='del'>-</div><div class='del'>-2000-08-31  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_get_type):</div><div class='del'>-	Implement POP3 with the CamelRemoteStore now.</div><div class='del'>-	(connect_to_server): Hack this a bit to get KPOP to work. Obey</div><div class='del'>-	the new connection semantics of the remote store (implicitly).</div><div class='del'>-	(query_auth_types_connected): Clear exceptions after attempts</div><div class='del'>-	to connect; the code at the bottom will catch hard errors.</div><div class='del'>-	Use camel_service_connect.</div><div class='del'>-	(camel_pop3_command): Take a CamelException; now, when an error</div><div class='del'>-	occurs, ret is set to NULL and the exception passes back the</div><div class='del'>-	appropriate information.</div><div class='del'>-	(pop3_get_response): Same as above.</div><div class='del'>-	(pop3_try_authenticate): Give camel_pop3_command its exception</div><div class='del'>-	and handle it properly.</div><div class='del'>-	(pop3_connect): Call the parent classfuncs. Don't disconnect</div><div class='del'>-	on error (done for us).</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: Obey the camel_pop3_command</div><div class='del'>-	semantics.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_query_auth_types_connected): Don't</div><div class='del'>-	warn; just return NULL.</div><div class='del'>-	(remote_query_auth_types_generic): Same.</div><div class='del'>-	(remote_send_string): Filter out passwords in debugging output.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Also</div><div class='del'>-	set the ALLOW_AUTH flag.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Same.</div><div class='del'>-</div><div class='del'>-2000-08-31  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_store_class_init):</div><div class='del'>-	remove get_folder_name.</div><div class='del'>-	(nntp_store_get_folder_name): remove.</div><div class='del'>-</div><div class='del'>-2000-08-31  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to-stream): Use filter only if we have one</div><div class='del'>-	</div><div class='del'>-2000-08-31  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): use</div><div class='del'>-	camel_remote_store_recv_line.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_message):</div><div class='del'>-	use camel_remote_store_recv_line to build message.  also, free our</div><div class='del'>-	buffer so we don't leak like mad.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c:</div><div class='del'>-	(camel_nntp_store_get_additional_data) remove.</div><div class='del'>-	(camel_nntp_store_get_extensions): use</div><div class='del'>-	camel_remote_store_recv_line.</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): same.  also, don't rely on</div><div class='del'>-	_get_additional_data anymore since it's easier to parse without.</div><div class='del'>-	(camel_nntp_command): use camel_remote_store_send_string and</div><div class='del'>-	camel_remote_store_recv_line.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.h: CamelRemoteStore is the</div><div class='del'>-	parent class now.  remove istream/ostream since CamelRemoteStore</div><div class='del'>-	takes care of that for us.  also remove the prototype for</div><div class='del'>-	camel_nntp_store_get_additional_data.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c (camel_nntp_newsrc_write):</div><div class='del'>-	make sure to clear dirty bit.</div><div class='del'>-	(camel_nntp_newsrc_read_for_server): don't worry about continually</div><div class='del'>-	trying to open the file - if it fails we just return an</div><div class='del'>-	unpopulated .newsrc file.</div><div class='del'>-</div><div class='del'>-2000-08-31  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c</div><div class='del'>-	(camel_nntp_newsrc_read_for_server): make this a bit more robust.</div><div class='del'>-	try to create an empty .newsrc file for the server if we can't</div><div class='del'>-	open it for reading.  also, don't allocate everything until we've</div><div class='del'>-	opened the file.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): make use</div><div class='del'>-	of our overview field indices.</div><div class='del'>-	(camel_nntp_get_headers): only call get_OVER_headers if the</div><div class='del'>-	extension is present.  warn if it's not - since get_HEAD_headers</div><div class='del'>-	needs work before it works.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_extensions): new function - query the server</div><div class='del'>-	for it's extensions.</div><div class='del'>-	(camel_nntp_store_get_overview_fmt): new function - query the</div><div class='del'>-	server for the overview format and build our table of the indices</div><div class='del'>-	we care about.  support the "full" suffix on fields.</div><div class='del'>-	(nntp_store_connect): call camel_nntp_store_get_extensions and</div><div class='del'>-	camel_nntp_store_get_overview_fmt.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.h: add codes for extensions</div><div class='del'>-	found on news.mozilla.org.  only one that we care about is OVER.</div><div class='del'>-	also, add CamelNNTPOverField and an enum of the overview fields</div><div class='del'>-	that we care about.</div><div class='del'>-</div><div class='del'>-2000-08-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp):</div><div class='del'>-	Reimplemented. It should now work correctly for most possible</div><div class='del'>-	VFolder rules.</div><div class='del'>-</div><div class='del'>-2000-08-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Don't save any exceptions caused by camel_imap_folder_changed</div><div class='del'>-	(camel_imap_fetch_command): Same.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Using a new way of calculating the first recent message that seems</div><div class='del'>-	more accurate. Also added code to make sure we don't accidently</div><div class='del'>-	add a duplicate summary.</div><div class='del'>-</div><div class='del'>-2000-08-31  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Use the proper type</div><div class='del'>-	checking function to check for text types.</div><div class='del'>-	(write_to_stream): If we have a charset on a text type that</div><div class='del'>-	isn't us-ascii or utf-8, then we need to reencode it, so add a</div><div class='del'>-	filter to do that too.</div><div class='del'>-	(write_to_stream): Fix some warnings/use the right constructor,</div><div class='del'>-	oops.</div><div class='del'>-	(write_to_stream): Rearrange the logic so it always does charset</div><div class='del'>-	conversion, and not just if we have a qp/base64 block.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (append_latin1): New function - even though</div><div class='del'>-	its broken, we'll assume mailers send latin1 headers instead of</div><div class='del'>-	us-ascii.  We just have to encode high chars into utf-8.</div><div class='del'>-	(header_decode_text): Call append_latin1 for appending unencoded</div><div class='del'>-	text segments.</div><div class='del'>-	(append_latin1): Do an additional mask for account for c's</div><div class='del'>-	undefined behaviour for sign extension whilst shifting right.</div><div class='del'>-</div><div class='del'>-2000-08-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_fetch_command):</div><div class='del'>-	Rewrote to ignore strings that look like server responses until it</div><div class='del'>-	is sure that it has finished reading the literal string response.</div><div class='del'>-</div><div class='del'>-2000-08-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-remote-store.c (remote_send_string): Don't wrap printed</div><div class='del'>-	strings in quotes, makes things messy</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Updated</div><div class='del'>-	to use the camel_imap_fetch_command</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Updated to use</div><div class='del'>-	camel_imap_fetch_command</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	No longer handles FETCH requests so no longer needs to be</div><div class='del'>-	concerned with checking to make sure that server responses are</div><div class='del'>-	valid (they have to be).</div><div class='del'>-	(camel_imap_fetch_command): New convenience function that handles</div><div class='del'>-	all FETCH requests</div><div class='del'>-</div><div class='del'>-2000-08-30  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.c (remote_connect): Unify with remote_post_connect.</div><div class='del'>-	(remote_disconnect): Unify with remote_pre_disconnect.</div><div class='del'>-	(camel_remote_store_class_init): Don't use the post_connect and</div><div class='del'>-	pre_disconnect classfuncs anymore ; they weren't especially useful.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Use this again</div><div class='del'>-	instead of implementing post_connect.</div><div class='del'>-	(imap_disconnect): Analogous to above.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_service_connected): New function.</div><div class='del'>-	Like camel_session_get_service() but also connects to the service</div><div class='del'>-	if needed. camel_session_get_{store,transport} (defined in the header)</div><div class='del'>-	used this now, preventing annoying when-to-connect problems.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_new): Revert to the old behavior</div><div class='del'>-	of not connecting until told to do so. Otherwise doing auth</div><div class='del'>-	testing correctly is really hard.</div><div class='del'>-	(camel_service_connect): Fix behavior here (set the connected</div><div class='del'>-	flag).</div><div class='del'>-	(camel_service_disconnect): Unset the connected flag.</div><div class='del'>-</div><div class='del'>-2000-08-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: General cleanup / moving</div><div class='del'>-	stuff around to make things easier to follow.</div><div class='del'>-</div><div class='del'>-2000-08-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-remote-store.c: Prevent exceptions from being overwritten</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Beautified</div><div class='del'>-	(imap_get_subfolder_names_internal): Removed old code as the</div><div class='del'>-	replacement code has now been tested and proven to work</div><div class='del'>-</div><div class='del'>-2000-08-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c: Removed old code that will</div><div class='del'>-	never be needed again</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Removed old code for</div><div class='del'>-	try_connect - will never need this code</div><div class='del'>-	(slurp_response): Update to make sure we aren't falsely detecting</div><div class='del'>-	EXPUNGE flags</div><div class='del'>-</div><div class='del'>-2000-08-29  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_connect): Uncomment this.</div><div class='del'>-	(camel_service_disconnect): Same.</div><div class='del'>-</div><div class='del'>-	* camel-remote-store.[ch]: New files. Abstract remote storages</div><div class='del'>-	(IMAP, POP3, NNTP) and hides the lower-level networky stuff.</div><div class='del'>-	</div><div class='del'>-	* camel-service.c (camel_service_new): Take an extra argument, the</div><div class='del'>-	provider that created us, cause it's useful.</div><div class='del'>-	(camel_service_finalize): Unref our new provider member.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_get_service): Pass the proper number of</div><div class='del'>-	arguments to camel_service_new().</div><div class='del'>-</div><div class='del'>-	* camel-imap-store.c: Massive update: 1) use the CamelRemoteService to</div><div class='del'>-	make our life Very Easy (TM). 2) Change the semantics of all </div><div class='del'>-	camel_imap_command* functions to take exceptions, centralize tons of</div><div class='del'>-	duplicate code, and use the handy RemoteStore utility functions</div><div class='del'>-</div><div class='del'>-	* camel-imap-folder.c: Use the new semantics of camel_imap_command*</div><div class='del'>-</div><div class='del'>-	* camel-imap-stream.c: Same.</div><div class='del'>-	</div><div class='del'>-2000-08-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Updated to check for EXPUNGE notifications</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Updated to account for messages which have been expunged (now</div><div class='del'>-	takes a new arg, a GPtrArray of message id's that have been</div><div class='del'>-	expunged)</div><div class='del'>-	(imap_expunge): Updated (we may want to just use the code in</div><div class='del'>-	folder_changed now instead of doing our own summary</div><div class='del'>-	expunging...but that can be fixed later)</div><div class='del'>-	(imap_append_message): Updated.</div><div class='del'>-	(imap_copy_message_to): Updated.</div><div class='del'>-	(imap_move_message_to): Updated.</div><div class='del'>-</div><div class='del'>-2000-08-28  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_refresh_info): New member function,</div><div class='del'>-	refresh_info, used for rereading folder state after its state has</div><div class='del'>-	somehow become unknown. Tries to preserve last-known status of</div><div class='del'>-	messages.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_refresh_info): Implement</div><div class='del'>-	::refresh_info (split up ::init)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Call ::refresh_info.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Call</div><div class='del'>-	::refresh_info once initialized.</div><div class='del'>-	(imap_refresh_info): New member function; reads the summary from</div><div class='del'>-	the server (used to be in camel_imap_folder_new; split out).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Set</div><div class='del'>-	CamelService::connected a little early so that </div><div class='del'>-	camel_imap_command won't try to connect while already</div><div class='del'>-	connnecting.</div><div class='del'>-	(camel_imap_command*): Try to connect if not connected already.</div><div class='del'>-	</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_refresh_info): Same as above.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Same</div><div class='del'>-	as above.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Set </div><div class='del'>-	CamelService::connected a little early so that</div><div class='del'>-	camel_pop3_command won't try to connect while already</div><div class='del'>-	connecting</div><div class='del'>-	(connect_to_server): Same.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_refresh_info): Same</div><div class='del'>-	as above.</div><div class='del'>-</div><div class='del'>-2000-08-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed the</div><div class='del'>-	hack around quoted string responses - should now handle them</div><div class='del'>-	according to the specifications in the RFC</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Updated to</div><div class='del'>-	match the code currently used in camel-imap-folder.c</div><div class='del'>-</div><div class='del'>-2000-08-28  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):</div><div class='del'>-	Never ever free `tmpname' as it comes from `alloca()'!</div><div class='del'>-</div><div class='del'>-2000-08-26  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_text): Use `g_free()', not</div><div class='del'>-	`free()', to free `decword'.</div><div class='del'>-</div><div class='del'>-2000-08-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): Don't call unicode_init; code in e-util</div><div class='del'>-	will do it, and if unicode_init is called twice, you get an</div><div class='del'>-	infinite loop when looking up nonexistant encodings (patch</div><div class='del'>-	has been submitted to libunicode's maintainer).</div><div class='del'>-	</div><div class='del'>-	* camel-provider.h: Add a new field, default_ports, which</div><div class='del'>-	helps the configuration code guess about how to make CamelURL's</div><div class='del'>-	from providers.</div><div class='del'>-	</div><div class='del'>-	* providers/*/camel-*-provider.c: Specify default ports.</div><div class='del'>-</div><div class='del'>-2000-08-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_names_internal): If the url path is "/" and</div><div class='del'>-	the folder path is "/", just LIST "" "*" (this should fix some</div><div class='del'>-	cyrus imapd problems). Also, INBOX is case insensitive so use</div><div class='del'>-	g_strcasecmp</div><div class='del'>-</div><div class='del'>-2000-08-24  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info):</div><div class='del'>-	Use UTF-8 as default</div><div class='del'>-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser):</div><div class='del'>-	Use UTF-8 as default</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): Use UTF-8</div><div class='del'>-	</div><div class='del'>-2000-08-17  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_finalize): And here too.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): Close index</div><div class='del'>-	on exit.</div><div class='del'>-</div><div class='del'>-2000-08-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_format_append): put</div><div class='del'>-	commas between addresses.</div><div class='del'>-</div><div class='del'>-2000-08-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_protocol_get_summary_specifier): use BODY.PEEK, not BODY, so</div><div class='del'>-	we don't set the message \Seen.</div><div class='del'>-</div><div class='del'>-2000-08-22  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Fixed a small warning.</div><div class='del'>-</div><div class='del'>-2000-08-22  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_new): Connect automatically if the</div><div class='del'>-	URL is not empty.</div><div class='del'>-	(finalize): Disconnect automatically if connected.</div><div class='del'>-	(camel_service_query_auth_types): Split	into two functions; one to</div><div class='del'>-	be called if we're connected to an actual server (_connected), one</div><div class='del'>-	to be called if we're just gauging the general authtypes supported</div><div class='del'>-	(_generic).</div><div class='del'>-	(is_connected): Remove.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Don't connect explicitly to</div><div class='del'>-	the service.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (query_auth_types_generic): Split</div><div class='del'>-	the query_auth_types function. Hook it up in _new.</div><div class='del'>-	(finalize): Don't try to disconnect here.</div><div class='del'>-	</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types_generic): Same.</div><div class='del'>-	(finalize): Don't try to disconnect here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types_generic): Same.</div><div class='del'>-	(finalize): Don't try to disconnect here.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (query_auth_types_generic): Split</div><div class='del'>-	the query_auth_types (dummy, in this case) function. Hook it up in _new.</div><div class='del'>-	(finalize): Don't try to disconnect here.</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_subfolder_names):</div><div class='del'>-	Make sure newsrc is not null</div><div class='del'>-	(nntp_folder_get_subfolder_names): ditto</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c </div><div class='del'>-	(camel_nntp_newsrc_get_subscribed_group_names): Programming check</div><div class='del'>-	for newsrc == NULL</div><div class='del'>-	(camel_nntp_newsrc_get_all_group_names): ditto</div><div class='del'>-	(camel_nntp_newsrc_write_to_file): ditto</div><div class='del'>-	(camel_nntp_newsrc_write): ditto</div><div class='del'>-</div><div class='del'>-2000-08-21  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c (camel_nntp_command): </div><div class='del'>-	Make sure respbuffer is not null before manipulating it.</div><div class='del'>-	If it is null, return CAMEL_NNTP_FAIL and a decent error</div><div class='del'>-	message.</div><div class='del'>-	</div><div class='del'>-2000-08-18  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): If the name is "" we</div><div class='del'>-	weren't outputting anything; output the address at least.</div><div class='del'>-</div><div class='del'>-2000-08-16  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): Fix a leak when</div><div class='del'>-	name = "". It's a single-byte leak, but it's the little things</div><div class='del'>-	that count.</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_type_lock_up): Don't leave the type</div><div class='del'>-	system locked when a bad unlock happens.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Fix a leak.</div><div class='del'>-</div><div class='del'>-2000-08-15  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_copy_message_to): Typo fix.</div><div class='del'>-</div><div class='del'>-2000-08-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_get_sent_date): New search function;</div><div class='del'>-	returns the time_t when the message was sent.</div><div class='del'>-	(search_get_receive_date): Same for when it was received.</div><div class='del'>-	(search_get_current_date): Gets the current time for use with the</div><div class='del'>-	above two. Is this in the right place?</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.h: Add the new functions above to the class.</div><div class='del'>-</div><div class='del'>-2000-08-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntpinclude_HEADERS): Add</div><div class='del'>-	camel-nntp-utils.h</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_names_internal): do a strcasecmp rather than</div><div class='del'>-	just a strcmp when checking if a folder is "INBOX", since it is</div><div class='del'>-	a case-insensitive name.</div><div class='del'>-</div><div class='del'>-2000-08-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):</div><div class='del'>-	Don't assume the FETCH results will come back in the order they</div><div class='del'>-	were requested.</div><div class='del'>-	(imap_get_subfolder_names_internal): Add "INBOX" to the list as</div><div class='del'>-	g_malloc'ed memory, not a static string.</div><div class='del'>-</div><div class='del'>-2000-08-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(camel_imap_command_continuation): Now takes a char * parameter</div><div class='del'>-	rather than a stream</div><div class='del'>-	(camel_imap_command_continuation_with_stream): Same function as</div><div class='del'>-	above but takes a stream parameter instead</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): Use</div><div class='del'>-	camel_imap_command_continuation_with_stream</div><div class='del'>-</div><div class='del'>-2000-08-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_try_authenticate): New</div><div class='del'>-	function to do one round of attempted authentication.</div><div class='del'>-	(pop3_connect): Move a bunch of code out into</div><div class='del'>-	pop3_try_authenticate and fix some bugs in the edge cases.</div><div class='del'>-</div><div class='del'>-2000-08-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types): No longer</div><div class='del'>-	calls try_connect() to get authtypes</div><div class='del'>-</div><div class='del'>-2000-08-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(camel_imap_command_continuation): Changed param order a bit and</div><div class='del'>-	fixed some logic</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): Use</div><div class='del'>-	the new multi-transactional convenience functions</div><div class='del'>-</div><div class='del'>-2000-08-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(camel_imap_command_preliminary): New convenience function for</div><div class='del'>-	multi-transactional commands (opening request)</div><div class='del'>-	(camel_imap_command_continuation): New convenience function for</div><div class='del'>-	multi-transactional commands (followup data)</div><div class='del'>-</div><div class='del'>-2000-08-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c: Fixed a warning.</div><div class='del'>-</div><div class='del'>-2000-08-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c</div><div class='del'>-	(camel_nntp_folder_class_init): remove get_name and get_full_name</div><div class='del'>-	assignments, since the camel-folder.c implementation does what we</div><div class='del'>-	need.</div><div class='del'>-</div><div class='del'>-2000-08-11  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_toplevel_dir): use g_get_home_dir, since</div><div class='del'>-	evolution_dir isn't available in the providers.</div><div class='del'>-</div><div class='del'>-2000-08-11  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (thaw): Fix a bug where the message_changed</div><div class='del'>-	signal wasn't being emitted.</div><div class='del'>-</div><div class='del'>-2000-08-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_set_message_user_tag):</div><div class='del'>-	Implement.</div><div class='del'>-	(mh_get_message_user_tag): Implement.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_user_tag):</div><div class='del'>-	(mbox_set_message_user_tag): Implement.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (move_message_to): Yay so lets fix an already</div><div class='del'>-	fixed fix, again.</div><div class='del'>-	(copy_message_to): and here too ... update for api change to append().</div><div class='del'>-	And removed another warning.</div><div class='del'>-	(camel_folder_set_message_user_tag): Routine to set message tags.</div><div class='del'>-	(camel_folder_get_message_user_tag): And accessor.</div><div class='del'>-</div><div class='del'>-2000-08-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c, camel-folder-summary.c, camel-medium.c,</div><div class='del'>-	camel-mime-filter-charset.c, camel-mime-filter.c,</div><div class='del'>-	camel-mime-filter.h, camel-mime-message.c, camel-mime-parser.c,</div><div class='del'>-	camel-mime-part-utils.c, camel-mime-part.c, camel-mime-utils.c,</div><div class='del'>-	camel-movemail.c, camel-multipart.c, camel-object.c,</div><div class='del'>-	camel-stream-mem.c, providers/mbox/camel-mbox-folder.c,</div><div class='del'>-	providers/mbox/camel-mbox-summary.c,</div><div class='del'>-	providers/mh/camel-mh-folder.c,</div><div class='del'>-	providers/smtp/camel-smtp-transport.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-2000-08-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder): Free</div><div class='del'>-	the search properly.</div><div class='del'>-	(vee_folder_build): And here too.</div><div class='del'>-</div><div class='del'>-2000-08-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	If we go over the max number of messages, don't keep requesting</div><div class='del'>-	new message summaries, just break.</div><div class='del'>-</div><div class='del'>-2000-08-11  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): A better way to</div><div class='del'>-	compress leading whitespace.  The code is probably invalid anyway,</div><div class='del'>-	I dont think it will work across buffer boundaries.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): And</div><div class='del'>-	write out proper format From lines here too.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_build_from): New function to build a more</div><div class='del'>-	compatible mbox "From " line.</div><div class='del'>-	(camel_mbox_summary_sync): Write From lines in the proper format.</div><div class='del'>-</div><div class='del'>-2000-08-10  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-store.c (get_folder): Remove warnin g.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (xrename): Kill some warnings</div><div class='del'>-	with constification.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): Fixed</div><div class='del'>-	for append api change.  Eek this routine seriously wastes memory.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_search_free): Impelemnt.</div><div class='del'>-	(mh_append_message): Fix for api change, and include user flags</div><div class='del'>-	and tags in new message.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Fix</div><div class='del'>-	for search api change.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_search_free): New function for</div><div class='del'>-	freeing search results.</div><div class='del'>-	(search_free): Changed my mind, implement a default that actually</div><div class='del'>-	does something.  Free as to the old interface.</div><div class='del'>-	(camel_folder_append_message): Changed to accept a</div><div class='del'>-	camelmessageinfo rather than flags, which just doesn't have enough</div><div class='del'>-	info in it.</div><div class='del'>-	(copy_message_to): Change for append_message api change.</div><div class='del'>-	(move_message_to): Likewise.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_search_free):</div><div class='del'>-	Implement.</div><div class='del'>-	(mbox_append_message): Fix for api change, and also copy user</div><div class='del'>-	flags/tags across to new summary.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_user_tag): A search expression</div><div class='del'>-	that returns the current use flag by name.</div><div class='del'>-	(camel_folder_search_free_result): New function to free the result</div><div class='del'>-	of a search.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Bump summary version.</div><div class='del'>-	(message_info_new): </div><div class='del'>-	(message_info_load): </div><div class='del'>-	(message_info_save): </div><div class='del'>-	(camel_message_info_dup_to): </div><div class='del'>-	(camel_message_info_free): Added support for arbitrary tag/value</div><div class='del'>-	pairs (CamelTag's).</div><div class='del'>-	(camel_tag_get): </div><div class='del'>-	(camel_tag_set):</div><div class='del'>-	(camel_tag_list_size):</div><div class='del'>-	(camel_tag_list_free): Operations for working with CamelTags.</div><div class='del'>-</div><div class='del'>-2000-08-09  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Connect beforehand, if</div><div class='del'>-	necessary.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): Default</div><div class='del'>-	the dir_sep to "/" so that certain functions can safely assume that</div><div class='del'>-	dir_sep is valid (at least, nonnull).</div><div class='del'>-</div><div class='del'>-2000-08-09  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c</div><div class='del'>-	(nntp_folder_set_message_flags): Get rid of an unused variable.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (INCLUDES): Fix includes so that we</div><div class='del'>-	don't use installed headers anymore.  [I copied this over from the</div><div class='del'>-	IMAP provider, that does not seem to have this problem.]</div><div class='del'>-</div><div class='del'>-2000-08-09  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_execute_expression):</div><div class='del'>-	Reorder search result in summary order if we searched with a</div><div class='del'>-	summary.</div><div class='del'>-</div><div class='del'>-2000-08-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-uid-cache.c: New code to keep an on-disk cache of what</div><div class='del'>-	UIDs have been seen in a folder.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Add new flags CAMEL_PROVIDER_IS_SOURCE (mail</div><div class='del'>-	can arrive in it by non-Camel means) and CAMEL_PROVIDER_IS_STORAGE</div><div class='del'>-	(you can work with mail directly without needing to copy it local).</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-provider.c: Add flags as needed: imap and</div><div class='del'>-	mbox are SOURCE and STORAGE. mh and nntp are just STORAGE, pop3 is</div><div class='del'>-	just SOURCE.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (process_header): Add another subject</div><div class='del'>-	g_strstrip that fejj's earlier commit missed.</div><div class='del'>-</div><div class='del'>-2000-08-08  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Remove some GTK stuff that I missed.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_noop): Turn this</div><div class='del'>-	back on with the new timeout interface in CamelSession.</div><div class='del'>-</div><div class='del'>-	* camel-session.[ch] (camel_session_register_timeout): New</div><div class='del'>-	interface for Camel to register timeouts. Basically the</div><div class='del'>-	GTK timeout interface is copied. We do this because Camel isn't</div><div class='del'>-	allowed to use GTK anymore.</div><div class='del'>-	</div><div class='del'>-2000-08-07  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_append_message): Only retry</div><div class='del'>-	another uid if we had a name clash, otherwise fail.</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_names_internal): If we are trying to get a</div><div class='del'>-	subfolder listing of the root folder, always make sure INBOX is</div><div class='del'>-	there...</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_parse_list_response): </div><div class='del'>-	Check for NIL as a directory separator.</div><div class='del'>-</div><div class='del'>-2000-08-07  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am: Reorder the INCLUDES to pull</div><div class='del'>-	in the camel headers from the local source tree before</div><div class='del'>-	the ones in $(includedir). This was causing compile problems</div><div class='del'>-	because the installed, Gtk-based camel-object.h was included</div><div class='del'>-	before the uninstall Camel-based one.</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): Strip</div><div class='del'>-	all \n's from the expression</div><div class='del'>-</div><div class='del'>-	* string-utils.c (strip): New convenience function to strip</div><div class='del'>-	occurences of a single char from a string</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_subject): Do a</div><div class='del'>-	g_strstrip on the subject so we can stop getting those annoying</div><div class='del'>-	leading spaces</div><div class='del'>-</div><div class='del'>-2000-08-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_free_deep): Fix this to not require</div><div class='del'>-	NULL-termination of the array.</div><div class='del'>-</div><div class='del'>-2000-08-04  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): If we fail to</div><div class='del'>-	get a dir_sep, then supply the default of "/".</div><div class='del'>-	(get_folder): Undo changes by Peter</div><div class='del'>-</div><div class='del'>-2000-08-04  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Prevent a coredump</div><div class='del'>-	when get_folder()ing from a store with dir_sep = NULL.</div><div class='del'>-</div><div class='del'>-2000-08-04  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.h: Include camel-object.h. Ettore said this wasn't</div><div class='del'>-	compiling.</div><div class='del'>-</div><div class='del'>-2000-08-04  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_set_protocol): </div><div class='del'>-	(camel_url_set_host): </div><div class='del'>-	(camel_url_set_path): </div><div class='del'>-	(camel_url_set_port): Url editing functions.</div><div class='del'>-</div><div class='del'>-2000-08-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (pop3_set_message_flags): </div><div class='del'>-	(pop3_sync): Indexes into the flags array are message_number minus</div><div class='del'>-	1, not just message_number.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: add a debugging macro for</div><div class='del'>-	doing protocol tracing.</div><div class='del'>-</div><div class='del'>-2000-08-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Only</div><div class='del'>-	call imap_get_summary_internal if the folder can hold messages</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c (camel_provider_module_init): </div><div class='del'>-	Initialize the service_cache for the news/nntp providers</div><div class='del'>-</div><div class='del'>-2000-08-03  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (INCLUDES): Add -I$(top_srcdir) to</div><div class='del'>-	pull in libibex/ibex.h</div><div class='del'>-</div><div class='del'>-2000-08-02  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-summary.c (camel_mh_summary_sync): Expunge</div><div class='del'>-	from the end, so the index isn't messed up when you remove a</div><div class='del'>-	message.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-folder.c (mh_append_message): Fix a bug</div><div class='del'>-	where it would never open an output file/uid.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (rename_folder):</div><div class='del'>-	Implementation for mbox as well.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_rename_folder): New method to rename folders.</div><div class='del'>-	(rename_folder): Default implementation.</div><div class='del'>-</div><div class='del'>-	* providers/mh/camel-mh-store.c (delete_folder): Implement this.</div><div class='del'>-	(rename_folder): Implement a rename operation.</div><div class='del'>-</div><div class='del'>-2000-08-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/MH: Kill this. It doesn't have any code to do anything</div><div class='del'>-	the new mh provider doesn't do better.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Remove reference to MH subdir, and</div><div class='del'>-	promote nntp to fully-supported status, since it does compile and</div><div class='del'>-	all.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_subject): Trim</div><div class='del'>-	trailing space from the subject. I've now seen replies from two</div><div class='del'>-	different people that tricked the threading code by (a) not having</div><div class='del'>-	References/In-Reply-To, and (b) adding an extra space to the end</div><div class='del'>-	of the subject line so the subject-based threading fails too. Who</div><div class='del'>-	writes these broken mailers anyway?</div><div class='del'>-</div><div class='del'>-2000-08-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_helo): When forced</div><div class='del'>-	to use the IP, place it in square brackets.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New and</div><div class='del'>-	improved sexp parser. An honest try at using e-sexp is wrapped in</div><div class='del'>-	a #ifdef at the bottom of the file but is currently not used</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	We want to do a UID SEARCH so we get UIDs back instead of sequence</div><div class='del'>-	numbers</div><div class='del'>-</div><div class='del'>-2000-08-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mh: New mh provider implementation.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): Added mh provider.</div><div class='del'>-</div><div class='del'>-2000-07-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_info_internal): </div><div class='del'>-	Some IMAP servers don't wrap the UID in ()'s so don't depend on that</div><div class='del'>-	(imap_get_summary_internal): Same</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (free_sexp_node): Oops, forgot to</div><div class='del'>-	free node-&gt;function - not good.</div><div class='del'>-</div><div class='del'>-2000-07-31  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_search_by_expression): Add</div><div class='del'>-	a NULL to the matches pointer array so that g_strfreev knows where</div><div class='del'>-	the end is.</div><div class='del'>-</div><div class='del'>-2000-07-31  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-utils.c (imap_translate_sexp): New</div><div class='del'>-	convenience function to translate a Camel sexp into the equivalent</div><div class='del'>-	IMAP sexp.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: More places now use</div><div class='del'>-	imap_next_word</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	Implemented initial version (this may or may not work quite right)</div><div class='del'>-</div><div class='del'>-2000-07-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Make sure</div><div class='del'>-	the third word/token (whatever) is "EXPUNGE" and not something</div><div class='del'>-	else like "EXISTS" or "RECENT". When removing the message from</div><div class='del'>-	the summary also make sure to free that data to avoid leakage.</div><div class='del'>-	Also make sure to subtract 1 from the 'id' since IMAP starts</div><div class='del'>-	at 1 and our summary starts at 0 :-)</div><div class='del'>-</div><div class='del'>-2000-07-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_status): Cleaned</div><div class='del'>-	up a bit, now uses imap_next_word()</div><div class='del'>-	(camel_imap_command_extended): Now uses imap_next_word(). When</div><div class='del'>-	checking for RECENT, allow the first digit of the recent-count</div><div class='del'>-	be between 0 and 9 inclusive instead of exclusive.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Optimized.</div><div class='del'>-	No longer will it need to reload the summary as it now instead</div><div class='del'>-	removes the appropriate message summaries from the cache.</div><div class='del'>-	(camel_imap_folder_changed): If recent == 0 then return. If </div><div class='del'>-	recent &lt; 0 then just emit the folder_changed signal, don't reload</div><div class='del'>-	summaries.</div><div class='del'>-</div><div class='del'>-2000-07-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_message_count_internal): Get message count when STATUS</div><div class='del'>-	is not available.</div><div class='del'>-	(imap_init): folder-&gt;has_search_capability is required for IMAP so</div><div class='del'>-	should always be set to TRUE (is currently being set to FALSE as</div><div class='del'>-	I've not yet implemented SEARCH support).</div><div class='del'>-	(camel_imap_folder_changed): Seem to have fixed my optimization</div><div class='del'>-	hack</div><div class='del'>-</div><div class='del'>-2000-07-28  Jon K Hellan  &lt;hellan@acm.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h (CamelImapServerLevel): New</div><div class='del'>-	enum.</div><div class='del'>-	(CamelImapStore): Added server_level and has_status_capability</div><div class='del'>-	members.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Detect</div><div class='del'>-	IMAP4REV1, IMAP4 and STATUS in capability response.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_message_count_internal): Use STATUS only if server</div><div class='del'>-	supports it. TODO: Get message count when STATUS not supported.</div><div class='del'>-	(imap_get_message, imap_get_summary_internal,</div><div class='del'>-	imap_get_message_info_internal): Handle IMAP4 as well.</div><div class='del'>-	(imap_protocol_get_summary_specifier): New function: Make a data</div><div class='del'>-	item specifier for the header lines we need, appropriate to the</div><div class='del'>-	server level.</div><div class='del'>-</div><div class='del'>-2000-07-27  Peter Williams &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_lwsp): More</div><div class='del'>-	checks for end of string.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c:</div><div class='del'>-	(imap_command_extended): Free the elements of our</div><div class='del'>-	array (huge mem leak)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c:</div><div class='del'>-	(summary_get_internal): Same as above.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-07-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Fixed my routine to only fetch new headers, my IDs were off by 1</div><div class='del'>-	on the high end, so when it would fetch the last newly arrived</div><div class='del'>-	message it would fail and end up fetching all of the summaries</div><div class='del'>-	because of the corruption.</div><div class='del'>-</div><div class='del'>-2000-07-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_to_string): If the path doesn't begin</div><div class='del'>-	with a / and there is a host, prepend a / to the path.</div><div class='del'>-</div><div class='del'>-2000-07-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/Makefile.am: Added camel-imap-utils.[c,h]</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-utils.[c,h]: Utilities for parsing</div><div class='del'>-	server responses for use in both camel-imap-store.c and</div><div class='del'>-	camel-imap-folder.c</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary_internal):</div><div class='del'>-	Free all the pointers in the headers array.</div><div class='del'>-	(imap_get_subfolder_names_internal): Updated to use</div><div class='del'>-	imap_parse_list_response</div><div class='del'>-	(imap_parse_subfolder_list): Removed in favor of</div><div class='del'>-	imap_parse_list_response</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Free all the pointers in the data array.</div><div class='del'>-	(imap_connect): Updated to use imap_parse_list_response and fixed</div><div class='del'>-	a leak</div><div class='del'>-	(folder_is_selectable): Updated.</div><div class='del'>-</div><div class='del'>-2000-07-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Now</div><div class='del'>-	uses a hash table for looking up message info rather than a linear</div><div class='del'>-	search :)</div><div class='del'>-</div><div class='del'>-2000-07-27  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/*/Makefile.am: Don't specify SUBDIRS =</div><div class='del'>-	[nothing]. Messes up distcheck.</div><div class='del'>-	</div><div class='del'>-2000-07-26  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-mime-parser.c (folder_scan_init): Initialize</div><div class='del'>-	outbuf to be "" -- it's not guaranteed to be zeroed.</div><div class='del'>-	</div><div class='del'>-	* camel-mime-utils.c (header_references_decode): Return</div><div class='del'>-	if the header is NULL -&gt; or "" &lt;-. Don't do our stupid</div><div class='del'>-	mailer trick if we point to \0.</div><div class='del'>-	(header_decode_quoted_string): Don't rip past end of </div><div class='del'>-	string!</div><div class='del'>-	</div><div class='del'>-2000-07-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c (movemail_external): routine to call an</div><div class='del'>-	external movemail program.</div><div class='del'>-	(camel_movemail): Nuke return value, use movemail_external when</div><div class='del'>-	available and useful, and don't delete "dest" on errors, since</div><div class='del'>-	it might have started non-empty.</div><div class='del'>-</div><div class='del'>-2000-07-26  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_to_string): Should now always prepend a '/'</div><div class='del'>-	before the path if it doesn't already exist.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Fixed a few compiler warnings</div><div class='del'>-</div><div class='del'>-2000-07-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_summary_free): Fixed the</div><div class='del'>-	real problem that Peter was running into.</div><div class='del'>-</div><div class='del'>-2000-07-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (write_to_stream): Don't add a Mime-Version</div><div class='del'>-	header to a message that already has one.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_encode): Don't put &lt;&gt;s around</div><div class='del'>-	addresses with no name part.</div><div class='del'>-</div><div class='del'>-2000-07-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Set </div><div class='del'>-	imap_folder-&gt;summary to NULL after calling imap_summary_free,</div><div class='del'>-	so we don't get stuck with a junk summary pointer. Should</div><div class='del'>-	we free it at all?</div><div class='del'>-</div><div class='del'>-2000-07-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_changed):</div><div class='del'>-	Optimized to try and get the new message headers without reloading</div><div class='del'>-	the entire summary from scratch.</div><div class='del'>-	(imap_get_summary_internal): Will now sync() before attempting to</div><div class='del'>-	reload the summary so that flags are set in the reloaded summary</div><div class='del'>-	as well.</div><div class='del'>-</div><div class='del'>-2000-07-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Updated to give</div><div class='del'>-	special attention to the root folder.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(imap_get_subfolder_names_internal): Updated to handle the root</div><div class='del'>-	folder</div><div class='del'>-	(imap_get_message_count_internal): return 0 if folder can't hold</div><div class='del'>-	messages</div><div class='del'>-	(camel_imap_folder_new): Change so that root folder gets special</div><div class='del'>-	attention and always gets can_hold_messages set to FALSE</div><div class='del'>-</div><div class='del'>-2000-07-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Remove exceptions from a number of methods that</div><div class='del'>-	work on what ought to be static data: get_parent_folder,</div><div class='del'>-	get_parent_store, get_message_count, get_unread_message_count,</div><div class='del'>-	get_permanent_flags, get_message_flags, set_message_flags,</div><div class='del'>-	get_message_user_flag, set_message_user_flag, get_uids,</div><div class='del'>-	get_summary, get_subfolder_names. Turn camel_folder_delete_message</div><div class='del'>-	into a macro. (Mostly a pull-up from the camel-async branch.)</div><div class='del'>-</div><div class='del'>-	* providers/{imap,mbox,nntp,pop3,vee}: Update for CamelFolder</div><div class='del'>-	changes</div><div class='del'>-</div><div class='del'>-2000-07-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_info): Updated</div><div class='del'>-	to port easily to the new Camel API</div><div class='del'>-	(imap_init): Don't SELECT INBOX, we don't need to do that</div><div class='del'>-</div><div class='del'>-2000-07-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): </div><div class='del'>-	Initialize the summary and subfolder listing.</div><div class='del'>-	(imap_summary_free): Now takes a GPtrArray arg rather than a </div><div class='del'>-	CamelImapFolder as it increases it's usefullness for free()'ing</div><div class='del'>-	temporary summaries.</div><div class='del'>-	(imap_get_message_count_internal): A new convenience function for</div><div class='del'>-	getting the actual message count on a server to be used by </div><div class='del'>-	imap_get_summary_internal)</div><div class='del'>-	(imap_get_message_count): Since the Camel API is on the move again, </div><div class='del'>-	the future version of this function will not be able to make a</div><div class='del'>-	call to the store, it must only access previously fetched data (thus </div><div class='del'>-	the creation of the _internal function)</div><div class='del'>-	(imap_get_subfolder_names_internal): Again, because the future version</div><div class='del'>-	of imap_get_subfolder_names will not take an exception, we must rename</div><div class='del'>-	this function which will be called by camel_imap_folder_new()</div><div class='del'>-	(imap_get_subfolder_names): We now return the previously collected</div><div class='del'>-	subfolder listing that the _internal function fetched previously</div><div class='del'>-	(imap_get_summary_internal): Again, same idea as the previous _internal</div><div class='del'>-	functions...</div><div class='del'>-	(imap_get_summary): Again... now returns a previously aquired summary</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_noop): This will hopefully</div><div class='del'>-	prevent the imap store from disconnecting.</div><div class='del'>-	(imap_connect): Modified to add a gtk timeout event that will call</div><div class='del'>-	imap_noop() every 10 minutes (we may want to change this time value)</div><div class='del'>-	(imap_disconnect): Modified to remove the NOOP timeout event from the</div><div class='del'>-	store.</div><div class='del'>-	(camel_imap_command_extended): Commented out the code that would try</div><div class='del'>-	and detect if the store was disconnected and then reconnect if it was</div><div class='del'>-	needed.</div><div class='del'>-</div><div class='del'>-2000-07-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: Remove camel_folder_get_message_uid, which</div><div class='del'>-	was not used, and not implemented by any provider.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c: Remove get_message_uid</div><div class='del'>-	non-implementation.</div><div class='del'>-</div><div class='del'>-	* camel-folder-pt-proxy.[ch], camel-arg-collector.c,</div><div class='del'>-	camel-marshal-utils.[ch]: Bye bye bye.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: remove reference to camel-arg-collector.c</div><div class='del'>-</div><div class='del'>-2000-07-23  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Made it a</div><div class='del'>-	little more forgiving. Also set current_folder to NULL as there is</div><div class='del'>-	no selected folder after a disconnect.</div><div class='del'>-	(stream_is_alive): Detects whether or not a socket is "alive"</div><div class='del'>-	(camel_imap_command_extended): Use stream_is_alive() to aid in the</div><div class='del'>-	detection of a disconnected state.</div><div class='del'>-</div><div class='del'>-2000-07-22  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Clear</div><div class='del'>-	CamelExceptions when appropriate (eg when folder is marked as</div><div class='del'>-	\NoSelect). Still needs some cleanup and perhaps Dan will have a</div><div class='del'>-	better way of doing this as this seems like a messy way of</div><div class='del'>-	handling this.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_uids): Took out</div><div class='del'>-	some debug statements as they are no longer needed.</div><div class='del'>-</div><div class='del'>-2000-07-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_subfolder_names):</div><div class='del'>-	Updated to not strip out subfolders that are marked as \NoSelect</div><div class='del'>-	because this will be correctly handled in store-&gt;get_folder from</div><div class='del'>-	now on.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (folder_is_selectable): New</div><div class='del'>-	convenience function for use in get_folder().</div><div class='del'>-	(parse_list_response): Now takes a char **flags argument which is</div><div class='del'>-	needed by folder_is_selectable().</div><div class='del'>-	(imap_connect): Updated to reflect changes to</div><div class='del'>-	parse_list_response().</div><div class='del'>-</div><div class='del'>-2000-07-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Updated with</div><div class='del'>-	some of the same fixes I've made to camel-imap-folder.c like</div><div class='del'>-	recalculating message part lengths.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended):</div><div class='del'>-	Rewrote the code to check for "* %d RECENT". Still needs to be</div><div class='del'>-	modified, but should no longer cause an infinite loop by detecting</div><div class='del'>-	mis-detecting RECENT messages.</div><div class='del'>-</div><div class='del'>-2000-07-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary):</div><div class='del'>-	(imap_get_message_info): Oops. Fix UID parser to allow 0 and 9 to</div><div class='del'>-	be in the range of valid UID chars.</div><div class='del'>-</div><div class='del'>-2000-07-20  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_object_unref): Add a new global mutex</div><div class='del'>-	'refcount' held when refcounting operations occur.</div><div class='del'>-</div><div class='del'>-2000-07-19  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_type_lock_up): Correct the recursiveness;</div><div class='del'>-	the locklevel is stored as a private, so each thread has its own</div><div class='del'>-	idea of the locklevel. Thus one thread can relock, but a different</div><div class='del'>-	one will think that it's a level 0 and try to lock the type_system</div><div class='del'>-	mutex.</div><div class='del'>-</div><div class='del'>-2000-07-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: General cleanup working</div><div class='del'>-	towards getting Actions-&gt;Expunge working correctly.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c</div><div class='del'>-	(cammel_imap_command_extended): Added code to look for "* %d</div><div class='del'>-	RECENT" and to emit the folder_changed signal if there are any</div><div class='del'>-	recent messages. Note: this is a hack and needs to be rewritten</div><div class='del'>-	badly.</div><div class='del'>-</div><div class='del'>-2000-07-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): If the</div><div class='del'>-	folder's message count is not the same as the number of summaries,</div><div class='del'>-	free the old summary and create a new summary.</div><div class='del'>-</div><div class='del'>-2000-07-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c</div><div class='del'>-	(camel_imap_folder_class_init): Added in</div><div class='del'>-	imap_[g,s]et_message_user_flag() methods</div><div class='del'>-	(imap_get_message_info): Rewrote to use the more efficient way of</div><div class='del'>-	downloading summary information and also added a UID comparison so</div><div class='del'>-	that if the UID requested doesn't match the UID received, it</div><div class='del'>-	returns NULL.  FIXME: When the mailer gets NULL when it requested</div><div class='del'>-	message info, it seems that it displays a row for that message and</div><div class='del'>-	when you try and select the blank row, it segfaults.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Oops, this</div><div class='del'>-	should not be checking against "/", it should be checking against</div><div class='del'>-	dir_sep.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_parse_subfolder_line):</div><div class='del'>-	Updated to trim out the leading namespace.</div><div class='del'>-	(imap_get_subfolder_names): Let the subfolder parser trim the</div><div class='del'>-	namespace off the folder name.</div><div class='del'>-</div><div class='del'>-2000-07-17  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c (camel_type_lock_up): New function; the</div><div class='del'>-	Camel type_system lock is now fakey-recursive, being controlled</div><div class='del'>-	by a semaphore that goes up and down and is protected by another</div><div class='del'>-	lock. Theoretically all we need is the lock on the semaphore,</div><div class='del'>-	but this we catch exceptions "better" (by deadlocking).</div><div class='del'>-	(camel_type_lock_down): Corresponding to above.</div><div class='del'>-	(all functions): s,G_LOCK,camel_type_lock_up, etc.</div><div class='del'>-</div><div class='del'>-2000-07-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_disconnect): Send a</div><div class='del'>-	"LOGOUT" command.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Hacks to</div><div class='del'>-	get IMAP code to work with CommunigatePro and MS Exchange (and any</div><div class='del'>-	other servers that send back a UID at the end of each FETCH inside</div><div class='del'>-	of the main body of the message part).</div><div class='del'>-	(imap_sync): Un-#if 0 the code that sets the flags on the IMAP</div><div class='del'>-	server for messages that have changed. Oops, don't mask with</div><div class='del'>-	DELETED to find out if the message has been answered ;-)</div><div class='del'>-	(imap_expunge): sync before expunging.</div><div class='del'>-</div><div class='del'>-2000-07-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: All SELECT calls now pass</div><div class='del'>-	a NULL folder argument to camel_imap_command_extended() since it's</div><div class='del'>-	not needed.</div><div class='del'>-	(imap_connect): Moved service_class-&gt;connect() to the point right</div><div class='del'>-	after a connection is established with the server rather than</div><div class='del'>-	waiting until the end of the function.</div><div class='del'>-	(camel_imap_command): Updated the documentation comment</div><div class='del'>-	(camel_imap_command_extended): Before sending a command, first</div><div class='del'>-	check to make sure we are connected; if we aren't, then reconnect.</div><div class='del'>-	Don't strncmp() command with "SELECT" as it's redundant.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: All SELECT calls now pass</div><div class='del'>-	a NULL folder argument to camel_imap_command_extended() since it's</div><div class='del'>-	not needed. Also s/camel_imap_command/camel_imap_command_extended as</div><div class='del'>-	I will probably be doing away with camel_imap_command() or at least</div><div class='del'>-	only using it for LOGIN and similar commands where the server won't</div><div class='del'>-	notify us of any recent messages.</div><div class='del'>-</div><div class='del'>-2000-07-15  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): </div><div class='del'>-	One last fix to get rid of hard-coded "/" directory separators</div><div class='del'>-</div><div class='del'>-2000-07-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c : Implement 'events', which are suspiciously</div><div class='del'>-	like signals except without all the marshalling baggage, and</div><div class='del'>-	with quasi-thread-safety.</div><div class='del'>-	(camel_object_class_declare_event): New func.</div><div class='del'>-	(camel_object_hook_event): Ditto.</div><div class='del'>-	(camel_object_trigger_event): Ditto.</div><div class='del'>-	(obj_class_init): Declare the "finalize" event.</div><div class='del'>-	(obj_class_finalize): Free the hashtable of events-&gt;preps</div><div class='del'>-	(obj_finalize): Free the hashtable of events-&gt;hooklists</div><div class='del'>-	(camel_object_unref): Trigger the finalize event (ourselves,</div><div class='del'>-	to prevent massively unpleasant looping things.)</div><div class='del'>-	</div><div class='del'>-2000-07-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* camel-object.c (make_global_classfuncs): Change to return</div><div class='del'>-	a CamelObjectClass. Change parents to a GSList and free it</div><div class='del'>-	when done.</div><div class='del'>-	(camel_object_new): Don't allocate a classfuncs for every object;</div><div class='del'>-	merely give it a reference to the global_classfuncs. Convert</div><div class='del'>-	parents to a GSList and free it when done.</div><div class='del'>-	(camel_object_unref): Don't free the classfuncs. Free the parents</div><div class='del'>-	list, which is changed to a GSList.</div><div class='del'>-</div><div class='del'>-2000-07-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* string-utils.c (string_unquote): New convenience function</div><div class='del'>-	to unquote a string if it's encapsulated by "'s</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c:</div><div class='del'>-	* providers/imap/camel-imap-store.c: Made the necessary changes</div><div class='del'>-	to stop using hard coded directory separators.</div><div class='del'>-</div><div class='del'>-2000-07-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):</div><div class='del'>-	If the summary is for a smaller mbox, and rebuilding from the</div><div class='del'>-	last-known end position fails, try rebuilding from the beginning.</div><div class='del'>-	Deals with the case where the user edits the mbox and makes it</div><div class='del'>-	bigger, without adding new messages.</div><div class='del'>-</div><div class='del'>-2000-07-13  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-object.c: Rewritten to not be based on GtkObject,</div><div class='del'>-	but a tiny threadsafe ripoff thereof. Objects still cannot</div><div class='del'>-	be shared across threads, but ref/unref/destroy/new/etc</div><div class='del'>-	will work. Signals are not implemented because doing it</div><div class='del'>-	robustly would be a major pain in the butt, but class</div><div class='del'>-	functions are. There's a small demonstration that it doesn't</div><div class='del'>-	crash in ./temp-test.c: build it with ./make-test.sh.</div><div class='del'>-	* camel-stream.c, camel-seekable-stream.c, camel-stream-mem.c:</div><div class='del'>-	moved over to CamelObject. Proof of concept: two levels of</div><div class='del'>-	subclass and class functions, all working without coredumps.</div><div class='del'>-	To port to CamelObject:</div><div class='del'>-	- s,GTK_,CAMEL_,g in the cast checks</div><div class='del'>-	- s,gtk_type_new,camel_object_new,g</div><div class='del'>-	- s,GtkType,CamelType,g</div><div class='del'>-	- Change get_type function over to camel_type_declare</div><div class='del'>-	- instead of hooking to finalize function, it goes into the</div><div class='del'>-	  type declaration.</div><div class='del'>-	- remove signals.</div><div class='del'>-	- instead of GTK_OBJECT(so)-&gt;klass, CAMEL_OBJECT_GET_CLASS(so)</div><div class='del'>-	- s,gtk_type_class,camel_type_get_global_classfuncs,g</div><div class='del'>-	- don't chain finalize handlers; it will be done for you</div><div class='del'>-	</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: </div><div class='del'>-	* providers/imap/camel-imap-store.c: If a SELECT fails, set</div><div class='del'>-	imap_store-&gt;current_folder to NULL so a SELECT is forced before</div><div class='del'>-	any message/folder operations are requested. Also, because some</div><div class='del'>-	users don't use a namespace, make sure that if the url-&gt;path is </div><div class='del'>-	"/" we don't use it when creating the folder_path.</div><div class='del'>-	(camel_imap_command[_extended]): Since we allow the passing of</div><div class='del'>-	a NULL folder which we can use to bypass a forced SELECT, no need</div><div class='del'>-	to check for the individual commands that don't require a folder</div><div class='del'>-	to be selected.</div><div class='del'>-</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: </div><div class='del'>-	* providers/imap/camel-imap-store.c: Updated to use CAMEL_IMAP_OK, </div><div class='del'>-	CAMEL_IMAP_NO, CAMEL_IMAP_BAD, and CAMEL_IMAP_FAIL rather than the </div><div class='del'>-	ones copied from the POP3 provider. </div><div class='del'>-</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Oops.</div><div class='del'>-	If the number of messages in the folder is 0, don't fetch</div><div class='del'>-	summaries 1 thru 0, just return an empty summary.</div><div class='del'>-	(imap_copy_message_to): Fixed to use message UID and also send</div><div class='del'>-	the source folder as an arg to camel_imap_command rather than NULL.</div><div class='del'>-	(imap_move_message_to): Same.</div><div class='del'>-	(imap_init): If SELECT is successful, we need to set the current</div><div class='del'>-	folder to the one selected, this was causing problems with move/copy</div><div class='del'>-</div><div class='del'>-2000-07-13  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.h: define a set of CAMEL_SERVICE_URL_ALLOW_* flags</div><div class='del'>-	parallel to the _NEED_* flags, and make the _NEED_* flags imply</div><div class='del'>-	the _ALLOW_* ones.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_init): imap</div><div class='del'>-	urls ALLOW_PATH</div><div class='del'>-</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): New</div><div class='del'>-	and improved approach to fetching an entire folder summary</div><div class='del'>-	that should be much much faster than the old way as it gets</div><div class='del'>-	the entire folder summary in 1 shot rather than requesting</div><div class='del'>-	message by message. As with the last update, this version</div><div class='del'>-	also only fetches the minimum number of header fields.</div><div class='del'>-	(imap_get_summary): Oops, forgot to free the temp </div><div class='del'>-	GPtrArray *headers</div><div class='del'>-</div><div class='del'>-2000-07-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Don't</div><div class='del'>-	fetch the entire RFC822 header, just fetch the fields we want.</div><div class='del'>-	(imap_get_message_info): Same.</div><div class='del'>-</div><div class='del'>-2000-07-13  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (camel_mime_filter_basic_new_type):</div><div class='del'>-	Reset filter on setup.</div><div class='del'>-	(reset): When resetting qp encoding, set the state to -1, instead</div><div class='del'>-	of 0.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (quoted_encode_step): Actually count the</div><div class='del'>-	characters output sofar (it never counted any).  Bunch of other</div><div class='del'>-	fixes.</div><div class='del'>-	(quoted_encode_close): Also flush out final character, if there's</div><div class='del'>-	one.</div><div class='del'>-</div><div class='del'>-2000-07-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Chris forgot to add #include &lt;e-util/e-util.h&gt; to the source files</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Fixed Peter's </div><div class='del'>-	fix, we don't want to send a string to a %d.</div><div class='del'>-</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c, providers/imap/camel-imap-store.c:</div><div class='del'>-	Changed from strstrcase to e_strstrcase.</div><div class='del'>-</div><div class='del'>-	* string-utils.c, string-utils.h: Removed strstrcase (in favor of</div><div class='del'>-	e_strstrcase in e-util/e-util.c.)</div><div class='del'>-</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c</div><div class='del'>-	(nntp_folder_set_message_flags): get the article num out of our</div><div class='del'>-	uid and mark it read in the newsrc.</div><div class='del'>-	(nntp_folder_get_message): get the message id out of the uid to</div><div class='del'>-	fetch the article.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): the uid</div><div class='del'>-	is now &lt;article-num&gt;,&lt;messageid&gt;</div><div class='del'>-	(get_HEAD_headers): same.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): go to HSCAN_MESSAGE</div><div class='del'>-	state when ct-&gt;subtype is "news" as well as "rfc822".  this makes</div><div class='del'>-	attachments of type "message/news" display properly.</div><div class='del'>-</div><div class='del'>-2000-07-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_free_deep,</div><div class='del'>-	camel_folder_free_shallow, camel_folder_free_nop): Useful default</div><div class='del'>-	implementations for free_{uids,subfolder_names,summary}.</div><div class='del'>-	(free_subfolder_names, free_uids): Make these g_warning-ing</div><div class='del'>-	default implementations.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-folder.c: Use the new functions where</div><div class='del'>-	appropriate, remove duplicated code.</div><div class='del'>-</div><div class='del'>-2000-07-12  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (query_auth_types): Check for</div><div class='del'>-	NULL parameters when setting the exception so as to not crash on</div><div class='del'>-	Solaris (can't handle a %s passed NULL).</div><div class='del'>-	(imap_connect): Same.</div><div class='del'>-	</div><div class='del'>-2000-07-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message): Use</div><div class='del'>-	mbox_set_message_flags () instead of setting the flags by hand. This</div><div class='del'>-	fixes the problem of the "message_changed" signal not being emitted</div><div class='del'>-	at the correct time.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: "folder_changed" signals should</div><div class='del'>-	pass a third argument (which is ignored).</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Undo gtk signal emits done in set_flags and </div><div class='del'>-	expunge.</div><div class='del'>-	(move_message_to): </div><div class='del'>-	(copy_message_to): Create info as a const CamelMessageInfo</div><div class='del'>-</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am: don't add test-newsrc to the build</div><div class='del'>-	since it needs libcamel (which isn't built at the time test-newsrc</div><div class='del'>-	needs linking.)</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_HEAD_headers): fill in</div><div class='del'>-	MessageInfo-&gt;message_id.</div><div class='del'>-	(get_XOVER_headers): same.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_folder_init): move</div><div class='del'>-	summary loading here.</div><div class='del'>-	(nntp_folder_sync): summary/newsrc changes should be stored here.</div><div class='del'>-	put a comment to that effect.</div><div class='del'>-	(nntp_folder_set_message_flags): don't save the newsrc here.</div><div class='del'>-	(nntp_folder_get_uids): use g_ptr_array_index instead of the</div><div class='del'>-	cast/addition.</div><div class='del'>-	(nntp_folder_get_summary): no need to check if we should generate</div><div class='del'>-	the summary here.  already done.</div><div class='del'>-	(nntp_folder_get_message_info): implement.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c</div><div class='del'>-	(camel_nntp_store_get_toplevel_dir): use evolution_dir instead of</div><div class='del'>-	computing it ourselves.</div><div class='del'>-	(nntp_store_disconnect): call camel_nntp_newsrc_write.</div><div class='del'>-	(ensure_news_dir_exists): new function to create the news/&lt;news</div><div class='del'>-	server&gt; subdir.</div><div class='del'>-	(camel_nntp_store_class_init): hook up connect/disconnect and</div><div class='del'>-	finalize.</div><div class='del'>-	(nntp_store_connect): if ensure_news_dir_exists fails throw an</div><div class='del'>-	exception.</div><div class='del'>-</div><div class='del'>-2000-07-12  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_set_message_flags): Emit a message_changed</div><div class='del'>-	signal once the flags are set on the message.</div><div class='del'>-	(camel_folder_set_user_flag): Ditto.</div><div class='del'>-	(camel_folder_expunge): Emit a folder_changed if no exception.</div><div class='del'>-</div><div class='del'>-2000-07-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream.c: Use size_t and ssize_t for read/write methods</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_set_message_flags): </div><div class='del'>-	Updated to emit the message_changed signal.</div><div class='del'>-	(imap_delete_message): Updated to use imap_set_message_flags ().</div><div class='del'>-	(imap_move_message_to): Updated to use imap_set_message_flags ()</div><div class='del'>-	and to emit the folder_changed signal on the destination folder.</div><div class='del'>-	(imap_copy_message_to): Updated to emit the folder_changed signal </div><div class='del'>-	on the destination folder.</div><div class='del'>-	(imap_append_message): Updated to emit the folder_changed signal </div><div class='del'>-	on the destination folder.</div><div class='del'>-</div><div class='del'>-2000-07-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_append_message): Now takes a</div><div class='del'>-	flags argument to specify the flags to be set on the message</div><div class='del'>-	since we might not necessarily want the flags to be wiped clean.</div><div class='del'>-	(move_message_to):</div><div class='del'>-	(copy_message_to): Updated to send a flags argument to </div><div class='del'>-	append_message (); currently sends the original message's flags.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): </div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): </div><div class='del'>-	Updated.</div><div class='del'>-</div><div class='del'>-2000-07-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Remove exceptions from a number of methods</div><div class='del'>-	that work on what ought to be static data: get_parent_folder,</div><div class='del'>-	get_parent_store, get_message_count, get_unread_message_count,</div><div class='del'>-	get_permanent_flags, get_message_flags, set_message_flags,</div><div class='del'>-	get_message_user_flag, set_message_user_flag, get_message_uid,</div><div class='del'>-	get_uids, get_summary, get_subfolder_names. Turn</div><div class='del'>-	camel_folder_delete_message into a macro.</div><div class='del'>-</div><div class='del'>-	* providers/{mbox,pop3,vee}: Update for CamelFolder changes</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Disable imap and nntp for now</div><div class='del'>-</div><div class='del'>-2000-07-11  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression): </div><div class='del'>-	This shouldn't return NULL, it should return g_ptr_array_new ()</div><div class='del'>-	so the mailer gets what it expects.</div><div class='del'>-</div><div class='del'>-2000-07-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_decode_string): </div><div class='del'>-	Oops, an unsigned integer can never be &lt; 0</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):</div><div class='del'>-	Initialize a variable to make this not crash again. And fix a bug</div><div class='del'>-	so it actually does something.</div><div class='del'>-</div><div class='del'>-2000-07-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Cleaned up a bunch of compile warnings</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee: kill more debugging messages</div><div class='del'>-</div><div class='del'>-2000-07-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_unread_message_count): </div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_get_unread_message_count): </div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_unread_message_count):</div><div class='del'>-	Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_get_unread_message_count): New</div><div class='del'>-	convenience function to allow the mailer to query the number</div><div class='del'>-	of unread messages in a folder (for displaying message stats</div><div class='del'>-	in a folder tree?).</div><div class='del'>-</div><div class='del'>-2000-07-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_references_dup): New function to copy</div><div class='del'>-	a header_references structure.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_message_info_dup_to): New function</div><div class='del'>-	to (deep) copy the data from one CamelMessageInfo into another.</div><div class='del'>-	(camel_message_info_free): And free the data.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_sync): Implement. (empty).</div><div class='del'>-	(vee_search_by_expression): belatedly update for</div><div class='del'>-	camel_folder_search change.</div><div class='del'>-	(vee_folder_build): belatedly update for camel_folder_search</div><div class='del'>-	change. Use camel_message_info_dup_to and camel_message_info_free</div><div class='del'>-	(in particular, so that we get message_id and references info so</div><div class='del'>-	vfolders can be threaded).</div><div class='del'>-	(vee_folder_build_folder): Ditto.</div><div class='del'>-</div><div class='del'>-2000-07-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c: </div><div class='del'>-	* providers/nntp/camel-nntp-utils.c: </div><div class='del'>-	* providers/nntp/camel-nntp-store.c: Update to reflect past changes</div><div class='del'>-	in the Camel API. Use gtk macro casts wherever possible and use glib's</div><div class='del'>-	memory functions instead of standard c's (since they are not </div><div class='del'>-	compatable)</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: </div><div class='del'>-	* providers/imap/camel-imap-store.c: Wrap debug print statements</div><div class='del'>-	in a macro</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Make sure</div><div class='del'>-	that we get up to and including the last \n of the mime part.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Make sure</div><div class='del'>-	that we get up to and including the last \n of the mime part.</div><div class='del'>-	Wrap debug print statements in a macro.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Only cache</div><div class='del'>-	the important data (aka the mime part requested and no extra</div><div class='del'>-	server response stuff)</div><div class='del'>-</div><div class='del'>-2000-07-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_references_decode): Work around</div><div class='del'>-	In-Reply-To's with unquoted punctuation. So many broken mailers.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_search_by_expression): Make this</div><div class='del'>-	return a GPtrArray rather than a GList.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (camel_folder_search_execute_expression):</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (nntp_search_by_expression):</div><div class='del'>-	Update to return a GPtrArray rather than a GList.</div><div class='del'>-</div><div class='del'>-2000-07-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (esmtp_get_authtypes): </div><div class='del'>-	Fixed the parser to actually work</div><div class='del'>-</div><div class='del'>-2000-07-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_references_decode): Make this deal</div><div class='del'>-	with the full RFC822 References/In-Reply-To format rather than</div><div class='del'>-	just the more-nicely-behaved RFC1036 version. (Needed to parse</div><div class='del'>-	In-Reply-To headers with extra junk in them.)</div><div class='del'>-</div><div class='del'>-2000-07-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Parse for</div><div class='del'>-	more header information to allow message threading in IMAP.</div><div class='del'>-	(imap_get_message_info): Same.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Renamed summary_format_* to</div><div class='del'>-	camel_summary_format_* and moved them into public scope.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Oops. Don't</div><div class='del'>-	pass port # as a string in the error code (if it fails to connect).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_append_message): Changed</div><div class='del'>-	over to camel_imap_command_extended as that was the source of the</div><div class='del'>-	problems - apparently appending replies with more than just 1 line.</div><div class='del'>-</div><div class='del'>-2000-07-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_header_contains): make header</div><div class='del'>-	matching case-insensitive</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c:</div><div class='del'>-	* camel-session.c:</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c:</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Remove some non-error case</div><div class='del'>-	debugging-type messages.</div><div class='del'>-</div><div class='del'>-2000-07-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (d): Define to empty so that</div><div class='del'>-	we get rid of a ton of debugging messages.</div><div class='del'>-</div><div class='del'>-2000-07-05  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Added prototype for uudecode_step</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (uudecode_step): Cleaned up some junk that</div><div class='del'>-	should have been cleaned up when debugging printf's were taken out.</div><div class='del'>-</div><div class='del'>-2000-07-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):</div><div class='del'>-	Update the X-Evolution: header even if the in-memory UID and the</div><div class='del'>-	saved UID are not the same.  Otherwise mboxes with clashing UIDs</div><div class='del'>-	can never be fixed.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c</div><div class='del'>-	(camel_folder_summary_add_from_parser): Add the message to the</div><div class='del'>-	summary before doing any ibex stuff.  In fact, this might also</div><div class='del'>-	have the side effect of reassigning the UID so it needs to be done</div><div class='del'>-	before we start using the UID.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Add</div><div class='del'>-	debugging message to keep track of the UIDs we add.</div><div class='del'>-</div><div class='del'>-2000-07-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: Add "Cc" to summary and bump summary</div><div class='del'>-	version number.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_header_contains): make "Cc" a</div><div class='del'>-	searchable header.</div><div class='del'>-</div><div class='del'>-2000-07-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_next_uid_string):</div><div class='del'>-	New.</div><div class='del'>-	(camel_folder_summary_add): Use</div><div class='del'>-	`camel_folder_summary_next_uid_string()' instead of recomputing</div><div class='del'>-	the UID manually here.</div><div class='del'>-	(camel_folder_summary_add_from_parser): Likewise.</div><div class='del'>-</div><div class='del'>-2000-07-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_set_uid): Removed.</div><div class='del'>-</div><div class='del'>-2000-07-03  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new): Parse In-Reply-To</div><div class='del'>-	with header_references_decode, not header_msgid_decode.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_class_init): message</div><div class='del'>-	headers are case-insensitive.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fix a</div><div class='del'>-	bug in error-setting code.</div><div class='del'>-	(pop3_connect): Don't re-prompt for password in the KPOP case.</div><div class='del'>-	(pop3_get_response): New function, split out from</div><div class='del'>-	camel_pop3_command.</div><div class='del'>-	(connect_to_server): Use pop3_get_response to parse the greeting</div><div class='del'>-	message, and error out appropriately if it's -ERR.</div><div class='del'>-</div><div class='del'>-2000-07-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_freeze, camel_folder_thaw): New</div><div class='del'>-	functions to freeze and thaw a folder (to prevent message/folder</div><div class='del'>-	changed signals in the middle of a long series of operations).</div><div class='del'>-	(camel_folder_class_init): Change signals to GTK_RUN_FIRST.</div><div class='del'>-	(message_changed, folder_changed): Add default implementations</div><div class='del'>-	that stop the emission and record info for later if the folder is</div><div class='del'>-	frozen.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_sync): leftover fixes</div><div class='del'>-	from the close-&gt;sync change: don't destroy the ibex, summary, and</div><div class='del'>-	search when syncing.</div><div class='del'>-	(append_message): emit "folder_changed" on a successful append.</div><div class='del'>-</div><div class='del'>-2000-07-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (uudecode_step): A rather complex uudecoder</div><div class='del'>-	written in the spirit of Zucchi-ness, is it up to par? Only the </div><div class='del'>-	Z-man can tell us :-)</div><div class='del'>-</div><div class='del'>-2000-07-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_get_name): New method, to return</div><div class='del'>-	an end-user-friendly name corresponding to a service. (eg, "POP</div><div class='del'>-	service for danw on trna.helixcode.com").</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c,</div><div class='del'>-	providers/mbox/camel-mbox-store.c,</div><div class='del'>-	providers/nntp/camel-nntp-store.c,</div><div class='del'>-	providers/pop3/camel-pop3-store.c,</div><div class='del'>-	providers/sendmail/camel-sendmail-transport.c,</div><div class='del'>-	providers/smtp/camel-smtp-transport.c: Implement.</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: remove unneeded</div><div class='del'>-	libcamelimap_la_LDADD.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server): fix the</div><div class='del'>-	CAPA-parsing code to not get into an infinite loop.</div><div class='del'>-</div><div class='del'>-2000-07-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message): Fixed</div><div class='del'>-	the bug that would sometimes leave part of the server response</div><div class='del'>-	tacked on to the end of the message.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Renamed _by_uid methods. Since we no longer</div><div class='del'>-	have get-by-number methods, no need to have the _by_uid </div><div class='del'>-	extensions. </div><div class='del'>-	(get_message_by_uid): Renamed to get_message</div><div class='del'>-	(delete_message_by_uid): Renamed to delete_message</div><div class='del'>-	(summary_get_by_uid): Renamed to get_message_info</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: </div><div class='del'>-	* providers/pop3/camel-pop3-folder.c:</div><div class='del'>-	* providers/imap/camel-imap-folder.c:</div><div class='del'>-	* providers/vee/camel-vee-folder.c: Updated to reflect</div><div class='del'>-	camel-folder changes.</div><div class='del'>-</div><div class='del'>-2000-06-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_copy_message_to): New function, to</div><div class='del'>-	copy a message from one folder to another. The default</div><div class='del'>-	implementation just uses append_message, but providers can </div><div class='del'>-	implement more efficient versions for use when both folders are on </div><div class='del'>-	the same store.</div><div class='del'>-</div><div class='del'>-	* broken-date-parser.[c,h]: Utilities for parsing broken</div><div class='del'>-	date strings.</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_move_message_to): </div><div class='del'>-	(imap_copy_message_to): Implemented.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): Wrote some code to try</div><div class='del'>-	and un-mangle broken date formats and then parse that new string </div><div class='del'>-	instead.</div><div class='del'>-</div><div class='del'>-2000-06-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_move_message_to): New function, to</div><div class='del'>-	move a message from one folder to another. The default</div><div class='del'>-	implementation just uses append_message and delete_message, but</div><div class='del'>-	providers can implement more efficient versions for use when both</div><div class='del'>-	folders are on the same store.</div><div class='del'>-</div><div class='del'>-2000-06-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_expunge): Should now</div><div class='del'>-	print a meaningful error message when it doesn't succeed</div><div class='del'>-</div><div class='del'>-2000-06-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Changed to</div><div class='del'>-	keep prompting user for a valid password until it either</div><div class='del'>-	authenticates or until Canceled by the user.</div><div class='del'>-	(camel_imap_command_extended): Improved speed (replaced the</div><div class='del'>-	g_strjoinv call with a faster implementation)</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c </div><div class='del'>-	(camel_pop3_command_get_additional_data): Fixed.</div><div class='del'>-	(pop3_connect): Changed to keep prompting the user for a</div><div class='del'>-	password until it either works or until Canceled by the user.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: General cleanup</div><div class='del'>-	(camel_mbox_summary_sync): Fixed a memory leak and added</div><div class='del'>-	CamelException handling.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (delete_folder): Fixed a </div><div class='del'>-	memory leak</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): </div><div class='del'>-	Default 'off_t seek' to -1 so as to make sure it's initialized</div><div class='del'>-	before it's used in the case of a bad stat() call.</div><div class='del'>-	(mbox_sync): Updated</div><div class='del'>-	(mbox_expunge): Updated</div><div class='del'>-</div><div class='del'>-2000-06-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_connect): Move the </div><div class='del'>-	CAPABILITY command here so we don't have to keep checking</div><div class='del'>-	each time we open a folder.</div><div class='del'>-	(camel_imap_command_extended): If we are doing an EXAMINE,</div><div class='del'>-	don't bother doing a SELECT first.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_init): Update so</div><div class='del'>-	folder-&gt;has_search_capability depends on the parent IMAP store</div><div class='del'>-	(since this is really dependant on the IMAP implementation and</div><div class='del'>-	not the folder)</div><div class='del'>-</div><div class='del'>-2000-06-27  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Don't close the filter</div><div class='del'>-	stream when done with it (this causes the source stream to close);</div><div class='del'>-	Instead, just flush it when done.</div><div class='del'>-</div><div class='del'>-2000-06-27  Michael Zucchi  &lt;zucchi@zedzone.mmc.com.au&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_header_contains): Make header</div><div class='del'>-	search 'to' match 'to', and not 'from', small typo, fixes #317.</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Added debugging</div><div class='del'>-	information.</div><div class='del'>-</div><div class='del'>-2000-06-23  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: </div><div class='del'>-	* providers/imap/camel-imap-folder.c: Improved folder parsing.</div><div class='del'>-	Not specifying a namespace should no longer list the entire</div><div class='del'>-	filesystem.</div><div class='del'>-</div><div class='del'>-2000-06-22  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/.cvsignore: ignore test-newsrc</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c,</div><div class='del'>-	providers/nntp/camel-nntp-store.h,</div><div class='del'>-	providers/nntp/camel-nntp-folder.c,</div><div class='del'>-	providers/nntp/camel-nntp-folder.h,</div><div class='del'>-	providers/nntp/camel-nntp-utils.c: Bring the nntp provider up to a</div><div class='del'>-	state where it builds and is usable with the current camel.  there</div><div class='del'>-	are still warts (semi-broken .newsrc file handling, and a lack of</div><div class='del'>-	a subscribe ui -- in fact no way to add a new server, really), but</div><div class='del'>-	it'll display news messages.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/Makefile.am (libcamelnntp_la_SOURCES): add</div><div class='del'>-	camel-nntp-newsrc.c</div><div class='del'>-	(libcamelnntpinclude_HEADERS): add camel-nntp-newsrc.h</div><div class='del'>-	also, add test-newsrc stuff.</div><div class='del'>-	</div><div class='del'>-	* providers/nntp/test-newsrc.c: new file that tests the newsrc</div><div class='del'>-	stuff by parsing and regurgitating a .newsrc file for a particular</div><div class='del'>-	server.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-newsrc.c,</div><div class='del'>-	providers/nntp/camel-nntp-newsrc.h: new files, initial support for .newsrc files.</div><div class='del'>-</div><div class='del'>-2000-06-22  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_count): </div><div class='del'>-	Oops. Now appends the namespace to the folder before querying</div><div class='del'>-	for the number of messages.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_folder_exists): New</div><div class='del'>-	convenience function for use by imap_create().</div><div class='del'>-	(get_folder): If folder is specified as "/", we really want</div><div class='del'>-	"INBOX".</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c:</div><div class='del'>-	* providers/vee/camel-vee-provider.c:</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c:</div><div class='del'>-	* providers/mbox/camel-mbox-provider.c:</div><div class='del'>-	* providers/pop3/camel-pop3-provider.c:</div><div class='del'>-	* providers/imap/camel-imap-provider.c: Updated</div><div class='del'>-	</div><div class='del'>-	* camel-session.c: Moved service_cache hash table into the</div><div class='del'>-	providers.</div><div class='del'>-	(service_cache_remove): Updated.</div><div class='del'>-	(camel_session_get_service): Updated.</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_hash): Took out the hashing of</div><div class='del'>-	url-&gt;passwd. We don't want this anymore.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_init): Took out</div><div class='del'>-	references to 'namespace'</div><div class='del'>-	(camel_imap_folder_init): Same</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.h: No more namespace. We are</div><div class='del'>-	instead going to use url-&gt;path as the namespace.</div><div class='del'>-</div><div class='del'>-2000-06-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_create): Modified to</div><div class='del'>-	use the "namespace" (url-&gt;path) if it exists.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_delete_message_by_uid):</div><div class='del'>-	Now just sets the deleted flag on the summary rather than speaking </div><div class='del'>-	directly to the IMAP server. This is both faster and cleaner.</div><div class='del'>-</div><div class='del'>-2000-06-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): Fix dumb</div><div class='del'>-	bug.</div><div class='del'>-</div><div class='del'>-2000-06-21  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): </div><div class='del'>-	We are getting mail in IMAP now!! whoo-hoo!. Stripped out the </div><div class='del'>-	filtering so messages may have some dot-stuffing, but the </div><div class='del'>-	filtering can always be added back in later when we know it </div><div class='del'>-	works and isn't the problem.</div><div class='del'>-</div><div class='del'>-2000-06-21  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_init): Use the basename</div><div class='del'>-	of the mailbox so we don't get pathnames like ~/evolution/inbox///movemail.ibex</div><div class='del'>-</div><div class='del'>-2000-06-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new): Set date_received</div><div class='del'>-	based on the first (most recent) "Received" header.</div><div class='del'>-</div><div class='del'>-2000-06-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): flush the filter stream</div><div class='del'>-	before unreffing it, so it will camel_mime_filter_complete.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (camel_stream_filter_class_init): Fix a</div><div class='del'>-	braino so camel_stream_flush works here.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (stream_seek): Fix a bug that resulted in</div><div class='del'>-	large attachments being silently dropped.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c</div><div class='del'>-	(camel_pop3_command_get_additional_data): Don't use g_strjoinv</div><div class='del'>-	here, since it is O(n^2) on the length of the output string, and</div><div class='del'>-	we can do O(n).</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): add a CRLF decoder</div><div class='del'>-	after the QP/B64 decoder if it's text.</div><div class='del'>-</div><div class='del'>-2000-06-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Only</div><div class='del'>-	fetch the summary if the folder summary doesn't already exist.</div><div class='del'>-	When the summary *does* exist, start fetching from 1, not 0.</div><div class='del'>-	(imap_free_summary): Don't do anything here.</div><div class='del'>-	(imap_finalize): Free the summary here instead of in</div><div class='del'>-	imap_free_summary().</div><div class='del'>-	(imap_set_message_flags): Implemented</div><div class='del'>-	(imap_sync): Added code to set flags on messages that have had</div><div class='del'>-	their flags changed (however I #if'd it out until we are more</div><div class='del'>-	confidant in the IMAP code :)</div><div class='del'>-	(imap_summary_get_by_uid): Now parese flags correctly.</div><div class='del'>-	(imap_get_summary): Now parese flags correctly. Also correctly</div><div class='del'>-	parses the UID correctly.</div><div class='del'>-</div><div class='del'>-	* camel-url.c (check_equal): No need to check s1 if s2 is NULL</div><div class='del'>-	(camel_url_equal): Don't check the passwd component of the url.</div><div class='del'>-</div><div class='del'>-2000-06-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_add): mark the</div><div class='del'>-	message info with CAMEL_MESSAGE_FOLDER_FLAGGED if we change the</div><div class='del'>-	uid, so the folder will know that it's dirty.</div><div class='del'>-</div><div class='del'>-2000-06-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command_extended): </div><div class='del'>-	Now returns the last line of data that the server sends back as</div><div class='del'>-	well. This is needed for commands like SELECT (like Peter pointed</div><div class='del'>-	out).</div><div class='del'>-	(camel_imap_command): No longer checks for SELECT (no need)</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Added namespace stuff</div><div class='del'>-	which we will need later on...</div><div class='del'>-	(imap_parse_subfolder_line): Convenience function for use in</div><div class='del'>-	get_subfolder_names()</div><div class='del'>-	(imap_get_subfolder_names): Updated. Also changed it to use LIST</div><div class='del'>-	instead of LSUB (temporary change).</div><div class='del'>-</div><div class='del'>-2000-06-19  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_init): Set</div><div class='del'>-	summary equal to NULL.</div><div class='del'>-	(imap_get_summary): Store the summary in the ImapFolder</div><div class='del'>-	(imap_summary_get_by_uid): If we have a summary cache in the</div><div class='del'>-	ImapFolder, first check to see if that message info is in the</div><div class='del'>-	cached summary first, if not fetch it directly from the IMAP</div><div class='del'>-	server and append it to the summary cache.</div><div class='del'>-	(imap_get_message_flags): Don't free the message info that we get</div><div class='del'>-	back from summary_get_by_uid as we don't want to be corrupting our</div><div class='del'>-	cached summary.</div><div class='del'>-</div><div class='del'>-2000-06-19  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_command{,_extended}): When</div><div class='del'>-	SELECT'ing a folder for an IMAP command, use _extended to grab the entire</div><div class='del'>-	response (before we just used camel_imap_command and missed the OK codes)</div><div class='del'>-</div><div class='del'>-2000-06-18  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_summary_get_by_uid): </div><div class='del'>-	Now gets the message flags as it should.</div><div class='del'>-	(imap_get_summary): Same as imap_summary_get_by_uid</div><div class='del'>-	(imap_get_permanent_flags): Return the permanent flags stored</div><div class='del'>-	on the folder.</div><div class='del'>-	(imap_get_message_flags): Return message flags associated with</div><div class='del'>-	given uid. Note: we may want to somehow cache summary info so</div><div class='del'>-	that we don't have to keep querying the IMAP provider in</div><div class='del'>-	imap_summary_get_by_uid().</div><div class='del'>-</div><div class='del'>-2000-06-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_free_summary): We were</div><div class='del'>-	leaking memory - but not anymore!</div><div class='del'>-	(imap_get_summary): We now get the UIDs and the beginnings of the</div><div class='del'>-	code to get the message flags as well.</div><div class='del'>-</div><div class='del'>-2000-06-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): Don't copy newlines</div><div class='del'>-	into the parsed header text, and turn any number of tabs and</div><div class='del'>-	spaces after a newline into a single space.</div><div class='del'>-</div><div class='del'>-2000-06-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_init): Should now</div><div class='del'>-	correctly do CAPABILITY.</div><div class='del'>-</div><div class='del'>-2000-06-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Add some debugging printfs</div><div class='del'>-	when rebulding summary to help figure out why people's summaries</div><div class='del'>-	are always being rebuilt.</div><div class='del'>-</div><div class='del'>-2000-06-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_search_by_expression):</div><div class='del'>-	Began to implement, need to get information on how to</div><div class='del'>-	deconstruct @expression into an IMAP search expression and</div><div class='del'>-	parse the results.</div><div class='del'>-	(imap_init): Now queries the IMAP provider for CAPABILITY to</div><div class='del'>-	determine if SEARCH is implemented or not.</div><div class='del'>-</div><div class='del'>-	* providers/imap/imap.c: Removed - no longer a need to have</div><div class='del'>-	this as an example for anyone interesting to help mecode IMAP</div><div class='del'>-	support.</div><div class='del'>-	</div><div class='del'>-2000-06-16  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_sync): Added code</div><div class='del'>-	to expunge if called for (still need to finish coding this).</div><div class='del'>-	(imap_get_uids): Implemented.</div><div class='del'>-	(imap_get_summary): Found a way to get the date</div><div class='del'>-	(imap_summary_get_by_uid): Same.</div><div class='del'>-	(imap_free_summary): Implemented.</div><div class='del'>-</div><div class='del'>-	* string-utils.c (strstrcase): Fixed a compile warning</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Removed - we don't</div><div class='del'>-	need a CamelImapSummary structure.</div><div class='del'>-</div><div class='del'>-2000-06-16  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Move flag handling from CamelMimeMessage to CamelFolder. This</div><div class='del'>-	simplifies several flag-handling pieces of code in the mailer, and</div><div class='del'>-	lets you change a message's flags without having to fetch the</div><div class='del'>-	message body. It also means that fully-constructed</div><div class='del'>-	CamelMimeMessages are now essentially constant, which will help</div><div class='del'>-	simplify locking issues later since it means two threads</div><div class='del'>-	interested in the same message can just work with separate copies</div><div class='del'>-	of it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h (struct _CamelMimeMessage): Removed flags</div><div class='del'>-	and user_flags (moved to summary). Removed expunged and</div><div class='del'>-	message_number which were unused. Removed message_uid and folder</div><div class='del'>-	which are no longer needed in the new scheme.</div><div class='del'>-	(struct CamelMimeMessageClass): Removed message_changed signal and</div><div class='del'>-	get/set_message_number methods.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c: Updates for CamelMimeMessage changes.</div><div class='del'>-	(camel_mime_message_get/set_flags,</div><div class='del'>-	camel_mime_message_get/set_user_flag): Replaced with methods in</div><div class='del'>-	CamelFolder.</div><div class='del'>-	(camel_flag_get, camel_flag_set, camel_flag_list_size,</div><div class='del'>-	camel_flag_list_free): Moved verbatim to camel-folder-summary.c</div><div class='del'>-	</div><div class='del'>-	* camel-folder.c (camel_folder_get/set_message_flags,</div><div class='del'>-	camel_folder_get/set_message_user_flag): New methods (and</div><div class='del'>-	corresponding useless default implementations)</div><div class='del'>-	(camel_folder_class_init): add a message_changed signal</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_flag_get, camel_flag_set,</div><div class='del'>-	camel_flag_list_size, camel_flag_list_free): Moved here from</div><div class='del'>-	camel-mime-message.c</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (message_changed): Removed.</div><div class='del'>-	(mbox_get_message_flags, mbox_set_message_flags,</div><div class='del'>-	mbox_get_message_user_flag, mbox_set_message_user_flag): Tweak</div><div class='del'>-	summary bits as appropriate. (Functionality moved here from</div><div class='del'>-	message_changed.)</div><div class='del'>-	(mbox_get_message_by_uid): Update for CamelMimeMessage changes</div><div class='del'>-	(less stuff to initialize).</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (message_changed): Remove</div><div class='del'>-	this. It was just copied from the mbox provider and doesn't deal</div><div class='del'>-	with the real IMAP flag stuff anyway. (So there's currently no</div><div class='del'>-	flag support in the IMAP provider.)</div><div class='del'>-	(imap_get_message_by_uid): Update for CamelMimeMessage changes.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c: (message_changed): Remove old</div><div class='del'>-	one. Add a new one to listen for message_changed on each folder</div><div class='del'>-	and re-emit message_changed signals that correspond to messages in</div><div class='del'>-	the vfolder.</div><div class='del'>-	(vee_get/set_message_flags, vee_get/set_message_user_flag): Proxy</div><div class='del'>-	flag setting to the underlying real messages.</div><div class='del'>-	(vee_append_message): Removed for now; there's no way to translate</div><div class='del'>-	this into the new CamelMimeMessage/CamelFolder scheme, but (a)</div><div class='del'>-	there's also no code which would ever call it and (b) we're</div><div class='del'>-	probably going want a better interface than append_message for</div><div class='del'>-	message drag and drop to work anyway. To be revisited.</div><div class='del'>-</div><div class='del'>-2000-06-16  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): </div><div class='del'>-	* camel-mime-part-utils.c (simple_data_wrapper_construct_from_parser): </div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info): </div><div class='del'>-	KLUDGE! Since neither ETable nor GtkHTML supports UTF-8 yet,</div><div class='del'>-	output ISO-8859-1 instead, so Ettore can read his Italian mail. :)</div><div class='del'>-	This will be reverted later.</div><div class='del'>-</div><div class='del'>-2000-06-15  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_summary): Started to </div><div class='del'>-	implement - may want to use ENVELOPE instead of BODY.PEEK[HEADER]</div><div class='del'>-	(imap_summary_get_by_uid): Started to code, I've got to find a way to </div><div class='del'>-	get the date in time_t format and also get the flags</div><div class='del'>-</div><div class='del'>-	* string-utils.c (strstrcase): Added this convenience function - I</div><div class='del'>-	know about strcasestr() but it's not portable.</div><div class='del'>-</div><div class='del'>-2000-06-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c: Remove camel_service_connect_with_url. (URLs</div><div class='del'>-	must be specified when the service is requested from the session,</div><div class='del'>-	so that there can only ever be one service for any URL.)</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: (camel_folder_open, camel_folder_is_open,</div><div class='del'>-	camel_folder_get_mode): Kill. Folders are now always open, and</div><div class='del'>-	handle "closing" sorts of operations at sync or finalize time.</div><div class='del'>-	(camel_folder_sync): renamed from camel_folder_close. Syncs state</div><div class='del'>-	to the store but doesn't necessarily close/disconnect.</div><div class='del'>-</div><div class='del'>-	* providers/*/camel-*-folder.c: Merge "open" methods into "init"</div><div class='del'>-	methods. Rename close to sync and update appropriately.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Remove camel_imap_store_open</div><div class='del'>-	and camel_imap_store_close, which should not have been copied from</div><div class='del'>-	the POP provider (where the exist to work around limitations of</div><div class='del'>-	the POP protocol).</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: fix a bug. (don't expunge</div><div class='del'>-	deleted messages if called with expunge == FALSE)</div><div class='del'>-	</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (connect_to_server): Check</div><div class='del'>-	server for various interesting extensions.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_uids): If the server</div><div class='del'>-	supports UIDL, use real UIDs rather than fake ones.</div><div class='del'>-	(etc): Map uids back to numbers appropriately</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Fix to</div><div class='del'>-	previous change: make sure the "seek" variable ends up with the</div><div class='del'>-	value it should.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update</div><div class='del'>-	summary mtime as well as size.</div><div class='del'>-</div><div class='del'>-2000-06-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): if the</div><div class='del'>-	mbox doesn't end with a '\n', write one before appending the new</div><div class='del'>-	message.</div><div class='del'>-</div><div class='del'>-2000-06-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-crlf.c (filter): Updated the encoder to allocate </div><div class='del'>-	more memory (since we are also now adding dots). Also updated the</div><div class='del'>-	decoder as we have found that it sometimes passes the end of the </div><div class='del'>-	buffer.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Took out the</div><div class='del'>-	filter code (we already filter in </div><div class='del'>-	camel_pop3_command_get_additional_data)</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (init): Updated: a separator is now a char* rather </div><div class='del'>-	than a single char because IMAP can have a string for a directory </div><div class='del'>-	separator. Also, since IMAP does not begin with a directory separator,</div><div class='del'>-	there is a new argument (path_begins_with_sep) which decides if a </div><div class='del'>-	directory should begin with a directory separator.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_create): Since, on connect,</div><div class='del'>-	Camel tries to create INBOX (which already exists on every IMAP </div><div class='del'>-	provider) we can return TRUE when the folder name is "INBOX".</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_init): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (camel_imap_folder_new): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-store.c (get_folder): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_init): Updated.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (camel_pop3_folder_new): Updated.</div><div class='del'>-</div><div class='del'>-2000-06-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_sync):</div><div class='del'>-	Renamed from camel_mbox_summary_expunge. Takes a gboolean saying</div><div class='del'>-	whether to expunge or just sync the mbox file. Change some</div><div class='del'>-	g_errors to g_warning so we don't abort. Make the quick</div><div class='del'>-	X-Evolution updating code lseek around correctly. Update the</div><div class='del'>-	mbox mtime in the summary file even in the quick case.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.h: make</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_NOXEV not conflict with</div><div class='del'>-	CAMEL_MESSAGE_FOLDER_FLAGGED defined in camel-mime-message.h</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_close): call</div><div class='del'>-	camel_mbox_summary_sync to save flag state if not expunging.</div><div class='del'>-	(mbox_expunge): Update for camel_mbox_summary_expunge rename.</div><div class='del'>-</div><div class='del'>-2000-06-13  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (camel_imap_store_open): </div><div class='del'>-	(camel_imap_store_close): Added.</div><div class='del'>-	(camel_imap_command_extended): Fixed a segfault and updated</div><div class='del'>-	to use camel_imap_status()</div><div class='del'>-	(camel_imap_command): Updated to use camel_imap_status()</div><div class='del'>-	(camel_imap_status): New convenience function for parsing</div><div class='del'>-	the return status of an IMAP command</div><div class='del'>-</div><div class='del'>-2000-06-12  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_message_by_uid): </div><div class='del'>-	Works like the POP fetch code, should work temporarily until</div><div class='del'>-	we get around to coding it the way it "Should Be".</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): Now uses</div><div class='del'>-	the camel-mime-filter-crlf decoder when retrieving messages.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-smtp.c: Deprecated.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Updated to use</div><div class='del'>-	camel-mime-filter-crlf with my 'dot' extension in place of</div><div class='del'>-	camel-mime-filter-smtp</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Updated to reflect changes</div><div class='del'>-	made to camel-mime-filter-crlf.c</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-crlf.c (filter): Modified to be able to</div><div class='del'>-	encode/decode dots ("\n.\n"&lt;-&gt;"\n..\n"). Also fixed the decoder</div><div class='del'>-	so that it should no longer get caught in an infinite loop.</div><div class='del'>-</div><div class='del'>-2000-06-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/*/Makefile.am: don't pass a second (incorrect) -rpath</div><div class='del'>-	in addition to the (correct) one automatically provided by</div><div class='del'>-	automake.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-crlf.c: New filter to do CRLF&lt;-&gt;LF conversion.</div><div class='del'>-	(Currently only tested in the LF-&gt;CRLF direction.)</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): if content-type is text,</div><div class='del'>-	and it's QP or B64 encoded, pass through the CRLF filter before</div><div class='del'>-	the other filter to satisfy the "canonical encoding" rules in the</div><div class='del'>-	MIME spec.</div><div class='del'>-</div><div class='del'>-2000-06-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_query_authenticator): Add another</div><div class='del'>-	argument, "mode", which can be CAMEL_AUTHENTICATOR_ASK or</div><div class='del'>-	CAMEL_AUTHENTICATOR_TELL, so callers can get the app to un-cache</div><div class='del'>-	bad info.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): uncache the</div><div class='del'>-	password if it doesn't work.</div><div class='del'>-</div><div class='del'>-2000-06-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.c (stream_read): Updated to reflect</div><div class='del'>-	changes made in camel-imap-store.c</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (imap_create): No longer checks to</div><div class='del'>-	make sure a folder doesn't already exists (as this is no longer needed)</div><div class='del'>-	(camel_imap_command): Now takes a CamelFolder argument so it can detect</div><div class='del'>-	whether or not it needs to SELECT a folder or not</div><div class='del'>-	(camel_imap_command_extended): Same.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_connect): Will now always</div><div class='del'>-	send EHLO first, if that fails it will fall back on HELO.</div><div class='del'>-	(esmtp_get_authtypes): Should now correctly parse authtypes.</div><div class='del'>-</div><div class='del'>-2000-06-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Now builds (not that it's worth</div><div class='del'>-	much yet).</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-folder.c (imap_get_uids): Now uses the </div><div class='del'>-	correct cast to a CamelImapMessageInfo structure (should get rid of </div><div class='del'>-	compile warnings).</div><div class='del'>-</div><div class='del'>-	* providers/imap/Makefile.am: Added rules to build </div><div class='del'>-	camel-imap-stream</div><div class='del'>-	</div><div class='del'>-	* providers/imap/camel-imap-store.c (get_folder): Update.</div><div class='del'>-	Moved imap_create here.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c (delete_messages): Remove.</div><div class='del'>-	(imap_create): Removed.</div><div class='del'>-	(imap_delete): Removed.</div><div class='del'>-	(imap_exists): Removed.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.h: Added typedef's for the stream</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.c: Modified to build cleanly</div><div class='del'>-</div><div class='del'>-2000-06-07  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_msgid_decode_internal): Properly</div><div class='del'>-	dereference warning/debug messages.</div><div class='del'>-	(header_references_decode): Check we actually have msgid stuff</div><div class='del'>-	before trying to decode it ...</div><div class='del'>-</div><div class='del'>-2000-06-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-imap-stream.[c,h]: Removed</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-stream.[c,h]: Relocated to this</div><div class='del'>-	location</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-summary.c: Added</div><div class='del'>-</div><div class='del'>-2000-06-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Remove exists, create, delete. A CamelFolder</div><div class='del'>-	now always references an existing folder. Remove delete_messages</div><div class='del'>-	too since it wasn't being used. Add a "create" flag to</div><div class='del'>-	get_subfolder saying whether or not to create the subfolder if it</div><div class='del'>-	doesn't yet exist.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_get_folder): Add a "create" flag to</div><div class='del'>-	say whether or not to create the folder if it doesn't yet exist.</div><div class='del'>-	(camel_store_delete_folder): New method, moved from CamelFolder.</div><div class='del'>-	(cache_folder, uncache_folder): Fix up a bit.</div><div class='del'>-	(get_folder_name): Explain what this is for.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: </div><div class='del'>-	* providers/mbox/camel-mbox-store.c: Update. Remove support for</div><div class='del'>-	hierarchical folders to simplify this for now, since we're not</div><div class='del'>-	using it, and it's not completely clear how they should work in an</div><div class='del'>-	ELocalStorage world. Needs to be revisited.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (delete_messages): Remove.</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (get_folder): Update.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (exists): Remove.</div><div class='del'>-	* providers/vee/camel-vee-store.c (vee_get_folder): Update.</div><div class='del'>-</div><div class='del'>-2000-06-06  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-*.[c,h]: Started on getting </div><div class='del'>-	imap to build cleanly (tho some work has not been completed</div><div class='del'>-	so it still won't build until camel-imap-summary is finished</div><div class='del'>-	along with a few methods in camel-imap-folder)</div><div class='del'>-</div><div class='del'>-	* camel-stream.[c,h]: Changed the read and write method prototypes</div><div class='del'>-	to return an ssize_t type rather than an int and also changed</div><div class='del'>-	the 'number of bytes' to read or write to a size_t type</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c: same as above</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c: again, same as above</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c: same</div><div class='del'>-</div><div class='del'>-	* camel-imap-stream.[c,h]: Added this new stream, cache's previously </div><div class='del'>-	read data so each successive call will instead read from the cache</div><div class='del'>-	</div><div class='del'>-2000-06-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_disposition): fix</div><div class='del'>-	typo/braino (set "Content-Disposition", not "Content-Description")</div><div class='del'>-	(camel_mime_part_set_filename): const poison</div><div class='del'>-</div><div class='del'>-2000-06-02  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_step): Ick, damn signs!  Fix a</div><div class='del'>-	bug with sign extended bytes.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-smtp.c (filter): Changed layout/logic slightly</div><div class='del'>-	(to match From filter)</div><div class='del'>-</div><div class='del'>-2000-06-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-smtp.c (filter): Fixed the filter so that it </div><div class='del'>-	wouldn't insert garbage under certain conditions.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Don't ref the services in the cache.</div><div class='del'>-</div><div class='del'>-2000-06-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Rearanged where debug</div><div class='del'>-	fprintf statements we placed so that any data the server sends </div><div class='del'>-	back is printed out before an exception is set and the function</div><div class='del'>-	returns.</div><div class='del'>-</div><div class='del'>-2000-06-02  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): If we get a funny</div><div class='del'>-	result, just throw it out.  Basically a fix for the one true</div><div class='del'>-	broken TradeClient.</div><div class='del'>-</div><div class='del'>-2000-06-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_free): Free</div><div class='del'>-	references/messsage id.</div><div class='del'>-	(message_info_save): Save them.</div><div class='del'>-	(message_info_load): Load them.</div><div class='del'>-	(message_info_new): And get them from the new message.</div><div class='del'>-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped for new changes.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Added references and messageid to</div><div class='del'>-	summary.</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Ref and unref objects in the service cache</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-	* camel-store.c: Ref the folder when returning it using</div><div class='del'>-	lookup_folder.  Used the folder's full name for the key for the</div><div class='del'>-	folder cache since that's used to uncache it.</div><div class='del'>-</div><div class='del'>-2000-06-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Fun with purify.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): free msg on</div><div class='del'>-	success as well as failure.</div><div class='del'>-	(camel_pop3_command_get_additional_data): free buf after reading</div><div class='del'>-	the last line (".").</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_uid): free</div><div class='del'>-	body data after creating the memstream from it (which will copy</div><div class='del'>-	the data).</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_finalize): free summary</div><div class='del'>-	and index paths.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (finalize): unref the stream, if it exists.</div><div class='del'>-</div><div class='del'>-2000-06-01  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (construct_from_parser): For a message part,</div><div class='del'>-	set the default content-type to message/rfc822.  Maybe needs to be</div><div class='del'>-	done for multiparts too?</div><div class='del'>-</div><div class='del'>-2000-05-31  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Typo in assersion.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): Use a default type of</div><div class='del'>-	message/rfc822 for multipart/digest.  Bug Z192.</div><div class='del'>-	(folder_scan_drop_step): Remove warning.</div><div class='del'>-</div><div class='del'>-2000-05-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Init</div><div class='del'>-	filter_from to NULL, for exception case.</div><div class='del'>-	(mbox_get_message_by_uid): Cast off_t to long int for diagnostics.</div><div class='del'>-</div><div class='del'>-	* camel-url.c (camel_url_hash): Hash funciton for using camel</div><div class='del'>-	url's as hash keys.</div><div class='del'>-	(camel_url_equal): equal function for same.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_finalise): Free cached services.</div><div class='del'>-	(camel_session_init): Init service cache.</div><div class='del'>-	(service_cache_remove): destroy callback to remove a service from</div><div class='del'>-	the cache.</div><div class='del'>-</div><div class='del'>-	* camel-store.c (get_folder_internal): Remove the extra ref of the</div><div class='del'>-	folder.  That seems the right behaviour ...?</div><div class='del'>-	(camel_store_get_type): Doh, actually call store init, so the</div><div class='del'>-	cache works.</div><div class='del'>-	(cache_folder): strdup the folder name!  no wonder it never found</div><div class='del'>-	it again.</div><div class='del'>-</div><div class='del'>-2000-05-30  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Implemented a few more</div><div class='del'>-	methods like imap_append and 1 or 2 others</div><div class='del'>-</div><div class='del'>-2000-05-29  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.c (camel_store_init): Move it to here.  If this</div><div class='del'>-	level is going to maintain it, it should set it up.  Lets see what</div><div class='del'>-	caching folders breaks :(</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_store_init): Dont</div><div class='del'>-	init folder cache here.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_expunge): Make sure we copy messages which are</div><div class='del'>-	still intact to the new folder.</div><div class='del'>-	(camel_mbox_summary_expunge): Update the frompos as well when</div><div class='del'>-	moving the content.</div><div class='del'>-	(camel_mbox_summary_expunge): Remove some debug, and dont offset</div><div class='del'>-	frompos?</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_build): Check the</div><div class='del'>-	searched folder is open before trying to search it.</div><div class='del'>-	(message_changed): Track changes to the source message in the</div><div class='del'>-	summary.</div><div class='del'>-	(folder_changed): Track folder changes, re-query the folder that</div><div class='del'>-	changed, and cascade the changed event as well.</div><div class='del'>-	(camel_vee_folder_finalise): Free subfolder and subfolder summary.</div><div class='del'>-</div><div class='del'>-2000-05-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_new): Fix up some glib</div><div class='del'>-	precondition stuff. Try to set the URL in camel_service_new before</div><div class='del'>-	checking whether or not it's "empty" so that you can successfully</div><div class='del'>-	set "sendmail:" as a URL.</div><div class='del'>-</div><div class='del'>-2000-05-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Add a domain field to CamelProvider, to say</div><div class='del'>-	what kind of data it provides.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-provider.c: </div><div class='del'>-	* providers/mbox/camel-mbox-provider.c: </div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: </div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c: </div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Set domain to "mail".</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: Set domain to "news".</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-provider.c: Set domain to "vfolder". (So</div><div class='del'>-	it doesn't end up being listed as a potential mail source in the</div><div class='del'>-	mail config wizard.)</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: Split apart password and APOP</div><div class='del'>-	auth, since some servers seem to do both, but don't really.</div><div class='del'>-	(connect_to_server): Renamed from try_connect. Now actually does</div><div class='del'>-	the connection up to the point of checking the greeting for APOP</div><div class='del'>-	support.</div><div class='del'>-	(query_auth_types): Return APOP, if appropriate. Call</div><div class='del'>-	pop3_disconnect after connect_to_server since we don't really want</div><div class='del'>-	to be connected.</div><div class='del'>-	(pop3_connect): Use connect_to_server rather than duplicating</div><div class='del'>-	code. Fix a one-byte buffer overrun in the APOP code.</div><div class='del'>-	(pop3_disconnect): Make this able to clean up after a partial</div><div class='del'>-	connect.</div><div class='del'>-	(connect_to_server): Remove port number from error message since</div><div class='del'>-	it's not terribly useful and we were getting it from the wrong</div><div class='del'>-	place anyway.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_format_append): Use</div><div class='del'>-	`foo@bar' rather than `"" &lt;foo@bar&gt;' for email addresses with no</div><div class='del'>-	name component.</div><div class='del'>-</div><div class='del'>-2000-05-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c: Removed </div><div class='del'>-	camel_imap_command_get_additional_data() as it was</div><div class='del'>-	completely useless, replaced with </div><div class='del'>-	camel_imap_command_extended() which may eventually replace</div><div class='del'>-	camel_imap_command() as well.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.h: Modified to reflect</div><div class='del'>-	changes made to camel-imap-store.c</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Wrote the first of many</div><div class='del'>-	methods: camel_imap_init(), imap_open(), imap_expunge(), </div><div class='del'>-	imap_get_message_count(), and imap_get_subfolder_names()</div><div class='del'>-</div><div class='del'>-2000-05-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (camel_multipart_init): Don't set a default</div><div class='del'>-	boundary. Require the caller to do that.</div><div class='del'>-	(set_boundary): if boundary is NULL, generate a "random" boundary.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Add a call to</div><div class='del'>-	camel_multipart_set_boundary after creating a new multipart.</div><div class='del'>-</div><div class='del'>-2000-05-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.c (try_connect): Removed</div><div class='del'>-	Exception code - Pop doesn't seem to set exceptions</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-folder.c: Initial code, mostly</div><div class='del'>-	just a template for future code</div><div class='del'>-</div><div class='del'>-	* providers/imap/imap.[c,h]: Source code from my personal</div><div class='del'>-	mailer - for reference only!</div><div class='del'>-</div><div class='del'>-2000-05-25  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Replace simple</div><div class='del'>-	data wrapper here too, oops.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Removed</div><div class='del'>-	camel-simple-data-wrapper again.  Less code to maintain == better</div><div class='del'>-	code.</div><div class='del'>-	</div><div class='del'>-	* camel-data-wrapper.c (construct_from_stream): Fixes for bug</div><div class='del'>-	where text attachments dont work.  Made data-wrapper concrete for</div><div class='del'>-	the second time.</div><div class='del'>-</div><div class='del'>-2000-05-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_folder_build_folder):</div><div class='del'>-	Update the vfolder details for a single folder.</div><div class='del'>-</div><div class='del'>-2000-05-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (_send_to): Took out code</div><div class='del'>-	that had been there to reconnect to the server if it was not</div><div class='del'>-	already connected - Mailer code was fixed so that this should not</div><div class='del'>-	be needed.</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-store.[c,h]: Initial code.</div><div class='del'>-</div><div class='del'>-2000-05-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: Re-add camel-simple-data-wrapper.h, which was removed</div><div class='del'>-	for some reason.</div><div class='del'>-</div><div class='del'>-2000-05-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.[c,h]: Moved global</div><div class='del'>-	variables into struct CamelSmtpTransport to make SMTP</div><div class='del'>-	thread-safe</div><div class='del'>-</div><div class='del'>-	* providers/imap/camel-imap-*.h: Stolen from Mbox. Rough structure</div><div class='del'>-	for Imap.</div><div class='del'>-	</div><div class='del'>-2000-05-23  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/imap: Added some initial code to the camel tree</div><div class='del'>-	for IMAPv4</div><div class='del'>-</div><div class='del'>-	* providers/imap/.cvsignore: Added to repository</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Added debug fprintf's</div><div class='del'>-	so that testers can provide more information. Tested with simple</div><div class='del'>-	messages and a reply to the hello@helixcode.com default message</div><div class='del'>-	but should really be tested more.</div><div class='del'>-	(smtp_data): Fixed to use data_wrapper_write_to_stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-smtp.c (filter): Modified to escape all lines</div><div class='del'>-	beginning with a '.' and to place a \r before each \n if one did</div><div class='del'>-	not previously exist. Removed code to escape "From " as it was</div><div class='del'>-	found to not be needed for SMTP.</div><div class='del'>-</div><div class='del'>-2000-05-22  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (smtp_data): Fixed the </div><div class='del'>-	filtered stream. Fixes for stream changes, updated to use </div><div class='del'>-	camel-mime-filter-smtp.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-mime-filter-smtp.c</div><div class='del'>-	</div><div class='del'>-	* camel-mime-filter-smtp.[c,h]: Added to camel tree</div><div class='del'>-	Smtp filter used to change \n into \r\n, escape lone dots,</div><div class='del'>-	and escape "From "'s.</div><div class='del'>-</div><div class='del'>-2000-05-19  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.c (construct_from_stream): If we</div><div class='del'>-	already have been constructed, unref our content.</div><div class='del'>-	(write_to_stream): Check we've been constructued, and change for</div><div class='del'>-	stream api changes.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Removed exception stuff.</div><div class='del'>-</div><div class='del'>-	* md5-utils.c (md5_get_digest_from_stream): repaired.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c: Remove exception from write_to_stream, and</div><div class='del'>-	fix, and fix formatting.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):</div><div class='del'>-	Fix for stream changes.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (camel_pop3_command): Fixes</div><div class='del'>-	for stream changes.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c, and elsewhere, fix all</div><div class='del'>-	stream api changes.</div><div class='del'>-	(mbox_append_message): Use stream_close() now its back.</div><div class='del'>-	(mbox_append_message): unref the from filter.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c: And here.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.[ch]: Here too.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c: Likewise.  This is getting tedious.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (stream_write): Fix a few little problems.</div><div class='del'>-	(stream_close): Reimplement.</div><div class='del'>-	(camel_stream_buffer_read_line): Slightly more efficient version,</div><div class='del'>-	that also only allocates the right amount of memory for strings.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c: Likewise.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.[ch]: Remove exceptions, fix formatting,</div><div class='del'>-	changes for stream (re)fixes.  set_bounds returns an error.</div><div class='del'>-</div><div class='del'>-	* camel-stream.[ch]: Remove exceptions.  Make flush and reset return</div><div class='del'>-	an error code, repair all the screwed up formatting, and put back</div><div class='del'>-	close.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): And here.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_content): And this too.</div><div class='del'>-	(write_to_stream): Fixed for stream changes.</div><div class='del'>-</div><div class='del'>-	* camel.h: Fixed.</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c (vee_search_by_expression):</div><div class='del'>-	Implement.  Performs an intersection of the two searches.</div><div class='del'>-	(camel_vee_folder_finalise): Unref search folders.</div><div class='del'>-	(vee_append_message): Implement append.</div><div class='del'>-</div><div class='del'>-2000-05-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: remove message_number_capability and require uid</div><div class='del'>-	capatibility.</div><div class='del'>-	(camel_folder_list_subfolders, camel_folder_get_uid_list,</div><div class='del'>-	camel_folder_get_subfolder_info, camel_folder_get_message_info):</div><div class='del'>-	removed</div><div class='del'>-	(camel_folder_get_subfolder_names,</div><div class='del'>-	camel_folder_free_subfolder_names): new subfolder interfaces.</div><div class='del'>-	(camel_folder_get_uids, camel_folder_free_uids): new uid</div><div class='del'>-	interfaces</div><div class='del'>-	(camel_folder_get_summary, camel_folder_free_summary): new summary</div><div class='del'>-	interfaces</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c,</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c:</div><div class='del'>-	* providers/vee/camel-vee-folder.c: Update for changes</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: Implement get_uids, update</div><div class='del'>-	for other changes.</div><div class='del'>-</div><div class='del'>-2000-05-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/vee/camel-vee-folder.c: Guess!</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c (search_user_flag): Implement user_flag</div><div class='del'>-	search term.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.h: Added user_flag search capability</div><div class='del'>-	(user-flag "blah")</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_init): Set USER flag in</div><div class='del'>-	permanent flags for the folder.</div><div class='del'>-</div><div class='del'>-2000-05-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: Remove unused async open/close and</div><div class='del'>-	copy_message_to functions.</div><div class='del'>-	Rename functions without initial _. Fix glib preconditions and</div><div class='del'>-	gtk-doc comments.</div><div class='del'>-</div><div class='del'>-2000-05-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c: remove get/set_output_stream operations.</div><div class='del'>-	They're redundant with write_to_stream, and CamelMimePart and</div><div class='del'>-	CamelMimeMessage only implement the latter, meaning that trying to</div><div class='del'>-	get_output_stream on a CamelMimeMessage that was built from pieces</div><div class='del'>-	rather than being parsed from a stream doesn't work. Anything that</div><div class='del'>-	uses get_output_stream can be rewritten to use write_to_stream, so</div><div class='del'>-	we'll standardize on that.</div><div class='del'>-	(camel_data_wrapper_new): remove this: CamelDataWrapper is</div><div class='del'>-	supposed to be an abstract class.</div><div class='del'>-	(write_to_stream): remove default implementation. (Moved to</div><div class='del'>-	CamelSimpleDataWrapper)</div><div class='del'>-	</div><div class='del'>-	* camel-simple-data-wrapper.c: resurrect, although it's not really</div><div class='del'>-	the same thing it was before. A simple data wrapper, which is</div><div class='del'>-	backed by a CamelStream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Use</div><div class='del'>-	construct_from_stream rather than set_output_stream.</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Change</div><div class='del'>-	camel_data_wrapper_new to camel_simple_data_wrapper_new.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_content): Change</div><div class='del'>-	camel_data_wrapper_new to camel_simple_data_wrapper_new.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-05-17  Darin Adler  &lt;darin@eazel.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: (message_info_load):</div><div class='del'>-	Quick fix to get it to compile. I hope I don't get into trouble.</div><div class='del'>-</div><div class='del'>-2000-05-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.h: Don't include the no-longer-distributed</div><div class='del'>-	possibly-to-be-removed headers.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c</div><div class='del'>-	(smtp_get_email_addr_from_text): fix an off-by-one error in</div><div class='del'>-	address parsing</div><div class='del'>-	(smtp_data): use camel_data_wrapper_get_output_stream rather than</div><div class='del'>-	data_wrapper-&gt;output_stream</div><div class='del'>-</div><div class='del'>-2000-05-17  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (message_changed): Snoop</div><div class='del'>-	changes to user flags on the message into the summary as well.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_init):</div><div class='del'>-	Changed version init to include the parent class version info</div><div class='del'>-	(i.e. add it not overwrite it).</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_new): Initialise user_flags</div><div class='del'>-	to empty.</div><div class='del'>-	(message_info_load): And load user flags.</div><div class='del'>-	(message_info_save): And save user flags.</div><div class='del'>-	(message_info_free): And free them.</div><div class='del'>-	(CAMEL_FOLDER_SUMMARY_VERSION): Bumped file revision.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: Added user-flags to summary.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_user_flag): Dont</div><div class='del'>-	use a hashtable for user flags.</div><div class='del'>-	(camel_mime_message_get_user_flag): And changed here too.</div><div class='del'>-	(camel_flag_get): New interface to get a flag from a flag</div><div class='del'>-	list.  Flag lists are easier to work with than hash tables, and</div><div class='del'>-	save memory too.</div><div class='del'>-	(camel_flag_set): And set.</div><div class='del'>-	(camel_flag_list_free): And free.</div><div class='del'>-	(free_key_only): Discard.</div><div class='del'>-	(finalize): Remove the flag list.</div><div class='del'>-</div><div class='del'>-2000-05-17  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): Error</div><div class='del'>-	checking on gethostbyaddr() eliminating a possible segfault.</div><div class='del'>-</div><div class='del'>-2000-05-16  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_delete_message_by_uid):</div><div class='del'>-	Implement.</div><div class='del'>-</div><div class='del'>-2000-05-12  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c (camel_movemail): Open the destination with</div><div class='del'>-	O_APPEND, so we dont blow away a partially transferred mbox.</div><div class='del'>-	(camel_movemail): Loop if we get errno=INTR, and not fail.</div><div class='del'>-</div><div class='del'>-2000-05-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (summary_rebuild): Update</div><div class='del'>-	the summarised file size, if everything went ok.</div><div class='del'>-	(camel_mbox_summary_expunge): Clear header flags after updating.</div><div class='del'>-</div><div class='del'>-2000-05-16  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c:</div><div class='del'>-	* providers/nntp/camel-nntp-folder.h:</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: </div><div class='del'>-	* providers/nntp/camel-nntp-store.c: </div><div class='del'>-	* providers/nntp/camel-nntp-utils.c: </div><div class='del'>-	* providers/nntp/camel-nntp-utils.h: </div><div class='del'>-	get things working with new camel summary stuff.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-summary.c: </div><div class='del'>-	* providers/nntp/camel-nntp-summary.h: </div><div class='del'>-	removed files since camel-folder-summary does all we need.</div><div class='del'>-</div><div class='del'>-2000-05-15  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: Added some preliminary</div><div class='del'>-	AUTH support.</div><div class='del'>-</div><div class='del'>-2000-05-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Remove camel_folder_get_summary, which no longer</div><div class='del'>-	exists.</div><div class='del'>-</div><div class='del'>-2000-05-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: remove some cruft that we're not currently using.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): Change</div><div class='del'>-	to match prototype (size_t vs unsigned int) so it works on 64-bit</div><div class='del'>-	machines. Noted by msw.</div><div class='del'>-</div><div class='del'>-2000-05-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (message_changed): Indicate</div><div class='del'>-	the summary changed also.</div><div class='del'>-</div><div class='del'>-2000-05-11  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (smtp_helo): </div><div class='del'>-	Updated to more closely comply with RFC 821 standards</div><div class='del'>-</div><div class='del'>-2000-05-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Unref the filter after</div><div class='del'>-	adding it to the filtering stream.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_finalise): Free the folder path.</div><div class='del'>-	(camel_mbox_summary_update): Also save summary when done.</div><div class='del'>-	(camel_mbox_summary_expunge): Unindex items when deleting them.</div><div class='del'>-	(camel_mbox_summary_expunge): Save the index as well as the</div><div class='del'>-	summary.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalise): Free the</div><div class='del'>-	summary path.</div><div class='del'>-	(camel_folder_summary_touch): New function, indicate the summary</div><div class='del'>-	info changed.</div><div class='del'>-	(camel_folder_summary_remove): Dirty here.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (internet_decode): Free multiple entry</div><div class='del'>-	addresses properly.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Plugged another</div><div class='del'>-	memleak, free text after converting it.</div><div class='del'>-	(header_decode_addrspec): More leaks plugged.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (finalize): Free message_uid.</div><div class='del'>-	(finalize): Free the recipients hashtable.</div><div class='del'>-</div><div class='del'>-2000-05-11    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalise): Free</div><div class='del'>-	summary items and charset filters.</div><div class='del'>-</div><div class='del'>-2000-05-10    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalise): Don't</div><div class='del'>-	free stuff in p, after we've free'd p.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Unref</div><div class='del'>-	the stream we created for appending.</div><div class='del'>-</div><div class='del'>-2000-05-10  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (camel_smtp_transport_class_init):</div><div class='del'>-	Added initialization for service_class</div><div class='del'>-</div><div class='del'>-2000-05-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (write_to_stream): fix a stupid typo. Thank</div><div class='del'>-	you, C.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): don't ref the stream before</div><div class='del'>-	wrapper a filter around it, since nothing will ever unref it.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-types.h, camel-folder-pt-proxy.h, and</div><div class='del'>-	camel-thread-proxy.h.</div><div class='del'>-</div><div class='del'>-2000-05-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):</div><div class='del'>-	Bleah. Can't fsync a pipe. As a quick kludge, just don't</div><div class='del'>-	stream_flush it. The right fix will require bringing back</div><div class='del'>-	stream_close though.</div><div class='del'>-</div><div class='del'>-2000-05-09  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-	* camel-internet-address.[c,h]: Undid my changes (moved</div><div class='del'>-	struct _address back into came-internet-address.c)</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (_send): changed</div><div class='del'>-	from using it's own address manipulation (using struct _address)</div><div class='del'>-	to using camel_internet_address_get(). Also some format changes</div><div class='del'>-	to keep consistant with the rest of Camel</div><div class='del'>-</div><div class='del'>-2000-05-09  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.[c,h]: Moved struct _address from</div><div class='del'>-	camel-internet-address.c to camel-internet-address.h</div><div class='del'>-	(hopefully this doesn't break anything...)</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: (_send): now</div><div class='del'>-	populates the recipient list with To, Cc, and Bcc addresses.</div><div class='del'>-	Should now be able to use this module.</div><div class='del'>-</div><div class='del'>-2000-05-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):</div><div class='del'>-	one more refcounting fix I missed before.</div><div class='del'>-</div><div class='del'>-2000-05-08  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: no longer frees memory it</div><div class='del'>-	shouldn't, updated to reflect camel-stream changes involving</div><div class='del'>-	CamelException (perhaps it should use a different CamelException</div><div class='del'>-	variable than is passed to the camel smtp module?)</div><div class='del'>-</div><div class='del'>-2000-05-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream.c (camel_stream_read, camel_stream_write,</div><div class='del'>-	camel_stream_flush, camel_stream_reset, camel_stream_printf,</div><div class='del'>-	camel_stream_write_to_stream): Use CamelException to signal</div><div class='del'>-	failure.</div><div class='del'>-	(camel_stream_write_strings): Remove. camel_stream_printf is more</div><div class='del'>-	useful in most of the places that used this.</div><div class='del'>-	(camel_stream_write_string): Change from macro to function to</div><div class='del'>-	prevent problems with double-evaluation.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.c (camel_seekable_stream_seek,</div><div class='del'>-	camel_seekable_stream_set_bounds): Use CamelException.</div><div class='del'>-	(reset): Update.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c, camel-stream-buffer.c,</div><div class='del'>-	camel-stream-filter.c, camel-stream-fs.c, camel-stream-mem.c:</div><div class='del'>-	Update.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c: Remove the virtual init functions and move</div><div class='del'>-	the code into the creator functions. Add CamelExceptions to</div><div class='del'>-	creation functions that could fail.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_write_to_stream): Use</div><div class='del'>-	CamelException.</div><div class='del'>-	* camel-mime-message.c, camel-mime-part.c, camel-multipart.c</div><div class='del'>-	(write_to_stream): Update.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: add an exception to the mime parser private</div><div class='del'>-	data and pass that to stream functions as needed.</div><div class='del'>-	</div><div class='del'>-	* gmime-content-field.c, md5-utils.c: Update (badly) for stream</div><div class='del'>-	changes.</div><div class='del'>-	</div><div class='del'>-	* camel-exception.h (camel_exception_is_set): convenience macro.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: disable SMTP for now</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_append_message): Pass</div><div class='del'>-	CamelException to the functions that now need it. Check the</div><div class='del'>-	exception after calling camel_stream_flush, and fail if it fails.</div><div class='del'>-	(mbox_get_message_by_uid): More updates.</div><div class='del'>-</div><div class='del'>-	* providers/pop/camel-pop3-folder.c,</div><div class='del'>-	providers/pop/camel-pop3-store.c,</div><div class='del'>-	providers/sendmail/camel-sendmail/transport.c: Update.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-05-08  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (process_header): Format From and Reply-To</div><div class='del'>-	to at least a decoded string.  Should probably store them as an</div><div class='del'>-	camelinternetaddress.</div><div class='del'>-</div><div class='del'>-	* Merged NEW_SUMMARY branch back to trunk, and resolved conflicts.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_update):</div><div class='del'>-	Return status.</div><div class='del'>-	(camel_mbox_summary_expunge): Force an update of the summary</div><div class='del'>-	before we do anything.</div><div class='del'>-	(camel_mbox_summary_expunge): Build new xev line in xevnew, and</div><div class='del'>-	free that, and consify xev.</div><div class='del'>-	(camel_mbox_summary_load): If we are rebuilding from scratch, make</div><div class='del'>-	sure we clear the summary content.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_close): We NEED a stream close.</div><div class='del'>-</div><div class='del'>-2000-05-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Make camel not leak like a sieve.</div><div class='del'>-</div><div class='del'>-	* camel-object.c: New subclass of GtkObject which is now the base</div><div class='del'>-	of the Camel object hierarchy. Currently the only difference</div><div class='del'>-	between CamelObject and GtkObject is that CamelObjects don't start</div><div class='del'>-	out floating.</div><div class='del'>-</div><div class='del'>-	* *.h: Move a bunch of typedefs to camel-types.h. Standardize on</div><div class='del'>-	using &lt;camel/foo.h&gt; in header files rather than &lt;foo.h&gt;, "foo.h",</div><div class='del'>-	or "camel/foo.h". Remove some unneeded includes.</div><div class='del'>-</div><div class='del'>-	* camel-address.c, camel-data-wrapper.c, camel-folder-search.c,</div><div class='del'>-	camel-folder-summary.c, camel-folder.c, camel-mime-filter.c,</div><div class='del'>-	camel-mime-parser.c, camel-service.c, camel-session.c,</div><div class='del'>-	camel-stream.c: These are now subclasses of CamelObject.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (set_output_stream):</div><div class='del'>-	* camel-medium.c (set_content_object):</div><div class='del'>-	* camel-seekable-substream.c</div><div class='del'>-	(init_with_seekable_stream_and_bounds):</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid): </div><div class='del'>-	remove gtk_object_sink calls.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (init_vbuf): </div><div class='del'>-	* camel-stream-filter.c (camel_stream_filter_new_with_stream):</div><div class='del'>-	ref the original stream.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_finalise): unref</div><div class='del'>-	the filters when finalizing.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser,</div><div class='del'>-	camel_mime_part_construct_content_from_parser):</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_content): Unref objects</div><div class='del'>-	that are created only to be handed off to other objects. If</div><div class='del'>-	they're going to be needed later, they will have been additionally</div><div class='del'>-	ref'ed by the object that needs them.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):</div><div class='del'>-	unref the message stream after creating the data from it.</div><div class='del'>-</div><div class='del'>-	* camel-stream.c, camel-stream-buffer.c, camel-stream-filter.c,</div><div class='del'>-	camel-stream-fs.c, camel-stream-mem.c: Remove camel_stream_close,</div><div class='del'>-	since its semantics are dubious (what happens when you close a</div><div class='del'>-	stream other people still have references on?).</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-store.c:</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c:</div><div class='del'>-	* providers/pop3/camel-pop3-store.c:</div><div class='del'>-	replace camel_stream_close calls with gtk_object_unref.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c:</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c:</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c:</div><div class='del'>-	replace camel_stream_close with camel_stream_flush +</div><div class='del'>-	gtk_object_unref</div><div class='del'>-</div><div class='del'>-2000-05-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): A machine</div><div class='del'>-	which serves neither POP nor KPOP is not a POP server.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: Note in the description</div><div class='del'>-	that this provider is not yet tested.</div><div class='del'>-</div><div class='del'>-2000-05-08    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Free the filter stream when</div><div class='del'>-	done.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_seek): Make sure we add the \n</div><div class='del'>-	terminal when we seek as well (frob!).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_addrspec): Plug minor memleak.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (finalize): Free header tables once finished.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_remove): Dont try</div><div class='del'>-	to access info after its free'd.</div><div class='del'>-</div><div class='del'>-2000-05-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Apply encoding to content</div><div class='del'>-	part, when writing to a stream *sigh*.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_write): implement write for the</div><div class='del'>-	filtering stream.  Writes shouldn't be mixed with reads.</div><div class='del'>-	(do_flush): Implemented flush.  Again write/flush shouldn't be</div><div class='del'>-	mixed with reads.  Only flushes if the last op was write.</div><div class='del'>-	(do_close): Force flush on close.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter.c (filter_run): Oops, make sure we include the</div><div class='del'>-	backlen in the total length before passing onto the filter.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-from.c: New filter, munges 'From ' lines into</div><div class='del'>-	'&gt;From ', for mbox.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_header_remove): New</div><div class='del'>-	function to remove the parser's raw header, rather than</div><div class='del'>-	manipulating the header directly (wich doesn't work with</div><div class='del'>-	mempools).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_address_list_clear): Fixed some</div><div class='del'>-	broken(tm) logic, which would leak entries on multivalued lists.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):</div><div class='del'>-	Use ibex_save() to save the ibex.  Makes a big difference to</div><div class='del'>-	startup times for very large mailboxes.</div><div class='del'>-	(camel_mbox_summary_expunge): Dum de dum, reimplemented.  Designed</div><div class='del'>-	to be much more robust, and to stop immediately if anything awry</div><div class='del'>-	happens.</div><div class='del'>-	(copy_block): Utility function to copy n bytes from one fd to</div><div class='del'>-	another.</div><div class='del'>-	(header_write): Utility function to write out raw headers to an</div><div class='del'>-	fd.</div><div class='del'>-	(camel_mbox_summary_update): Incremental summary updater.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_get_message_by_uid):</div><div class='del'>-	Dont unref the stream, because of the broken(tm) ref model of gtk</div><div class='del'>-	widget that for some odd reason is being perpetuated in camel.	</div><div class='del'>-	(mbox_expunge): Reenable expunge again.</div><div class='del'>-	(mbox_append_message): Removed the optimised mbox append.  If its</div><div class='del'>-	an issue, it can go back later.  Cleaned up a lot, checks error</div><div class='del'>-	returns, and automagically translates 'From ' into '&gt;From' as</div><div class='del'>-	necessary.</div><div class='del'>-</div><div class='del'>-2000-05-07    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter.c (filter_run): Oops, forgot to add the</div><div class='del'>-	backlen to the pre-buffer (*poof*).</div><div class='del'>-</div><div class='del'>-2000-05-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Allow</div><div class='del'>-	HSCAN_FROM_END to terminate the processing of a message.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (perform_content_info_load): Ick, dont</div><div class='del'>-	try and append a node onto its own list.</div><div class='del'>-	(camel_folder_summary_clear): Actually clear the indexes after</div><div class='del'>-	we've removed the messages.</div><div class='del'>-	(camel_folder_summary_clear): Set dirty if it changes.</div><div class='del'>-	(camel_folder_summary_load): Clear dirty.</div><div class='del'>-	(camel_folder_summary_save): Only save if dirty.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (summary_header_load): Oops,</div><div class='del'>-	remember to call that parent class first ...</div><div class='del'>-	(summary_header_save): Here too.</div><div class='del'>-	(camel_mbox_summary_load): Do more checking to verify the index</div><div class='del'>-	contents as well as teh summary contents, against the mbox</div><div class='del'>-	contents.</div><div class='del'>-	(camel_mbox_summary_load): Removed some fo that checking, it needs</div><div class='del'>-	more code to work reliably.</div><div class='del'>-</div><div class='del'>-2000-05-07    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_load):</div><div class='del'>-	Set the size and mtime of the mbox we indexed once done.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (camel_folder_summary_set_index): Dont</div><div class='del'>-	write the index if it changes - let the claler fix it (uh, kind of</div><div class='del'>-	impacts performance).</div><div class='del'>-	(camel_folder_summary_load): close in.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_format_string): Check header</div><div class='del'>-	exists before trying to strip its leading spaces.</div><div class='del'>-</div><div class='del'>-2000-05-06  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Removed summary info from here, and include</div><div class='del'>-	camel-folder-summary.h as well.</div><div class='del'>-	</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_step): Allow it to accept</div><div class='del'>-	a NULL databuffer.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Totally new file, now</div><div class='del'>-	subclasses camel-folder-summary.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (message_info_load): Load the uid as a</div><div class='del'>-	string.</div><div class='del'>-	(message_info_save): And save too.</div><div class='del'>-	(camel_folder_summary_clear): New function, clears the contents of</div><div class='del'>-	the summary.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: Fixes for	summary changes.</div><div class='del'>-	(mbox_get_message_by_uid): Completely redone.  Now cross-checks</div><div class='del'>-	the summary information to make sure we get a real message.</div><div class='del'>-	(mbox_append_message): Disabled the copy version of append for</div><div class='del'>-	now.</div><div class='del'>-	(mbox_expunge): Temporarily disabled the expunge function, until</div><div class='del'>-	it is put back in camel-mbox-summary.c</div><div class='del'>-</div><div class='del'>-2000-05-05  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: And same here ...</div><div class='del'>-	(camel_folder_summary_encode_fixed_int32): Ugh, fwrite doesn't</div><div class='del'>-	return -1 on error ..</div><div class='del'>-	(camel_folder_summary_decode_fixed_int32): Neither deos fread.</div><div class='del'>-	(camel_folder_summary_encode_token): Fix here too.</div><div class='del'>-	(summary_build_content_info): Use start-headers to get the pos of</div><div class='del'>-	the message, not parser_tell(), which might not be what we</div><div class='del'>-	expected because of parser_unstep().</div><div class='del'>-	(camel_folder_summary_encode_token): Use bserch() to tokenise the</div><div class='del'>-	values, rather than a linear search.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Defined out some memory profiling stuff I</div><div class='del'>-	left there by mistake.</div><div class='del'>-	(header_decode_mailbox): Dont try to append the word part of a</div><div class='del'>-	local address if we ran out of words.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_content): Apply the fix from</div><div class='del'>-	the header scanner to here too.</div><div class='del'>-	(folder_scan_header): Only check for end of header if we have</div><div class='del'>-	space for it (didn't end the read with a newline)</div><div class='del'>-	(folder_scan_header): inptr is the only real thing we need</div><div class='del'>-	registerised for performance.  Try to help the compiler be smart</div><div class='del'>-	about it ..</div><div class='del'>-	(folder_scan_header): Simplified the save header case a tad.</div><div class='del'>-</div><div class='del'>-	Commented out some memory profiling stuff.</div><div class='del'>-</div><div class='del'>-2000-05-05    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Plug a memory leak.</div><div class='del'>-	(header_decode_text): Fixed memory leaks with g_string_append().</div><div class='del'>-	(header_encode_string): And here too, and a few other places.  The</div><div class='del'>-	glib api is so awful ...</div><div class='del'>-	(header_content_type_decode): More memory leaks.</div><div class='del'>-</div><div class='del'>-2000-05-05    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_init_with_fd): Make sure we</div><div class='del'>-	init the end of buffer sentinal!</div><div class='del'>-	(folder_scan_init_with_stream): And here too ...</div><div class='del'>-</div><div class='del'>-2000-05-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (summary_get_message_info):</div><div class='del'>-	Maxcount is minimum of the max and the requested count, not the</div><div class='del'>-	maximum :)</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_content): Properly set midline,</div><div class='del'>-	so we dont falsely catch offset boundary markers (i.e. From inside</div><div class='del'>-	content).</div><div class='del'>-	(folder_read): Set a sentinal on the end of the read data (\n) so</div><div class='del'>-	we dont have to check the buffer boundary in the inner loop.</div><div class='del'>-	(mempool_*): New experimental memory management routines, speed</div><div class='del'>-	up simple structure parsing by about 25% ... not compiled in by</div><div class='del'>-	default.  Something similar may be needed for camel-mime-utils to</div><div class='del'>-	address performance issues with g_malloc and friends.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Added a macro w(x) used to wrap all warnings</div><div class='del'>-	about mime/rfc violations, so they can be turned off.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c (summary_build_content_info): Step after</div><div class='del'>-	the end of a message ...</div><div class='del'>-	Turn into a stand-alone program for testing and profiling.</div><div class='del'>-</div><div class='del'>-2000-05-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Don't fall</div><div class='del'>-	back to plaintext passwords if APOP fails, since it should also</div><div class='del'>-	fail.</div><div class='del'>-</div><div class='del'>-2000-05-04  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_list_providers): New function to</div><div class='del'>-	replace camel_provider_scan. Returns a list of either (a) all</div><div class='del'>-	currently-loaded providers, or (b) all available providers.</div><div class='del'>-</div><div class='del'>-	* camel-url.[ch]: Add an "empty" flag to CamelURL (indicating that</div><div class='del'>-	it contains only a protocol).</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_query_auth_types): Make this take</div><div class='del'>-	a CamelException (since it may have to try to connect to the</div><div class='del'>-	server, and it might not able to.)</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: add KPOP (Kerberized POP)</div><div class='del'>-	support. This is mostly so I have two kinds of authmech to play</div><div class='del'>-	with instead of just one. (But it does actually work.)</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c (query_auth_types): update</div><div class='del'>-	for prototype change, but disable the functionality, since it</div><div class='del'>-	doesn't really support any auth types yet.</div><div class='del'>-	(camel_smtp_transport_get_type): add an object init function to</div><div class='del'>-	set the service url_flags.</div><div class='del'>-</div><div class='del'>-2000-05-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c: Yes, and anotherone.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: And another one.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c: And another one.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c: And another one.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c: And another one.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Reverted a change wihtout a ChangeLog entry.</div><div class='del'>-</div><div class='del'>-2000-05-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[hc]: Yes, CamelFolderSummary is back ...</div><div class='del'>-	... re-usable class to summarise and index any stream or message</div><div class='del'>-	and to manage/load/save the created summaries.</div><div class='del'>-	</div><div class='del'>-	* camel-folder.c: Include string.h to kill a warning.</div><div class='del'>-</div><div class='del'>-2000-05-03  Jason Leach  &lt;leach@wam.umd.edu&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): add $(UNICODE_CFLAGS) to the INCLUDES,</div><div class='del'>-	people who installed libunicde in non-standard include paths need</div><div class='del'>-	this.</div><div class='del'>-</div><div class='del'>-2000-05-03  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Added pos/bodypos/endpos to the basic message</div><div class='del'>-	content info object.  Size to be removed?  Moved the</div><div class='del'>-	messageconentinfo and messageinfo back to camel-folder-summary.h.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-index.c (camel_mime_filter_index_set_ibex):</div><div class='del'>-	New function to (re)set the index to use on a filter.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_scan_from): Whole bunch</div><div class='del'>-	of inline docs.</div><div class='del'>-	(camel_mime_parser_drop_step): New function to drop a state from</div><div class='del'>-	the parser.  Needs more testing.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): If the iconv handle is</div><div class='del'>-	-1, then dont try and convert (crashes unicode_iconv?).</div><div class='del'>-	(rfc2047_decode_word): Use alloca for variables instead of</div><div class='del'>-	g_malloc - by the rfc they should always be short.</div><div class='del'>-	(rfc2047_decode_word): If we can't do the charset conversion, undo</div><div class='del'>-	the quoted-printable/base64 at least?  Should probably convert</div><div class='del'>-	unknown characters to the utf-8 unknown character.</div><div class='del'>-</div><div class='del'>-2000-05-02  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_date): fix typo when</div><div class='del'>-	dereferencing saveoffset.</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.c: Added some header doco.</div><div class='del'>-</div><div class='del'>-	* camel.h: REmove gmime-utils.h from here.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.[ch]: Removed.  Functionally</div><div class='del'>-	redundant.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (mbox_search_by_expression):</div><div class='del'>-	Use the new CamelFolderSearch class to do the actual searching,</div><div class='del'>-	just setup the search here.</div><div class='del'>-</div><div class='del'>-	* camel-folder-search.[ch]: A helper class that providers may</div><div class='del'>-	subclass to provide their own search functionality, or they can</div><div class='del'>-	simply use as is, it supports body searches if an ibex is</div><div class='del'>-	supplied, and header searches if a summary is supplied.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-	* providers/MH/Makefile.am: same.</div><div class='del'>-	* providers/maildir/Makefile.am: same.</div><div class='del'>-	* providers/mbox/Makefile.am: same.</div><div class='del'>-	* providers/nntp/Makefile.am: same.</div><div class='del'>-	* providers/pop3/Makefile.am: same.</div><div class='del'>-	* providers/sendmail/Makefile.am: same.	</div><div class='del'>-	* providers/smtp/Makefile.am: same.		</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Dont store/remove</div><div class='del'>-	current search from the search list.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-folder.h: Removed searches list,</div><div class='del'>-	searches are all sync now.</div><div class='del'>-</div><div class='del'>-	* gmime-utils.[ch]: What the hell, remove it.  This will break the</div><div class='del'>-	nntp provider.  The mime parser can be used instead though.</div><div class='del'>-	Removed from all code including it (but none were using it).</div><div class='del'>-</div><div class='del'>-	* gmime-utils.c (_store_header_pair_from_string): Removed bizarre</div><div class='del'>-	string_dichotomy version of this.  This code is somewhat redundant</div><div class='del'>-	now, and is headed for death anyway.</div><div class='del'>-</div><div class='del'>-	* gstring-util.c (g_string_dichotomy): Same with this one.</div><div class='del'>-	(g_string_clone): Removed a memory leak, g_string_new() allocates</div><div class='del'>-	its own memory.</div><div class='del'>-	(g_string_append_g_string): Allow to append an empty gstring onto</div><div class='del'>-	another gstring, dont abort()!</div><div class='del'>-</div><div class='del'>-	* string-utils.c (string_dichotomy): Removed this incredibly weird</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (_create): Replaced the rather obtuse use of</div><div class='del'>-	"string_dichotomy" function with a simple strrchr().  Still not</div><div class='del'>-	sure it'll work.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.c: cvs removed a long-removed file.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): Fix the previous</div><div class='del'>-	overflow problem properly (can happen in 2 places).</div><div class='del'>-	(header_append): A new macro to include the code changed above, so</div><div class='del'>-	it only appears in one place.</div><div class='del'>-	(folder_scan_step): Change the content type to text/plain if the</div><div class='del'>-	multipart is broken.  Doesn't actually change the header though.</div><div class='del'>-	(header_append): Also move the header-start tracking stuff here.</div><div class='del'>-	Could be a static function to save code.</div><div class='del'>-</div><div class='del'>-2000-05-02    &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Dont use autofill on</div><div class='del'>-	these fucking long function anmes!!!!!!</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_expunge): Fix the offset for the summary when</div><div class='del'>-	an item is expunged to take account of the From line.</div><div class='del'>-</div><div class='del'>-2000-05-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.h (CamelMboxFolder): Removed</div><div class='del'>-	search_id.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_cancel): Remove.d</div><div class='del'>-	(camel_mbox_folder_search_complete): Removed.</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Changed back to sync</div><div class='del'>-	api.</div><div class='del'>-	(struct _searchcontext): Removed cancelled flag.</div><div class='del'>-	(find_context): Removed.</div><div class='del'>-	(func_header_contains): Debug out some search stuff.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.h</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Moved back to sync api.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_set_flags_by_uid): New function to update the</div><div class='del'>-	flags in the summary.</div><div class='del'>-	(camel_mbox_summary_expunge): Expunge messages from a folder.</div><div class='del'>-	(offset_content): Re-align offsets of summary when messages</div><div class='del'>-	added/removed to an existing summary.</div><div class='del'>-	(camel_mbox_summary_remove_uid): Remove a message summary entry by</div><div class='del'>-	uid.</div><div class='del'>-	(index_folder): Restore flags from X-Evolution header, if they are set.</div><div class='del'>-	(index_folder): Make sure we index using a decimal uid, since</div><div class='del'>-	thats what everything else indexes off (oops).</div><div class='del'>-	Upped SUMMARY_VERSION as a result.</div><div class='del'>-	(camel_mbox_summary_expunge): Oops, my wrong, use the string uid</div><div class='del'>-	to unindex on.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):</div><div class='del'>-	Connect to the message_changed signal.</div><div class='del'>-	(_init): Set permanent flags to something reasonable.  No user</div><div class='del'>-	flags yet ...</div><div class='del'>-	(message_changed): If the flags of the message change, update the</div><div class='del'>-	flags in the summary.</div><div class='del'>-	(mbox_expunge): Implement the expunge.</div><div class='del'>-	(camel_mbox_folder_class_init): Renamed all leading _'s to mbox_'s</div><div class='del'>-	(mbox_expunge): Emit a folder_changed signal on expunge (uh, even</div><div class='del'>-	if it didn't ...)</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (_finalize): Uh, dont free permanent_flags</div><div class='del'>-	anymore (this wouldn't failed anyway, it was a GList !!!)</div><div class='del'>-	(camel_folder_search_complete): Removed.</div><div class='del'>-	(camel_folder_search_cancel): Removed.</div><div class='del'>-	(camel_folder_expunge): Changed to only allow expunge on an open</div><div class='del'>-	folder.  It doesn't make sense for mbox, otherwise (?)</div><div class='del'>-	(camel_folder_class_init): Added a folder_changed signal.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (struct _CamelFolder): Change permanent_flags to</div><div class='del'>-	a bitfield.</div><div class='del'>-	(list_permanent_flags): Renamed to get_permanent_flags, and</div><div class='del'>-	returns a bitfield.</div><div class='del'>-	(camel_folder_expunge): Changed expunge to a void type.  The</div><div class='del'>-	messages would no longer be useful after they have been removed</div><div class='del'>-	...</div><div class='del'>-	(CamelFolderClass): New function summary_get_by_uid() to get a single</div><div class='del'>-	summary.</div><div class='del'>-	(*search*): Moved back to synchronous search api ... *sigh*</div><div class='del'>-	</div><div class='del'>-	* camel-folder.h: Removed CamelSearchFunc.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (set_flag): Removed.</div><div class='del'>-	(camel_mime_message_set_flag): Removed.</div><div class='del'>-	(get_flag): Removed.</div><div class='del'>-	(camel_mime_message_get_flag): Removed.</div><div class='del'>-	(add_flag_to_list): Removed.</div><div class='del'>-	(get_flag_list): Removed.</div><div class='del'>-	(camel_mime_message_get_flag_list): Removed.</div><div class='del'>-	(camel_mime_message_get_flags): New interface to get system flags.</div><div class='del'>-	(camel_mime_message_set_flags):  " to set ".</div><div class='del'>-	(camel_mime_message_get_user_flag): To get a user flag.</div><div class='del'>-	(camel_mime_message_set_user_flag): To set a user flag.</div><div class='del'>-	(finalize): Hmm, the old one free'd the key and data, not good</div><div class='del'>-	when the data is a boolean ...</div><div class='del'>-</div><div class='del'>-2000-04-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Tweak the definition of CamelProvider. Among</div><div class='del'>-	other things, a provider may now be both a store and a transport.</div><div class='del'>-</div><div class='del'>-	* camel-provider.c: Remove a lot of code we had no intention of</div><div class='del'>-	using. This now only contains two functions: camel_provider_init</div><div class='del'>-	to read the installed .urls files, and camel_provider_load to</div><div class='del'>-	load and register a new provider.</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Remove more unused code and simplify some of</div><div class='del'>-	the remaining code. The list of available provider modules is now</div><div class='del'>-	stored in the session, and it handles calling camel_provider_load</div><div class='del'>-	to load them as needed. Provider registration is now done by</div><div class='del'>-	calling back from the module init routine, which allows a single</div><div class='del'>-	module to register providers for multiple URL types.</div><div class='del'>-</div><div class='del'>-	* providers/*: Update provider structures and init routines for</div><div class='del'>-	the new stuff. Add a .urls file to each provider specifying what</div><div class='del'>-	urls it handles, and install that with the library.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-provider.c: Add hints towards</div><div class='del'>-	supporting both news: and nntp: URLs, and using nntp as both a</div><div class='del'>-	store and a transport.</div><div class='del'>-</div><div class='del'>-2000-04-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.c (camel_internet_address_get): const</div><div class='del'>-	poison</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser):</div><div class='del'>-	camel_mime_parser_tell() returns an offset from where it started</div><div class='del'>-	parsing, not necessarily from the start of data. Since we're</div><div class='del'>-	parsing a bounded seekable_stream, we need to add the stream's</div><div class='del'>-	starting bound to camel_mime_parser_tell's return value to</div><div class='del'>-	create the substream in the right place.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c</div><div class='del'>-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):</div><div class='del'>-	say CAMEL_STREAM_UNBOUND rather than -1 in doc.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.c (camel_seekable_stream_seek): Add more</div><div class='del'>-	info to docs.</div><div class='del'>-</div><div class='del'>-2000-04-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): fix a bug that would</div><div class='del'>-	cause corruption with very long headers.</div><div class='del'>-</div><div class='del'>-2000-04-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/Makefile.am (INCLUDES): Add `-I$(srcdir)/../../..'</div><div class='del'>-	to pick the Camel includes.</div><div class='del'>-	* providers/sendmail/Makefile.am (INCLUDES): Likewise.</div><div class='del'>-</div><div class='del'>-	* camel.h: Don't #include &lt;camel/data-wrapper-repository.h&gt; anymore.</div><div class='del'>-</div><div class='del'>-2000-04-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (check_header): Dont try and check a NULL</div><div class='del'>-	header.</div><div class='del'>-</div><div class='del'>-	* camel-recipient.[ch]: Dead.  Its not pining.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h: Dont include recipients.h anymore.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_add_recipient): Accept</div><div class='del'>-	name/address separately, and store in an CamelInternetAddress.</div><div class='del'>-	(add_recipient): Removed.</div><div class='del'>-	(remove_recipient): Removed.</div><div class='del'>-	(remove_recipient_address): Renamed from remove_receipient, works</div><div class='del'>-	via address.</div><div class='del'>-	(camel_mime_message_remove_recipient_name): New function to remove</div><div class='del'>-	by name.</div><div class='del'>-	(get_recipients): Removed.</div><div class='del'>-	(camel_mime_message_get_recipients): Return a camel-internet-address.</div><div class='del'>-	(write_to_stream): No longer write receipients directly.</div><div class='del'>-	(write_recipients_to_stream): Removed.</div><div class='del'>-	(write_one_recipient_to_stream): Removed.</div><div class='del'>-	(camel_mime_message_init): Setup recipients hashtable, rather than</div><div class='del'>-	usign the recipients stuff.</div><div class='del'>-	(set_recipient_list_from_string): Killed, a violent and lengthy</div><div class='del'>-	death.</div><div class='del'>-	(process_header): Simplified recipient handling code a lot.</div><div class='del'>-	(received_date_str, sent_date_str, reply_to_str, subject_str,</div><div class='del'>-	from_str): Removed some oddly-defined global statics.</div><div class='del'>-	(camel_mime_message_class_init): Dont initialise above variables</div><div class='del'>-	anymore.</div><div class='del'>-	(init_header_name_table): Removed, use a table to init this, and</div><div class='del'>-	do it in class init (2 lines of code ...).</div><div class='del'>-</div><div class='del'>-	* camel-news-address.c: Class to represent news addresses -</div><div class='del'>-	currently empty, and not built.</div><div class='del'>-</div><div class='del'>-	* camel-internet-address.h: Class to represent internet (email)</div><div class='del'>-	addresses.</div><div class='del'>-</div><div class='del'>-	* camel-address.h: Abstract class to represent (lists of)</div><div class='del'>-	addresses.</div><div class='del'>-</div><div class='del'>-2000-04-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Revert previous change. I</div><div class='del'>-	was confused.</div><div class='del'>-</div><div class='del'>-	* camel-url.[ch] (camel_url_encode, camel_url_decode): expose</div><div class='del'>-	these routines.</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (write_to_stream): Only write a newline</div><div class='del'>-	between the headers and the content object if the content object</div><div class='del'>-	is not a CamelMedium. (If the content is a medium, it may have its</div><div class='del'>-	own headers, which then need to go before the blank line.)</div><div class='del'>-</div><div class='del'>-	* camel-mime-body-part.[ch]: Remove. We weren't using the fields</div><div class='del'>-	that made this different from camel-mime-part, so it basically</div><div class='del'>-	just forced us to do lots of gratuitous typecasting.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.[ch]: Use CamelMimePart. Remove the multipart</div><div class='del'>-	parent stuff, since we weren't using that either.</div><div class='del'>-</div><div class='del'>-	* etc: update for CamelMimeBodyPart -&gt; CamelMimePart</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (set_content_object): sink the content object</div><div class='del'>-	after referencing it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c: fix various little things in the handling</div><div class='del'>-	of CamelMedium methods. Change camel_mime_part_set_text to the</div><div class='del'>-	more generic camel_mime_part_set_content.</div><div class='del'>-</div><div class='del'>-	* camel.h: sync to current reality</div><div class='del'>-</div><div class='del'>-	* camel-folder-utils.[ch]: removed</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_format_date): fix format specifier</div><div class='del'>-	for time zone. Fix typo in month names array.</div><div class='del'>-</div><div class='del'>-2000-04-26  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c (stream_seek): Changed to have</div><div class='del'>-	absolute seek semantics, not relative to the bounds.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.c (reset): When we reset, seek to the</div><div class='del'>-	start of the bound, if there is one.</div><div class='del'>-	(stream_tell): Make tell virtual.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_available): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c: Remove leading _'s from static functions.</div><div class='del'>-	(stream_read): Renamed from read().  Fancy that conflicting!  (my</div><div class='del'>-	boo!)  Others too.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):</div><div class='del'>-	Changed to stream_mem interface.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Fixed</div><div class='del'>-	for streamfs interface changes, and implement a failure case.</div><div class='del'>-	(_append_message): Changed for fs stream interface change.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (print_part): Iterate rahter than callback.  I</div><div class='del'>-	hate glists's interface (hence, move this to write_to_stream).</div><div class='del'>-	(write_to_stream): Return an error (yuck, this is a royal PITA to</div><div class='del'>-	do with the stream write interface).</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c: Removed leading _ from static names.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h: construct_from_parser() now returns an error</div><div class='del'>-	code.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Changed to use a</div><div class='del'>-	camel-data-wrapper instead of a camel-simple-data-wrapper (no</div><div class='del'>-	change needed elsewhere?).</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): Fixes for stream-mem</div><div class='del'>-	interface changes.</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.[ch],</div><div class='del'>-	camel-simple-data-wrapper-stream.[ch],</div><div class='del'>-	camel-stream-data-wrapper.[ch], removed.  Fixed including of these</div><div class='del'>-	files.</div><div class='del'>-	</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_set_text): Remove the use of</div><div class='del'>-	the camel-simple-data-wrapper-stream, just use a mem stream.</div><div class='del'>-	(write_to_stream): Renamed from my_*</div><div class='del'>-	(construct_from_stream): Return an error on error.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (camel_stream_mem_new*): Remove mode</div><div class='del'>-	parameter.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.h (enum CamelStreamMemMode): Removed.  It</div><div class='del'>-	wasn't used at all.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.h: Add camel_data_wrapper_new() to create</div><div class='del'>-	these.</div><div class='del'>-	(write_to_stream, construct_from_stream): Return an error</div><div class='del'>-	indicator for success.  Fixed all methods to match (ICK).</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Remove</div><div class='del'>-	camel-simple-data-wrapper.c, camel-simple-data-wrapper-stream.c,</div><div class='del'>-	camel-stream-data-wrapper.c.  Obsoleted by code re-use!</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (construct_from_stream): Change the default</div><div class='del'>-	implementation to just set the output stream == construction</div><div class='del'>-	stream.  Well, this lets me get rid of both simple-data-wrapper</div><div class='del'>-	and stream-data-wrapper (unused anyway), and</div><div class='del'>-	simple-data-wrapper-stream in one hit.  CamelDataWrapper is now</div><div class='del'>-	also a concrete class.</div><div class='del'>-	(write_to_stream): Use camel_stream_write_to_stream() to</div><div class='del'>-	calculate/return values (and save code).</div><div class='del'>-	Include &lt;errno.h&gt; for obvious reasons.</div><div class='del'>-</div><div class='del'>-	* camel-stream.c (eos): Provide a default implementation of .eos().</div><div class='del'>-	(camel_stream_write_to_stream): Make it return an error code on</div><div class='del'>-	error.</div><div class='del'>-	(camel_stream_printf): Changed to return the number of bytes</div><div class='del'>-	written/error.</div><div class='del'>-	(camel_stream_available): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.h (enum CamelStreamFsMode): Removed.  Changed to</div><div class='del'>-	use unix modes and so forth (wasn't used for anything but new file</div><div class='del'>-	creation and didn't work well either).</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c: Removed leading _'s for names.  And removed</div><div class='del'>-	some virtual method 'documentation'.</div><div class='del'>-	(destroy): Dont try and close a closed/error fd.  Only report</div><div class='del'>-	error if close returns -1.  Moved all the code to finalise(), and</div><div class='del'>-	killed this function.</div><div class='del'>-	(init_with_fd): Properly setup the seek offset, if it is a</div><div class='del'>-	valid and seekable file descriptor.</div><div class='del'>-	(init_with_fd_and_bounds): Use off_t for bounds, set bounds on the</div><div class='del'>-	seekable stream.</div><div class='del'>-	(init_with_name): Return error codes.</div><div class='del'>-	(init_with_name_and_bounds): Ditto.</div><div class='del'>-	(camel_stream_fs_new_with_name): REturn NULL object if it failed.</div><div class='del'>-	(camel_stream_fs_new_with_name_and_bounds): Return NULL object on</div><div class='del'>-	failure.  Changed with_name* api's to take unix open style args</div><div class='del'>-	and flags.</div><div class='del'>-	(read): The bounded stream bounds checking seemed off, simplified</div><div class='del'>-	code a bit.</div><div class='del'>-	(write): Implement bounds checking for writing, the comment was</div><div class='del'>-	wrong, it could make sense to bound writing.  Cleaned up a little.</div><div class='del'>-	(available): Gone.</div><div class='del'>-	(eos): Removed.  Use CamelStream's implementation now.</div><div class='del'>-	(close): Reset the fd to -1, provide a warning for bad usage.</div><div class='del'>-	(seek): Cleaned up.  Changed the behaviour a little, the returned</div><div class='del'>-	offset is the absolute position in the file, even in bounded</div><div class='del'>-	streams.	</div><div class='del'>-	(seek): Seek from end mirrors lseek() behaviour (reverse seeking).</div><div class='del'>-</div><div class='del'>-2000-04-25  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.h (struct _CamelStreamFs): Moved bounds and eof</div><div class='del'>-	indicator to other parent classes.</div><div class='del'>-</div><div class='del'>-	* camel-stream.c (camel_stream_printf): New utility</div><div class='del'>-	function.  Obvious use.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c: Removed leading _'s from static func's.</div><div class='del'>-	(camel_stream_mem_new_with_byte_array): Fixed for api changes, set</div><div class='del'>-	the owner for the byte array to us.</div><div class='del'>-	: Removed A bunch of gtk doc stuff for static (implementation) functions.</div><div class='del'>-	(available): Removed.</div><div class='del'>-	(write): Fixed the write implementation so that seek() works on a</div><div class='del'>-	seekable memory stream, as expected.  Seeking past the end of the</div><div class='del'>-	buffer has unix semantics (filling with 0).</div><div class='del'>-	(available): Removed.</div><div class='del'>-	(write): Implement seekable stream bounded stream.</div><div class='del'>-	(read): Implement seekable stream bounded stream.</div><div class='del'>-	(close): Dont free the stream_mem if we're not the owner.</div><div class='del'>-	(seek): Allow to seek beyond the end of memory area,</div><div class='del'>-	implement bounds checking.</div><div class='del'>-	(seek): Set errno on bad policy.</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.h (struct _CamelStreamMem): Changed position to off_t.</div><div class='del'>-	(new_with_buffer): Changed len to be a size_t.</div><div class='del'>-	(set_buffer, set_byte_array): New interface functions.</div><div class='del'>-	(struct _CamelStreamMem): Removed position, it is stored in the</div><div class='del'>-	superclass.</div><div class='del'>-</div><div class='del'>-	* camel-stream.h: Removed some of the seemingly random</div><div class='del'>-	whitespace.  Removed the available method (its not</div><div class='del'>-	impelemented/useful enough).</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c</div><div class='del'>-	(init_with_seekable_stream_and_bounds): Remove the data_available</div><div class='del'>-	stuff, it hasn't been properly implemented/finished, and may never</div><div class='del'>-	work (unfortunately *sigh).</div><div class='del'>-	(reemit_parent_signal): Removed part of the above change.</div><div class='del'>-	(set_bounds): Removed (moved to seekable-stream).</div><div class='del'>-	: Fixed up some of the generally unreadable indenting (sorry,</div><div class='del'>-	wrapping at 80 characters with</div><div class='del'>-	camels_really_long_function_names()</div><div class='del'>-	just_doesnt_work_very_well_does_it().</div><div class='del'>-	(available): Removed.</div><div class='del'>-	(stream_seek): Fixup for object changes.  Make sure we return -1</div><div class='del'>-	if the parent stream can't seek.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.c (ccamel_seekable_stream_set_bounds): New</div><div class='del'>-	function to bound any seekable stream.</div><div class='del'>-	: Removed _'s.</div><div class='del'>-	(camel_seekable_stream_class_init): Implement an init function, to</div><div class='del'>-	setup the stream bounds to unbound.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.h (CamelSeekableStreamClass): New virtual</div><div class='del'>-	method set_bounds for seekable streams.</div><div class='del'>-	(CAMEL_STREAM_UNBOUND): New define for no bound.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.h (struct _CamelSeekableSubstream):</div><div class='del'>-	Removed sup_bound and inf_bound, moved to CamelSeekableStream (and</div><div class='del'>-	renamed, and changed to off_t's).</div><div class='del'>-	(new_with_seekable_stream_and_bounds): Use off_t as the bounds.</div><div class='del'>-	(CamelSeekableSubstreamClass): Uh, why was the intialiser virtual?</div><div class='del'>-	Removed.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-stream.[ch] (CamelSeekableStreamClass): Changed seek</div><div class='del'>-	to accept an off_t as the offset.</div><div class='del'>-	(struct _CamelSeekableStream): Renamed cur_pos to position and</div><div class='del'>-	changed it to an off_t type.</div><div class='del'>-	(enum CamelStreamSeekPolicy): Set to match the SEEK_* constants</div><div class='del'>-	from lseek().</div><div class='del'>-	(get_current_position): Renamed to tell().</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.h: Commented out set_vbuf - never implemented.</div><div class='del'>-</div><div class='del'>-2000-04-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (_eos): only return TRUE if the parent is</div><div class='del'>-	at eos AND the buffer has been exhausted</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c: fix some incorrect macro usage that</div><div class='del'>-	resulted in bogus casts</div><div class='del'>-</div><div class='del'>-2000-04-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(simple_data_wrapper_construct_from_parser): fix a cut-and-pasto.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): ref</div><div class='del'>-	(and sink) the message stream if we're going to unref it later.</div><div class='del'>-	Otherwise it could get destroyed while there are still substreams</div><div class='del'>-	attached to it. This needs a cleaner solution.</div><div class='del'>-</div><div class='del'>-	* camel.h: remove data-wrapper-repository.h include(s)</div><div class='del'>-</div><div class='del'>-2000-04-24  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Allow MESSAGE_END</div><div class='del'>-	_or_ EOF as valid termination conditions.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Decode</div><div class='del'>-	and then re-encode the addresses, so they are consistently</div><div class='del'>-	formatted.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_decode_mailbox): Store the address in</div><div class='del'>-	a _header_address.  And try to get a comment-stored name if there</div><div class='del'>-	is one.</div><div class='del'>-	(header_decode_address): Actually return an address.</div><div class='del'>-	(header_to_decode): Renamed to header_address_decode()</div><div class='del'>-	(header_mailbox_decode): New function to get a single mailbox.</div><div class='del'>-	(header_mime_decode): Return the major/minor value, as</div><div class='del'>-	appropriate.</div><div class='del'>-	(header_address_new, and friends): Whole bunch of utility</div><div class='del'>-	functions for working with the address thingies.</div><div class='del'>-	(header_decode_domain): Free the string header, and dont expand</div><div class='del'>-	'.' into ' . '.</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): No longer call</div><div class='del'>-	data_wrapper_repository_init.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (write_to_stream): Moved (back) to</div><div class='del'>-	camel-mime-part.</div><div class='del'>-	(add_header):</div><div class='del'>-	(set_header):</div><div class='del'>-	(remove_header): </div><div class='del'>-	(get_header): Make all these abstract, and spit warnings if</div><div class='del'>-	called.  I guess it could manage the list, but well, it doesn't.</div><div class='del'>-</div><div class='del'>-	* camel-medium.h (struct _CamelMedium): Dont store headers here,</div><div class='del'>-	the implementor is the only one who knows their format.</div><div class='del'>-	(CamelMediumClass): Changed header values to be void *'s.  They</div><div class='del'>-	need not be strings?</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.c (construct_from_stream): And we're</div><div class='del'>-	back.  Set the output stream.</div><div class='del'>-	(construct_from_parser): Moved to camel-mime-part-utils.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Create the</div><div class='del'>-	contents of multipart and simple messages.</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Oops, this was</div><div class='del'>-	totally screwed up, try creating the right cotnent on the right</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (construct_from_parser): Moved to</div><div class='del'>-	camel-mime-part-utils.</div><div class='del'>-	(separate_part): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (construct_from_stream): Back again!  This now</div><div class='del'>-	switches over to using a mime parser for any mime parts, only.</div><div class='del'>-	(my_write_to_stream): Write our headers and so forth here.</div><div class='del'>-	(add_header): Add header directly, parent class is abstract.</div><div class='del'>-	(remove_header): Ditto.</div><div class='del'>-	(set_header): Ditto.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_stream):</div><div class='del'>-	Remade abstract.</div><div class='del'>-	(camel_data_wrapper_construct_from_parser): Moved to</div><div class='del'>-	camel_mime_part.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.h: Put back construct_from_stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h: Put construct_from_parser in here, the</div><div class='del'>-	data-wrapper shouldn't know about mime.  Ok, so now to undo half</div><div class='del'>-	of the last hours changes ... duh.</div><div class='del'>-	</div><div class='del'>-2000-04-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_to_decode, header_mime_decode): fix</div><div class='del'>-	some obvious minor bugs noted by -Wall.</div><div class='del'>-</div><div class='del'>-2000-04-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_number): Use</div><div class='del'>-	construct_from_stream instead of set_input_stream().</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper-stream.c</div><div class='del'>-	(camel_simple_data_wrapper_stream_construct): REmoved the destroy</div><div class='del'>-	callback code.</div><div class='del'>-	(wrapper_destroy_cb): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.h: Add prototype for _construct()</div><div class='del'>-	method.</div><div class='del'>-</div><div class='del'>-	* camel.c: Include unicode.h to kill a warning.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.h (CameldataWrapperClass): Removed</div><div class='del'>-	construct_from_stream virtual method.</div><div class='del'>-	Removed get/set input stream.</div><div class='del'>-</div><div class='del'>-	* data-wrapper-repository.[ch]: Removed&amp;from build.  Obsoleted?</div><div class='del'>-	The justification as is follows: It is mixing storage</div><div class='del'>-	protocol/format with message architecture.  It really just doesn't</div><div class='del'>-	serve any purpose, as each medium implementor will have to have its</div><div class='del'>-	own type-&gt;handler mapping, and the only current implementor,</div><div class='del'>-	mimepart has a very simple structure and no need for this.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (write_to_stream): Moved here from most of the</div><div class='del'>-	stuff in camel-mime-part.  Well, the MEDIUM is the one that knows</div><div class='del'>-	what the headers are, and the content is, let it write it out.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c (camel_mime_part_construct_content):</div><div class='del'>-	Copied from camel-mime-part.c, removed handling of message</div><div class='del'>-	followon state (moved to camel-mime-message).</div><div class='del'>-	(camel_mime_part_construct_content_from_parser): Renamed from</div><div class='del'>-	construct_content.</div><div class='del'>-	(camel_mime_part_construct_headers_from_stream):</div><div class='del'>-	(camel_mime_part_construct_content_from_stream):</div><div class='del'>-	(camel_mime_part_store_stream_in_buffer): Removed.  Replaced by</div><div class='del'>-	the new construct from parser stuff.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (construct_from_parser): Do</div><div class='del'>-	construct_from_parser for mime-message.</div><div class='del'>-	(_write_to_stream): Set the mime-version header for medium to</div><div class='del'>-	write out, rather than writing it out ourselves.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (set_mime_type_field): Ref the</div><div class='del'>-	content_field when we get it?</div><div class='del'>-	(construct_from_stream): Removed.</div><div class='del'>-	(camel_data_wrapper_construct_from_stream): Changed to a helper</div><div class='del'>-	function, creates a mime_parser, and constructs from that.</div><div class='del'>-	(set_input_stream): Removed.</div><div class='del'>-	(camel_data_wrapper_set_input_stream): Removed.</div><div class='del'>-	(get_input_stream): Removed.</div><div class='del'>-	(camel_data_wrapper_get_input_stream): Removed.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_unstep): New function.</div><div class='del'>-	Cause a subsequent call to mime_parser_step() to return the same</div><div class='del'>-	state over again.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid):</div><div class='del'>-	Initial test code using the mime parser to construct the message.</div><div class='del'>-	(_get_message_by_uid): Use construct_from_stream() instead of</div><div class='del'>-	creating our own parser.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (construct_from_parser): part constructor.</div><div class='del'>-	(camel_mime_part_construct_content): Basically a simpler</div><div class='del'>-	replacement for the datawrapper repository.</div><div class='del'>-	(camel_mime_part_init): Set the default type to text/plain.</div><div class='del'>-	(camel_mime_part_construct_content): Removed to</div><div class='del'>-	camel-mime-part-utils.c</div><div class='del'>-	(my_get_output_stream): Removed.  The streeam is in the</div><div class='del'>-	data-wrapper.</div><div class='del'>-	(my_get_content_object): Removed.  The content object is stored in</div><div class='del'>-	the medium.  If none is there, the object wasn't created properly.</div><div class='del'>-	(my_write_content_to_stream): Removed.  The content object is the</div><div class='del'>-	one that knows how to write itself out!!!!!!!!</div><div class='del'>-	(my_write_to_stream): Remove the base header writing stuff - has</div><div class='del'>-	been moved to camel-medium, where it belongs.  This can just be</div><div class='del'>-	used to check for mandatory headers.</div><div class='del'>-	(my_construct_from_stream): Removed.</div><div class='del'>-	(my_set_input_stream): What the hell, i'll remove this too.</div><div class='del'>-	Nobody seems to understand how it differs from create from stream,</div><div class='del'>-	and they both seem to serve the same purpose ...</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.c (construct_from_parser): Initial</div><div class='del'>-	implementation of a content constructor.</div><div class='del'>-	(construct_from_stream): Removed!  Job taken over by</div><div class='del'>-	construct_from_parser.</div><div class='del'>-</div><div class='del'>-	* camel-multipart.c (construct_from_parser): Multipart</div><div class='del'>-	construction routine.</div><div class='del'>-	(camel_multipart_init): Set the default multipart type to</div><div class='del'>-	multipart/mixed.  Duh, no subtype is not allowed anyway.</div><div class='del'>-	(set_input_stream): REmoved.  Replaced by construct_from_parser.</div><div class='del'>-</div><div class='del'>-2000-04-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-multipart.[ch]: clean, document, etc.</div><div class='del'>-	(camel_multipart_init): pick a prettier default boundary. Still</div><div class='del'>-	need to deal with the larger problem</div><div class='del'>-</div><div class='del'>-2000-04-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.h (struct _CamelMimeMessage): Removed</div><div class='del'>-	send_date, and received_date, and replaced it with a time_t</div><div class='del'>-	'date' (this is what the header is called), and date_offset to</div><div class='del'>-	store the GMT offset of the date.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_set_from): Update raw</div><div class='del'>-	header as we go.</div><div class='del'>-	(_set_from): Removed.</div><div class='del'>-	(_get_from): Removed.</div><div class='del'>-	(camel_mime_message_get_from): Moved implementation here.</div><div class='del'>-	(camel_mime_message_get_subject): Move implementation here.</div><div class='del'>-	(_get_subject): Nuked.</div><div class='del'>-	(camel_mime_message_set_subject): Handle utf-8 input, and also</div><div class='del'>-	update raw header when changed.</div><div class='del'>-	(_set_subject): Removed.</div><div class='del'>-	(_set_received_date): Removed.</div><div class='del'>-	(camel_mime_message_set_received_date): Removed.</div><div class='del'>-	(_get_received_date): Removed.</div><div class='del'>-	(camel_mime_message_get_received_date): Removed.</div><div class='del'>-	(_get_sent_date): Removed.</div><div class='del'>-	(camel_mime_message_get_sent_date): Removed.</div><div class='del'>-	(camel_mime_message_get_date): New function to get the date as a</div><div class='del'>-	time_t/offset.</div><div class='del'>-	(camel_mime_message_set_date): Set the date as a time_t/offset.</div><div class='del'>-	(camel_mime_message_get_date_string): Get the date as a string.</div><div class='del'>-	(camel_mime_message_init): Initialise the current date as</div><div class='del'>-	'CMAEL_MESSAGE_DATE_CURRENT'.</div><div class='del'>-	(_set_reply_to): Removed.</div><div class='del'>-	(camel_mime_message_set_reply_to): Moved implementation here.</div><div class='del'>-	This is still broken, reply-to can have multiple addresses.</div><div class='del'>-	(_get_reply_to): Removed.</div><div class='del'>-	(_set_field): Removed, no longer used anywhere.</div><div class='del'>-	(_get_field): Also removed.</div><div class='del'>-	(_init_header_name_table): Add the Date header.</div><div class='del'>-	(process_header): Also handle snooping of Date header here.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (finalise): Unref the source stream on</div><div class='del'>-	finalise, and also call the parent class (oops).</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_state): New function to</div><div class='del'>-	get the current parser state.</div><div class='del'>-	(camel_mime_parser_stream): Allow you to get the stream back from</div><div class='del'>-	the mime_parser.</div><div class='del'>-	(camel_mime_parser_fd): Alternative to allow you to get the fd</div><div class='del'>-	back from the mime_parser.</div><div class='del'>-	(folder_scan_init_with_stream): Properly ref/unref the stream.</div><div class='del'>-	(folder_scan_close): Properly unref the stream/close the fd on</div><div class='del'>-	exit.</div><div class='del'>-	(folder_scan_init_with_fd): Close the old fd if there is one.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (camel_data_wrapper_construct_from_parser):</div><div class='del'>-	New method, construct a data wrapper from an initialised parser.</div><div class='del'>-	(construct_from_parser): Empty implementation.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (message_struct_new):</div><div class='del'>-	Convert subject line to unicode, before storing in the summary.</div><div class='del'>-	(strdup_trim): Removed, no longer needed.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): Ref</div><div class='del'>-	the folder after setting it in the new message.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_set_content_object): Have the headers</div><div class='del'>-	follow the content-type change here too.</div><div class='del'>-	(my_write_to_stream): Dont write content-type here, automatically</div><div class='del'>-	stored in the headers ...</div><div class='del'>-	(my_write_to_stream): Use header_disposition_format() to format</div><div class='del'>-	the content-disposition header.</div><div class='del'>-	(my_write_to_stream): Removed old code, all headers are now stored</div><div class='del'>-	in the camel-medium level, always.  Need to do the same with</div><div class='del'>-	camel-mime-message i suppose ...</div><div class='del'>-	(my_write_to_stream): Write the content using the parent class,</div><div class='del'>-	not some weird function.</div><div class='del'>-	(camel_mime_part_class_init): Dont override get_output_stream.</div><div class='del'>-	(camel_mime_part_encoding_from_string): Bleh, make it</div><div class='del'>-	case-insensitive.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_is): Handle empty types.</div><div class='del'>-	(header_encode_string): Start of an implementation of the rfc2047</div><div class='del'>-	encoder.  It does iso-8859-1, and us-ascii, and utf-8 (others get</div><div class='del'>-	tricky *sigh*)</div><div class='del'>-	(rfc2047_encode_word): Convert a single word/string into rfc2047</div><div class='del'>-	encoding.</div><div class='del'>-	(quoted_encode): Different quoted-printable encoding for rfc2047</div><div class='del'>-	encoding of headers.</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_write_to_stream): Use</div><div class='del'>-	header_content_type_format() to format it.</div><div class='del'>-</div><div class='del'>-2000-04-21  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Add prototype for header_param_list_free.</div><div class='del'>-</div><div class='del'>-	* camel-recipient.c: New function to remove all the types of a</div><div class='del'>-	recipient list.  I think this whole object needs a major review.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (camel_mime_message_class_init): Removed</div><div class='del'>-	parse_header_pair override, override add_header instead.</div><div class='del'>-	(_parse_header_pair): Renamed to add_header.</div><div class='del'>-	(remove_header): Add this method, to make sure we keep upto date</div><div class='del'>-	with removed headers too.</div><div class='del'>-	(_set_field): If given a NULL value, clear it out.</div><div class='del'>-	(_set_recipient_list_from_string): Constify.</div><div class='del'>-	(set_header): Override set_header from camel_medium.</div><div class='del'>-	(process_header): Local function to handle set/add/remove of each</div><div class='del'>-	header we know about.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_class_init): Removed</div><div class='del'>-	parse_header_pair setup.</div><div class='del'>-	(my_parse_header_pair): Moved into add_header(), removed.</div><div class='del'>-	(my_set_disposition): Allow a NULL disposition to clear it.</div><div class='del'>-	(my_set_content_id): Allow NULL content id to clear it.</div><div class='del'>-	(remove_header): Track removed headers.</div><div class='del'>-	(my_set_description): Allow NULL description to clear it.</div><div class='del'>-	(my_set_content_MD5): Make sure we copy the md5 value, and allow a</div><div class='del'>-	NULL value to reset it.</div><div class='del'>-	(my_set_filename): Copy the filename.</div><div class='del'>-	(my_set_header_lines): Removed.  Nothing uses it, it doesn't</div><div class='del'>-	actually serve any purpose.</div><div class='del'>-	(camel_mime_part_set_header_lines): Ditto.</div><div class='del'>-	(my_get_header_lines): Ditto.</div><div class='del'>-	(camel_mime_part_get_header_lines): Ditto.</div><div class='del'>-	(camel_mime_part_class_init): Remove *_header_lines setup.</div><div class='del'>-	(camel_mime_part_init): Remove header_lines init.</div><div class='del'>-	(my_finalize): Remove header_lines finalise.</div><div class='del'>-	(my_write_to_stream): Write the headers here.  This is just WRONG,</div><div class='del'>-	camel_medium should be doing this.</div><div class='del'>-	(my_get_output_stream): Kill a warning.</div><div class='del'>-	(camel_mime_part_encoding_to_string): Ditto.</div><div class='del'>-	(camel_mime_part_set_description): Unvirtualiase, use add_header()</div><div class='del'>-	to do the processing.</div><div class='del'>-	(my_set_description): Removed.</div><div class='del'>-	(set_disposition): Renamed from my_set_disposition.</div><div class='del'>-	(camel_mime_part_get_description): Get the descriptionf rom the</div><div class='del'>-	get_header method.</div><div class='del'>-	(my_get_description): Removed.</div><div class='del'>-	(my_set_filename): Removed.</div><div class='del'>-	(camel_mime_part_get_filename): Get the parameter from the</div><div class='del'>-	disposition.</div><div class='del'>-	(camel_mime_part_encoding_from_string): Handle NULL string.</div><div class='del'>-	(camel_mime_part_init): Remove reference to filename.</div><div class='del'>-	(my_finalize): Dont free filename.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.h (CamelMimePartClass): Removed</div><div class='del'>-	parse_header_pair() method, it doesn't add anything that</div><div class='del'>-	add_header() can't be used for.</div><div class='del'>-	(CamelMimePartClass): Remove *_header_lines methods.</div><div class='del'>-	(struct _CamelMimePart): Remove header_lines list.</div><div class='del'>-	(struct _CamelMimePart): Removed filename attribute.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (camel_medium_init): Init headers to null, not a</div><div class='del'>-	hashtable.</div><div class='del'>-	(add_header): Append the headers as a list.</div><div class='del'>-	(remove_header): Remove headers as a list.</div><div class='del'>-	(get_header): Likewise for lookup.</div><div class='del'>-	(free_header): Removed, no longer needed.</div><div class='del'>-	(finalize): Free headers using header_raw_clear().</div><div class='del'>-	(camel_medium_set_header): New function, to reset and override all</div><div class='del'>-	values of a header with a new value.</div><div class='del'>-</div><div class='del'>-	* camel-medium.h (struct _CamelMedium): Changed to use a</div><div class='del'>-	header_raw struct rather than a hash table, to store headers</div><div class='del'>-	(many headers can occur multiple times).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_find_next): New function, allows</div><div class='del'>-	you to find multi-valued header fields.</div><div class='del'>-	(header_disposition_format): New function to format/create</div><div class='del'>-	content-disposition header string.</div><div class='del'>-	(header_param_list_format_append): Function to format parameter</div><div class='del'>-	lists into a GString.</div><div class='del'>-	(header_content_type_format): Function to format content-type into</div><div class='del'>-	a usable format.</div><div class='del'>-	(header_set_param): allow NULL value to remove the parameter.</div><div class='del'>-	(decode_token): Renamed from header_decode_token.</div><div class='del'>-	(header_decode_token): New interface for external use.</div><div class='del'>-	(quoted_decode): Made static to kill annoying warnings.</div><div class='del'>-	(g_strdup_len): Killed, replaced with calls to g_strndup().</div><div class='del'>-	(rfc2047_decode_word): Made static to kill warnings.</div><div class='del'>-	(decode_coded_string): Terminated.</div><div class='del'>-	(g_string_append_len): Made static to kill warnings.</div><div class='del'>-	(header_decode_text): Made static to kill warnings.</div><div class='del'>-	(header_decode_text): Constify.</div><div class='del'>-	(rfc2047_decode_word): Constify.</div><div class='del'>-	(header_param): Constify.</div><div class='del'>-	(header_content_type_new): Copy the type/subtype strings.</div><div class='del'>-	(header_param_list_decode): Made static.</div><div class='del'>-	(header_param_list_format_append): Made static.</div><div class='del'>-	(quoted_decode): Constify.</div><div class='del'>-	(g_string_append_len): Constify.</div><div class='del'>-	(header_token_decode): New function to decode a single token.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (header_write): Append a</div><div class='del'>-	trailing \n when writing headers.</div><div class='del'>-	(strdup_trim): Killed a warning.</div><div class='del'>-	(camel_mbox_summary_set_uid): Make sure the next uid is at least 1</div><div class='del'>-	higher than any existing one.</div><div class='del'>-	(header_evolution_decode): Use header_token_decode to get the</div><div class='del'>-	token.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_header): Strip the trailing \n</div><div class='del'>-	of the end of all header lines.</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.[ch]: Removed.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-parser.[ch]: Removed.  Removed</div><div class='del'>-	references to it.</div><div class='del'>-</div><div class='del'>-2000-04-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (rfc2047_decode_word): use libunicode iconv</div><div class='del'>-	functions rather than libc ones (since libc might not have them).</div><div class='del'>-	(header_decode_date): add autoconfiscation on timezone code</div><div class='del'>-</div><div class='del'>-	* camel.c (camel_init): call unicode_init ()</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (message_struct_new): Trim</div><div class='del'>-	leading/trailing spaces off the raw headers.</div><div class='del'>-</div><div class='del'>-	* MERGE NEW_PARSER branch into HEAD, fixed conflicts.</div><div class='del'>-	</div><div class='del'>-	* gmime-content-field.c (_print_parameter): Duh, removed again</div><div class='del'>-	(@@#$@ cvs merge).</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_is): Constify.</div><div class='del'>-	(header_content_type_unref): Killed a couple warnings.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (_init): Removed more log crap.</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): Removed nntp, pending fixes for</div><div class='del'>-	summary changes.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):</div><div class='del'>-	Fixed for new summary interface.  Added a warning for using this</div><div class='del'>-	broken api.</div><div class='del'>-	(_get_message_by_uid): Fixed for message new with session</div><div class='del'>-	vanishing.</div><div class='del'>-</div><div class='del'>-2000-04-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper-stream.c</div><div class='del'>-	(camel_simple_data_wrapper_stream_get_type): This is a subtype of</div><div class='del'>-	CamelSeekableStream, not CamelStream.</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c: clean up a lot.</div><div class='del'>-	(eos): When testing for end-of-stream, reset the parent position</div><div class='del'>-	before testing if it is at end-of-stream, since either (a) it may</div><div class='del'>-	have been seek'ed to eos by someone else, or (b) we may have been</div><div class='del'>-	seek'ed away from eos and it hasn't been synced yet.</div><div class='del'>-</div><div class='del'>-	* camel-medium.[ch] (camel_medium_add_header): const poison.</div><div class='del'>-	(Belatedly goes with my change of 2000-02-23.)</div><div class='del'>-	(camel_medium_init): Use g_strcase_{hash,equal} on the header</div><div class='del'>-	array.</div><div class='del'>-	</div><div class='del'>-2000-04-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_set_input_stream): </div><div class='del'>-	* camel-data-wrapper.c (set_input_stream, set_output_stream): do</div><div class='del'>-	better reference counting of streams so they actually go away</div><div class='del'>-	when they should.</div><div class='del'>-</div><div class='del'>-	* camel-log.[ch], *: Nuke camel log stuff. Replace calls to</div><div class='del'>-	CAMEL_LOG_WARNING with calls to g_warning.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.[ch]:</div><div class='del'>-	* camel-simple-data-wrapper.[ch]:</div><div class='del'>-	* camel-medium.[ch]: Clean, polish, document. Most of the gtk-doc</div><div class='del'>-	comments added to camel-data-wrapper.c note serious problems that</div><div class='del'>-	need to be fixed.</div><div class='del'>-</div><div class='del'>-2000-04-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.[ch]: Remove the "session" field from</div><div class='del'>-	CamelMimeMessage. Nothing uses it, about half of the existing</div><div class='del'>-	calls to camel_mime_message_new_with_session pass NULL, and</div><div class='del'>-	there's no obvious reason for it to be there.</div><div class='del'>-</div><div class='del'>-	* providers/MH/camel-mh-folder.c:</div><div class='del'>-	* providers/maildir/camel-maildir-folder.c:</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c:</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c:</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c:</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: Use camel_mime_message_new</div><div class='del'>-	instead of camel_mime_message_new_with_session.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (get_store_for_protocol_with_url): Set the</div><div class='del'>-	exception if no provider is found.</div><div class='del'>-</div><div class='del'>-	* camel-url.c: Add code to encode and decode %-escapes in URLs,</div><div class='del'>-	and do some additional correctness-checking on URL syntax. From</div><div class='del'>-	Tiago Antào with modifications by me.</div><div class='del'>-</div><div class='del'>-2000-04-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): add nntp</div><div class='del'>-</div><div class='del'>-2000-04-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c: Fix switch statement.</div><div class='del'>-</div><div class='del'>-2000-04-14  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-folder.c (_exists): always return TRUE</div><div class='del'>-	for now.  we need to check the server response to make sure the</div><div class='del'>-	group exists.</div><div class='del'>-	(_get_message_by_uid): make sure to account for the \n we add to</div><div class='del'>-	the string after every line.</div><div class='del'>-</div><div class='del'>-	* providers/nntp/camel-nntp-utils.c (get_XOVER_headers): function</div><div class='del'>-	to get the headers using the XOVER command.</div><div class='del'>-	(get_HEAD_headers): function to get the headers using the HEAD</div><div class='del'>-	command on each message. slooooooow.</div><div class='del'>-	(camel_nntp_get_headers): make this function use either XOVER or HEAD</div><div class='del'>-	versions depending on whether or not the server extension is present.</div><div class='del'>-</div><div class='del'>-2000-04-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.[ch]: This didn't belong in Camel. Move to mail/</div><div class='del'>-</div><div class='del'>-	* Makefile.am, camel-types.h: remove references to</div><div class='del'>-	camel-formatter.</div><div class='del'>-</div><div class='del'>-2000-04-12  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-pt-proxy.c (_folder_open_cb): Print warning message</div><div class='del'>-	for broken function.</div><div class='del'>-	(_folder_close_cb): Same.</div><div class='del'>-</div><div class='del'>-2000-04-12  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (pthread_SRC): Use correct names for the pthread</div><div class='del'>-	source variables.</div><div class='del'>-</div><div class='del'>-2000-04-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): fix various</div><div class='del'>-	bugs in APOP code (still untested) and some of the error cases.</div><div class='del'>-</div><div class='del'>-	* camel-provider.h: Clarify what provider.protocol, provider.name,</div><div class='del'>-	and provider.description should be.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-provider.c: </div><div class='del'>-	* providers/pop3/camel-pop3-provider.c: </div><div class='del'>-	* providers/sendmail/camel-sendmail-provider.c: </div><div class='del'>-	* providers/smtp/camel-smtp-provider.c: update protocols, names,</div><div class='del'>-	and descriptions</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_number):</div><div class='del'>-	implement get_message_by_number for the mail fetch code.</div><div class='del'>-</div><div class='del'>-2000-04-09  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: reformatted to fit</div><div class='del'>-	the standard indent format used by helix code</div><div class='del'>-</div><div class='del'>-2000-04-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-movemail.c: New file with new function to dot-lock an mbox</div><div class='del'>-	file and copy it to a safe private directory.</div><div class='del'>-</div><div class='del'>-2000-04-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/.cvsignore: Added a .cvsignore file.</div><div class='del'>-</div><div class='del'>-2000-04-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/camel-sendmail-transport.c (_send_internal):</div><div class='del'>-	actually record the pid returned by fork(). Noticed by clahey.</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: #include &lt;sys/param.h&gt;</div><div class='del'>-	for MAXHOSTNAMELEN. (This is a stopgap: some of the uses of</div><div class='del'>-	MAXHOSTNAMELEN are wrong anyway...)</div><div class='del'>-</div><div class='del'>-2000-04-07  Jeffrey Stedfast  &lt;fejj@stampede.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/smtp/camel-smtp-transport.c: fixes to numerous bugs;</div><div class='del'>-	should now build fine.</div><div class='del'>-	* providers/Makefile.am: Readded smtp now that smtp builds without</div><div class='del'>-	error.</div><div class='del'>-</div><div class='del'>-2000-04-20  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(camel_mbox_summary_next_uid): Public function to get the next</div><div class='del'>-	uid, makes sure its saved to disk too.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_finalize): Fix disposition crap with a</div><div class='del'>-	real disposition.</div><div class='del'>-	(my_set_disposition): Likewise.</div><div class='del'>-	(my_get_disposition): And here.</div><div class='del'>-	(my_write_to_stream): And here, needs more cleanup.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_append_message): Assign a</div><div class='del'>-	new uid at this point.</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_write_to_stream):</div><div class='del'>-	Make something up if we have an invalid/missing content type</div><div class='del'>-	(i.e. text/plain).</div><div class='del'>-</div><div class='del'>-2000-04-19  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_delete): Fixed completely</div><div class='del'>-	broken switch() syntax, only compiled because errno is a macro on</div><div class='del'>-	some systems.</div><div class='del'>-	(_list_subfolders): Likewise.</div><div class='del'>-</div><div class='del'>-2000-04-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_init): init stream to null.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c</div><div class='del'>-	(CAMEL_MBOX_SUMMARY_VERSION): Moved to .c file, incremented.</div><div class='del'>-	(index_folder): Changed to have index passed via the summary.</div><div class='del'>-	(decode_string): Do a sanity check on the string size, so we dont</div><div class='del'>-	visit g_malloc()'s friendly abort().</div><div class='del'>-</div><div class='del'>-	* camel-folder-pt-proxy.c (camel_folder_pt_proxy_class_init):</div><div class='del'>-	Removed reference to set_name.</div><div class='del'>-	(_set_name): Removed.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c</div><div class='del'>-	(parsed_information_to_mbox_summary): Removed.  Most of this file</div><div class='del'>-	is about to be binned.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c (func_header_contains): Fixes</div><div class='del'>-	for changes to summary interface.</div><div class='del'>-	(struct _searchcontext): Remove pointer to message info, get it</div><div class='del'>-	straight from the mboxsummary.</div><div class='del'>-	(camel_mbox_folder_search_by_expression): New summary interface.</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Uh, the summary is not</div><div class='del'>-	an object anymore (well not yet).</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c</div><div class='del'>-	(camel_mbox_folder_class_init): Removed set_name init.</div><div class='del'>-	(_set_name): Removed.</div><div class='del'>-	(_open): Call new summary interface.</div><div class='del'>-	(_close): Use new summary interface.</div><div class='del'>-	(_create): Removed a summary object leak.</div><div class='del'>-	(_get_message_count): New summary interface.</div><div class='del'>-	(_get_uid_list): Use new summary interface. FIXME: this is leaky.</div><div class='del'>-	(_get_message_by_uid): Use the new summary interface, some</div><div class='del'>-	cleanup.</div><div class='del'>-	(_append_message): Totally changed, basically just appends the</div><div class='del'>-	message directly, ignores the summary (for now), the summary will</div><div class='del'>-	fix itself up if it needs to.</div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): Bye bye old code.</div><div class='del'>-	(summary_get_message_info): Implement get_message_info again, for</div><div class='del'>-	folder.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_class_init): Removed set_name</div><div class='del'>-	setup.</div><div class='del'>-	(_set_name): Moved contents into _init.</div><div class='del'>-	(_init): Perform the old functions of set_name here.</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Removed the set_name internal interface.</div><div class='del'>-</div><div class='del'>-2000-04-14  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.[ch]: Completely replaced with</div><div class='del'>-	new code.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamel_la_SOURCES): Removed</div><div class='del'>-	camel-folder-summary.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-folder.h (struct _CamelFolder): Removed summary.</div><div class='del'>-	(struct _CamelFolder): Changed flags to be 1 bit bitfields.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[ch]: Class removed entirely.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_get_summary): Removed.</div><div class='del'>-	(camel_folder_summary_get_message_info): Moved from</div><div class='del'>-	camel-folder-summary.c</div><div class='del'>-	(camel_folder_summary_get_subfolder_info): Moved from</div><div class='del'>-	camel-folder-summary.c</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): Store the start of</div><div class='del'>-	headers and start of from in the scan state.</div><div class='del'>-	(camel_mime_parser_tell_start_headers): Query the start of the</div><div class='del'>-	headers.</div><div class='del'>-	(camel_mime_parser_tell_start_from): Query the cached start of</div><div class='del'>-	from marker.</div><div class='del'>-</div><div class='del'>-2000-04-13  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_free): Removed this</div><div class='del'>-	function.  If its too dangerous to use, it shouldn't be here.</div><div class='del'>-	(gmime_content_field_ref): Also ref the embedded content-type.</div><div class='del'>-	(gmime_content_field_unref): Ditto to unref it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Add a refcount for content-type header.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_content_type_unref): Implement unref</div><div class='del'>-	for content-type.</div><div class='del'>-	(header_content_type_ref): Implement ref for header content type.</div><div class='del'>-</div><div class='del'>-2000-04-12  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.h: Changed to use a _header_content_type.</div><div class='del'>-	Added type/subtype back for compatability with clients.</div><div class='del'>-	</div><div class='del'>-	* gmime-content-field.c: Basically a total rewrite, and now just a</div><div class='del'>-	thin wrapper ontop of header_content_type.</div><div class='del'>-	(_free_parameter): Got rid of it.</div><div class='del'>-	(gmime_content_field_new): Use header_content_type_* functions.</div><div class='del'>-	(gmime_content_field_set_parameter): Likewise.</div><div class='del'>-	(_print_parameter): Blow away.</div><div class='del'>-	(gmime_content_field_write_to_stream): Get details from the</div><div class='del'>-	content_type field.  Should check if it needs to escape chars in</div><div class='del'>-	the paramter value.</div><div class='del'>-	(gmime_content_field_get_mime_type): Likewise.</div><div class='del'>-	(___debug_print_parameter): Get rid of this rather annoyingly</div><div class='del'>-	named function.</div><div class='del'>-	(gmime_content_field_get_parameter): Simplified function.</div><div class='del'>-	(gmime_content_field_construct_from_string): Fixed this to use a</div><div class='del'>-	real parser.</div><div class='del'>-	(gmime_content_field_is_type): New function to test if a type matches.</div><div class='del'>-	(gmime_content_field_construct_from_string): Track type/subtype</div><div class='del'>-	from subordinate content_type header struct.</div><div class='del'>-</div><div class='del'>-	* gmime-rfc2047.[ch]: Removed.  Unused.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.[ch]: Blown away more duplicated code.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed camel-stream-b64.[ch], and</div><div class='del'>-	gmime-base64.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_get_content_object): Replaced</div><div class='del'>-	camel-stream-b64 with camel-stream-filter/camel-mime-filter-basic.</div><div class='del'>-	(my_write_content_to_stream): Replaced camel-stream-b64 with the</div><div class='del'>-	camel-stream-filter with an encoder.</div><div class='del'>-	(my_get_content_object): Also implement quoted-printable decoding.</div><div class='del'>-	(my_write_content_to_stream): Also implement quoted-printable</div><div class='del'>-	encoding.</div><div class='del'>-	(my_get_output_stream): Took out stream-b64 code (nothing's being</div><div class='del'>-	executed yet anyway).</div><div class='del'>-</div><div class='del'>-	* gmime-base64.[ch]: Blown away.  Not used, dont need it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Added offset for this header.  Records where</div><div class='del'>-	it is in the source.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (header_raw_append_parse): Add offset</div><div class='del'>-	parameter, to store where the header is stored in the stream.</div><div class='del'>-	(header_raw_append): Added offset param.</div><div class='del'>-	(header_raw_find): Return offset, if a pointer supplied for it.</div><div class='del'>-	(header_raw_replace): Add offset param.</div><div class='del'>-	(header_content_type_new): New function, to create an empty</div><div class='del'>-	content type.</div><div class='del'>-	(header_content_type_set_param): Set a parameter in the</div><div class='del'>-	content-type.</div><div class='del'>-	(header_set_param): Generic header parameter setting function.</div><div class='del'>-	(header_decode_string): Handle NULL input.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_headers_raw): New</div><div class='del'>-	function to get access to all the raw headers.</div><div class='del'>-	(folder_scan_header): Keep track of the header start position, and</div><div class='del'>-	store it when saving the header.</div><div class='del'>-</div><div class='del'>-2000-04-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Moved a bunch of printf's to debug.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Moved a bunch of printf's to debug.</div><div class='del'>-	(folder_scan_header): Detect end of each header line using the</div><div class='del'>-	last scanned char, and not the last scanned position.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-index.[ch]: Indexing filter.  Indexes unicode</div><div class='del'>-	sequences into ibex files.</div><div class='del'>-</div><div class='del'>-2000-04-09  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c: Dont include gmime-base64.h</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.c (complete): Implement the completion</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (folder_scan_step): If we get to the end of</div><div class='del'>-	the body data, check any filters for outstanding completion data.</div><div class='del'>-	(camel_mime_parser_scan_from): Set whether we scan for "From "</div><div class='del'>-	headers or not.</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.c (do_read): If we get to end of stream on</div><div class='del'>-	the source, then call the filtering completion function to see if</div><div class='del'>-	we have any more data to return.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Implement quoted printable</div><div class='del'>-	encoding and decoding filters.</div><div class='del'>-	(complete): And the complete function as well.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_close): Also take an input</div><div class='del'>-	buffer, allow closing of filters.</div><div class='del'>-	(quoted_encode_step): First cut, simple quoted-printable encoder.</div><div class='del'>-	Doesn't handle trailing spaces/tabs on end of line properly yet.</div><div class='del'>-	(quoted_encode_close): Complete a quoted-encoding.</div><div class='del'>-	(is_qpsafe): New type check, for quoted-printable safe characters</div><div class='del'>-	(that do not need encoding).  Thats all bits used in the type</div><div class='del'>-	table!  Rebuilt the types table.</div><div class='del'>-	(header_content_type_is): Checks a content type against at</div><div class='del'>-	type/subtype match.</div><div class='del'>-	(header_content_type_param): Handle NULL content type pointer.</div><div class='del'>-</div><div class='del'>-2000-04-08  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.c (filter): Implement the base64</div><div class='del'>-	encoder.  Problem is, there is no way to know when to close it.</div><div class='del'>-	Close/Reset will have to provide the same args as filter, so it can</div><div class='del'>-	flush remaining data *sigh*</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c (base64_encode_step): A rather complex base64</div><div class='del'>-	encoder, fast?</div><div class='del'>-	(base64_step_close): Companion function to finish off the base64</div><div class='del'>-	sequence.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_write_content_to_stream): Changed to use</div><div class='del'>-	camel_stream_write_to_stream().</div><div class='del'>-</div><div class='del'>-	* camel-stream.[ch] (camel_stream_write_to_stream): From</div><div class='del'>-	camel_stream_b64_write_to_stream().  Fixed some infinite loop</div><div class='del'>-	bugs with error conditions.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.[ch] (camel_stream_b64_write_to_stream): Removed.</div><div class='del'>-	This has nothing to do with stream-b64, so i've moved it to</div><div class='del'>-	CamelStream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.h: Add a comment about refcounting</div><div class='del'>-	header_content_type struct.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-stream-filter*.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-stream-filter.[ch]: Class to implement a generic</div><div class='del'>-	(multipass) filter ontop of a stream.  Only implements a read-only</div><div class='del'>-	stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c (camel_mime_parser_filter_add): Ref the</div><div class='del'>-	filter we just added.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-mime-filter*.[ch].</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-charset.[ch]: A filter to preform character set</div><div class='del'>-	conversion (uses unicode_iconv).</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-save.[ch]: A simple filter which will save all</div><div class='del'>-	data directly to a file or file descriptor.</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter-basic.[ch]: Implements the basic mime filters,</div><div class='del'>-	base64 and quoted-printable decoding (encoding not implemented yet).</div><div class='del'>-</div><div class='del'>-	* camel-mime-filter.[ch]: A filtering class, which can filter streams</div><div class='del'>-	of data without having to copy them.  Simpler than stream classes,</div><div class='del'>-	and can be plugged into a single stream class (when i write it).</div><div class='del'>-</div><div class='del'>-2000-04-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Clarify error</div><div class='del'>-	messages.</div><div class='del'>-	(finalize): fix a bug in camel_exception usage</div><div class='del'>-	(pop3_connect): Remember the password after asking for it the</div><div class='del'>-	first time.</div><div class='del'>-</div><div class='del'>-2000-04-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added camel-mime-parser/camel-mime-utils.</div><div class='del'>-</div><div class='del'>-	* camel-mime-parser.c: Fast mime parser.</div><div class='del'>-</div><div class='del'>-	* camel-mime-utils.c: Mime utility functions, and email header</div><div class='del'>-	parsers.</div><div class='del'>-</div><div class='del'>-2000-04-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am: Removed smtp for now, its a long way from</div><div class='del'>-	building.</div><div class='del'>-	* providers/smtp/Makefile.in: Removed file that shouldn't have been</div><div class='del'>-	checked in.</div><div class='del'>-</div><div class='del'>-2000-04-06  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-pt-proxy.c (_get_full_name): Remove exception param</div><div class='del'>-	from get_full_name() called, since get_full_name() was changed to</div><div class='del'>-	not have an exception in the last param (see dan's notes below).</div><div class='del'>-	(_get_name): same.</div><div class='del'>-</div><div class='del'>-2000-04-06  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-store.[ch]: Reorganize the folder-fetching methods and</div><div class='del'>-	implement a folder cache so that multiple requests for the same</div><div class='del'>-	folder will yield the same CamelFolder object (as long as it</div><div class='del'>-	remains active). Includes some code to remove no-longer-active</div><div class='del'>-	folders from the cache, but it doesn't get used since nothing is</div><div class='del'>-	ever unref'ed in Camel right now...</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-store.c:</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: update for CamelStore</div><div class='del'>-	changes.</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: Remove the (unused) CamelException argument</div><div class='del'>-	from camel_folder_get_name and camel_folder_get_full_name.</div><div class='del'>-	(camel_folder_set_name): make this go away since changing a</div><div class='del'>-	folder's name after it has been created could result in it</div><div class='del'>-	conflicting with a separately-issued folder.</div><div class='del'>-	</div><div class='del'>-2000-04-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* g_url_new really wanted to take a CamelException. So, rename</div><div class='del'>-	Gurl to CamelURL, g_url_* to camel_url_* (with camel_url_new</div><div class='del'>-	taking an exception), and url-util.[ch] to camel-url.[ch]. Also</div><div class='del'>-	force url-&gt;port to be numeric and remove camel_service_getport. (I</div><div class='del'>-	was confused before: the URL RFC says the port must be numeric, so</div><div class='del'>-	we don't want to do getportbyname.)</div><div class='del'>-</div><div class='del'>-2000-04-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c</div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): Compare</div><div class='del'>-	mbox_file_size and mbox_modtime to the results of stat()ing the</div><div class='del'>-	mbox file, not the summary file. Duh.</div><div class='del'>-	(_close): Update the summary's mbox_file_size and mbox_modtime</div><div class='del'>-	before writing it to disk.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c (camel_mbox_summary_save,</div><div class='del'>-	camel_mbox_summary_load): Wow. I must have been tired when I wrote</div><div class='del'>-	this code. First, the comparison bug above. Second, it was using</div><div class='del'>-	ntohs and htons instead of ntohl and htonl. Third, I was reading</div><div class='del'>-	the status flag byte in two different places and thus getting out</div><div class='del'>-	of sync. Fourth, it was writing out field_length bytes of each</div><div class='del'>-	header field after having converted field_length to network byte</div><div class='del'>-	order, resulting in lots of random crap being appended, and the</div><div class='del'>-	summary files being huge. (Fortunately, since the size/modtime</div><div class='del'>-	comparison was biffed, the garbage summary read from disk was</div><div class='del'>-	always immediately discarded.)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-parser.c (camel_mbox_parse_file): fix</div><div class='del'>-	an off-by-one error that caused the last-used UID to be reused if</div><div class='del'>-	the summary file was regenerated. (That one wasn't my fault. :-)</div><div class='del'>-</div><div class='del'>-2000-03-31  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c: implement unimplemented methods</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c</div><div class='del'>-	(gmime_content_field_construct_from_string):</div><div class='del'>-	* data-wrapper-repository.c</div><div class='del'>-	(data_wrapper_repository_get_data_wrapper_type):</div><div class='del'>-	* camel-simple-data-wrapper.c (my_write_to_stream):</div><div class='del'>-	* camel-mime-part.c (my_set_input_stream):</div><div class='del'>-	remove debugging printf()s that no longer seem useful.</div><div class='del'>-</div><div class='del'>-2000-03-31  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (text_to_html): Added "convert_newlines_to_br"</div><div class='del'>-	boolean param, to give the option of not converting '\n's to &lt;br&gt;</div><div class='del'>-	tags. This way, when we stick stuff in a &lt;pre&gt; tag, newlines stay</div><div class='del'>-	newlines.</div><div class='del'>-</div><div class='del'>-2000-03-30  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (handle_text_plain): Use &lt;pre&gt; tag to force</div><div class='del'>-	the use of monospaced fonts.</div><div class='del'>-</div><div class='del'>-2000-03-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_getport): Add a htons in the</div><div class='del'>-	default_number case, and document the fact that the function</div><div class='del'>-	returns the port in network byte order.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Revert</div><div class='del'>-	Miguel's change. The port number bug was actually somewhere</div><div class='del'>-	else, and the IP address copying code was fine already.</div><div class='del'>-	</div><div class='del'>-2000-03-29  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (pop3_connect): Add htons</div><div class='del'>-	(port), and only copy 4 bytes for the IP address to prevent a DNS</div><div class='del'>-	attack. </div><div class='del'>-</div><div class='del'>-2000-03-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c</div><div class='del'>-	(camel_seekable_substream_new_with_seekable_stream_and_bounds):</div><div class='del'>-	make this return a CamelStream rather than a</div><div class='del'>-	CamelSeekableSubstream, because that's the way Gtk objects tend to</div><div class='del'>-	work.</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_gethost,</div><div class='del'>-	camel_service_getport): convenience functions to canonicalize</div><div class='del'>-	the host and port values of a service's URL.</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: use them</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c</div><div class='del'>-	(_check_get_or_maybe_generate_summary_file): Make this work when</div><div class='del'>-	the inbox file doesn't yet exist.</div><div class='del'>-</div><div class='del'>-2000-03-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_append_message): uncomment</div><div class='del'>-	the call to unlink the temp file: there's no way to tell</div><div class='del'>-	camel_stream_fs to truncate a file, so reusing the same file was</div><div class='del'>-	resulting in junk at the ends of messages.</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: add delete_message_by_{number,uid}.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.[ch]: implement</div><div class='del'>-	delete_message_by_uid. Add a close method to do expunging</div><div class='del'>-	of deleted messages if requested.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.[ch]: support for</div><div class='del'>-	CamelPop3Folder::close. (You have to close the connection</div><div class='del'>-	in order to expunge the folder, thus the store may be</div><div class='del'>-	connected in the CamelService::is_connected sense when it</div><div class='del'>-	is not actually connected to the server.) Also some bugfixes.</div><div class='del'>-</div><div class='del'>-2000-03-27  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_append_message): Unref the</div><div class='del'>-	output_stream when done, close doesn't do it.</div><div class='del'>-	(_append_message): Clear all uid's from the appending messages, so</div><div class='del'>-	they are reassigned proper unique id's.</div><div class='del'>-</div><div class='del'>-	* gmime-utils.c (get_header_array_from_stream): Actually free the</div><div class='del'>-	header, it is copied elsewhere.</div><div class='del'>-</div><div class='del'>-2000-03-26  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Added</div><div class='del'>-	folder parameter to function.  Fixed callers.</div><div class='del'>-	(index_message): Index a message as it is assigned a unique id.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_set_content_id): Make sure we malloc and</div><div class='del'>-	copy the content_id, otherwise *poof*</div><div class='del'>-</div><div class='del'>-2000-03-25  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (_finalize): Another leak, unref the content if</div><div class='del'>-	finished with it.</div><div class='del'>-</div><div class='del'>-	* camel-recipient.c (camel_recipient_table_free): Plug another</div><div class='del'>-	memory leak - actually free the recipient table.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (_finalize): Plugged a memory leak with the</div><div class='del'>-	flags table.</div><div class='del'>-</div><div class='del'>-	* gmime-utils.c (_store_header_pair_from_string): A simpler, more</div><div class='del'>-	debuggable and functionally identical header extraction function.</div><div class='del'>-</div><div class='del'>-2000-03-24  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_set_parameter):</div><div class='del'>-	Remove the hash table entry before freeing its key and data.</div><div class='del'>-</div><div class='del'>-2000-03-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/Makefile.am (SUBDIRS): Add pop3.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: keep separate input and</div><div class='del'>-	output streams so the output doesn't end up being buffered.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c (get_message_by_number):</div><div class='del'>-	finish implementing this.</div><div class='del'>-</div><div class='del'>-2000-03-27  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_set_disposition): fix so less broken.</div><div class='del'>-	(my_finalize): remove dodgy disposition free.</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (my_set_mime_type_field): unref instead of</div><div class='del'>-	free on mime_type.</div><div class='del'>-</div><div class='del'>-2000-03-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_free_auth_types): new routine to</div><div class='del'>-	free the data allocated by camel_service_query_auth_types.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (free_auth_types): implement</div><div class='del'>-</div><div class='del'>-	* camel-stream-mem.c (camel_stream_mem_new_with_buffer): rename</div><div class='del'>-	camel_stream_mem_new_with_buffer to ..._with_byte_array and add a</div><div class='del'>-	new ..._with_buffer that takes a char * rather than a GByteArray.</div><div class='del'>-</div><div class='del'>-	* Remove CamelStreamBufferedFs, since CamelStreamBuffer makes it</div><div class='del'>-	redundant.</div><div class='del'>-</div><div class='del'>-2000-03-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.[ch]: change the CamelFolderSummary</div><div class='del'>-	interfaces to allow partial summary queries (for dealing</div><div class='del'>-	with very large folders). Remove the "extended_fields" from</div><div class='del'>-	CamelFolderInfo and CamelMessageInfo: this is better dealt</div><div class='del'>-	with by subtyping.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.[ch]: Make CamelMboxSummary a</div><div class='del'>-	subclass of CamelFolderSummary. Update interfaces for that. Remove</div><div class='del'>-	the internal/external summary distinction. Remove the (unused) md5</div><div class='del'>-	checksum in the folder summary. Change the summary file format</div><div class='del'>-	(primarily to make it no longer byte-order dependent) and add a</div><div class='del'>-	version number to it so it will be easier to change in the future.</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-folder.[ch]</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c: update for summary changes</div><div class='del'>-</div><div class='del'>-	* camel-exception-list.def: add</div><div class='del'>-	CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID</div><div class='del'>-	</div><div class='del'>-2000-03-23  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-provider.c: Added flag to provider</div><div class='del'>-	initialisation, to match changed structure.</div><div class='del'>-</div><div class='del'>-2000-03-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.[ch]: Added async search api.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Changed to use an</div><div class='del'>-	asynchronous interface.</div><div class='del'>-	(camel_mbox_folder_search_cancel): Cancel function for async</div><div class='del'>-	interface.</div><div class='del'>-</div><div class='del'>-2000-03-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.c (camel_stream_buffer_read_line): Function</div><div class='del'>-	to read one line of any size from a stream and return it in</div><div class='del'>-	allocated memory.</div><div class='del'>-</div><div class='del'>-2000-03-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.c (camel_service_query_auth_types): New function</div><div class='del'>-	to query a service for the authentication protocols it supports.</div><div class='del'>-	* providers/pop3/camel-pop3-store.c (query_auth_types): implement</div><div class='del'>-</div><div class='del'>-	* camel-provider.c (camel_provider_scan): New function to</div><div class='del'>-	scan the provider dir and return a list of all providers.</div><div class='del'>-</div><div class='del'>-	* providers/pop3/camel-pop3-folder.c: fill this in partially</div><div class='del'>-	* providers/pop3/camel-pop3-store.c: make camel_pop3_command</div><div class='del'>-	return the text after "+OK"/"-ERR" and add a separate</div><div class='del'>-	camel_pop3_get_additional_data to get the message body or</div><div class='del'>-	whatever. Also make them take a CamelPop3Store rather than</div><div class='del'>-	a CamelStreamBuffer.</div><div class='del'>-</div><div class='del'>-2000-03-22  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (debug): Disabled some useless debug</div><div class='del'>-	messaging.</div><div class='del'>-</div><div class='del'>-2000-03-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/pop3: some initial bits of the POP3 provider, to</div><div class='del'>-	make Matt happy. Incomplete, untested, etc.</div><div class='del'>-</div><div class='del'>-2000-03-21  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c </div><div class='del'>-	(camel_mbox_summary_append_internal_to_external): copy the size field</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): initialize </div><div class='del'>-	message_info to NULL</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: added the size field.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.h: </div><div class='del'>-	added the received_date field.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-summary.c:</div><div class='del'>-	documented all functions.</div><div class='del'>-</div><div class='del'>-	* camel-folder-summary.h: name change and </div><div class='del'>-	new fields.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c: update to </div><div class='del'>-	conform to name change in the summary fields.</div><div class='del'>-</div><div class='del'>-2000-03-10  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-service.h: cosmetic changes.</div><div class='del'>-</div><div class='del'>-2000-03-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* s/HelixCode/Helix Code, Inc./ in the copyrights</div><div class='del'>-</div><div class='del'>-2000-03-07  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (handle_mime_part): </div><div class='del'>-	plug mem leaks due to bad documentation</div><div class='del'>-	of camel_content_field_get_mime_type</div><div class='del'>-	(print_camel_body_part): idem</div><div class='del'>-	(handle_multipart_alternative): idem</div><div class='del'>-</div><div class='del'>-	* gmime-content-field.c (gmime_content_field_get_mime_type): </div><div class='del'>-	documentation fix.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_finalize): unref the </div><div class='del'>-	content_input_stream if any. </div><div class='del'>-</div><div class='del'>-2000-03-06  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (_seek): fix a bogus calculation</div><div class='del'>-	in the return position.</div><div class='del'>-</div><div class='del'>-2000-03-05  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.h: cosmetic fixes.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (_read): </div><div class='del'>-	(_seek): fixed the current position so that it refers</div><div class='del'>-	to the current position in the stream, not in its parent.</div><div class='del'>-</div><div class='del'>-2000-03-04  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Ref the summary</div><div class='del'>-	after we have got it.</div><div class='del'>-</div><div class='del'>-2000-03-04  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_write_content_to_stream): </div><div class='del'>-	stream the raw content instead of nothing if the encoding</div><div class='del'>-	is not supported.</div><div class='del'>-</div><div class='del'>-	* camel-stream-fs.c (_seek): handle eos more</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (get_bonobo_tag_for_object): </div><div class='del'>-	bonobo-goad-id is the good key to look for. </div><div class='del'>-	(get_bonobo_tag_for_object): close the &lt;object&gt; tag.</div><div class='del'>-	(get_bonobo_tag_for_object): the correct syntax for the</div><div class='del'>-	to set a parameter inside an &lt;object&gt; tag is :</div><div class='del'>-	&lt;object classid="..."&gt; &lt;param name="uid" value="..."&gt; &lt;param ...&gt;</div><div class='del'>-	&lt;/object&gt;</div><div class='del'>-</div><div class='del'>-2000-03-03  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_get_message_by_uid): </div><div class='del'>-	use set_input_stream instead of construct_from_stream</div><div class='del'>-	to feed the message object. </div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (my_write_to_stream): reset output stream.</div><div class='del'>-	(my_set_input_stream): unref the previous input stream.</div><div class='del'>-	use the set_output_stream for default behaviour.</div><div class='del'>-	(my_set_output_stream): unref previous output stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (my_write_content_to_stream): reset content</div><div class='del'>-	object output stream.</div><div class='del'>-</div><div class='del'>-2000-03-03  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev): Make</div><div class='del'>-	sure we open with create with a creation mask.</div><div class='del'>-</div><div class='del'>-2000-03-01  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_content_from_stream): DO NOT assert on</div><div class='del'>-	content type, we have fallback code 4 lines below it ... *sigh*</div><div class='del'>-</div><div class='del'>-2000-02-29  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcamelinclude_HEADERS): Added camel-stream-buffer</div><div class='del'>-	to build.</div><div class='del'>-</div><div class='del'>-	* camel-stream-buffer.[ch]: Generic buffer which can be applied to</div><div class='del'>-	any stream.</div><div class='del'>-</div><div class='del'>-2000-03-03  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (handle_image): in the case</div><div class='del'>-	of images, put the content object output stream</div><div class='del'>-	in the url. This allows the message browser</div><div class='del'>-	to show inline images.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_encode): fixed state</div><div class='del'>-	0 keep value. </div><div class='del'>-</div><div class='del'>-2000-03-02  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_encode): don't forget to </div><div class='del'>-	set the state to 0 after 3.</div><div class='del'>-	(my_read_encode): don't forget to encode, even in state 3.</div><div class='del'>-</div><div class='del'>-	* camel-simple-data-wrapper.c: static functions are prefixed </div><div class='del'>-	with my_ instead of _</div><div class='del'>-	* camel-multipart.c: static functions are prefixed </div><div class='del'>-	with my_ instead of _</div><div class='del'>-	(my_write_to_stream): commented.</div><div class='del'>-	(my_write_to_stream): warning in case the boudary is set</div><div class='del'>-	but is a zero length string.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (camel_mime_part_encoding_from_string): </div><div class='del'>-	remove debug trace. </div><div class='del'>-	</div><div class='del'>-	* camel-mime-part.c: Replaced all static functions</div><div class='del'>-	with name begining with _ by the same name begining</div><div class='del'>-	with "my_" to prevent the possible conflicts </div><div class='del'>-	with system symbols Dan warned us about. </div><div class='del'>-	</div><div class='del'>-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): </div><div class='del'>-	use CamelStreamB64 type for the input stream.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (_get_content_object): remove </div><div class='del'>-	debugging trace</div><div class='del'>-	(_write_content_to_stream): implement the b64 </div><div class='del'>-	encoding the new way (that is using camel_stream_b64)</div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (my_write_to_stream): </div><div class='del'>-	fix implementation so that it writes properly</div><div class='del'>-	to the output stream even.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): </div><div class='del'>-	fix implementation. </div><div class='del'>-</div><div class='del'>-2000-02-29  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (camel_stream_b64_write_to_stream): new</div><div class='del'>-	utility function. </div><div class='del'>-</div><div class='del'>-	* camel-data-wrapper.c (_write_to_stream): default</div><div class='del'>-	implementation. </div><div class='del'>-</div><div class='del'>-	* gmime-utils.c (_store_header_pair_from_string): </div><div class='del'>-	revert strange changes. </div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_decode): set eos to true when we</div><div class='del'>-	have read the whole input stream. </div><div class='del'>-	(my_reset): set eos to FALSE.</div><div class='del'>-</div><div class='del'>-2000-02-28  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-mime-part.c (_parse_header_pair): Dont free this either.</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (_remove_header): Ugh, dont free the header</div><div class='del'>-	before we actually remove it.</div><div class='del'>-	(_add_header): Ugh, dont free hashtable entries which may be</div><div class='del'>-	duplicated (hash_insert _will_ reference that memory).</div><div class='del'>-</div><div class='del'>-	* string-utils.c (string_trim): Trimming a 0-length string is not</div><div class='del'>-	an error.</div><div class='del'>-</div><div class='del'>-	* camel-mime-message.c (_parse_header_pair): Fixed very broken</div><div class='del'>-	memory handling of header_name/value.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c (camel_mbox_write_xev):</div><div class='del'>-	Initialise end_of_last_message always.</div><div class='del'>-	(camel_mbox_copy_file_chunk): Stop trying to read if we run out of</div><div class='del'>-	data, rather than looping forever.</div><div class='del'>-	(camel_mbox_write_xev): Use an open flag when opening with create.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_search_by_expression): No, its not</div><div class='del'>-	a fatal error to search on a non-searchable folder, you just dont</div><div class='del'>-	get any matches.</div><div class='del'>-	(_open): Dont open an opened folder (i dont see why this is really</div><div class='del'>-	a bug, but what the hell ...)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_init): Set search cap on.</div><div class='del'>-	(_open): Call parent class to perform open.  Remove folder-open</div><div class='del'>-	check to parent instead.</div><div class='del'>-	(_create): open takes a creation mask, dont use umask to try and</div><div class='del'>-	set the open mode.</div><div class='del'>-	(_delete): Dont bother checking folder==NULL, its already been</div><div class='del'>-	checked on the external interface (changed to an assertion, this</div><div class='del'>-	would have to be a camel bug).</div><div class='del'>-	(_delete_messages): Likewise.</div><div class='del'>-	(_create): Ditto.</div><div class='del'>-	(_init): Dont go and clear all the paths and shit that the parent</div><div class='del'>-	open just setup for us.</div><div class='del'>-	(_delete_messages): Get rid of more umask stuff.</div><div class='del'>-	(_append_message): Make sure we pass file mode to open with create.</div><div class='del'>-	(_append_message): Cleaned up some indenting to make it readable.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_encode): Fixed a typo.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c: Changed to use e-sexp,</div><div class='del'>-	rather than filter-sexp.</div><div class='del'>-</div><div class='del'>-2000-02-28  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (my_read_encode): encoding</div><div class='del'>-	filter.</div><div class='del'>-</div><div class='del'>-2000-02-23  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c: changed the __static </div><div class='del'>-	suffix into a my_ prefix. </div><div class='del'>-	(camel_stream_b64_set_mode): reset the persistent</div><div class='del'>-	status. </div><div class='del'>-	(my_read_decode): remove superfluous %</div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-utils.c (camel_mbox_copy_file_chunk): </div><div class='del'>-	fix exception description message.</div><div class='del'>-</div><div class='del'>-2000-02-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: Add camel_session_get_transport_for_protocol.</div><div class='del'>-</div><div class='del'>-	* camel-transport.h:</div><div class='del'>-	* camel-transport.c: Add an abstract CamelTransport class.</div><div class='del'>-</div><div class='del'>-	* providers/sendmail/*: A CamelTransport that uses sendmail</div><div class='del'>-	to deliver mail.</div><div class='del'>-</div><div class='del'>-2000-02-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.c: use CamelExceptions for run-time errors, not</div><div class='del'>-	incorrect code. Don't bother validating that an object exists from</div><div class='del'>-	inside one of its methods, since you couldn't have gotten there if</div><div class='del'>-	it didn't. Fix some code style bugs.</div><div class='del'>-</div><div class='del'>-	(_init): Rename init_with_store to init and add parent_folder,</div><div class='del'>-	separator, and name arguments.</div><div class='del'>-	(_set_name): Get separator from self, not parent_store now.</div><div class='del'>-</div><div class='del'>-	* camel-store.h:</div><div class='del'>-	* camel-store.c: Remove get/set_separator.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/: Update for above.</div><div class='del'>-</div><div class='del'>-2000-02-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-medium.c (_finalize): Free the data in the headers hash</div><div class='del'>-	table.</div><div class='del'>-	(_add_header): g_strdup the header name and value when adding it.</div><div class='del'>-</div><div class='del'>-	* camel-mime-part-utils.c</div><div class='del'>-	(camel_mime_part_construct_headers_from_stream): Free the header</div><div class='del'>-	data after calling camel_medium_add_header, since it will have</div><div class='del'>-	g_strdup()ed it itself.</div><div class='del'>-</div><div class='del'>-2000-02-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c: Dont compile by default.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am: Fuck off the filter code.</div><div class='del'>-</div><div class='del'>-2000-02-22  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (read_decode__static): </div><div class='del'>-	don't read the char if we reached the length</div><div class='del'>-	of the output buffer. Hours lost on this</div><div class='del'>-	%$!@# bug : 3.5</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_get_subfolder): </div><div class='del'>-	(camel_folder_create): </div><div class='del'>-	(camel_folder_delete): </div><div class='del'>-	(camel_folder_delete_messages): </div><div class='del'>-	(camel_folder_list_subfolders): </div><div class='del'>-	(camel_folder_expunge): </div><div class='del'>-	(camel_folder_get_message_by_number): </div><div class='del'>-	(camel_folder_get_message_count): </div><div class='del'>-	(camel_folder_append_message): </div><div class='del'>-	(camel_folder_copy_message_to): </div><div class='del'>-	(camel_folder_get_summary): </div><div class='del'>-	(camel_folder_get_message_uid): </div><div class='del'>-	(camel_folder_get_message_by_uid): </div><div class='del'>-	(camel_folder_get_uid_list): </div><div class='del'>-	Check folder state (open/close) and raise an</div><div class='del'>-	exception if it is not ok. </div><div class='del'>-	</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_create): </div><div class='del'>-	create the file and the path with two different</div><div class='del'>-	names.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (_create): handle the case </div><div class='del'>-	when the folder name starts with '/'</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_new): use </div><div class='del'>-	(void) instead of () in decl.</div><div class='del'>-</div><div class='del'>-	* camel-exception.h: cosmetic fixes.</div><div class='del'>-</div><div class='del'>-	* camel-exception.c (camel_exception_init): new routine.</div><div class='del'>-	Fix a bug in mail/message-list.c</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: cosmetic changes.</div><div class='del'>-</div><div class='del'>-	* camel-stream-b64.c (reset__static): added a</div><div class='del'>-	reset method. Thanks message-browser to find</div><div class='del'>-	so much bugs :)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): readd</div><div class='del'>-	Unicode libs.</div><div class='del'>-</div><div class='del'>-2000-02-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-formatter.c (lookup_unique_id): </div><div class='del'>-	awful hack to test get_output_stream.</div><div class='del'>-	* camel-stream-b64.[ch] :</div><div class='del'>-	b64 encoding/decoding is now implemented as</div><div class='del'>-	a stream. </div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-02-21  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel-seekable-substream.c (_reemit_parent_signal): </div><div class='del'>-	emit "data_available" when parent stream emits it. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-02-21  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am: Uh, fixed LIBADD again.  What was</div><div class='del'>-	there was never ever going to work, wasn't it tested?</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2000-02-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.h: (struct _CamelSession): Add authenticator.</div><div class='del'>-</div><div class='del'>-	* camel-session.c (camel_session_new): Add authenticator.</div><div class='del'>-	(camel_session_query_authenticator): New function to query the</div><div class='del'>-	session authenticator for password, etc, information.</div><div class='del'>-</div><div class='del'>-2000-02-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-session.c: add CamelExceptions to several functions. Use</div><div class='del'>-	camel_session_new to initialize the session and URL fields of</div><div class='del'>-	created CamelStores as appropriate.</div><div class='del'>-</div><div class='del'>-	* camel-store.h:</div><div class='del'>-	* camel-store.c</div><div class='del'>-	* camel-service.h:</div><div class='del'>-	* camel-service.c: Move the session and url (and associated</div><div class='del'>-	functions) from CamelStore to CamelService. Add url_flags to</div><div class='del'>-	CamelService so subclasses can specify which URL components</div><div class='del'>-	are mandatory for them.	Add camel_session_new for</div><div class='del'>-	camel_session_get_store* to use.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c:</div><div class='del'>-	* providers/mbox/camel-mbox-store.c:</div><div class='del'>-	* providers/mbox/camel-mbox-store.h: Update for above changes.</div><div class='del'>-</div><div class='del'>-	* camel-exception-list.def: Once camel is being used for real,</div><div class='del'>-	exceptions won't be renumberable. So renumber them now to make</div><div class='del'>-	more room to add exceptions to the various categories later, and</div><div class='del'>-	add a big warning message.</div><div class='del'>-</div><div class='del'>-2000-02-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am: add libibex back to</div><div class='del'>-	libcamelmbox_la_LIBADD</div><div class='del'>-</div><div class='del'>-2000-02-18  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.h</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Added exception to call,</div><div class='del'>-	and fixed caller.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c</div><div class='del'>-	(camel_mbox_folder_search_by_expression): Major changes, to use</div><div class='del'>-	the sexp evaluator from filter/filter-sexp.c to implement the</div><div class='del'>-	searching.</div><div class='del'>-	(func_body_contains): Changed to support multiple strings in 1</div><div class='del'>-	command (results or'd together)</div><div class='del'>-</div><div class='del'>-	* url-util.c (g_url_new): Fixed a typo (colon == 0 isn't right),</div><div class='del'>-	and made it so full url's are absolute pathed (Dan, this is how it</div><div class='del'>-	has to work!).  Also, always include a path part, even if it is an</div><div class='del'>-	empty string.</div><div class='del'>-</div><div class='del'>-2000-02-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-types.h: New header with the typedefs for all camel</div><div class='del'>-	classes. Now the class headers can just include this and the</div><div class='del'>-	header for the parent type. This makes it possible for</div><div class='del'>-	CamelService to include a CamelSession without creating an</div><div class='del'>-	#include loop.</div><div class='del'>-</div><div class='del'>-	* camel/*:	</div><div class='del'>-	* composer/e-msg-composer-attachment-bar.h:</div><div class='del'>-	* mail/folder-browser.c:</div><div class='del'>-	* mail/message-list.c: frob #includes to match the new reality</div><div class='del'>-</div><div class='del'>-2000-02-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-service.h:</div><div class='del'>-	* camel/camel-service.c: Make camel-service us a Gurl internally.</div><div class='del'>-	Remove the login/password interfaces and instead provide</div><div class='del'>-	camel_service_connect_with_url. Add CamelExceptions</div><div class='del'>-</div><div class='del'>-2000-02-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (handle_text_plain): </div><div class='del'>-	(handle_text_html): use camel_stream_reset instead</div><div class='del'>-	of seek. The formatter should be able to work </div><div class='del'>-	with all streams, not only seekable streams. </div><div class='del'>-	In the case where some provider implementation</div><div class='del'>-	would not be able to provide a reset method </div><div class='del'>-	to their stream, implementors would have</div><div class='del'>-	to find a workaround.</div><div class='del'>-</div><div class='del'>-	* camel/camel-session.c (camel_session_new): use</div><div class='del'>-	(void) instean of () in function decl.</div><div class='del'>-</div><div class='del'>-	* camel/camel-folder.c: ifdef async operation </div><div class='del'>-	related code. </div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.c (_seek): added a warning.</div><div class='del'>-	(_reset): default implementation of reset for seekable</div><div class='del'>-	stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-message.h: set_received_date declaration fix.</div><div class='del'>-	cosmetic changes.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-provider.c (camel_provider_module_init): </div><div class='del'>-	use (void) instead of ().</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream.c (camel_stream_reset): </div><div class='del'>-	new method for CamelStream.</div><div class='del'>-</div><div class='del'>-2000-02-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/url-util.c (g_url_to_string): New function to convert</div><div class='del'>-	a Gurl back into a char *.</div><div class='del'>-</div><div class='del'>-2000-02-17  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-formatter.c (handle_text_plain): </div><div class='del'>-	revamped so that it uses the output stream</div><div class='del'>-	of the data wrapper</div><div class='del'>-	(handle_text_html): ditto.</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	* camel/camel-simple-data-wrapper.h: </div><div class='del'>-	* camel/camel-simple-data-wrapper.c (camel_simple_data_wrapper_new): </div><div class='del'>-	use (void) instead of ().</div><div class='del'>-	(_get_output_stream): simple implementation. </div><div class='del'>-</div><div class='del'>-2000-02-16  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (_set_input_stream): ref input stream</div><div class='del'>-	(_set_output_stream): ref output stream</div><div class='del'>-	(_finalize): unref input and output streams</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-substream.c (_set_bounds): don't</div><div class='del'>-	seek the begining of the substream.</div><div class='del'>-	(_eos): fix eos condition testing. </div><div class='del'>-	(_finalize): unref parent stream</div><div class='del'>-	(_init_with_seekable_stream_and_bounds): ref parent stream</div><div class='del'>-</div><div class='del'>-	* camel/gstring-util.c (g_string_equal_for_hash): </div><div class='del'>-	(g_string_equal_for_glist): return type is int.</div><div class='del'>-</div><div class='del'>-	* camel/camel.h: </div><div class='del'>-	* camel/camel.c (camel_init): use (void) </div><div class='del'>-	instead of ().</div><div class='del'>-	</div><div class='del'>-2000-02-16  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Added</div><div class='del'>-	libfilter to link line (temporarily?).  Required for</div><div class='del'>-	filter-sexp.</div><div class='del'>-</div><div class='del'>-2000-02-15  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_localize_part): </div><div class='del'>-	this routine replaces the _read_part routine</div><div class='del'>-	and does not store the part in a buffer. </div><div class='del'>-	(_set_input_stream): use the set_input_stream</div><div class='del'>-	instead of the construct_from_stream.</div><div class='del'>-	each bodypart is given an input stream. </div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part-utils.c: </div><div class='del'>-	include the data-wrapper-repository header. </div><div class='del'>-	(camel_mime_part_construct_content_from_stream): </div><div class='del'>-	use the set_input_stream instead of the </div><div class='del'>-	construct_from_stream method. </div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-substream.c (_set_bounds): </div><div class='del'>-	cur position is set to 0 not to inf_bound.</div><div class='del'>-</div><div class='del'>-2000-02-15  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c: include gmime-base64.h</div><div class='del'>-	various compilation and runtime fixes.</div><div class='del'>-	(_set_input_stream): store the input substream </div><div class='del'>-	for the content object.</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.h: declare the </div><div class='del'>-	set/get function on input/output stream.</div><div class='del'>-</div><div class='del'>-	* camel/camel-mime-part.c (_get_content_object): </div><div class='del'>-	don't use a temporary mem stream. 	</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-substream.c (_seek): </div><div class='del'>-	(_eos): </div><div class='del'>-	(_read): the substream can be unlimited in length</div><div class='del'>-</div><div class='del'>-	* camel/camel-data-wrapper.c (camel_data_wrapper_class_init): </div><div class='del'>-	set the get/set_input/output_stream methods. 	</div><div class='del'>-</div><div class='del'>-	* camel/camel-multipart.c (_construct_from_stream): </div><div class='del'>-	camel_stream_seek -&gt; camel_seekable_stream_seek</div><div class='del'>-</div><div class='del'>-2000-02-14  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/Makefile.am (libcamelmbox_la_LIBADD): Add</div><div class='del'>-	the unicode libraries as well.</div><div class='del'>-</div><div class='del'>-	* camel/camel-provider.c (camel_provider_register_as_module): Add</div><div class='del'>-	error reporting here.  Desire to use Solaris increases.  Hair loss</div><div class='del'>-	in the last two hours: 5,400.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/camel-mbox-provider.c</div><div class='del'>-	(camel_mbox_get_provider): Renamed function.</div><div class='del'>-</div><div class='del'>-	* camel/camel.h: All include files use camel/ now here.</div><div class='del'>-</div><div class='del'>-	* camel/providers/mbox/Makefile.am: Drop all the dynamism from</div><div class='del'>-	Camel, and make this a standard library.</div><div class='del'>-</div><div class='del'>-2000-02-14  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_array_from_stream): use the </div><div class='del'>-	eos stream method. </div><div class='del'>-	(gmime_read_line_from_stream): ditto.</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.h (struct ): add the eof field</div><div class='del'>-	cosmetics changes. </div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c (camel_stream_fs_init): set eof.</div><div class='del'>-	(_read): set eof on end of file.</div><div class='del'>-	(_eos): implemented.</div><div class='del'>-</div><div class='del'>-	* camel/gmime-utils.c (get_header_array_from_stream): </div><div class='del'>-	make a blocking version of the header parser. </div><div class='del'>-	When the fs stream uses gnome-vfs, this should</div><div class='del'>-	be changed. </div><div class='del'>-	(gmime_read_line_from_stream): ditto. </div><div class='del'>-</div><div class='del'>-2000-02-11  bertrand  &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-	* camel/camel-stream-fs.c: </div><div class='del'>-	everywhere, when using the cur_pos field, do it</div><div class='del'>-	on the CamelSeekableStream object.</div><div class='del'>-	(_seek): small fix. </div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.c (camel_seekable_stream_seek): </div><div class='del'>-	s/camel_stream_seek/camel_seekable_stream_seek/g</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.h: </div><div class='del'>-	(struct ): added a field to store the</div><div class='del'>-	current position.</div><div class='del'>-</div><div class='del'>-	* camel/camel-seekable-stream.c (camel_seekable_stream_get_current_position): </div><div class='del'>-	New function. Allows to get the current position </div><div class='del'>-	of a seekable stream.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-02-13  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-search.c: New file, implements the</div><div class='del'>-	search api for mbox folders.</div><div class='del'>-</div><div class='del'>-	* providers/mbox/Makefile.am: Link with ibex.</div><div class='del'>-</div><div class='del'>-	* camel-folder.c (camel_folder_has_search_capability): Api</div><div class='del'>-	additions.</div><div class='del'>-	(camel_folder_search_by_expression): Ditto.</div><div class='del'>-</div><div class='del'>-2000-02-12  NotZed  &lt;notzed@zedzone.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.c (_set_name): Setup index</div><div class='del'>-	filename as well.</div><div class='del'>-	(_init_with_store): Init index filename.  Hmm, none of these</div><div class='del'>-	names ever seem to get free'd (FIXME?)</div><div class='del'>-</div><div class='del'>-	* providers/mbox/camel-mbox-folder.h: Add index file name.</div><div class='del'>-</div><div class='del'>-2000-02-12  NotZed  &lt;notzed@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel-folder.h: Add folder search functions.</div><div class='del'>-</div><div class='del'>-	** Created ChangeLog just for camel **</div><div class='del'>-	 - refer to ../ChangeLog for changes prior to this date.</div><div class='head'>diff --git a/camel/Makefile.am b/camel/Makefile.am<br/>deleted file mode 100644<br/>index 67689b261a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,138 +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'>-	-I$(top_srcdir)/e-util			 \</div><div class='del'>-	$(GLIB_CFLAGS)				 \</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'>-	broken-date-parser.c			\</div><div class='del'>-	camel-address.c				\</div><div class='del'>-	camel-data-wrapper.c			\</div><div class='del'>-	camel-exception.c			\</div><div class='del'>-	camel-folder-search.c			\</div><div class='del'>-	camel-folder-summary.c			\</div><div class='del'>-	camel-folder.c				\</div><div class='del'>-	camel-internet-address.c		\</div><div class='del'>-	camel-medium.c				\</div><div class='del'>-	camel-mime-filter-basic.c		\</div><div class='del'>-	camel-mime-filter-charset.c		\</div><div class='del'>-	camel-mime-filter-crlf.c		\</div><div class='del'>-	camel-mime-filter-from.c		\</div><div class='del'>-	camel-mime-filter-index.c		\</div><div class='del'>-	camel-mime-filter-linewrap.c		\</div><div class='del'>-	camel-mime-filter-save.c		\</div><div class='del'>-	camel-mime-filter.c			\</div><div class='del'>-	camel-mime-message.c			\</div><div class='del'>-	camel-mime-parser.c			\</div><div class='del'>-	camel-mime-part-utils.c			\</div><div class='del'>-	camel-mime-part.c			\</div><div class='del'>-	camel-mime-utils.c			\</div><div class='del'>-	camel-movemail.c			\</div><div class='del'>-	camel-multipart.c			\</div><div class='del'>-	camel-object.c				\</div><div class='del'>-	camel-provider.c			\</div><div class='del'>-	camel-remote-store.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-buffer.c			\</div><div class='del'>-	camel-stream-filter.c			\</div><div class='del'>-	camel-stream-fs.c			\</div><div class='del'>-	camel-stream-mem.c			\</div><div class='del'>-	camel-stream.c				\</div><div class='del'>-	camel-transport.c			\</div><div class='del'>-	camel-uid-cache.c			\</div><div class='del'>-	camel-url.c				\</div><div class='del'>-	camel-charset-map.c			\</div><div class='del'>-	camel.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'>-	string-utils.c</div><div class='del'>-</div><div class='del'>-libcamelinclude_HEADERS =			\</div><div class='del'>-	broken-date-parser.h			\</div><div class='del'>-	camel-address.h				\</div><div class='del'>-	camel-charset-map.h			\</div><div class='del'>-	camel-charset-map-private.h		\</div><div class='del'>-	camel-data-wrapper.h			\</div><div class='del'>-	camel-exception-list.def		\</div><div class='del'>-	camel-exception.h			\</div><div class='del'>-	camel-folder-search.h			\</div><div class='del'>-	camel-folder-summary.h			\</div><div class='del'>-	camel-folder.h				\</div><div class='del'>-	camel-internet-address.h		\</div><div class='del'>-	camel-medium.h				\</div><div class='del'>-	camel-mime-filter-basic.h		\</div><div class='del'>-	camel-mime-filter-charset.h		\</div><div class='del'>-	camel-mime-filter-crlf.h		\</div><div class='del'>-	camel-mime-filter-from.h		\</div><div class='del'>-	camel-mime-filter-index.h		\</div><div class='del'>-	camel-mime-filter-linewrap.h		\</div><div class='del'>-	camel-mime-filter-save.h		\</div><div class='del'>-	camel-mime-filter.h			\</div><div class='del'>-	camel-mime-message.h			\</div><div class='del'>-	camel-mime-parser.h			\</div><div class='del'>-	camel-mime-part-utils.h			\</div><div class='del'>-	camel-mime-part.h			\</div><div class='del'>-	camel-mime-utils.h			\</div><div class='del'>-	camel-movemail.h			\</div><div class='del'>-	camel-multipart.h			\</div><div class='del'>-	camel-object.h				\</div><div class='del'>-	camel-provider.h			\</div><div class='del'>-	camel-remote-store.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-buffer.h			\</div><div class='del'>-	camel-stream-filter.h			\</div><div class='del'>-	camel-stream-fs.h			\</div><div class='del'>-	camel-stream-mem.h			\</div><div class='del'>-	camel-stream.h				\</div><div class='del'>-	camel-transport.h			\</div><div class='del'>-	camel-types.h				\</div><div class='del'>-	camel-uid-cache.h			\</div><div class='del'>-	camel-url.h				\</div><div class='del'>-	camel.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'>-	string-utils.h</div><div class='del'>-</div><div class='del'>-libcamel_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)</div><div class='del'>-</div><div class='del'>-libcamel_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =					\</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='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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/broken-date-parser.c b/camel/broken-date-parser.c<br/>deleted file mode 100644<br/>index 544dc04e28..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/broken-date-parser.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/broken-date-parser.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,315 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  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'>-#include "broken-date-parser.h"</div><div class='del'>-</div><div class='del'>-/* prototypes for functions dealing with broken date formats */</div><div class='del'>-static GList *datetok (const gchar *date);</div><div class='del'>-static gint get_days_in_month (gint mon, gint year);</div><div class='del'>-static gint get_weekday (gchar *str);</div><div class='del'>-static gint get_month (gchar *str);</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'>-/*****************************************************************************</div><div class='del'>- * The following functions are here in the case of badly broken date formats *</div><div class='del'>- *                                                                           *</div><div class='del'>- * -- fejj@helixcode.com                                                     *</div><div class='del'>- *****************************************************************************/</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	gchar dow[6];   /* day of week (should only need 4 chars) */</div><div class='del'>-	gint day;</div><div class='del'>-	gint mon;       /* 1-&gt;12 or 0 if invalid */</div><div class='del'>-	gint year;</div><div class='del'>-	gint hour;</div><div class='del'>-	gint min;</div><div class='del'>-	gint sec;</div><div class='del'>-	gchar zone[6];  /* time zone */</div><div class='del'>-} date_t;</div><div class='del'>-</div><div class='del'>-static</div><div class='del'>-GList *datetok (const gchar *date)</div><div class='del'>-{</div><div class='del'>-	GList *tokens = NULL;</div><div class='del'>-	gchar *token, *start, *end;</div><div class='del'>-	</div><div class='del'>-	start = (gchar *) date;</div><div class='del'>-	while (*start) {</div><div class='del'>-		/* find the end of this token */</div><div class='del'>-		for (end = start; *end &amp;&amp; *end != ' '; end++);</div><div class='del'>-		</div><div class='del'>-		token = g_strndup (start, (end - start));</div><div class='del'>-		</div><div class='del'>-		if (token &amp;&amp; *token)</div><div class='del'>-			tokens = g_list_append (tokens, token);</div><div class='del'>-		else</div><div class='del'>-			g_free (token);</div><div class='del'>-</div><div class='del'>-		if (*end)</div><div class='del'>-			start = end + 1;</div><div class='del'>-		else</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return tokens;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-get_days_in_month (gint mon, gint year)</div><div class='del'>-{</div><div class='del'>-	switch (mon) {</div><div class='del'>-	case 1: case 3: case 5: case 7: case 8: case 10: case 12:</div><div class='del'>-		return 31;</div><div class='del'>-	case 4: case 6: case 9: case 11:</div><div class='del'>-		return 30;</div><div class='del'>-	case 2:</div><div class='del'>-		if ((year % 4 == 0 &amp;&amp; year % 100 != 0) || year % 400 == 0)</div><div class='del'>-			return 29;</div><div class='del'>-		return 28;</div><div class='del'>-	default:</div><div class='del'>-		return 30;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-get_weekday (gchar *str)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail ((str != NULL), 0);</div><div class='del'>-</div><div class='del'>-	if (strncmp (str, "Mon", 3) == 0) {</div><div class='del'>-		return 1;</div><div class='del'>-	} else if (strncmp (str, "Tue", 3) == 0) {</div><div class='del'>-		return 2;</div><div class='del'>-	} else if (strncmp (str, "Wed", 3) == 0) {</div><div class='del'>-		return 3;</div><div class='del'>-	} else if (strncmp (str, "Thu", 3) == 0) {</div><div class='del'>-		return 4;</div><div class='del'>-	} else if (strncmp (str, "Fri", 3) == 0) {</div><div class='del'>-		return 5;</div><div class='del'>-	} else if (strncmp (str, "Sat", 3) == 0) {</div><div class='del'>-		return 6;</div><div class='del'>-	} else if (strncmp (str, "Sun", 3) == 0) {</div><div class='del'>-		return 7;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;  /* unknown week day */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-get_month (gchar *str)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (str != NULL, 0);</div><div class='del'>-    </div><div class='del'>-	if (strncmp (str, "Jan", 3) == 0) {</div><div class='del'>-		return 1;</div><div class='del'>-	} else if (strncmp (str, "Feb", 3) == 0) {</div><div class='del'>-		return 2;</div><div class='del'>-	} else if (strncmp (str, "Mar", 3) == 0) {</div><div class='del'>-		return 3;</div><div class='del'>-	} else if (strncmp (str, "Apr", 3) == 0) {</div><div class='del'>-		return 4;</div><div class='del'>-	} else if (strncmp (str, "May", 3) == 0) {</div><div class='del'>-		return 5;</div><div class='del'>-	} else if (strncmp (str, "Jun", 3) == 0) {</div><div class='del'>-		return 6;</div><div class='del'>-	} else if (strncmp (str, "Jul", 3) == 0) {</div><div class='del'>-		return 7;</div><div class='del'>-	} else if (strncmp (str, "Aug", 3) == 0) {</div><div class='del'>-		return 8;</div><div class='del'>-	} else if (strncmp (str, "Sep", 3) == 0) {</div><div class='del'>-		return 9;</div><div class='del'>-	} else if (strncmp (str, "Oct", 3) == 0) {</div><div class='del'>-		return 10;</div><div class='del'>-	} else if (strncmp (str, "Nov", 3) == 0) {</div><div class='del'>-		return 11;</div><div class='del'>-	} else if (strncmp (str, "Dec", 3) == 0) {</div><div class='del'>-		return 12;</div><div class='del'>-	}</div><div class='del'>-    </div><div class='del'>-	return 0;  /* unknown month */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-parse_broken_date (const gchar *datestr)</div><div class='del'>-{</div><div class='del'>-	GList *tokens;</div><div class='del'>-	date_t date;</div><div class='del'>-	gchar *token, *ptr, *newdatestr;</div><div class='del'>-	guint len, i, retval;</div><div class='del'>-	gdouble tz = 0.0;</div><div class='del'>-</div><div class='del'>-	memset ((void*)&amp;date, 0, sizeof (date_t));</div><div class='del'>-	g_return_val_if_fail (datestr != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	tokens = datetok (datestr);</div><div class='del'>-	len = g_list_length (tokens);</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		token = g_list_nth_data (tokens, i);</div><div class='del'>-		</div><div class='del'>-		if ((retval = get_weekday (token))) {</div><div class='del'>-			strncpy (date.dow, datestr, 4);</div><div class='del'>-		} else if ((retval = get_month (token))) {</div><div class='del'>-			date.mon = retval;</div><div class='del'>-		} else if (strlen (token) &lt;= 2) {</div><div class='del'>-			/* this could be a 1 or 2 digit day of the month */</div><div class='del'>-			for (retval = 1, ptr = token; *ptr; ptr++)</div><div class='del'>-				if (*ptr &lt; '0' || *ptr &gt; '9')</div><div class='del'>-					retval = 0;</div><div class='del'>-			</div><div class='del'>-			if (retval &amp;&amp; atoi (token) &lt;= 31 &amp;&amp; !date.day)  /* probably should find a better way */</div><div class='del'>-				date.day = atoi (token);</div><div class='del'>-			else                                            /* fubar'd client using a 2-digit year */</div><div class='del'>-				date.year = atoi (token) &lt; 69 ? 2000 + atoi (token) : 1900 + atoi (token);</div><div class='del'>-		} else if (strlen (token) == 4) {</div><div class='del'>-			/* this could be the year... */</div><div class='del'>-			for (retval = 1, ptr = token; *ptr; ptr++)</div><div class='del'>-				if (*ptr &lt; '0' || *ptr &gt; '9')</div><div class='del'>-					retval = 0;</div><div class='del'>-			</div><div class='del'>-			if (retval)</div><div class='del'>-				date.year = atoi (token);</div><div class='del'>-		} else if (strchr (token, ':')) {</div><div class='del'>-			/* this must be the time: hh:mm:ss */</div><div class='del'>-			sscanf (token, "%d:%d:%d", &amp;date.hour, &amp;date.min, &amp;date.sec);</div><div class='del'>-		} else if (*token == '-' || *token == '+') {</div><div class='del'>-			tz = atoi (token) / 100.0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_list_free (tokens);</div><div class='del'>-	</div><div class='del'>-	/* adjust times based on time zones */</div><div class='del'>-	</div><div class='del'>-	if (tz != 0) {</div><div class='del'>-		/* check for time-zone shift */</div><div class='del'>-		if (tz &gt; 0) {</div><div class='del'>-			/* correct for positive hours off of UCT */</div><div class='del'>-			date.hour -= (tz / 100);</div><div class='del'>-			tz = (gint)tz % 100;</div><div class='del'>-			</div><div class='del'>-			if (tz &gt; 0) /* correct for positive minutes off of UCT */</div><div class='del'>-				date.min -= (gint)(((gdouble) tz / 100.0) * 60.0);</div><div class='del'>-		} else {</div><div class='del'>-			if (tz &lt; 0) {</div><div class='del'>-				/* correct for negative hours off of UCT */</div><div class='del'>-				tz = -tz;</div><div class='del'>-				date.hour += (tz / 100);</div><div class='del'>-				tz = -((gint)tz % 100);</div><div class='del'>-				</div><div class='del'>-				if (tz &lt; 0)</div><div class='del'>-					date.min -= (gint)(((gdouble) tz / 100.0) * 60.0);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* adjust seconds to proper range */</div><div class='del'>-		if (date.sec &gt; 59) {</div><div class='del'>-			date.min += (date.sec / 60);</div><div class='del'>-			date.sec = (date.sec % 60);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* adjust minutes to proper range */</div><div class='del'>-		if (date.min &gt; 59) {</div><div class='del'>-			date.hour += (date.min / 60);</div><div class='del'>-			date.min = (date.min % 60);</div><div class='del'>-		} else {</div><div class='del'>-			if (date.min &lt; 0) {</div><div class='del'>-				date.min = -date.min;</div><div class='del'>-				date.hour -= (date.min / 60) - 1;</div><div class='del'>-				date.min = 60 - (date.min % 60);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* adjust hours to the proper randge */</div><div class='del'>-		if (date.hour &gt; 23) {</div><div class='del'>-			date.day += (date.hour / 24);</div><div class='del'>-			date.hour -= (date.hour % 24);</div><div class='del'>-		} else {</div><div class='del'>-			if (date.hour &lt; 0) {</div><div class='del'>-				date.hour = -date.hour;</div><div class='del'>-				date.day -= (date.hour / 24) - 1;</div><div class='del'>-				date.hour = 24 - (date.hour % 60);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* adjust days to the proper range */</div><div class='del'>-		while (date.day &gt; get_days_in_month (date.mon, date.year)) {</div><div class='del'>-			date.day -= get_days_in_month (date.mon, date.year);</div><div class='del'>-			date.mon++;</div><div class='del'>-			if (date.mon &gt; 12) {</div><div class='del'>-				date.year += (date.mon / 12);</div><div class='del'>-				date.mon = (date.mon % 12);</div><div class='del'>-				if (date.mon == 0) {</div><div class='del'>-					/* month sanity check */</div><div class='del'>-					date.mon = 12;</div><div class='del'>-					date.year -= 1;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		while (date.day &lt; 1) {</div><div class='del'>-			date.day += get_days_in_month (date.mon, date.year);</div><div class='del'>-			date.mon--;</div><div class='del'>-			if (date.mon &lt; 1) {</div><div class='del'>-				date.mon = -date.mon;</div><div class='del'>-				date.year -= (date.mon / 12) - 1;</div><div class='del'>-				date.mon = 12 - (date.mon % 12);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* adjust months to the proper range */</div><div class='del'>-		if (date.mon &gt; 12) {</div><div class='del'>-			date.year += (date.mon / 12);</div><div class='del'>-			date.mon = (date.mon % 12);</div><div class='del'>-			if (date.mon == 0) {</div><div class='del'>-				/* month sanity check */</div><div class='del'>-				date.mon = 12;</div><div class='del'>-				date.year -= 1;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (date.mon &lt; 1) {</div><div class='del'>-				date.mon = -date.mon;</div><div class='del'>-				date.year -= (date.mon / 12) - 1;</div><div class='del'>-				date.mon = 12 - (date.mon % 12);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now lets print this date into a string with the correct format */</div><div class='del'>-	newdatestr = g_strdup_printf ("%s, %d %s %d %s%d:%s%d:%s%d -0000",</div><div class='del'>-				      date.dow, date.day, tz_months[date.mon-1],</div><div class='del'>-				      date.year,</div><div class='del'>-				      date.hour &gt; 10 ? "" : "0", date.hour,</div><div class='del'>-				      date.min &gt; 10 ? "" : "0", date.min,</div><div class='del'>-				      date.sec &gt; 10 ? "" : "0", date.sec);</div><div class='del'>-	</div><div class='del'>-	return newdatestr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*****************************************************************************</div><div class='del'>- * This ends the code for the broken date parser...                          *</div><div class='del'>- *                                                                           *</div><div class='del'>- * -- fejj@helixcode.com                                                     *</div><div class='del'>- *****************************************************************************/</div><div class='head'>diff --git a/camel/broken-date-parser.h b/camel/broken-date-parser.h<br/>deleted file mode 100644<br/>index 17000b3299..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/broken-date-parser.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/broken-date-parser.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,41 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  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'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;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'>-</div><div class='del'>-/* prototypes for functions dealing with broken date formats */</div><div class='del'>-</div><div class='del'>-gchar *parse_broken_date (const gchar *datestr);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-address.c b/camel/camel-address.c<br/>deleted file mode 100644<br/>index 8f7cea3d67..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-address.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,133 +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_finalize   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_address_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_address_class_init (CamelAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_address_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_address_init (CamelAddress *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;addresses = g_ptr_array_new();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_address_finalize (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	camel_address_remove((CamelAddress *)obj, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_address_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelAddress",</div><div class='del'>-					    sizeof (CamelAddress),</div><div class='del'>-					    sizeof (CamelAddressClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_address_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_address_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_address_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelAddress object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelAddress widget.</div><div class='del'>- **/</div><div class='del'>-CamelAddress *</div><div class='del'>-camel_address_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelAddress *new = CAMEL_ADDRESS ( camel_object_new (camel_address_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</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 CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;decode(a, raw);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_encode:</div><div class='del'>- * @a: </div><div class='del'>- * </div><div class='del'>- * Encode an address in a format suitable for a raw header.</div><div class='del'>- * </div><div class='del'>- * Return value: The encoded address.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_address_encode	(CamelAddress *a)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(IS_CAMEL_ADDRESS(a), NULL);</div><div class='del'>-</div><div class='del'>-	return CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;encode(a);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_address_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'>-			CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;remove(a, index);</div><div class='del'>-	} else {</div><div class='del'>-		CAMEL_ADDRESS_CLASS (CAMEL_OBJECT_GET_CLASS (a))-&gt;remove(a, index);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-address.h b/camel/camel-address.h<br/>deleted file mode 100644<br/>index a2d6fe34dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-address.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, camel_address_get_type (), CamelAddress)</div><div class='del'>-#define CAMEL_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_address_get_type (), CamelAddressClass)</div><div class='del'>-#define IS_CAMEL_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_address_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelAddressClass CamelAddressClass;</div><div class='del'>-</div><div class='del'>-struct _CamelAddress {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	GPtrArray *addresses;</div><div class='del'>-</div><div class='del'>-	struct _CamelAddressPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelAddressClass {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	int   (*decode)		(CamelAddress *, const char *raw);</div><div class='del'>-	char *(*encode)		(CamelAddress *);</div><div class='del'>-</div><div class='del'>-	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-charset-map-private.h b/camel/camel-charset-map-private.h<br/>deleted file mode 100644<br/>index 18b603148a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-charset-map-private.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-charset-map-private.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4345 +0,0 @@</div><div class='del'>-/* This file is automatically generated: DO NOT EDIT */</div><div class='del'>-</div><div class='del'>-static unsigned char m000[256] = {</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xd0, 0xd0, 0xf2, 0xf7, 0xf2, 0xf0, 0xff, </div><div class='del'>-	0xf7, 0xf0, 0xb0, 0xf0, 0xe0, 0xff, 0xf2, 0x94, </div><div class='del'>-	0xf7, 0xf0, 0xf2, 0xf2, 0xd7, 0xd2, 0xd0, 0xf2, </div><div class='del'>-	0xd7, 0xd0, 0x90, 0xe0, 0xd0, 0xf2, 0xd2, 0xc0, </div><div class='del'>-	0xd2, 0xc7, 0xc7, 0xc6, 0xc7, 0xc4, 0xc4, 0xc3, </div><div class='del'>-	0xc2, 0xc7, 0xc2, 0xc7, 0xc2, 0xc7, 0xc7, 0xc2, </div><div class='del'>-	0x42, 0xc2, 0xe2, 0xc3, 0xc7, 0xc4, 0xc7, 0xc7, </div><div class='del'>-	0xc4, 0xc2, 0xc7, 0xd6, 0xd7, 0x51, 0x50, 0x97, </div><div class='del'>-	0x82, 0x87, 0x87, 0x86, 0x87, 0x84, 0x84, 0x83, </div><div class='del'>-	0x82, 0x87, 0x82, 0x87, 0x82, 0x87, 0x87, 0x82, </div><div class='del'>-	0x02, 0x82, 0x82, 0x93, 0x97, 0x94, 0x97, 0xd7, </div><div class='del'>-	0x94, 0x92, 0x97, 0xd6, 0xd7, 0x51, 0x50, 0xf0, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m001[256] = {</div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, </div><div class='del'>-	0x0f, 0x2f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, </div><div class='del'>-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x2f, 0x0f, 0x2f, </div><div class='del'>-	0x2f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, </div><div class='del'>-	0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x2f, 0x0f, 0x0f, </div><div class='del'>-	0xff, 0x28, 0x6a, 0x6e, 0x72, 0x28, 0x72, 0x7f, </div><div class='del'>-	0x70, 0xfe, 0x28, 0x7a, 0x7a, 0x7f, 0x7e, 0x68, </div><div class='del'>-	0xfb, 0x7a, 0xea, 0x6a, 0x70, 0x7a, 0x7e, 0xfb, </div><div class='del'>-	0x70, 0x6a, 0x28, 0x7a, 0x62, 0x62, 0x62, 0x28, </div><div class='del'>-	0x2c, 0x3d, 0x3d, 0x2d, 0x7f, 0x6f, 0x6f, 0x3c, </div><div class='del'>-	0x2c, 0x7f, 0x2c, 0x3d, 0x2c, 0x3d, 0x3d, 0x2d, </div><div class='del'>-	0x29, 0x2c, 0x2c, 0x7f, 0x3d, 0x6f, 0x7f, 0x7a, </div><div class='del'>-	0x6f, 0x2c, 0x3d, 0x2d, 0x7f, 0x3d, 0x29, 0x7f, </div><div class='del'>-	0x2c, 0x3d, 0x3d, 0x2d, 0x7f, 0x6f, 0x6f, 0x3c, </div><div class='del'>-	0x2c, 0x7f, 0x2c, 0x3d, 0x2c, 0x3d, 0x3d, 0x2d, </div><div class='del'>-	0x29, 0x2c, 0x2c, 0x7f, 0x3d, 0x6f, 0x7f, 0xfa, </div><div class='del'>-	0x6f, 0x2c, 0x3d, 0x2d, 0x7f, 0x3d, 0x29, 0x2c, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m002[256] = {</div><div class='del'>-	0x1f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, </div><div class='del'>-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, </div><div class='del'>-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, </div><div class='del'>-	0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, 0x3f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, </div><div class='del'>-	0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x3f, 0x3f, </div><div class='del'>-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, </div><div class='del'>-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, </div><div class='del'>-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, </div><div class='del'>-	0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, 0x1e, </div><div class='del'>-	0x1f, 0x18, 0x58, 0x58, 0x18, 0x58, 0x18, 0x7c, </div><div class='del'>-	0x78, 0x19, 0x18, 0x1c, 0x58, 0x18, 0x18, 0x18, </div><div class='del'>-	0x79, 0x78, 0x19, 0x18, 0x78, 0x18, 0x78, 0x19, </div><div class='del'>-	0x18, 0x18, 0x18, 0x1c, 0x18, 0x18, 0x18, 0x18, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x02, 0x02, 0x1a, 0x1a, 0x18, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x79, </div><div class='del'>-	0x18, 0x18, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, 0x1a, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m010[256] = {</div><div class='del'>-	0x04, 0x04, 0x01, 0x01, 0x05, 0x05, 0x01, 0x01, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x05, 0x05, 0x01, 0x01, </div><div class='del'>-	0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, </div><div class='del'>-	0x05, 0x05, 0x01, 0x01, 0x02, 0x02, 0x82, 0x82, </div><div class='del'>-	0x02, 0x02, 0x04, 0x04, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x04, 0x04, </div><div class='del'>-	0x82, 0x82, 0x00, 0x00, 0x02, 0x02, 0x04, 0x04, </div><div class='del'>-	0x04, 0x01, 0x01, 0x04, 0x04, 0x01, 0x01, 0x00, </div><div class='del'>-	0x00, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, 0x01, </div><div class='del'>-	0x01, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, </div><div class='del'>-	0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x04, 0x04, </div><div class='del'>-	0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x83, 0x83, </div><div class='del'>-	0x05, 0x05, 0x01, 0x01, 0x01, 0x01, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x02, 0x02, 0x01, 0x01, </div><div class='del'>-	0x01, 0x01, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x01, 0x01, 0x03, 0x03, 0x05, 0x05, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m011[256] = {</div><div class='del'>-	0x43, 0x43, 0x10, 0x10, 0x53, 0x53, 0x52, 0x52, </div><div class='del'>-	0x00, 0x00, 0x04, 0x04, 0x53, 0x53, 0x10, 0x10, </div><div class='del'>-	0x11, 0x11, 0x43, 0x43, 0x00, 0x00, 0x43, 0x43, </div><div class='del'>-	0x53, 0x53, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x04, 0x04, 0x43, 0x43, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x01, 0x43, 0x43, 0x00, 0x00, 0x43, 0x43, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x43, 0x43, </div><div class='del'>-	0x01, 0x10, 0x10, 0x43, 0x43, 0x10, 0x10, 0x00, </div><div class='del'>-	0x00, 0x52, 0x52, 0x52, 0x52, 0x43, 0x43, 0x10, </div><div class='del'>-	0x10, 0x00, 0x01, 0x01, 0x43, 0x43, 0x00, 0x00, </div><div class='del'>-	0x10, 0x10, 0x28, 0x28, 0x10, 0x10, 0x42, 0x42, </div><div class='del'>-	0x10, 0x10, 0x52, 0x52, 0x00, 0x00, 0x10, 0x10, </div><div class='del'>-	0x7b, 0x7b, 0x10, 0x10, 0x10, 0x10, 0x01, 0x01, </div><div class='del'>-	0x01, 0x01, 0x43, 0x43, 0x00, 0x00, 0x10, 0x10, </div><div class='del'>-	0x10, 0x10, 0x43, 0x43, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x2c, 0x52, 0x52, 0x52, 0x52, 0x7b, 0x7b, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m020[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x03, 0x07, 0x00, 0x05, 0x00, 0x01, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m021[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x50, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x10, 0x50, 0x00, 0x50, 0x20, 0x10, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m022[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m030[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, </div><div class='del'>-	0x20, 0x20, 0x20, 0x00, 0x20, 0x00, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x00, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m032[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m040[256] = {</div><div class='del'>-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x00, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, </div><div class='del'>-	0x08, 0x08, 0x08, 0x08, 0x08, 0x00, 0x08, 0x08, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m041[256] = {</div><div class='del'>-	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m042[256] = {</div><div class='del'>-	0x00, 0x61, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, </div><div class='del'>-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, </div><div class='del'>-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, </div><div class='del'>-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, </div><div class='del'>-	0x61, 0x61, 0x61, 0x61, 0x61, 0x60, 0x61, 0x61, </div><div class='del'>-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, </div><div class='del'>-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, </div><div class='del'>-	0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, </div><div class='del'>-	0x00, 0x61, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m050[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, </div><div class='del'>-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, </div><div class='del'>-	0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, </div><div class='del'>-	0x40, 0x40, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m052[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x00, </div><div class='del'>-	0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, </div><div class='del'>-	0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m060[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, </div><div class='del'>-	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, </div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, </div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, </div><div class='del'>-	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, </div><div class='del'>-	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, </div><div class='del'>-	0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m0e2[256] = {</div><div class='del'>-	0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, </div><div class='del'>-	0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m102[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, </div><div class='del'>-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, </div><div class='del'>-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, </div><div class='del'>-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, </div><div class='del'>-	0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m1e1[256] = {</div><div class='del'>-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m200[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x40, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m201[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x70, 0x71, 0x00, 0x00, 0x00, </div><div class='del'>-	0x70, 0x72, 0x70, 0x00, 0x72, 0x72, 0x72, 0x00, </div><div class='del'>-	0x70, 0x70, 0xf0, 0x00, 0x00, 0x00, 0x70, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x70, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x78, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m202[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x64, 0x00, 0x00, 0x00, 0x04, 0x60, 0x40, 0x00, </div><div class='del'>-	0x78, 0x78, 0x00, 0x00, 0x60, 0x60, 0x18, 0x18, </div><div class='del'>-	0x60, 0x60, 0x01, 0x00, 0x00, 0x60, 0x64, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x40, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m210[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m211[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m212[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m221[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m222[256] = {</div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x61, 0x00, 0x00, 0x60, 0x60, 0x20, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x01, 0x01, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m231[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m232[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m242[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m251[256] = {</div><div class='del'>-	0x80, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x80, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m252[256] = {</div><div class='del'>-	0x61, 0x60, 0x61, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x61, 0x00, 0x00, 0x60, </div><div class='del'>-	0x61, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, </div><div class='del'>-	0x61, 0x00, 0x00, 0x60, 0x61, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x61, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x61, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, </div><div class='del'>-	0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, </div><div class='del'>-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, </div><div class='del'>-	0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, </div><div class='del'>-	0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x61, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m262[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m302[256] = {</div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x40, 0x20, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m322[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m332[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x20, 0x00, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x20, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m4e2[256] = {</div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x20, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m4f2[256] = {</div><div class='del'>-	0x20, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x20, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m502[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x20, 0x60, </div><div class='del'>-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m512[256] = {</div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x20, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m522[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x20, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m532[256] = {</div><div class='del'>-	0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x20, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m542[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m552[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m562[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m572[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x20, </div><div class='del'>-	0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m582[256] = {</div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m592[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x20, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m5a2[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m5b2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x20, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m5c2[256] = {</div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m5d2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x20, 0x20, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m5e2[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m5f2[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x20, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x20, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m602[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x20, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m612[256] = {</div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x20, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m622[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m632[256] = {</div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m642[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m652[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m662[256] = {</div><div class='del'>-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x60, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x20, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x20, 0x20, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m672[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m682[256] = {</div><div class='del'>-	0x00, 0x20, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x20, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x20, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x20, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m692[256] = {</div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m6a2[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m6b2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x20, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m6c2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x20, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m6d2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x20, 0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m6e2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x20, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x20, 0x60, 0x00, 0x20, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m6f2[256] = {</div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m702[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m712[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m722[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x20, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m732[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m742[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x20, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, </div><div class='del'>-	0x00, 0x20, 0x20, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m752[256] = {</div><div class='del'>-	0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m762[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x20, 0x20, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m772[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m782[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m792[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m7a2[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x20, </div><div class='del'>-	0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m7b2[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m7c2[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m7d2[256] = {</div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x20, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m7e2[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m7f2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m802[256] = {</div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m812[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m822[256] = {</div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m832[256] = {</div><div class='del'>-	0x00, 0x20, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m842[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m852[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x20, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x20, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m862[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m872[256] = {</div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m882[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x20, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m892[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m8a2[256] = {</div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x20, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x20, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x20, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x20, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m8b2[256] = {</div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m8c2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m8d2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x20, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m8e2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m8f2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m902[256] = {</div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x20, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m912[256] = {</div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, </div><div class='del'>-	0x60, 0x00, 0x20, 0x60, 0x60, 0x60, 0x20, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x20, 0x20, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m922[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x20, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x20, 0x20, 0x00, 0x20, 0x00, 0x00, 0x60, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x60, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x20, 0x00, 0x60, 0x20, 0x00, 0x20, 0x00, 0x20, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x20, 0x60, 0x20, 0x60, 0x00, 0x00, 0x20, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m932[256] = {</div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x20, 0x20, 0x00, </div><div class='del'>-	0x60, 0x20, 0x60, 0x60, 0x00, 0x20, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x20, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m942[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x20, 0x00, 0x00, </div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m952[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x20, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m962[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x20, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m972[256] = {</div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x20, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x20, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x20, 0x00, 0x20, </div><div class='del'>-	0x00, 0x20, 0x60, 0x00, 0x00, 0x20, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m982[256] = {</div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x20, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m992[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x20, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m9a2[256] = {</div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x20, 0x00, 0x00, 0x20, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m9b2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x20, 0x00, 0x60, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x20, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m9c2[256] = {</div><div class='del'>-	0x20, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m9d2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x20, 0x60, 0x00, 0x00, 0x60, </div><div class='del'>-	0x20, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m9e2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x20, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x60, 0x60, 0x60, 0x60, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x60, 0x00, 0x60, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char m9f2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x60, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x60, 0x00, 0x00, 0x60, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x60, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x60, 0x00, 0x00, 0x00, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x60, 0x60, 0x00, 0x00, </div><div class='del'>-	0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char mf02[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char mf92[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char mfa2[256] = {</div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, </div><div class='del'>-	0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned char mff2[256] = {</div><div class='del'>-	0x00, 0x60, 0x20, 0x60, 0x60, 0x60, 0x60, 0x20, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x20, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x00, </div><div class='del'>-	0x00, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x20, 0x20, 0x20, 0x60, 0x20, 0x60, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	unsigned char *bits0;</div><div class='del'>-	unsigned char *bits1;</div><div class='del'>-	unsigned char *bits2;</div><div class='del'>-} camel_charmap[256] = {</div><div class='del'>-	{ m000, m001, m002, }, { m010, m011, 0, }, { m020, m021, m022, }, { m030, 0, m032, }, { m040, m041, m042, }, { m050, 0, m052, }, { m060, 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, 0, 0, }, { 0, 0, m0e2, }, { 0, 0, 0, }, </div><div class='del'>-	{ 0, 0, m102, }, { 0, 0, 0, }, { 0, 0, 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, 0, 0, }, { 0, m1e1, 0, }, { 0, 0, 0, }, </div><div class='del'>-	{ m200, m201, m202, }, { m210, m211, m212, }, { 0, m221, m222, }, { 0, m231, m232, }, { 0, 0, m242, }, { 0, m251, m252, }, { 0, 0, m262, }, { 0, 0, 0, }, </div><div class='del'>-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, </div><div class='del'>-	{ 0, 0, m302, }, { 0, 0, 0, }, { 0, 0, m322, }, { 0, 0, m332, }, { 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, 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, 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, 0, 0, }, { 0, 0, m4e2, }, { 0, 0, m4f2, }, </div><div class='del'>-	{ 0, 0, m502, }, { 0, 0, m512, }, { 0, 0, m522, }, { 0, 0, m532, }, { 0, 0, m542, }, { 0, 0, m552, }, { 0, 0, m562, }, { 0, 0, m572, }, </div><div class='del'>-	{ 0, 0, m582, }, { 0, 0, m592, }, { 0, 0, m5a2, }, { 0, 0, m5b2, }, { 0, 0, m5c2, }, { 0, 0, m5d2, }, { 0, 0, m5e2, }, { 0, 0, m5f2, }, </div><div class='del'>-	{ 0, 0, m602, }, { 0, 0, m612, }, { 0, 0, m622, }, { 0, 0, m632, }, { 0, 0, m642, }, { 0, 0, m652, }, { 0, 0, m662, }, { 0, 0, m672, }, </div><div class='del'>-	{ 0, 0, m682, }, { 0, 0, m692, }, { 0, 0, m6a2, }, { 0, 0, m6b2, }, { 0, 0, m6c2, }, { 0, 0, m6d2, }, { 0, 0, m6e2, }, { 0, 0, m6f2, }, </div><div class='del'>-	{ 0, 0, m702, }, { 0, 0, m712, }, { 0, 0, m722, }, { 0, 0, m732, }, { 0, 0, m742, }, { 0, 0, m752, }, { 0, 0, m762, }, { 0, 0, m772, }, </div><div class='del'>-	{ 0, 0, m782, }, { 0, 0, m792, }, { 0, 0, m7a2, }, { 0, 0, m7b2, }, { 0, 0, m7c2, }, { 0, 0, m7d2, }, { 0, 0, m7e2, }, { 0, 0, m7f2, }, </div><div class='del'>-	{ 0, 0, m802, }, { 0, 0, m812, }, { 0, 0, m822, }, { 0, 0, m832, }, { 0, 0, m842, }, { 0, 0, m852, }, { 0, 0, m862, }, { 0, 0, m872, }, </div><div class='del'>-	{ 0, 0, m882, }, { 0, 0, m892, }, { 0, 0, m8a2, }, { 0, 0, m8b2, }, { 0, 0, m8c2, }, { 0, 0, m8d2, }, { 0, 0, m8e2, }, { 0, 0, m8f2, }, </div><div class='del'>-	{ 0, 0, m902, }, { 0, 0, m912, }, { 0, 0, m922, }, { 0, 0, m932, }, { 0, 0, m942, }, { 0, 0, m952, }, { 0, 0, m962, }, { 0, 0, m972, }, </div><div class='del'>-	{ 0, 0, m982, }, { 0, 0, m992, }, { 0, 0, m9a2, }, { 0, 0, m9b2, }, { 0, 0, m9c2, }, { 0, 0, m9d2, }, { 0, 0, m9e2, }, { 0, 0, m9f2, }, </div><div class='del'>-	{ 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 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, 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, 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, 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, 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, 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, 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, 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, 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, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, </div><div class='del'>-	{ 0, 0, mf02, }, { 0, 0, 0, }, { 0, 0, 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, mf92, }, { 0, 0, mfa2, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, 0, }, { 0, 0, mff2, }, </div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	const char *name;</div><div class='del'>-	unsigned int bit;</div><div class='del'>-} camel_charinfo[] = {</div><div class='del'>-	{ "iso-8859-2", 0x0001 },</div><div class='del'>-	{ "iso-8859-3", 0x0002 },</div><div class='del'>-	{ "iso-8859-4", 0x0004 },</div><div class='del'>-	{ "iso-8859-5", 0x0008 },</div><div class='del'>-	{ "iso-8859-6", 0x0010 },</div><div class='del'>-	{ "iso-8859-7", 0x0020 },</div><div class='del'>-	{ "iso-8859-8", 0x0040 },</div><div class='del'>-	{ "iso-8859-9", 0x0080 },</div><div class='del'>-	{ "iso-8859-10", 0x0100 },</div><div class='del'>-	{ "iso-8859-13", 0x0200 },</div><div class='del'>-	{ "iso-8859-14", 0x0400 },</div><div class='del'>-	{ "iso-8859-15", 0x0800 },</div><div class='del'>-	{ "windows-1250", 0x1000 },</div><div class='del'>-	{ "windows-1252", 0x2000 },</div><div class='del'>-	{ "windows-1257", 0x4000 },</div><div class='del'>-	{ "koi8-r", 0x8000 },</div><div class='del'>-	{ "koi8-u", 0x10000 },</div><div class='del'>-	{ "tis620.2533-1", 0x20000 },</div><div class='del'>-	{ "armscii-8", 0x40000 },</div><div class='del'>-	{ "georgian-academy", 0x80000 },</div><div class='del'>-	{ "georgian-ps", 0x100000 },</div><div class='del'>-	{ "CP932", 0x200000 },</div><div class='del'>-	{ "Shift-JIS", 0x400000 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define charset_mask(x) \</div><div class='del'>-	(camel_charmap[(x)&gt;&gt;8].bits0?camel_charmap[(x)&gt;&gt;8].bits0[(x)&amp;0xff]&lt;&lt;0:0)	\</div><div class='del'>-	| (camel_charmap[(x)&gt;&gt;8].bits1?camel_charmap[(x)&gt;&gt;8].bits1[(x)&amp;0xff]&lt;&lt;8:0)	\</div><div class='del'>-	| (camel_charmap[(x)&gt;&gt;8].bits2?camel_charmap[(x)&gt;&gt;8].bits2[(x)&amp;0xff]&lt;&lt;16:0)</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-charset-map.c b/camel/camel-charset-map.c<br/>deleted file mode 100644<br/>index c0b697290b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-charset-map.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-charset-map.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,270 +0,0 @@</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  if you want to build the charset map, add the root directory of</div><div class='del'>-  libunicode to the include path and define BUILD_MAP,</div><div class='del'>-  then run it as </div><div class='del'>-    ./a.out &gt; camel-charset-map-private.h</div><div class='del'>-</div><div class='del'>-  The tables genereated work like this:</div><div class='del'>-</div><div class='del'>-   An indirect array for each page of unicode character</div><div class='del'>-   Each array element has an indirect pointer to one of the bytes of</div><div class='del'>-   the generated bitmask.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifdef BUILD_MAP</div><div class='del'>-#include "iso/iso8859-2.h"</div><div class='del'>-#include "iso/iso8859-3.h"</div><div class='del'>-#include "iso/iso8859-4.h"</div><div class='del'>-#include "iso/iso8859-5.h"</div><div class='del'>-#include "iso/iso8859-6.h"</div><div class='del'>-#include "iso/iso8859-7.h"</div><div class='del'>-#include "iso/iso8859-8.h"</div><div class='del'>-#include "iso/iso8859-9.h"</div><div class='del'>-#include "iso/iso8859-10.h"</div><div class='del'>-#include "iso/iso8859-13.h"</div><div class='del'>-#include "iso/iso8859-14.h"</div><div class='del'>-#include "iso/iso8859-15.h"</div><div class='del'>-#include "iso/windows-1250.h"</div><div class='del'>-#include "iso/windows-1252.h"</div><div class='del'>-#include "iso/windows-1257.h"</div><div class='del'>-#include "iso/koi8-r.h"</div><div class='del'>-#include "iso/koi8-u.h"</div><div class='del'>-#include "iso/tis620.2533-1.h"</div><div class='del'>-#include "iso/armscii-8.h"</div><div class='del'>-#include "iso/georgian-academy.h"</div><div class='del'>-#include "iso/georgian-ps.h"</div><div class='del'>-#include "msft/cp932.h"</div><div class='del'>-#include "jis/shiftjis.h"</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	unsigned short *table;</div><div class='del'>-	char *name;</div><div class='del'>-	int type;		/* type of table */</div><div class='del'>-	unsigned int bit;	/* assigned bit */</div><div class='del'>-} tables[] = {</div><div class='del'>-	{ iso8859_2_table, "iso-8859-2", 0, 0} ,</div><div class='del'>-	{ iso8859_3_table, "iso-8859-3", 0, 0} ,</div><div class='del'>-	{ iso8859_4_table, "iso-8859-4", 0, 0},</div><div class='del'>-	{ iso8859_5_table, "iso-8859-5", 0, 0},</div><div class='del'>-/* apparently -6 has special digits? */</div><div class='del'>-	{ iso8859_6_table, "iso-8859-6", 0, 0},</div><div class='del'>-	{ iso8859_7_table, "iso-8859-7", 0, 0},</div><div class='del'>-	{ iso8859_8_table, "iso-8859-8", 0, 0},</div><div class='del'>-	{ iso8859_9_table, "iso-8859-9", 0, 0},</div><div class='del'>-	{ iso8859_10_table, "iso-8859-10", 0, 0},</div><div class='del'>-	{ iso8859_13_table, "iso-8859-13", 0, 0},</div><div class='del'>-	{ iso8859_14_table, "iso-8859-14", 0, 0},</div><div class='del'>-	{ iso8859_15_table, "iso-8859-15", 0, 0},</div><div class='del'>-	{ windows_1250_table, "windows-1250", 0, 0},</div><div class='del'>-	{ windows_1252_table, "windows-1252", 0, 0},</div><div class='del'>-	{ windows_1257_table, "windows-1257", 0, 0},</div><div class='del'>-	{ koi8_r_table, "koi8-r", 0, 0},</div><div class='del'>-	{ koi8_u_table, "koi8-u", 0, 0},</div><div class='del'>-	{ tis_620_table, "tis620.2533-1", 0, 0},</div><div class='del'>-	{ armscii_8_table, "armscii-8", 0, 0},</div><div class='del'>-	{ georgian_academy_table, "georgian-academy", 0, 0},</div><div class='del'>-	{ georgian_ps_table, "georgian-ps", 0, 0},</div><div class='del'>-	{ cp932_table, "CP932", 1, 0},</div><div class='del'>-	{ sjis_table, "Shift-JIS", 1, 0},</div><div class='del'>-	{ 0, 0}</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-unsigned int encoding_map[256 * 256];</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_bigmap(unsigned short **table, int bit)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int j;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		unsigned short *tab = table[i];</div><div class='del'>-		if (tab) {</div><div class='del'>-			for (j=0;j&lt;256;j++) {</div><div class='del'>-				if (tab[j])</div><div class='del'>-					encoding_map[tab[j]] |= 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'>-void main(void)</div><div class='del'>-{</div><div class='del'>-	int i, j;</div><div class='del'>-	unsigned short *tab;</div><div class='del'>-	int max, min;</div><div class='del'>-	int bit = 0x01;</div><div class='del'>-	int k;</div><div class='del'>-	int bytes;</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	/* iso-latin-1 (not needed-detected in code) */</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		encoding_map[i] |= bit;</div><div class='del'>-	}</div><div class='del'>-	bit &lt;&lt;= 1;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* dont count the terminator */</div><div class='del'>-	bytes = ((sizeof(tables)/sizeof(tables[0]))+7-1)/8;</div><div class='del'>-</div><div class='del'>-	/* the other latin charsets */</div><div class='del'>-	for (j=0;tables[j].table;j++) {</div><div class='del'>-		switch (tables[j].type) {</div><div class='del'>-		case 0:		/* table from 128-256 */</div><div class='del'>-			tab = tables[j].table;</div><div class='del'>-			for (i=0;i&lt;128;i++) {</div><div class='del'>-				/* 0-127 is the common */</div><div class='del'>-				encoding_map[i] |= bit;</div><div class='del'>-				encoding_map[tab[i]] |= bit;</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case 1:		/* sparse table */</div><div class='del'>-			add_bigmap(tables[j].table, bit);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		tables[j].bit = bit;</div><div class='del'>-		bit &lt;&lt;= 1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("/* This file is automatically generated: DO NOT EDIT */\n\n");</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		/* first, do we need this block? */</div><div class='del'>-		for (k=0;k&lt;bytes;k++) {</div><div class='del'>-			for (j=0;j&lt;256;j++) {</div><div class='del'>-				if ((encoding_map[i*256 + j] &amp; (0xff &lt;&lt; (k*8))) != 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (j &lt; 256) {</div><div class='del'>-				/* yes, dump it */</div><div class='del'>-				printf("static unsigned char m%02x%x[256] = {\n\t", i, k);</div><div class='del'>-				for (j=0;j&lt;256;j++) {</div><div class='del'>-					printf("0x%02x, ", (encoding_map[i*256+j] &gt;&gt; (k*8)) &amp; 0xff );</div><div class='del'>-					if (((j+1)&amp;7) == 0 &amp;&amp; j&lt;255)</div><div class='del'>-						printf("\n\t");</div><div class='del'>-				}</div><div class='del'>-				printf("\n};\n\n");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("struct {\n");</div><div class='del'>-	for (k=0;k&lt;bytes;k++) {</div><div class='del'>-		printf("\tunsigned char *bits%d;\n", k);</div><div class='del'>-	}</div><div class='del'>-	printf("} camel_charmap[256] = {\n\t");</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		/* first, do we need this block? */</div><div class='del'>-		printf("{ ");</div><div class='del'>-		for (k=0;k&lt;bytes;k++) {</div><div class='del'>-			for (j=0;j&lt;256;j++) {</div><div class='del'>-				if ((encoding_map[i*256 + j] &amp; (0xff &lt;&lt; (k*8))) != 0)</div><div class='del'>-					break;</div><div class='del'>-			}</div><div class='del'>-			if (j &lt; 256) {</div><div class='del'>-				printf("m%02x%x, ", i, k);</div><div class='del'>-			} else {</div><div class='del'>-				printf("0, ");</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		printf("}, ");</div><div class='del'>-		if (((i+1)&amp;7) == 0 &amp;&amp; i&lt;255)</div><div class='del'>-			printf("\n\t");</div><div class='del'>-	}</div><div class='del'>-	printf("\n};\n\n");</div><div class='del'>-</div><div class='del'>-	printf("struct {\n\tconst char *name;\n\tunsigned int bit;\n} camel_charinfo[] = {\n");</div><div class='del'>-	for (j=0;tables[j].table;j++) {</div><div class='del'>-		printf("\t{ \"%s\", 0x%04x },\n", tables[j].name, tables[j].bit);</div><div class='del'>-	}</div><div class='del'>-	printf("};\n\n");</div><div class='del'>-</div><div class='del'>-	printf("#define charset_mask(x) \\\n");</div><div class='del'>-	for (k=0;k&lt;bytes;k++) {</div><div class='del'>-		if (k!=0)</div><div class='del'>-			printf("\t| ");</div><div class='del'>-		else</div><div class='del'>-			printf("\t");</div><div class='del'>-		printf("(camel_charmap[(x)&gt;&gt;8].bits%d?camel_charmap[(x)&gt;&gt;8].bits%d[(x)&amp;0xff]&lt;&lt;%d:0)", k, k, k*8);</div><div class='del'>-		if (k&lt;bytes-1)</div><div class='del'>-			printf("\t\\\n");</div><div class='del'>-	}</div><div class='del'>-	printf("\n\n");</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-#include "camel-charset-map-private.h"</div><div class='del'>-#include &lt;unicode.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-unsigned int</div><div class='del'>-camel_charset_mask(unsigned int c)</div><div class='del'>-{</div><div class='del'>-	if (c&gt;0xffff)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return charset_mask(c);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* gets the best charset from the mask of chars in it */</div><div class='del'>-const char *</div><div class='del'>-camel_charset_best_mask(unsigned int mask)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;sizeof(camel_charinfo)/sizeof(camel_charinfo[0]);i++) {</div><div class='del'>-		if (camel_charinfo[i].bit &amp; mask)</div><div class='del'>-			return camel_charinfo[i].name;</div><div class='del'>-	}</div><div class='del'>-	return "UTF-8";</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* finds the minimum charset for this string NULL means US-ASCII */</div><div class='del'>-const char *</div><div class='del'>-camel_charset_best(const char *in, int len)</div><div class='del'>-{</div><div class='del'>-	unsigned int mask = ~0;</div><div class='del'>-	int level = 0;</div><div class='del'>-	const char *inptr = in, *inend = in+len;</div><div class='del'>-</div><div class='del'>-	/* check what charset a given string will fit in */</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		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'>-			inptr++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-		inptr = newinptr;</div><div class='del'>-		if (c&lt;=0xffff) {</div><div class='del'>-			mask |= camel_charset_mask(c);</div><div class='del'>-		</div><div class='del'>-			if (c&gt;=128 &amp;&amp; c&lt;256)</div><div class='del'>-				level = MAX(level, 1);</div><div class='del'>-			else if (c&gt;=256)</div><div class='del'>-				level = MAX(level, 2);</div><div class='del'>-		} else {</div><div class='del'>-			mask = 0;</div><div class='del'>-			level = MAX(level, 2);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (level == 1)</div><div class='del'>-		return "ISO-8859-1";</div><div class='del'>-	else if (level == 2)</div><div class='del'>-		return camel_charset_best_mask(mask);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* !BUILD_MAP */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-charset-map.h b/camel/camel-charset-map.h<br/>deleted file mode 100644<br/>index d5ce0799b8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-charset-map.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-charset-map.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +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_CHARSET_MAP_H</div><div class='del'>-#define _CAMEL_CHARSET_MAP_H</div><div class='del'>-</div><div class='del'>-unsigned int camel_charset_mask(unsigned int c);</div><div class='del'>-const char *camel_charset_best(const char *in, int len);</div><div class='del'>-const char *camel_charset_best_mask(unsigned int mask);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_CHARSET_MAP_H */</div><div class='head'>diff --git a/camel/camel-data-wrapper.c b/camel/camel-data-wrapper.c<br/>deleted file mode 100644<br/>index 52cf60bd33..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-data-wrapper.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-data-wrapper.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,270 +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 (CAMEL_OBJECT_GET_CLASS(so))</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'>-</div><div class='del'>-static void</div><div class='del'>-camel_data_wrapper_class_init (CamelDataWrapperClass *camel_data_wrapper_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream = write_to_stream;</div><div class='del'>-	camel_data_wrapper_class-&gt;set_mime_type = set_mime_type;</div><div class='del'>-	camel_data_wrapper_class-&gt;get_mime_type = get_mime_type;</div><div class='del'>-	camel_data_wrapper_class-&gt;get_mime_type_field = get_mime_type_field;</div><div class='del'>-	camel_data_wrapper_class-&gt;set_mime_type_field = set_mime_type_field;</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_class-&gt;construct_from_stream = construct_from_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_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'>-static void</div><div class='del'>-camel_data_wrapper_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *camel_data_wrapper = CAMEL_DATA_WRAPPER (object);</div><div class='del'>-</div><div class='del'>-	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'>-		camel_object_unref (CAMEL_OBJECT (camel_data_wrapper-&gt;stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_data_wrapper_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_data_wrapper_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_data_wrapper_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_data_wrapper_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelDataWrapper",</div><div class='del'>-							       sizeof (CamelDataWrapper),</div><div class='del'>-							       sizeof (CamelDataWrapperClass),</div><div class='del'>-							       (CamelObjectClassInitFunc) camel_data_wrapper_class_init,</div><div class='del'>-							       NULL,</div><div class='del'>-							       (CamelObjectInitFunc) camel_data_wrapper_init,</div><div class='del'>-							       (CamelObjectFinalizeFunc) camel_data_wrapper_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_data_wrapper_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-write_to_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	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 *)camel_object_new(camel_data_wrapper_get_type());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_write_to_stream:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- * @stream: stream for data to be written to</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Writes the data content to @stream in a machine-independent format</div><div class='del'>- * appropriate for the data. It should be possible to construct an</div><div class='del'>- * equivalent data wrapper object later by passing this stream to</div><div class='del'>- * camel_data_construct_from_stream().</div><div class='del'>- *</div><div class='del'>- * Return value: the number of bytes written, or -1 if an error occurs.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_data_wrapper_write_to_stream (CamelDataWrapper *data_wrapper,</div><div class='del'>-				    CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CDW_CLASS (data_wrapper)-&gt;write_to_stream (data_wrapper, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-construct_from_stream (CamelDataWrapper *data_wrapper, CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	if (data_wrapper-&gt;stream)</div><div class='del'>-		camel_object_unref((CamelObject *)data_wrapper-&gt;stream);</div><div class='del'>-</div><div class='del'>-	data_wrapper-&gt;stream = stream;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (stream));</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_data_wrapper_construct_from_stream:</div><div class='del'>- * @data_wrapper: a data wrapper</div><div class='del'>- * @stream: A stream that can be read from.</div><div class='del'>- *</div><div class='del'>- * Constructs the content of the data wrapper from the</div><div class='del'>- * supplied @stream.</div><div class='del'>- *</div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_data_wrapper_construct_from_stream (CamelDataWrapper *data_wrapper,</div><div class='del'>-					  CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_DATA_WRAPPER (data_wrapper), -1);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CDW_CLASS (data_wrapper)-&gt;construct_from_stream (data_wrapper, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_mime_type (CamelDataWrapper *data_wrapper, const gchar *mime_type)</div><div class='del'>-{</div><div class='del'>-	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 ff4dda649f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-data-wrapper.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-data-wrapper.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'>-/* 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)     (CAMEL_CHECK_CAST((obj), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapper))</div><div class='del'>-#define CAMEL_DATA_WRAPPER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_DATA_WRAPPER_TYPE, CamelDataWrapperClass))</div><div class='del'>-#define CAMEL_IS_DATA_WRAPPER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_DATA_WRAPPER_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelDataWrapper</div><div class='del'>-{</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</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 Camel function */</div><div class='del'>-CamelType camel_data_wrapper_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelDataWrapper *  camel_data_wrapper_new(void);</div><div class='del'>-int                 camel_data_wrapper_write_to_stream          (CamelDataWrapper *data_wrapper,</div><div class='del'>-								 CamelStream *stream);</div><div class='del'>-void                camel_data_wrapper_set_mime_type            (CamelDataWrapper *data_wrapper,</div><div class='del'>-								 const gchar *mime_type);</div><div class='del'>-gchar *             camel_data_wrapper_get_mime_type            (CamelDataWrapper *data_wrapper);</div><div class='del'>-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, 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 8fe1e268cf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-exception-list.def?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-exception-list.def</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/* WARNING: Exceptions MUST NOT be renumbered: they need to be</div><div class='del'>- * consistent across libraries compiled at different times.</div><div class='del'>- * Categories should be widely separated, old unused exceptions can</div><div class='del'>- * never be deleted, and new exceptions can be added only to the</div><div class='del'>- * ends of categories.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-CAMEL_EXCEPTION_NONE = 0,</div><div class='del'>-</div><div class='del'>-/* Generic exceptions */</div><div class='del'>-CAMEL_EXCEPTION_INVALID_PARAM,</div><div class='del'>-CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-</div><div class='del'>-/* CamelFolderException */</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_NULL = 100,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INVALID_STATE,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_NON_EMPTY,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_NON_UID,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INVALID_PATH,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-CAMEL_EXCEPTION_FOLDER_SUMMARY_INVALID,</div><div class='del'>-</div><div class='del'>-/* CamelStoreException */</div><div class='del'>-CAMEL_EXCEPTION_STORE_NULL = 200,</div><div class='del'>-CAMEL_EXCEPTION_STORE_INVALID,</div><div class='del'>-CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-</div><div class='del'>-/* CamelServiceException */</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_NULL = 300,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_INVALID,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_URL_INVALID,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED</div><div class='head'>diff --git a/camel/camel-exception.c b/camel/camel-exception.c<br/>deleted file mode 100644<br/>index cf5daff9d3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-exception.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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-search.c b/camel/camel-folder-search.c<br/>deleted file mode 100644<br/>index ff9539c9ec..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-search.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-folder-search.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,731 +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'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;regex.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include "camel-folder-search.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-medium.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "gmime-content-field.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-#define r(x) 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'>-static ESExpResult *search_user_tag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_get_sent_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_get_received_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-static ESExpResult *search_get_current_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-static ESExpResult *search_dummy(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search);</div><div class='del'>-</div><div class='del'>-static void camel_folder_search_class_init (CamelFolderSearchClass *klass);</div><div class='del'>-static void camel_folder_search_init       (CamelFolderSearch *obj);</div><div class='del'>-static void camel_folder_search_finalize   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_folder_search_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_search_class_init (CamelFolderSearchClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_folder_search_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	klass-&gt;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_tag = search_user_tag;</div><div class='del'>-	klass-&gt;user_flag = search_user_flag;</div><div class='del'>-	klass-&gt;get_sent_date = search_get_sent_date;</div><div class='del'>-	klass-&gt;get_received_date = search_get_received_date;</div><div class='del'>-	klass-&gt;get_current_date = search_get_current_date;</div><div class='del'>-}</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_finalize (CamelObject *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'>-		camel_object_unref((CamelObject *)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'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_folder_search_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelFolderSearch",</div><div class='del'>-					    sizeof (CamelFolderSearch),</div><div class='del'>-					    sizeof (CamelFolderSearchClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_folder_search_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_folder_search_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_folder_search_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef offsetof</div><div class='del'>-#define CAMEL_STRUCT_OFFSET(type, field)        ((gint) offsetof (type, field))</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_STRUCT_OFFSET(type, field)        ((gint) ((gchar*) &amp;((type *) 0)-&gt;field))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct {</div><div class='del'>-	char *name;</div><div class='del'>-	int offset;</div><div class='del'>-	int flags;		/* 0x02 = immediate, 0x01 = always enter */</div><div class='del'>-} builtins[] = {</div><div class='del'>-	/* these have default implementations in e-sexp */</div><div class='del'>-	{ "and", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, and), 2 },</div><div class='del'>-	{ "or", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, or), 2 },</div><div class='del'>-	{ "not", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, not), 2 },</div><div class='del'>-	{ "&lt;", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, lt), 2 },</div><div class='del'>-	{ "&gt;", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, gt), 2 },</div><div class='del'>-	{ "=", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, eq), 2 },</div><div class='del'>-</div><div class='del'>-	/* these we have to use our own default if there is none */</div><div class='del'>-	/* they should all be defined in the language? so it poarses, or should they not?? */</div><div class='del'>-	{ "match-all", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, match_all), 3 },</div><div class='del'>-	{ "body-contains", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, body_contains), 1 },</div><div class='del'>-	{ "header-contains", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, header_contains), 1 },</div><div class='del'>-	{ "user-tag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_tag), 1 },</div><div class='del'>-	{ "user-flag", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, user_flag), 1 },</div><div class='del'>-	{ "get-sent-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_sent_date), 1 },</div><div class='del'>-	{ "get-received-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_received_date), 1 },</div><div class='del'>-	{ "get-current-date", CAMEL_STRUCT_OFFSET(CamelFolderSearchClass, get_current_date), 1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_folder_search_construct (CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelFolderSearchClass *klass = (CamelFolderSearchClass *)CAMEL_OBJECT_GET_CLASS(search);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;sizeof(builtins)/sizeof(builtins[0]);i++) {</div><div class='del'>-		void *func;</div><div class='del'>-		/* c is sure messy sometimes */</div><div class='del'>-		func = *((void **)(((char *)klass)+builtins[i].offset));</div><div class='del'>-		if (func == NULL &amp;&amp; builtins[i].flags&amp;1) {</div><div class='del'>-			g_warning("Search class doesn't implement '%s' method: %s", builtins[i].name, camel_type_to_name(CAMEL_OBJECT_GET_CLASS(search)-&gt;s.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 ( camel_object_new (camel_folder_search_get_type ()));</div><div class='del'>-</div><div class='del'>-	camel_folder_search_construct(new);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_set_folder:</div><div class='del'>- * @search:</div><div class='del'>- * @folder: A folder.</div><div class='del'>- * </div><div class='del'>- * Set the folder attribute of the search.  This is currently unused, but</div><div class='del'>- * could be used to perform a slow-search when indexes and so forth are not</div><div class='del'>- * available.  Or for use by subclasses.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_search_set_folder(CamelFolderSearch *search, CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	search-&gt;folder = folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_set_summary:</div><div class='del'>- * @search: </div><div class='del'>- * @summary: An array of CamelMessageInfo pointers.</div><div class='del'>- * </div><div class='del'>- * Set the array of summary objects representing the span of the search.</div><div class='del'>- *</div><div class='del'>- * If this is not set, then a subclass must provide the functions</div><div class='del'>- * for searching headers and for the match-all operator.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_search_set_summary(CamelFolderSearch *search, GPtrArray *summary)</div><div class='del'>-{</div><div class='del'>-	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 an array of</div><div class='del'>- * all matches as a GPtrArray of uid's of matching messages.</div><div class='del'>- *</div><div class='del'>- * Note that any settings such as set_body_index(), set_folder(),</div><div class='del'>- * and so on are reset to #NULL once the search has completed.</div><div class='del'>- *</div><div class='del'>- * TODO: The interface should probably return summary items instead</div><div class='del'>- * (since they are much more useful to any client).</div><div class='del'>- * </div><div class='del'>- * Return value: A GPtrArray of strings of all matching messages.</div><div class='del'>- * This must only be freed by camel_folder_search_free_result.</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	GPtrArray *matches = g_ptr_array_new ();</div><div class='del'>-	int i;</div><div class='del'>-	GHashTable *results;</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'>-		if (search-&gt;summary) {</div><div class='del'>-			/* reorder result in summary order */</div><div class='del'>-			results = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-			for (i=0;i&lt;r-&gt;value.ptrarray-&gt;len;i++) {</div><div class='del'>-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r-&gt;value.ptrarray, i)));</div><div class='del'>-				g_hash_table_insert(results, g_ptr_array_index(r-&gt;value.ptrarray, i), (void *)1);</div><div class='del'>-			}</div><div class='del'>-			for (i=0;i&lt;search-&gt;summary-&gt;len;i++) {</div><div class='del'>-				CamelMessageInfo *info = g_ptr_array_index(search-&gt;summary, i);</div><div class='del'>-				if (g_hash_table_lookup(results, info-&gt;uid)) {</div><div class='del'>-					g_ptr_array_add(matches, g_strdup(info-&gt;uid));</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			g_hash_table_destroy(results);</div><div class='del'>-		} else {</div><div class='del'>-			for (i=0;i&lt;r-&gt;value.ptrarray-&gt;len;i++) {</div><div class='del'>-				d(printf("adding match: %s\n", (char *)g_ptr_array_index(r-&gt;value.ptrarray, i)));</div><div class='del'>-				g_ptr_array_add(matches, g_strdup(g_ptr_array_index(r-&gt;value.ptrarray, i)));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(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'>-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *result)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;result-&gt;len;i++)</div><div class='del'>-		g_free(g_ptr_array_index(result, i));</div><div class='del'>-	g_ptr_array_free(result, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 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;to;</div><div class='del'>-		} else if (!strcasecmp(headername, "cc")) {</div><div class='del'>-			header = search-&gt;current-&gt;cc;</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; e_utf8_strstrcase (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'>-/* performs a 'slow' content-based match */</div><div class='del'>-static gboolean</div><div class='del'>-message_body_contains(CamelDataWrapper *object, regex_t *pattern)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper *containee;</div><div class='del'>-	int truth = FALSE;</div><div class='del'>-	int parts, i;</div><div class='del'>-</div><div class='del'>-	containee = camel_medium_get_content_object(CAMEL_MEDIUM(object));</div><div class='del'>-</div><div class='del'>-	if (containee == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* TODO: I find it odd that get_part and get_content_object do not</div><div class='del'>-	   add a reference, probably need fixing for multithreading */</div><div class='del'>-</div><div class='del'>-	/* using the object types is more accurate than using the mime/types */</div><div class='del'>-	if (CAMEL_IS_MULTIPART(containee)) {</div><div class='del'>-		parts = camel_multipart_get_number(CAMEL_MULTIPART(containee));</div><div class='del'>-		for (i=0;i&lt;parts &amp;&amp; truth==FALSE;i++) {</div><div class='del'>-			CamelDataWrapper *part = (CamelDataWrapper *)camel_multipart_get_part(CAMEL_MULTIPART(containee), i);</div><div class='del'>-			if (part) {</div><div class='del'>-				truth = message_body_contains(part, pattern);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else if (CAMEL_IS_MIME_MESSAGE(containee)) {</div><div class='del'>-		/* for messages we only look at its contents */</div><div class='del'>-		truth = message_body_contains((CamelDataWrapper *)containee, pattern);</div><div class='del'>-	} else if (gmime_content_field_is_type(CAMEL_DATA_WRAPPER(containee)-&gt;mime_type, "text", "*")) {</div><div class='del'>-		/* for all other text parts, we look inside, otherwise we dont care */</div><div class='del'>-		CamelStreamMem *mem = (CamelStreamMem *)camel_stream_mem_new();</div><div class='del'>-</div><div class='del'>-		camel_data_wrapper_write_to_stream(containee, (CamelStream *)mem);</div><div class='del'>-		camel_stream_write((CamelStream *)mem, "", 1);</div><div class='del'>-		truth = regexec(pattern, mem-&gt;buffer-&gt;data, 0, NULL, 0) == 0;</div><div class='del'>-		camel_object_unref((CamelObject *)mem);</div><div class='del'>-	}</div><div class='del'>-	return truth;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* builds the regex into pattern */</div><div class='del'>-static int</div><div class='del'>-build_match_regex(regex_t *pattern, int argc, struct _ESExpResult **argv)</div><div class='del'>-{</div><div class='del'>-	GString *match = g_string_new("");</div><div class='del'>-	int c, i, count=0, err;</div><div class='del'>-	char *word;</div><div class='del'>-</div><div class='del'>-	/* build a regex pattern we can use to match the words, we OR them together */</div><div class='del'>-	if (argc&gt;1)</div><div class='del'>-		g_string_append_c(match, '(');</div><div class='del'>-	for (i=0;i&lt;argc;i++) {</div><div class='del'>-		if (argv[i]-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			if (count &gt; 0)</div><div class='del'>-				g_string_append_c(match, '|');</div><div class='del'>-			/* escape any special chars (not sure if this list is complete) */</div><div class='del'>-			word = argv[i]-&gt;value.string;</div><div class='del'>-			while ((c = *word++)) {</div><div class='del'>-				if (strchr("*\\.()[]^$+", c) != NULL) {</div><div class='del'>-					g_string_append_c(match, '\\');</div><div class='del'>-				}</div><div class='del'>-				g_string_append_c(match, c);</div><div class='del'>-			}</div><div class='del'>-			count++;</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Invalid type passed to body-contains match function");</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (argc&gt;1)</div><div class='del'>-		g_string_append_c(match, ')');</div><div class='del'>-	err = regcomp(pattern, match-&gt;str, REG_EXTENDED|REG_ICASE|REG_NOSUB);</div><div class='del'>-	if (err != 0) {</div><div class='del'>-		char buffer[1024]; /* dont really care if its longer than this ... */</div><div class='del'>-		</div><div class='del'>-		regerror(err, pattern, buffer, 1023);</div><div class='del'>-		g_warning("Internal error with search pattern: %s: %s", match-&gt;str, buffer);</div><div class='del'>-		regfree(pattern);</div><div class='del'>-	}</div><div class='del'>-	d(printf("Built regex: '%s'\n", match-&gt;str));</div><div class='del'>-	g_string_free(match, TRUE);</div><div class='del'>-	return err;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-match_message(CamelFolder *folder, const char *uid, regex_t *pattern)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	int truth = FALSE;</div><div class='del'>-	CamelException *ex;</div><div class='del'>-</div><div class='del'>-	ex = camel_exception_new();</div><div class='del'>-	msg = camel_folder_get_message(folder, uid, ex);</div><div class='del'>-	if (!camel_exception_is_set(ex) &amp;&amp; msg!=NULL) {</div><div class='del'>-		truth = message_body_contains((CamelDataWrapper *)msg, pattern);</div><div class='del'>-		camel_object_unref((CamelObject *)msg);</div><div class='del'>-	}</div><div class='del'>-	camel_exception_free(ex);</div><div class='del'>-	return truth;</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'>-	regex_t pattern;</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 if (search-&gt;folder) {</div><div class='del'>-			/* we do a 'slow' direct search */</div><div class='del'>-			if (build_match_regex(&amp;pattern, argc, argv) == 0) {</div><div class='del'>-				truth = match_message(search-&gt;folder, search-&gt;current-&gt;uid, &amp;pattern);</div><div class='del'>-				regfree(&amp;pattern);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Cannot perform indexed body query with no index or folder set");</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 if (search-&gt;folder) {</div><div class='del'>-			/* do a slow search */</div><div class='del'>-			r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-			if (build_match_regex(&amp;pattern, argc, argv) == 0) {</div><div class='del'>-				if (search-&gt;summary) {</div><div class='del'>-					for (i=0;i&lt;search-&gt;summary-&gt;len;i++) {</div><div class='del'>-						CamelMessageInfo *info = g_ptr_array_index(search-&gt;summary, i);</div><div class='del'>-</div><div class='del'>-						if (match_message(search-&gt;folder, info-&gt;uid, &amp;pattern))</div><div class='del'>-							g_ptr_array_add(r-&gt;value.ptrarray, info-&gt;uid);</div><div class='del'>-					}</div><div class='del'>-				} /* else?  we could always get the summary from the folder, but then</div><div class='del'>-				     we need to free it later somehow */</div><div class='del'>-				regfree(&amp;pattern);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			g_warning("Cannot perform indexed body query with no index or folder set");</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='del'>-</div><div class='del'>-static ESExpResult *search_user_tag(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *search)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	r(printf("executing user-tag\n"));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (search-&gt;current) {</div><div class='del'>-		const char *value = NULL;</div><div class='del'>-		if (argc == 1) {</div><div class='del'>-			value = camel_tag_get(&amp;search-&gt;current-&gt;user_tags, argv[0]-&gt;value.string);</div><div class='del'>-		}</div><div class='del'>-		r = e_sexp_result_new(ESEXP_RES_STRING);</div><div class='del'>-		r-&gt;value.string = g_strdup(value?value:"");</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new(ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_get_sent_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	r(printf("executing get-sent-date\n"));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (s-&gt;current) {</div><div class='del'>-		r = e_sexp_result_new (ESEXP_RES_INT);</div><div class='del'>-</div><div class='del'>-		r-&gt;value.number = s-&gt;current-&gt;date_sent;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new (ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_get_received_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	r(printf("executing get-received-date\n"));</div><div class='del'>-</div><div class='del'>-	/* are we inside a match-all? */</div><div class='del'>-	if (s-&gt;current) {</div><div class='del'>-		r = e_sexp_result_new (ESEXP_RES_INT);</div><div class='del'>-</div><div class='del'>-		r-&gt;value.number = s-&gt;current-&gt;date_received;</div><div class='del'>-	} else {</div><div class='del'>-		r = e_sexp_result_new (ESEXP_RES_ARRAY_PTR);</div><div class='del'>-		r-&gt;value.ptrarray = g_ptr_array_new ();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-search_get_current_date(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	r(printf("executing get-current-date\n"));</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new (ESEXP_RES_INT);</div><div class='del'>-	r-&gt;value.number = time (NULL);</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-folder-search.h b/camel/camel-folder-search.h<br/>deleted file mode 100644<br/>index f74813e6f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-search.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-folder-search.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,100 +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;gal/util/e-util.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)         CAMEL_CHECK_CAST (obj, camel_folder_search_get_type (), CamelFolderSearch)</div><div class='del'>-#define CAMEL_FOLDER_SEARCH_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_search_get_type (), CamelFolderSearchClass)</div><div class='del'>-#define IS_CAMEL_FOLDER_SEARCH(obj)      CAMEL_CHECK_TYPE (obj, camel_folder_search_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderSearchClass CamelFolderSearchClass;</div><div class='del'>-</div><div class='del'>-struct _CamelFolderSearch {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelFolderSearchPrivate *priv;</div><div class='del'>-</div><div class='del'>-	ESExp *sexp;		/* s-exp evaluator */</div><div class='del'>-	char *last_search;	/* last searched expression */</div><div class='del'>-</div><div class='del'>-	/* these are only valid during the search, and are reset afterwards */</div><div class='del'>-	CamelFolder *folder;	/* folder for current search */</div><div class='del'>-	GPtrArray *summary;	/* summary array for current search */</div><div class='del'>-	CamelMessageInfo *current; /* current message info, when searching one by one */</div><div class='del'>-	CamelMimeMessage *current_message; /* cache of current message, if required */</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'>-	/* (user-tag "flagname") Returns the value of a user tag.  Can only be used in match-all */</div><div class='del'>-	ESExpResult * (*user_tag)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (get-sent-date) Retrieve the date that the message was sent on as a time_t */</div><div class='del'>-	ESExpResult * (*get_sent_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (get-received-date) Retrieve the date that the message was received on as a time_t */</div><div class='del'>-	ESExpResult * (*get_received_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-</div><div class='del'>-	/* (get-current-date) Retrieve 'now' as a time_t */</div><div class='del'>-	ESExpResult * (*get_current_date)(struct _ESExp *f, int argc, struct _ESExpResult **argv, CamelFolderSearch *s);</div><div class='del'>-};</div><div class='del'>-</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'>-GPtrArray *camel_folder_search_execute_expression(CamelFolderSearch *search, const char *expr, CamelException *ex);</div><div class='del'>-void camel_folder_search_free_result(CamelFolderSearch *search, GPtrArray *);</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 f68c2a7970..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-summary.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-folder-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1682 +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 (8)</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_finalize   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_folder_summary_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_summary_class_init (CamelFolderSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_folder_summary_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	klass-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	klass-&gt;summary_header_save = summary_header_save;</div><div class='del'>-</div><div class='del'>-	klass-&gt;message_info_new  = message_info_new;</div><div class='del'>-	klass-&gt;message_info_new_from_parser = message_info_new_from_parser;</div><div class='del'>-	klass-&gt;message_info_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'>-</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'>-	camel_object_unref((CamelObject *)value);</div><div class='del'>-	g_free(key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_summary_finalize (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSummaryPrivate *p;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj);</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_clear(s);</div><div class='del'>-	g_ptr_array_free(s-&gt;messages, TRUE);</div><div class='del'>-	g_hash_table_destroy(s-&gt;messages_uid);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach(p-&gt;filter_charset, free_o_name, 0);</div><div class='del'>-	g_hash_table_destroy(p-&gt;filter_charset);</div><div class='del'>-</div><div class='del'>-	g_free(s-&gt;summary_path);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;filter_index)</div><div class='del'>-		camel_object_unref ((CamelObject *)p-&gt;filter_index);</div><div class='del'>-	if (p-&gt;filter_64)</div><div class='del'>-		camel_object_unref ((CamelObject *)p-&gt;filter_64);</div><div class='del'>-	if (p-&gt;filter_qp)</div><div class='del'>-		camel_object_unref ((CamelObject *)p-&gt;filter_qp);</div><div class='del'>-	if (p-&gt;filter_save)</div><div class='del'>-		camel_object_unref ((CamelObject *)p-&gt;filter_save);</div><div class='del'>-</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_folder_summary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelFolderSummary",</div><div class='del'>-					    sizeof (CamelFolderSummary),</div><div class='del'>-					    sizeof (CamelFolderSummaryClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_folder_summary_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_folder_summary_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_folder_summary_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_summary_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelFolderSummary object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelFolderSummary widget.</div><div class='del'>- **/</div><div class='del'>-CamelFolderSummary *</div><div class='del'>-camel_folder_summary_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *new = CAMEL_FOLDER_SUMMARY ( camel_object_new (camel_folder_summary_get_type ()));</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'>-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'>-void camel_folder_summary_set_uid(CamelFolderSummary *s, guint32 uid)</div><div class='del'>-{</div><div class='del'>-	s-&gt;nextuid = MAX(s-&gt;nextuid, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-camel_folder_summary_next_uid_string(CamelFolderSummary *s)</div><div class='del'>-{</div><div class='del'>-	return g_strdup_printf("%u", camel_folder_summary_next_uid(s));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* loads the content descriptions, recursively */</div><div class='del'>-static CamelMessageContentInfo *</div><div class='del'>-perform_content_info_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	guint32 count;</div><div class='del'>-	CamelMessageContentInfo *ci, *part;</div><div class='del'>-</div><div class='del'>-	ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_load(s, in);</div><div class='del'>-	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'>-	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'>-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&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'>-	/* 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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&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'>-	if ((s-&gt;flags &amp; CAMEL_SUMMARY_DIRTY) == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	fd = open(s-&gt;summary_path, O_RDWR|O_CREAT, 0600);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	out = fdopen(fd, "w");</div><div class='del'>-	if ( out == NULL ) {</div><div class='del'>-		close(fd);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	io(printf("saving header\n"));</div><div class='del'>-</div><div class='del'>-	if ( ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_save(s, out, mi);</div><div class='del'>-</div><div class='del'>-		if (s-&gt;build_content) {</div><div class='del'>-			perform_content_info_save(s, out, mi-&gt;content);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	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 = camel_folder_summary_next_uid_string(s);</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 (%s).  new uid re-assigned", info-&gt;uid);</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 *)(CAMEL_OBJECT_GET_CLASS(s))) -&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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_new_from_parser(s, mp);</div><div class='del'>-</div><div class='del'>-		camel_mime_parser_unstep(mp);</div><div class='del'>-</div><div class='del'>-		camel_folder_summary_add(s, info);</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'>-	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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_free(s, ci);</div><div class='del'>-	while (pw) {</div><div class='del'>-		pn = pw-&gt;next;</div><div class='del'>-		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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_free(s, mi);		</div><div class='del'>-		if (s-&gt;build_content &amp;&amp; ci) {</div><div class='del'>-			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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&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'>-void camel_folder_summary_remove_index(CamelFolderSummary *s, int index)</div><div class='del'>-{</div><div class='del'>-        CamelMessageInfo *oldinfo;</div><div class='del'>-</div><div class='del'>-	oldinfo = camel_folder_summary_index (s, index);</div><div class='del'>-	if (oldinfo)</div><div class='del'>-		camel_folder_summary_remove(s, oldinfo);</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'>-        guint32 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'>-int</div><div class='del'>-camel_folder_summary_encode_time_t(FILE *out, time_t value)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=sizeof(time_t)-1;i&gt;=0;i--) {</div><div class='del'>-		if (fputc((value &gt;&gt; (i*8)) &amp; 0xff, out) == -1)</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_folder_summary_decode_time_t(FILE *in, time_t *dest)</div><div class='del'>-{</div><div class='del'>-	time_t save = 0;</div><div class='del'>-	unsigned int v;</div><div class='del'>-	int i = sizeof(time_t) - 1;</div><div class='del'>-</div><div class='del'>-        while ( i&gt;=0 &amp;&amp; (v = fgetc(in)) != EOF) {</div><div class='del'>-		save |= v &lt;&lt; (i*8);</div><div class='del'>-		i--;</div><div class='del'>-	}</div><div class='del'>-	*dest = save;</div><div class='del'>-	return 0;</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 (*)(const void *, const void *))token_search_cmp);</div><div class='del'>-			if (match)</div><div class='del'>-				token = match-tokens;</div><div class='del'>-#else</div><div class='del'>-			for (i=0;i&lt;tokens_len;i++) {</div><div class='del'>-				if (!strcmp(tokens[i], lower)) {</div><div class='del'>-					token = i;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-		if (token != -1) {</div><div class='del'>-			return camel_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'>-	guint32 len;</div><div class='del'>-</div><div class='del'>-	io(printf("Decode token ...\n"));</div><div class='del'>-	</div><div class='del'>-	if (camel_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'>-	gint32 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'>-	gint32 version, flags, nextuid, count, utime;</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;utime) == -1</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_t) utime;</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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;message_info_new(s, camel_mime_parser_headers_raw(mp));</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_error("Invalid parser state");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageContentInfo * content_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageContentInfo *ci = NULL;</div><div class='del'>-</div><div class='del'>-	switch (camel_mime_parser_state(mp)) {</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-	case HSCAN_MESSAGE:</div><div class='del'>-	case HSCAN_MULTIPART:</div><div class='del'>-		ci = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))-&gt;content_info_new(s, camel_mime_parser_headers_raw(mp));</div><div class='del'>-		if (ci) {</div><div class='del'>-			ci-&gt;type = camel_mime_parser_content_type(mp);</div><div class='del'>-			header_content_type_ref(ci-&gt;type);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_error("Invalid parser state");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ci;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-camel_folder_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, *tmp;</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'>-		/* FIXME: perhaps decoding would be best done in header_address_list_format */</div><div class='del'>-		tmp = header_address_list_format (addr);</div><div class='del'>-		ret = header_decode_string (tmp);</div><div class='del'>-		g_free (tmp);</div><div class='del'>-		header_address_list_clear (&amp;addr);</div><div class='del'>-	} else {</div><div class='del'>-		ret = g_strdup (text);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-camel_folder_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'>-	const 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 = camel_folder_summary_format_string(h, "subject");</div><div class='del'>-	mi-&gt;from = camel_folder_summary_format_address(h, "from");</div><div class='del'>-	mi-&gt;to = camel_folder_summary_format_address(h, "to");</div><div class='del'>-	mi-&gt;cc = camel_folder_summary_format_address(h, "cc");</div><div class='del'>-	mi-&gt;user_flags = NULL;</div><div class='del'>-	mi-&gt;user_tags = NULL;</div><div class='del'>-	mi-&gt;date_sent = header_decode_date(header_raw_find(&amp;h, "date", NULL), NULL);</div><div class='del'>-	received = header_raw_find(&amp;h, "received", NULL);</div><div class='del'>-	if (received)</div><div class='del'>-		received = strrchr(received, ';');</div><div class='del'>-	if (received)</div><div class='del'>-		mi-&gt;date_received = header_decode_date(received + 1, NULL);</div><div class='del'>-	else</div><div class='del'>-		mi-&gt;date_received = 0;</div><div class='del'>-	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'>-		mi-&gt;references = header_references_decode(header_raw_find(&amp;h, "in-reply-to", NULL));</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;size);</div><div class='del'>-	camel_folder_summary_decode_time_t(in, &amp;mi-&gt;date_sent);</div><div class='del'>-	camel_folder_summary_decode_time_t(in, &amp;mi-&gt;date_received);</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'>-	camel_folder_summary_decode_string(in, &amp;mi-&gt;cc);</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'>-	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_string(in, &amp;name);</div><div class='del'>-		camel_folder_summary_decode_string(in, &amp;value);</div><div class='del'>-		camel_tag_set(&amp;mi-&gt;user_tags, name, value);</div><div class='del'>-		g_free(name);</div><div class='del'>-		g_free(value);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	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'>-	CamelTag *tag;</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;size);</div><div class='del'>-	camel_folder_summary_encode_time_t(out, mi-&gt;date_sent);</div><div class='del'>-	camel_folder_summary_encode_time_t(out, mi-&gt;date_received);</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'>-	camel_folder_summary_encode_string(out, mi-&gt;cc);</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'>-</div><div class='del'>-	count = camel_tag_list_size(&amp;mi-&gt;user_tags);</div><div class='del'>-	camel_folder_summary_encode_uint32(out, count);</div><div class='del'>-	tag = mi-&gt;user_tags;</div><div class='del'>-	while (tag) {</div><div class='del'>-		camel_folder_summary_encode_string(out, tag-&gt;name);</div><div class='del'>-		camel_folder_summary_encode_string(out, tag-&gt;value);</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return ferror(out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-message_info_free(CamelFolderSummary *s, CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	camel_message_info_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, upos, ubodypos, uendpos;</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;upos);</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;ubodypos);</div><div class='del'>-	camel_folder_summary_decode_uint32(in, &amp;uendpos);</div><div class='del'>-</div><div class='del'>-	ci-&gt;pos = (off_t) upos;</div><div class='del'>-        ci-&gt;bodypos = (off_t) ubodypos;</div><div class='del'>-	ci-&gt;endpos = (off_t) uendpos;</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 *)(CAMEL_OBJECT_GET_CLASS(s)))-&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, "utf-8")==0)) {</div><div class='del'>-				d(printf(" Adding conversion filter from %s to UTF-8\n", charset));</div><div class='del'>-				mfc = g_hash_table_lookup(p-&gt;filter_charset, charset);</div><div class='del'>-				if (mfc == NULL) {</div><div class='del'>-					mfc = camel_mime_filter_charset_new_convert(charset, "UTF-8");</div><div class='del'>-					if (mfc)</div><div class='del'>-						g_hash_table_insert(p-&gt;filter_charset, g_strdup(charset), mfc);</div><div class='del'>-				}</div><div class='del'>-				if (mfc) {</div><div class='del'>-					chr_id = camel_mime_parser_filter_add(mp, (CamelMimeFilter *)mfc);</div><div class='del'>-				} else {</div><div class='del'>-					g_warning("Cannot convert '%s' to 'UTF-8', message index may be corrupt", charset);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* 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'>-const char	*camel_tag_get(CamelTag **list, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-</div><div class='del'>-	tag = *list;</div><div class='del'>-	while (tag) {</div><div class='del'>-		if (!strcmp(tag-&gt;name, name))</div><div class='del'>-			return (const char *)tag-&gt;value;</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void		camel_tag_set(CamelTag **list, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	CamelTag *tag, *tmp;</div><div class='del'>-</div><div class='del'>-	/* this 'trick' works because tag-&gt;next is the first element */</div><div class='del'>-	tag = (CamelTag *)list;</div><div class='del'>-	while (tag-&gt;next) {</div><div class='del'>-		tmp = tag-&gt;next;</div><div class='del'>-		if (!strcmp(tmp-&gt;name, name)) {</div><div class='del'>-			if (value == NULL) { /* clear it? */</div><div class='del'>-				tag-&gt;next = tmp-&gt;next;</div><div class='del'>-				g_free(tmp-&gt;value);</div><div class='del'>-				g_free(tmp);</div><div class='del'>-			} else if (strcmp(tmp-&gt;value, value)) { /* has it changed? */</div><div class='del'>-				g_free(tmp-&gt;value);</div><div class='del'>-				tmp-&gt;value = g_strdup(value);</div><div class='del'>-			}</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		tag = tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		tmp = g_malloc(sizeof(*tmp)+strlen(name));</div><div class='del'>-		strcpy(tmp-&gt;name, name);</div><div class='del'>-		tmp-&gt;value = g_strdup(value);</div><div class='del'>-		tmp-&gt;next = 0;</div><div class='del'>-		tag-&gt;next = tmp;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int		camel_tag_list_size(CamelTag **list)</div><div class='del'>-{</div><div class='del'>-	int count=0;</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-</div><div class='del'>-	tag = *list;</div><div class='del'>-	while (tag) {</div><div class='del'>-		count++;</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void		camel_tag_list_free(CamelTag **list)</div><div class='del'>-{</div><div class='del'>-	CamelTag *tag, *tmp;</div><div class='del'>-	tag = *list;</div><div class='del'>-	while (tag) {</div><div class='del'>-		tmp = tag-&gt;next;</div><div class='del'>-		g_free(tag-&gt;value);</div><div class='del'>-		g_free(tag);</div><div class='del'>-		tag = tmp;</div><div class='del'>-	}</div><div class='del'>-	*list = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_message_info_dup_to:</div><div class='del'>- * @from: source message info</div><div class='del'>- * @to: destination message info</div><div class='del'>- *</div><div class='del'>- * Duplicates the contents of one CamelMessageInfo structure into another.</div><div class='del'>- * (The destination is assumed to be empty: its contents are not freed.)</div><div class='del'>- * The slightly odd interface is to allow this to be used to initialize</div><div class='del'>- * "subclasses" of CamelMessageInfo.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to)</div><div class='del'>-{</div><div class='del'>-	CamelFlag *flag;</div><div class='del'>-	CamelTag *tag;</div><div class='del'>-</div><div class='del'>-	/* Copy numbers */</div><div class='del'>-	to-&gt;flags = from-&gt;flags;</div><div class='del'>-	to-&gt;size = from-&gt;size;</div><div class='del'>-	to-&gt;date_sent = from-&gt;date_sent;</div><div class='del'>-	to-&gt;date_received = from-&gt;date_received;</div><div class='del'>-</div><div class='del'>-	/* Copy strings */</div><div class='del'>-	to-&gt;subject = g_strdup(from-&gt;subject);</div><div class='del'>-	to-&gt;from = g_strdup(from-&gt;from);</div><div class='del'>-	to-&gt;to = g_strdup(from-&gt;to);</div><div class='del'>-	to-&gt;cc = g_strdup(from-&gt;cc);</div><div class='del'>-	to-&gt;uid = g_strdup(from-&gt;uid);</div><div class='del'>-	to-&gt;message_id = g_strdup(from-&gt;message_id);</div><div class='del'>-</div><div class='del'>-	/* Copy structures */</div><div class='del'>-	to-&gt;references = header_references_dup(from-&gt;references);</div><div class='del'>-	flag = from-&gt;user_flags;</div><div class='del'>-	while (flag) {</div><div class='del'>-		camel_flag_set(&amp;to-&gt;user_flags, flag-&gt;name, TRUE);</div><div class='del'>-		flag = flag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	tag = from-&gt;user_tags;</div><div class='del'>-	while (tag) {</div><div class='del'>-		camel_tag_set(&amp;to-&gt;user_tags, tag-&gt;name, tag-&gt;value);</div><div class='del'>-		tag = tag-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* FIXME some day */</div><div class='del'>-	to-&gt;content = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_message_info_free:</div><div class='del'>- * @mi: the message info</div><div class='del'>- *</div><div class='del'>- * Frees a CamelMessageInfo and its contents.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_message_info_free(CamelMessageInfo *mi)</div><div class='del'>-{</div><div class='del'>-	g_free(mi-&gt;uid);</div><div class='del'>-	g_free(mi-&gt;subject);</div><div class='del'>-	g_free(mi-&gt;from);</div><div class='del'>-	g_free(mi-&gt;to);</div><div class='del'>-	g_free(mi-&gt;cc);</div><div class='del'>-	g_free(mi-&gt;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'>-	camel_tag_list_free(&amp;mi-&gt;user_tags);</div><div class='del'>-	/* FIXME: content info? */</div><div class='del'>-	g_free(mi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 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("Cc: %s\n", mi-&gt;cc);</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'>-	/*g_tk_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'>-		camel_object_unref(n);		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	camel_object_unref(mp);</div><div class='del'>-	camel_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 95b394c69f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder-summary.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-folder-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,233 +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)         CAMEL_CHECK_CAST (obj, camel_folder_summary_get_type (), CamelFolderSummary)</div><div class='del'>-#define CAMEL_FOLDER_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_folder_summary_get_type (), CamelFolderSummaryClass)</div><div class='del'>-#define IS_CAMEL_FOLDER_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_folder_summary_get_type ())</div><div class='del'>-</div><div class='del'>-/*typedef struct _CamelFolderSummary      CamelFolderSummary;*/</div><div class='del'>-typedef struct _CamelFolderSummaryClass CamelFolderSummaryClass;</div><div class='del'>-</div><div class='del'>-/* A tree of message content info structures</div><div class='del'>-   describe the content structure of the message (if it has any) */</div><div class='del'>-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];		/* name allocated as part of the structure */</div><div class='del'>-} CamelFlag;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTag {</div><div class='del'>-	struct _CamelTag *next;</div><div class='del'>-	char *value;</div><div class='del'>-	char name[1];		/* name allocated as part of the structure */</div><div class='del'>-} CamelTag;</div><div class='del'>-</div><div class='del'>-/* 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 *from;</div><div class='del'>-	gchar *to;</div><div class='del'>-	gchar *cc;</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'>-	struct _CamelTag *user_tags;</div><div class='del'>-</div><div class='del'>-	/* tree of content description - NULL if it is not available */</div><div class='del'>-	CamelMessageContentInfo *content;</div><div class='del'>-} 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_build_content(CamelFolderSummary *, gboolean state);</div><div class='del'>-</div><div class='del'>-guint32  camel_folder_summary_next_uid        (CamelFolderSummary *s);</div><div class='del'>-char    *camel_folder_summary_next_uid_string (CamelFolderSummary *s);</div><div class='del'>-void 	 camel_folder_summary_set_uid	      (CamelFolderSummary *s, guint32 uid);</div><div class='del'>-</div><div class='del'>-/* load/save the summary in its entirety */</div><div class='del'>-int camel_folder_summary_load(CamelFolderSummary *);</div><div class='del'>-int camel_folder_summary_save(CamelFolderSummary *);</div><div class='del'>-</div><div class='del'>-/* 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'>-void camel_folder_summary_remove_index(CamelFolderSummary *s, int);</div><div class='del'>-/* remove all items */</div><div class='del'>-void camel_folder_summary_clear(CamelFolderSummary *s);</div><div class='del'>-</div><div class='del'>-/* lookup functions */</div><div class='del'>-int camel_folder_summary_count(CamelFolderSummary *);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_index(CamelFolderSummary *, int);</div><div class='del'>-CamelMessageInfo *camel_folder_summary_uid(CamelFolderSummary *, const char *uid);</div><div class='del'>-</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 formatting utils */</div><div class='del'>-char *camel_folder_summary_format_address (struct _header_raw *h, const char *name);</div><div class='del'>-char *camel_folder_summary_format_string (struct _header_raw *h, const char *name);</div><div class='del'>-</div><div class='del'>-/* 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_time_t(FILE *out, time_t value);</div><div class='del'>-int camel_folder_summary_decode_time_t(FILE *in, time_t *dest);</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'>-/* message tag operations */</div><div class='del'>-const char	*camel_tag_get(CamelTag **list, const char *name);</div><div class='del'>-void		camel_tag_set(CamelTag **list, const char *name, const char *value);</div><div class='del'>-int		camel_tag_list_size(CamelTag **list);</div><div class='del'>-void		camel_tag_list_free(CamelTag **list);</div><div class='del'>-</div><div class='del'>-/* message info utils */</div><div class='del'>-void camel_message_info_dup_to(const CamelMessageInfo *from, CamelMessageInfo *to);</div><div class='del'>-void camel_message_info_free(CamelMessageInfo *mi);</div><div class='del'>-</div><div class='del'>-#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 1d929fb4f0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1360 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-folder.c: Abstract class for an email folder */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Author:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void camel_folder_finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static void refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void folder_sync (CamelFolder *folder, gboolean expunge,</div><div class='del'>-			 CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const gchar *get_name (CamelFolder *folder);</div><div class='del'>-static const gchar *get_full_name (CamelFolder *folder);</div><div class='del'>-static CamelStore *get_parent_store   (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static guint32 get_permanent_flags (CamelFolder *folder);</div><div class='del'>-static guint32 get_message_flags (CamelFolder *folder, const char *uid);</div><div class='del'>-static void set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-			       guint32 flags, guint32 set);</div><div class='del'>-static gboolean get_message_user_flag (CamelFolder *folder, const char *uid, const char *name);</div><div class='del'>-static void set_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				   const char *name, gboolean value);</div><div class='del'>-static const char *get_message_user_tag(CamelFolder *folder, const char *uid, const char *name);</div><div class='del'>-static void set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);</div><div class='del'>-</div><div class='del'>-static gint get_message_count (CamelFolder *folder);</div><div class='del'>-static gint get_unread_message_count (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static void expunge             (CamelFolder *folder,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-			    const CamelMessageInfo *info, CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GPtrArray        *get_uids            (CamelFolder *folder);</div><div class='del'>-static void              free_uids           (CamelFolder *folder,</div><div class='del'>-					      GPtrArray *array);</div><div class='del'>-static GPtrArray        *get_summary         (CamelFolder *folder);</div><div class='del'>-static void              free_summary        (CamelFolder *folder,</div><div class='del'>-					      GPtrArray *array);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *get_message         (CamelFolder *folder,</div><div class='del'>-					      const gchar *uid,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *get_message_info (CamelFolder *folder,</div><div class='del'>-						 const char *uid);</div><div class='del'>-</div><div class='del'>-static GPtrArray      *search_by_expression  (CamelFolder *folder,</div><div class='del'>-					      const char *exp,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-static void            search_free           (CamelFolder * folder, </div><div class='del'>-					      GPtrArray * result);</div><div class='del'>-</div><div class='del'>-static void            copy_message_to       (CamelFolder *source,</div><div class='del'>-					      const char *uid,</div><div class='del'>-					      CamelFolder *dest,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void            move_message_to       (CamelFolder *source,</div><div class='del'>-					      const char *uid,</div><div class='del'>-					      CamelFolder *dest,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void            freeze                (CamelFolder *folder);</div><div class='del'>-static void            thaw                  (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static gboolean        folder_changed        (CamelObject *object,</div><div class='del'>-					      gpointer event_data);</div><div class='del'>-static gboolean        message_changed       (CamelObject *object,</div><div class='del'>-					      /*const char *uid*/gpointer event_data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_class_init (CamelFolderClass *camel_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *camel_object_class =</div><div class='del'>-		CAMEL_OBJECT_CLASS (camel_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_folder_class-&gt;sync = folder_sync;</div><div class='del'>-	camel_folder_class-&gt;refresh_info = refresh_info;</div><div class='del'>-	camel_folder_class-&gt;get_name = get_name;</div><div class='del'>-	camel_folder_class-&gt;get_full_name = get_full_name;</div><div class='del'>-	camel_folder_class-&gt;get_parent_store = get_parent_store;</div><div class='del'>-	camel_folder_class-&gt;expunge = expunge;</div><div class='del'>-	camel_folder_class-&gt;get_message_count = get_message_count;</div><div class='del'>-	camel_folder_class-&gt;get_unread_message_count = get_unread_message_count;</div><div class='del'>-	camel_folder_class-&gt;append_message = append_message;</div><div class='del'>-	camel_folder_class-&gt;get_permanent_flags = get_permanent_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_flags = get_message_flags;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = set_message_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_flag = get_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_flag = set_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_tag = get_message_user_tag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_tag = set_message_user_tag;</div><div class='del'>-	camel_folder_class-&gt;get_message = get_message;</div><div class='del'>-	camel_folder_class-&gt;get_uids = get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = free_uids;</div><div class='del'>-	camel_folder_class-&gt;get_summary = get_summary;</div><div class='del'>-	camel_folder_class-&gt;free_summary = free_summary;</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;search_free = search_free;</div><div class='del'>-	camel_folder_class-&gt;get_message_info = get_message_info;</div><div class='del'>-	camel_folder_class-&gt;copy_message_to = copy_message_to;</div><div class='del'>-	camel_folder_class-&gt;move_message_to = move_message_to;</div><div class='del'>-	camel_folder_class-&gt;freeze = freeze;</div><div class='del'>-	camel_folder_class-&gt;thaw = thaw;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_object_class_declare_event (camel_object_class,</div><div class='del'>-					  "folder_changed", folder_changed);</div><div class='del'>-	camel_object_class_declare_event (camel_object_class,</div><div class='del'>-					  "message_changed", message_changed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = object;</div><div class='del'>-</div><div class='del'>-	folder-&gt;frozen = 0;</div><div class='del'>-	folder-&gt;changed_frozen = camel_folder_change_info_new();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_folder_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *camel_folder = CAMEL_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	g_free (camel_folder-&gt;name);</div><div class='del'>-	g_free (camel_folder-&gt;full_name);</div><div class='del'>-</div><div class='del'>-	if (camel_folder-&gt;parent_store)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (camel_folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_free(camel_folder-&gt;changed_frozen);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_folder_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_folder_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelFolder",</div><div class='del'>-							 sizeof (CamelFolder),</div><div class='del'>-							 sizeof (CamelFolderClass),</div><div class='del'>-							 (CamelObjectClassInitFunc) camel_folder_class_init,</div><div class='del'>-							 NULL,</div><div class='del'>-							 (CamelObjectInitFunc) camel_folder_init,</div><div class='del'>-							 (CamelObjectFinalizeFunc) camel_folder_finalize );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_construct:</div><div class='del'>- * @folder: folder object to construct</div><div class='del'>- * @parent_store: parent store object of the folder</div><div class='del'>- * @full_name: full name of the folder</div><div class='del'>- * @name: short name of the folder</div><div class='del'>- *</div><div class='del'>- * Initalizes the folder by setting the parent store and name.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_construct (CamelFolder *folder, CamelStore *parent_store,</div><div class='del'>-			const char *full_name, const char *name)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (parent_store));</div><div class='del'>-	g_return_if_fail (folder-&gt;parent_store == NULL);</div><div class='del'>-	g_return_if_fail (folder-&gt;name == NULL);</div><div class='del'>-</div><div class='del'>-	folder-&gt;parent_store = parent_store;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (parent_store));</div><div class='del'>-</div><div class='del'>-	folder-&gt;name = g_strdup (name);</div><div class='del'>-	folder-&gt;full_name = g_strdup (full_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::sync not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_sync:</div><div class='del'>- * @folder: The folder object</div><div class='del'>- * @expunge: whether or not to expunge deleted messages</div><div class='del'>- * @ex: exception object</div><div class='del'>- *</div><div class='del'>- * Sync changes made to a folder to its backing store, possibly expunging</div><div class='del'>- * deleted messages as well.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	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 void</div><div class='del'>-refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* No op */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_refresh_info:</div><div class='del'>- * @folder: The folder object</div><div class='del'>- * @ex: exception object</div><div class='del'>- *</div><div class='del'>- * Updates a folder's summary to be in sync with its backing store.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;refresh_info (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-get_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_name:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Get the (short) name of the folder. The fully qualified name</div><div class='del'>- * can be obtained with the get_full_name method.</div><div class='del'>- *</div><div class='del'>- * Return value: name of the folder</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_folder_get_name (CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_name (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-get_full_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;full_name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_full_name:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Get the (full) name of the folder.</div><div class='del'>- *</div><div class='del'>- * Return value: full name of the folder</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_folder_get_full_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_full_name (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelStore *</div><div class='del'>-get_parent_store (CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;parent_store;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_parent_store:</div><div class='del'>- * @folder: folder to get the parent of</div><div class='del'>- *</div><div class='del'>- * Return value: the parent store of the folder.</div><div class='del'>- **/</div><div class='del'>-CamelStore *</div><div class='del'>-camel_folder_get_parent_store (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), NULL);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_parent_store (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::expunge not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_expunge:</div><div class='del'>- * @folder: the folder</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Delete messages which have been marked as "DELETED"</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;expunge (folder, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_count not implemented "</div><div class='del'>-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_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'>- *</div><div class='del'>- * Return value: the number of messages in the folder, or -1 if unknown.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_folder_get_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	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);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-get_unread_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_unread_message_count not implemented "</div><div class='del'>-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_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_unread_get_message_count:</div><div class='del'>- * @folder: A CamelFolder object</div><div class='del'>- *</div><div class='del'>- * Return value: the number of unread messages in the folder, or -1 if unknown.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_folder_get_unread_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), -1);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_unread_message_count (folder);</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'>-		const CamelMessageInfo *info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::append_message not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-	return;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_append_message: add a message to a folder</div><div class='del'>- * @folder: folder object to add the message to</div><div class='del'>- * @message: message object</div><div class='del'>- * @info: message info with additional flags/etc to set on</div><div class='del'>- * new message, or %NULL</div><div class='del'>- * @ex: exception object</div><div class='del'>- *</div><div class='del'>- * Add a message to a folder. Only the flag and tag data from @info</div><div class='del'>- * is used. If @info is %NULL, no flags or tags will be set.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-			     const CamelMessageInfo *info, 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, info, 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)</div><div class='del'>-{</div><div class='del'>-	return folder-&gt;permanent_flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_permanent_flags:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- *</div><div class='del'>- * Return value: the set of CamelMessageFlags that can be permanently</div><div class='del'>- * stored on a message between sessions. If it includes %CAMEL_FLAG_USER,</div><div class='del'>- * then user-defined flags will be remembered.</div><div class='del'>- **/</div><div class='del'>-guint32</div><div class='del'>-camel_folder_get_permanent_flags (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), 0);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;get_permanent_flags (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static guint32</div><div class='del'>-get_message_flags (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_flags not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_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'>- *</div><div class='del'>- * Return value: the CamelMessageFlags that are set on the indicated</div><div class='del'>- * message.</div><div class='del'>- **/</div><div class='del'>-guint32</div><div class='del'>-camel_folder_get_message_flags (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	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);</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)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::set_message_flags not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_set_message_flags:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @flags: a set of CamelMessageFlag values to set</div><div class='del'>- * @set: the mask of values in @flags to use.</div><div class='del'>- *</div><div class='del'>- * Sets those flags specified by @set to the values specified by @flags</div><div class='del'>- * on the indicated message. (This may or may not persist after the</div><div class='del'>- * folder or store is closed. See camel_folder_get_permanent_flags().)</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-				guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;set_message_flags (folder, uid, flags, set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-		       const char *name)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_user_flag not implemented "</div><div class='del'>-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_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'>- *</div><div class='del'>- * Return value: whether or not the given user flag is set on the message.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_folder_get_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				    const char *name)</div><div class='del'>-{</div><div class='del'>-	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, name);</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)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::set_message_user_flag not implemented "</div><div class='del'>-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_set_message_user_flag:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @name: the name of the user flag to set</div><div class='del'>- * @value: the value to set it to</div><div class='del'>- *</div><div class='del'>- * Sets the user flag specified by @name to the value specified by @value</div><div class='del'>- * on the indicated message. (This may or may not persist after the</div><div class='del'>- * folder or store is closed. See camel_folder_get_permanent_flags().)</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_set_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				    const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;set_message_user_flag (folder, uid, name, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *get_message_user_tag(CamelFolder *folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_user_tag not implemented "</div><div class='del'>-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_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_user_tag:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @name: the name of a user tag</div><div class='del'>- *</div><div class='del'>- * Return value: Returns the value of the user tag.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_folder_get_message_user_tag (CamelFolder *folder, const char *uid,  const char *name)</div><div class='del'>-{</div><div class='del'>-	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_tag (folder, uid, name);</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_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::set_message_user_tag not implemented "</div><div class='del'>-		   "for `%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_set_message_user_tag:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the UID of a message in @folder</div><div class='del'>- * @name: the name of the user tag to set</div><div class='del'>- * @value: the value to set it to</div><div class='del'>- *</div><div class='del'>- * Sets the user tag specified by @name to the value specified by @value</div><div class='del'>- * on the indicated message. (This may or may not persist after the</div><div class='del'>- * folder or store is closed. See camel_folder_get_permanent_flags().)</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_set_message_user_tag (CamelFolder *folder, const char *uid, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;set_message_user_tag (folder, uid, name, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *</div><div class='del'>-get_message_info (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message_info not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_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_info:</div><div class='del'>- * @folder: a CamelFolder</div><div class='del'>- * @uid: the uid of a message</div><div class='del'>- *</div><div class='del'>- * 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_get_message_info (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;get_message_info (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 CamelMimeMessage *</div><div class='del'>-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_message not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_get_message:</div><div class='del'>- * @folder: the folder object</div><div class='del'>- * @uid: the UID</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Get a message from its UID in the folder. Messages are cached</div><div class='del'>- * within a folder, that is, asking twice for the same UID returns the</div><div class='del'>- * same message object. (FIXME: is this true?)</div><div class='del'>- *</div><div class='del'>- * Return value: Message corresponding to the UID</div><div class='del'>- **/</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_folder_get_message (CamelFolder *folder, const gchar *uid,</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 (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)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_uids not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_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'>- *</div><div class='del'>- * Get the list of UIDs available in a folder. This routine is useful</div><div class='del'>- * for finding what messages are available when the folder does not</div><div class='del'>- * support summaries. The returned array shoudl not be modified, and</div><div class='del'>- * must be freed by passing it to camel_folder_free_uids().</div><div class='del'>- *</div><div class='del'>- * Return value: GPtrArray of UIDs corresponding to the messages</div><div class='del'>- * available in the folder.</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_get_uids (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	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);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_uids (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::free_uids not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_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)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::get_summary not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_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'>- *</div><div class='del'>- * This returns the summary information for the folder. This array</div><div class='del'>- * should not be modified, and must be freed with</div><div class='del'>- * camel_folder_free_summary().</div><div class='del'>- *</div><div class='del'>- * Return value: an array of CamelMessageInfo</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_get_summary (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	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);</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'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_summary:</div><div class='del'>- * @folder: folder object</div><div class='del'>- * @array: the summary array to free</div><div class='del'>- *</div><div class='del'>- * Frees the summary array returned by camel_folder_get_summary().</div><div class='del'>- **/</div><div class='del'>-void camel_folder_free_summary(CamelFolder * folder, GPtrArray * array)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(CAMEL_IS_FOLDER(folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS(folder)-&gt;free_summary(folder, array);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_has_search_capability:</div><div class='del'>- * @folder: Folder object</div><div class='del'>- *</div><div class='del'>- * Checks if a folder supports searching.</div><div class='del'>- *</div><div class='del'>- * Return value: %TRUE if the folder supports searching</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_folder_has_search_capability (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_FOLDER (folder), FALSE);</div><div class='del'>-</div><div class='del'>-	return folder-&gt;has_search_capability;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-search_by_expression (CamelFolder *folder, const char *expression,</div><div class='del'>-		      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelFolder::search_by_expression not implemented for "</div><div class='del'>-		   "`%s'", camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_by_expression:</div><div class='del'>- * @folder: Folder object</div><div class='del'>- * @expression: a search expression</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Searches the folder for messages matching the given search expression.</div><div class='del'>- *</div><div class='del'>- * Return value: a list of uids of matching messages. The caller must</div><div class='del'>- * free the list and each of the elements when it is done.</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_folder_search_by_expression (CamelFolder *folder, const char *expression,</div><div class='del'>-				   CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	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='del'>-</div><div class='del'>-static void</div><div class='del'>-search_free (CamelFolder *folder, GPtrArray *result)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; result-&gt;len; i++)</div><div class='del'>-		g_free (g_ptr_array_index (result, i));</div><div class='del'>-	g_ptr_array_free (result, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_search_free:</div><div class='del'>- * @folder: </div><div class='del'>- * @result: </div><div class='del'>- * </div><div class='del'>- * Free the result of a search.</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_folder_search_free (CamelFolder *folder, GPtrArray *result)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-	g_return_if_fail (folder-&gt;has_search_capability);</div><div class='del'>-</div><div class='del'>-	return CF_CLASS (folder)-&gt;search_free (folder, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-copy_message_to (CamelFolder *source, const char *uid, CamelFolder *dest,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	/* Default implementation. */</div><div class='del'>-	</div><div class='del'>-	msg = camel_folder_get_message (source, uid, ex);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return;</div><div class='del'>-	info = camel_folder_get_message_info (source, uid);</div><div class='del'>-	camel_folder_append_message (dest, msg, info, ex);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_copy_message_to:</div><div class='del'>- * @source: source folder</div><div class='del'>- * @uid: UID of message in @source</div><div class='del'>- * @dest: destination folder</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This copies a message from one folder to another. If the @source and</div><div class='del'>- * @dest folders have the same parent_store, this may be more efficient</div><div class='del'>- * than a camel_folder_append_message().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_copy_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-			      CamelFolder *dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (source));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (dest));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	if (source-&gt;parent_store == dest-&gt;parent_store) {</div><div class='del'>-		return CF_CLASS (source)-&gt;copy_message_to (source, uid,</div><div class='del'>-							   dest, ex);</div><div class='del'>-	} else</div><div class='del'>-		return copy_message_to (source, uid, dest, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-move_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-		 CamelFolder *dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	/* Default implementation. */</div><div class='del'>-	</div><div class='del'>-	msg = camel_folder_get_message (source, uid, ex);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return;</div><div class='del'>-	info = camel_folder_get_message_info (source, uid);</div><div class='del'>-	camel_folder_append_message (dest, msg, info, ex);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (msg));</div><div class='del'>-	if (camel_exception_is_set(ex))</div><div class='del'>-		return;</div><div class='del'>-	camel_folder_delete_message (source, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_move_message_to:</div><div class='del'>- * @source: source folder</div><div class='del'>- * @uid: UID of message in @source</div><div class='del'>- * @dest: destination folder</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This moves a message from one folder to another. If the @source and</div><div class='del'>- * @dest folders have the same parent_store, this may be more efficient</div><div class='del'>- * than a camel_folder_append_message() followed by</div><div class='del'>- * camel_folder_delete_message().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_move_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-			      CamelFolder *dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (source));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (dest));</div><div class='del'>-	g_return_if_fail (uid != NULL);</div><div class='del'>-</div><div class='del'>-	if (source-&gt;parent_store == dest-&gt;parent_store) {</div><div class='del'>-		return CF_CLASS (source)-&gt;move_message_to (source, uid,</div><div class='del'>-							   dest, ex);</div><div class='del'>-	} else</div><div class='del'>-		return move_message_to (source, uid, dest, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-freeze (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	folder-&gt;frozen++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_freeze:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Freezes the folder so that a series of operation can be performed</div><div class='del'>- * without "message_changed" and "folder_changed" signals being emitted.</div><div class='del'>- * When the folder is later thawed with camel_folder_thaw(), the</div><div class='del'>- * suppressed signals will be emitted.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_freeze (CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;freeze (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-thaw (CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	CamelFolderChangeInfo *info;</div><div class='del'>-</div><div class='del'>-	folder-&gt;frozen--;</div><div class='del'>-	if (folder-&gt;frozen != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* If we have more or less messages, do a folder changed, otherwise just</div><div class='del'>-	   do a message changed for each one.</div><div class='del'>-	   TODO: message_changed is now probably irrelevant and not required */</div><div class='del'>-	info = folder-&gt;changed_frozen;</div><div class='del'>-	if (info-&gt;uid_added-&gt;len &gt; 0 || info-&gt;uid_removed-&gt;len &gt; 0) {</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", info);</div><div class='del'>-	} else if (info-&gt;uid_changed-&gt;len &gt; 0) {</div><div class='del'>-		for (i=0;i&lt;info-&gt;uid_changed-&gt;len;i++) {</div><div class='del'>-			camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", info-&gt;uid_changed-&gt;pdata[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_clear(info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_thaw:</div><div class='del'>- * @folder: a folder</div><div class='del'>- *</div><div class='del'>- * Thaws the folder and emits any pending folder_changed or</div><div class='del'>- * message_changed signals.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_thaw (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_FOLDER (folder));</div><div class='del'>-	g_return_if_fail (folder-&gt;frozen != 0);</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&gt;thaw (folder);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Event hooks that block emission when frozen */</div><div class='del'>-static gboolean</div><div class='del'>-folder_changed (CamelObject *obj, gpointer event_data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (obj);</div><div class='del'>-	CamelFolderChangeInfo *changed = event_data;</div><div class='del'>-</div><div class='del'>-	if (folder-&gt;frozen) {</div><div class='del'>-		if (changed != NULL)</div><div class='del'>-			camel_folder_change_info_cat(folder-&gt;changed_frozen, changed);</div><div class='del'>-		else</div><div class='del'>-			g_warning("Class %s is passing NULL to folder_changed event",</div><div class='del'>-				  camel_type_to_name (CAMEL_OBJECT_GET_TYPE (folder)));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-message_changed (CamelObject *obj, /*const char *uid*/gpointer event_data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (obj);</div><div class='del'>-</div><div class='del'>-	if (folder-&gt;frozen) {</div><div class='del'>-		camel_folder_change_info_change_uid(folder-&gt;changed_frozen, (char *)event_data);</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'>- * camel_folder_free_nop:</div><div class='del'>- * @folder: a folder</div><div class='del'>- * @array: an array of uids or CamelMessageInfo</div><div class='del'>- *</div><div class='del'>- * "Frees" the provided array by doing nothing. Used by CamelFolder</div><div class='del'>- * subclasses as an implementation for free_uids, or free_summary when</div><div class='del'>- * the returned array is "static" information and should not be freed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_nop (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_shallow:</div><div class='del'>- * @folder: a folder</div><div class='del'>- * @array: an array of uids or CamelMessageInfo</div><div class='del'>- *</div><div class='del'>- * Frees the provided array but not its contents. Used by CamelFolder</div><div class='del'>- * subclasses as an implementation for free_uids or free_summary when</div><div class='del'>- * the returned array needs to be freed but its contents come from</div><div class='del'>- * "static" information.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	g_ptr_array_free (array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_free_deep:</div><div class='del'>- * @folder: a folder</div><div class='del'>- * @array: an array of uids</div><div class='del'>- *</div><div class='del'>- * Frees the provided array and its contents. Used by CamelFolder</div><div class='del'>- * subclasses as an implementation for free_uids when the provided</div><div class='del'>- * information was created explicitly by the corresponding get_ call.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_free_deep (CamelFolder *folder, GPtrArray *array)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; array-&gt;len; i++)</div><div class='del'>-		g_free (array-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (array, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_new:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Create a new folder change info structure.</div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-CamelFolderChangeInfo *</div><div class='del'>-camel_folder_change_info_new(void)</div><div class='del'>-{</div><div class='del'>-	CamelFolderChangeInfo *info;</div><div class='del'>-</div><div class='del'>-	info = g_malloc(sizeof(*info));</div><div class='del'>-	info-&gt;uid_added = g_ptr_array_new();</div><div class='del'>-	info-&gt;uid_removed = g_ptr_array_new();</div><div class='del'>-	info-&gt;uid_changed = g_ptr_array_new();</div><div class='del'>-	info-&gt;uid_source = NULL;</div><div class='del'>-</div><div class='del'>-	return info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_source:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a source uid for generating a changeset.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_source(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	if (info-&gt;uid_source == NULL)</div><div class='del'>-		info-&gt;uid_source = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup(info-&gt;uid_source, uid) == NULL)</div><div class='del'>-		g_hash_table_insert(info-&gt;uid_source, g_strdup(uid), (void *)1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_source_list:</div><div class='del'>- * @info: </div><div class='del'>- * @list: </div><div class='del'>- * </div><div class='del'>- * Add a list of source uid's for generating a changeset.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtrArray *list)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;uid_source == NULL)</div><div class='del'>-		info-&gt;uid_source = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;list-&gt;len;i++) {</div><div class='del'>-		char *uid = list-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		if (g_hash_table_lookup(info-&gt;uid_source, uid) == NULL)</div><div class='del'>-			g_hash_table_insert(info-&gt;uid_source, g_strdup(uid), (void *)1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_update:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a uid from the updated list, used to generate a changeset diff.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_update(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	char *key;</div><div class='del'>-	int value;</div><div class='del'>-</div><div class='del'>-	if (info-&gt;uid_source == NULL) {</div><div class='del'>-		camel_folder_change_info_add_uid(info, uid);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (g_hash_table_lookup_extended(info-&gt;uid_source, uid, (void **)&amp;key, (void **)&amp;value)) {</div><div class='del'>-		g_hash_table_remove(info-&gt;uid_source, key);</div><div class='del'>-		g_free(key);</div><div class='del'>-	} else {</div><div class='del'>-		camel_folder_change_info_add_uid(info, uid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_update_list:</div><div class='del'>- * @info: </div><div class='del'>- * @list: </div><div class='del'>- * </div><div class='del'>- * Add a list of uid's from the updated list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_update_list(CamelFolderChangeInfo *info, const GPtrArray *list)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;list-&gt;len;i++) {</div><div class='del'>-		camel_folder_change_info_add_update(info, list-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_info_remove(char *key, void *value, CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	camel_folder_change_info_remove_uid(info, key);</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'>-change_info_free_update(char *key, void *value, CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_free(key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_build_diff:</div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Compare the source uid set to the updated uid set and generate the differences</div><div class='del'>- * into the added and removed lists.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_build_diff(CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (info-&gt;uid_source) {</div><div class='del'>-		g_hash_table_foreach(info-&gt;uid_source, (GHFunc)change_info_remove, info);</div><div class='del'>-		g_hash_table_destroy(info-&gt;uid_source);</div><div class='del'>-		info-&gt;uid_source = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_info_add_uid(CamelFolderChangeInfo *info, GPtrArray *uids, const char *uid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* TODO: Check that it is in the other arrays and remove it from them/etc? */</div><div class='del'>-	for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-		if (!strcmp(uids-&gt;pdata[i], uid))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_add(uids, g_strdup(uid));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_info_cat(CamelFolderChangeInfo *info, GPtrArray *uids, GPtrArray *source)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;source-&gt;len;i++) {</div><div class='del'>-		change_info_add_uid(info, uids, source-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_cat:</div><div class='del'>- * @info: </div><div class='del'>- * @source: </div><div class='del'>- * </div><div class='del'>- * Concatenate one change info onto antoher.  Can be used to copy</div><div class='del'>- * them too.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_cat(CamelFolderChangeInfo *info, CamelFolderChangeInfo *source)</div><div class='del'>-{</div><div class='del'>-	change_info_cat(info, info-&gt;uid_added, source-&gt;uid_added);</div><div class='del'>-	change_info_cat(info, info-&gt;uid_removed, source-&gt;uid_removed);</div><div class='del'>-	change_info_cat(info, info-&gt;uid_changed, source-&gt;uid_changed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_add_uid:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a new uid to the changeinfo.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_add_uid(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	change_info_add_uid(info, info-&gt;uid_added, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_remove_uid:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a uid to the removed uid list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_remove_uid(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	change_info_add_uid(info, info-&gt;uid_removed, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_change_uid:</div><div class='del'>- * @info: </div><div class='del'>- * @uid: </div><div class='del'>- * </div><div class='del'>- * Add a uid to the changed uid list.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_change_uid(CamelFolderChangeInfo *info, const char *uid)</div><div class='del'>-{</div><div class='del'>-	change_info_add_uid(info, info-&gt;uid_changed, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-change_info_clear(GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;uids-&gt;len;i++) {</div><div class='del'>-		g_free(uids-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-	g_ptr_array_set_size(uids, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_clear:</div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Empty out the change info; called after changes have been processed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_clear(CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	change_info_clear(info-&gt;uid_added);</div><div class='del'>-	change_info_clear(info-&gt;uid_removed);</div><div class='del'>-	change_info_clear(info-&gt;uid_changed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_change_info_free:</div><div class='del'>- * @info: </div><div class='del'>- * </div><div class='del'>- * Free memory associated with the folder change info lists.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_change_info_free(CamelFolderChangeInfo *info)</div><div class='del'>-{</div><div class='del'>-	if (info-&gt;uid_source) {</div><div class='del'>-		g_hash_table_foreach(info-&gt;uid_source, (GHFunc)change_info_free_update, info);</div><div class='del'>-		g_hash_table_destroy(info-&gt;uid_source);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_clear(info);</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free(info-&gt;uid_added, TRUE);</div><div class='del'>-	g_ptr_array_free(info-&gt;uid_removed, TRUE);</div><div class='del'>-	g_ptr_array_free(info-&gt;uid_changed, TRUE);</div><div class='del'>-	g_free(info);</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.h b/camel/camel-folder.h<br/>deleted file mode 100644<br/>index 12fe86f4b8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-folder.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,297 +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)     (CAMEL_CHECK_CAST((obj), CAMEL_FOLDER_TYPE, CamelFolder))</div><div class='del'>-#define CAMEL_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_FOLDER_TYPE, CamelFolderClass))</div><div class='del'>-#define CAMEL_IS_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderChangeInfo CamelFolderChangeInfo;</div><div class='del'>-</div><div class='del'>-struct _CamelFolderChangeInfo {</div><div class='del'>-	GPtrArray *uid_added;</div><div class='del'>-	GPtrArray *uid_removed;</div><div class='del'>-	GPtrArray *uid_changed;</div><div class='del'>-</div><div class='del'>-	GHashTable *uid_source;	/* used to create unique lists */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelFolder</div><div class='del'>-{</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</div><div class='del'>-	int frozen;</div><div class='del'>-	CamelFolderChangeInfo *changed_frozen; /* queues changed events */</div><div class='del'>-</div><div class='del'>-	char *name;</div><div class='del'>-	char *full_name;</div><div class='del'>-	CamelStore *parent_store;</div><div class='del'>-</div><div class='del'>-	guint32 permanent_flags;</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'>-	/* Virtual methods */	</div><div class='del'>-	void   (*refresh_info) (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void   (*sync) (CamelFolder *folder, gboolean expunge, </div><div class='del'>-			CamelException *ex);</div><div class='del'>-</div><div class='del'>-	const char *  (*get_name)  (CamelFolder *folder);</div><div class='del'>-	const char *  (*get_full_name)   (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	CamelStore *  (*get_parent_store) (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	void (*expunge)  (CamelFolder *folder, </div><div class='del'>-			  CamelException *ex);</div><div class='del'>-</div><div class='del'>-	int   (*get_message_count)   (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	int   (*get_unread_message_count) (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	void (*append_message)  (CamelFolder *folder, </div><div class='del'>-				 CamelMimeMessage *message,</div><div class='del'>-				 const CamelMessageInfo *info,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	guint32 (*get_permanent_flags) (CamelFolder *folder);</div><div class='del'>-	guint32 (*get_message_flags)   (CamelFolder *folder,</div><div class='del'>-					const char *uid);</div><div class='del'>-	void    (*set_message_flags)   (CamelFolder *folder,</div><div class='del'>-					const char *uid,</div><div class='del'>-					guint32 flags, guint32 set);</div><div class='del'>-</div><div class='del'>-	gboolean (*get_message_user_flag) (CamelFolder *folder,</div><div class='del'>-					   const char *uid,</div><div class='del'>-					   const char *name);</div><div class='del'>-	void     (*set_message_user_flag) (CamelFolder *folder,</div><div class='del'>-					   const char *uid,</div><div class='del'>-					   const char *name,</div><div class='del'>-					   gboolean value);</div><div class='del'>-</div><div class='del'>-	const char * (*get_message_user_tag) (CamelFolder *folder,</div><div class='del'>-					      const char *uid,</div><div class='del'>-					      const char *name);</div><div class='del'>-	void     (*set_message_user_tag) (CamelFolder *folder,</div><div class='del'>-					  const char *uid,</div><div class='del'>-					  const char *name,</div><div class='del'>-					  const char *value);</div><div class='del'>-</div><div class='del'>-	CamelMimeMessage * (*get_message)  (CamelFolder *folder, </div><div class='del'>-					    const char *uid, </div><div class='del'>-					    CamelException *ex);</div><div class='del'>-</div><div class='del'>-	GPtrArray * (*get_uids)       (CamelFolder *folder);</div><div class='del'>-	void (*free_uids)             (CamelFolder *folder,</div><div class='del'>-				       GPtrArray *array);</div><div class='del'>-</div><div class='del'>-	GPtrArray * (*get_summary)    (CamelFolder *folder);</div><div class='del'>-	void (*free_summary)          (CamelFolder *folder,</div><div class='del'>-				       GPtrArray *summary);</div><div class='del'>-</div><div class='del'>-	gboolean (*has_search_capability) (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-	GPtrArray * (*search_by_expression) (CamelFolder *folder,</div><div class='del'>-					     const char *expression,</div><div class='del'>-					     CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*search_free) (CamelFolder *folder, GPtrArray *result);</div><div class='del'>-</div><div class='del'>-	const CamelMessageInfo * (*get_message_info) (CamelFolder *, const char *uid);</div><div class='del'>-</div><div class='del'>-	void (*copy_message_to) (CamelFolder *source,</div><div class='del'>-				 const char *uid,</div><div class='del'>-				 CamelFolder *destination,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-	</div><div class='del'>-	void (*move_message_to) (CamelFolder *source,</div><div class='del'>-				 const char *uid,</div><div class='del'>-				 CamelFolder *destination,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-</div><div class='del'>-	void (*freeze) (CamelFolder *folder);</div><div class='del'>-	void (*thaw)   (CamelFolder *folder);</div><div class='del'>-} CamelFolderClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-void               camel_folder_construct              (CamelFolder *folder,</div><div class='del'>-							CamelStore *parent_store,</div><div class='del'>-							const char *full_name,</div><div class='del'>-							const char *name);</div><div class='del'>-</div><div class='del'>-void               camel_folder_refresh_info           (CamelFolder * folder, </div><div class='del'>-							CamelException * ex);</div><div class='del'>-void               camel_folder_sync                   (CamelFolder *folder, </div><div class='del'>-							gboolean expunge, </div><div class='del'>-							CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelStore *       camel_folder_get_parent_store       (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* delete operations */</div><div class='del'>-void		   camel_folder_expunge                (CamelFolder *folder, </div><div class='del'>-							CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* folder name operations */</div><div class='del'>-const char *      camel_folder_get_name                (CamelFolder *folder);</div><div class='del'>-const char *      camel_folder_get_full_name           (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* various properties accessors */</div><div class='del'>-guint32		   camel_folder_get_permanent_flags    (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-guint32		   camel_folder_get_message_flags      (CamelFolder *folder,</div><div class='del'>-							const char *uid);</div><div class='del'>-</div><div class='del'>-void		   camel_folder_set_message_flags      (CamelFolder *folder,</div><div class='del'>-							const char *uid,</div><div class='del'>-							guint32 flags,</div><div class='del'>-							guint32 set);</div><div class='del'>-</div><div class='del'>-gboolean	   camel_folder_get_message_user_flag  (CamelFolder *folder,</div><div class='del'>-							const char *uid,</div><div class='del'>-							const char *name);</div><div class='del'>-</div><div class='del'>-void		   camel_folder_set_message_user_flag  (CamelFolder *folder,</div><div class='del'>-							const char *uid,</div><div class='del'>-							const char *name,</div><div class='del'>-							gboolean value);</div><div class='del'>-const char *	   camel_folder_get_message_user_tag  (CamelFolder *folder,</div><div class='del'>-						       const char *uid,</div><div class='del'>-						       const char *name);</div><div class='del'>-</div><div class='del'>-void		   camel_folder_set_message_user_tag  (CamelFolder *folder,</div><div class='del'>-						       const char *uid,</div><div class='del'>-						       const char *name,</div><div class='del'>-						       const char *value);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* message manipulation */</div><div class='del'>-void               camel_folder_append_message         (CamelFolder *folder, </div><div class='del'>-							CamelMimeMessage *message,</div><div class='del'>-							const CamelMessageInfo *info,</div><div class='del'>-							CamelException *ex);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* summary related operations */</div><div class='del'>-gboolean           camel_folder_has_summary_capability (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-int                camel_folder_get_message_count     (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-int                camel_folder_get_unread_message_count (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-GPtrArray *        camel_folder_get_summary           (CamelFolder *folder);</div><div class='del'>-void               camel_folder_free_summary          (CamelFolder *folder,</div><div class='del'>-						       GPtrArray *array);</div><div class='del'>-</div><div class='del'>-/* uid based access operations */</div><div class='del'>-CamelMimeMessage * camel_folder_get_message           (CamelFolder *folder, </div><div class='del'>-						       const char *uid, </div><div class='del'>-						       CamelException *ex);</div><div class='del'>-#define camel_folder_delete_message(folder, uid) \</div><div class='del'>-	camel_folder_set_message_flags (folder, uid, CAMEL_MESSAGE_DELETED, CAMEL_MESSAGE_DELETED)</div><div class='del'>-</div><div class='del'>-GPtrArray *        camel_folder_get_uids              (CamelFolder *folder);</div><div class='del'>-void               camel_folder_free_uids             (CamelFolder *folder,</div><div class='del'>-						       GPtrArray *array);</div><div class='del'>-</div><div class='del'>-/* search api */</div><div class='del'>-gboolean           camel_folder_has_search_capability (CamelFolder *folder);</div><div class='del'>-GPtrArray *	   camel_folder_search_by_expression  (CamelFolder *folder,</div><div class='del'>-						       const char *expression,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-void		   camel_folder_search_free	      (CamelFolder *folder, GPtrArray *);</div><div class='del'>-</div><div class='del'>-/* summary info */</div><div class='del'>-const CamelMessageInfo *camel_folder_get_message_info (CamelFolder *summary,</div><div class='del'>-						       const char *uid);</div><div class='del'>-</div><div class='del'>-void               camel_folder_copy_message_to       (CamelFolder *source,</div><div class='del'>-						       const char *uid,</div><div class='del'>-						       CamelFolder *dest,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-</div><div class='del'>-void               camel_folder_move_message_to       (CamelFolder *source,</div><div class='del'>-						       const char *uid,</div><div class='del'>-						       CamelFolder *dest,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-</div><div class='del'>-void               camel_folder_freeze                (CamelFolder *folder);</div><div class='del'>-void               camel_folder_thaw                  (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* For use by subclasses (for free_{uids,summary,subfolder_names}) */</div><div class='del'>-void camel_folder_free_nop     (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-void camel_folder_free_shallow (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-void camel_folder_free_deep    (CamelFolder *folder, GPtrArray *array);</div><div class='del'>-</div><div class='del'>-/* update functions for change info */</div><div class='del'>-CamelFolderChangeInfo *	camel_folder_change_info_new		(void);</div><div class='del'>-void			camel_folder_change_info_clear		(CamelFolderChangeInfo *info);</div><div class='del'>-void			camel_folder_change_info_free		(CamelFolderChangeInfo *info);</div><div class='del'>-</div><div class='del'>-/* for building diff's automatically */</div><div class='del'>-void			camel_folder_change_info_add_source	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_add_source_list(CamelFolderChangeInfo *info, const GPtrArray *list);</div><div class='del'>-void			camel_folder_change_info_add_update	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_add_update_list(CamelFolderChangeInfo *info, const GPtrArray *list);</div><div class='del'>-void			camel_folder_change_info_build_diff	(CamelFolderChangeInfo *info);</div><div class='del'>-</div><div class='del'>-/* for manipulating diff's directly */</div><div class='del'>-void			camel_folder_change_info_cat		(CamelFolderChangeInfo *info, CamelFolderChangeInfo *s);</div><div class='del'>-void			camel_folder_change_info_add_uid	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_remove_uid	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-void			camel_folder_change_info_change_uid	(CamelFolderChangeInfo *info, const char *uid);</div><div class='del'>-</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 878ff1ca7b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-internet-address.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-internet-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,282 +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'>-static void</div><div class='del'>-camel_internet_address_class_init(CamelInternetAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelAddressClass *address = (CamelAddressClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_internet_address_parent = CAMEL_ADDRESS_CLASS(camel_type_get_global_classfuncs(camel_address_get_type()));</div><div class='del'>-</div><div class='del'>-	address-&gt;decode = internet_decode;</div><div class='del'>-	address-&gt;encode = internet_encode;</div><div class='del'>-	address-&gt;remove = internet_remove;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_internet_address_init(CamelInternetAddress *obj)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_internet_address_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_address_get_type(), "CamelInternetAddress",</div><div class='del'>-					   sizeof (CamelInternetAddress),</div><div class='del'>-					   sizeof (CamelInternetAddressClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_internet_address_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_internet_address_init,</div><div class='del'>-					   NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-internet_decode	(CamelAddress *a, const char *raw)</div><div class='del'>-{</div><div class='del'>-	struct _header_address *ha, *n;</div><div class='del'>-	</div><div class='del'>-	/* Should probably use its own decoder or something */</div><div class='del'>-	ha = header_address_decode(raw);</div><div class='del'>-	if (ha) {</div><div class='del'>-		n = ha;</div><div class='del'>-		while (n) {</div><div class='del'>-			if (n-&gt;type == HEADER_ADDRESS_NAME) {</div><div class='del'>-				camel_internet_address_add((CamelInternetAddress *)a, n-&gt;name, n-&gt;v.addr);</div><div class='del'>-			} else if (n-&gt;type == HEADER_ADDRESS_GROUP) {</div><div class='del'>-				struct _header_address *g = n-&gt;v.members;</div><div class='del'>-				while (g) {</div><div class='del'>-					if (g-&gt;type == HEADER_ADDRESS_NAME)</div><div class='del'>-						camel_internet_address_add((CamelInternetAddress *)a, g-&gt;name, g-&gt;v.addr);</div><div class='del'>-					/* otherwise, it's an error, infact */</div><div class='del'>-					g = g-&gt;next;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			n = n-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		header_address_list_clear(&amp;ha);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-internet_encode	(CamelAddress *a)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-	</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_phrase(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'>-			if (*name) {</div><div class='del'>-				g_string_sprintfa(out, "%s &lt;%s&gt;", name, addr-&gt;address);</div><div class='del'>-			} else if (addr-&gt;address)</div><div class='del'>-				g_string_sprintfa(out, "%s", addr-&gt;address);</div><div class='del'>-			g_free(name);</div><div class='del'>-		} else</div><div class='del'>-			g_string_sprintfa(out, "%s", addr-&gt;address);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-internet_remove	(CamelAddress *a, int index)</div><div class='del'>-{</div><div class='del'>-	struct _address *addr;</div><div class='del'>-	</div><div class='del'>-	if (index &lt; 0 || index &gt;= a-&gt;addresses-&gt;len)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	addr = g_ptr_array_index(a-&gt;addresses, index);</div><div class='del'>-	g_free(addr-&gt;name);</div><div class='del'>-	g_free(addr-&gt;address);</div><div class='del'>-	g_free(addr);</div><div class='del'>-	g_ptr_array_remove_index(a-&gt;addresses, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelInternetAddress object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelInternetAddress object.</div><div class='del'>- **/</div><div class='del'>-CamelInternetAddress *</div><div class='del'>-camel_internet_address_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelInternetAddress *new = CAMEL_INTERNET_ADDRESS(camel_object_new(camel_internet_address_get_type()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_add:</div><div class='del'>- * @a: internet address object</div><div class='del'>- * @name: </div><div class='del'>- * @address: </div><div class='del'>- * </div><div class='del'>- * Add a new internet address to the address object.</div><div class='del'>- * </div><div class='del'>- * Return value: Index of added entry.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_internet_address_add	(CamelInternetAddress *a, const char *name, const char *address)</div><div class='del'>-{</div><div class='del'>-	struct _address *new;</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	g_assert(IS_CAMEL_INTERNET_ADDRESS(a));</div><div class='del'>-</div><div class='del'>-	new = g_malloc(sizeof(*new));</div><div class='del'>-	new-&gt;name = g_strdup(name);</div><div class='del'>-	new-&gt;address = g_strdup(address);</div><div class='del'>-	index = ((CamelAddress *)a)-&gt;addresses-&gt;len;</div><div class='del'>-	g_ptr_array_add(((CamelAddress *)a)-&gt;addresses, new);</div><div class='del'>-</div><div class='del'>-	return index;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_get:</div><div class='del'>- * @a: internet address object</div><div class='del'>- * @index: address's array index</div><div class='del'>- * @namep: Holder for the returned name, or NULL, if not required.</div><div class='del'>- * @addressp: Holder for the returned address, or NULL, if not required.</div><div class='del'>- * </div><div class='del'>- * Get the address at @index.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if such an address exists, or FALSE otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_internet_address_get	(const CamelInternetAddress *a, int index, const char **namep, const char **addressp)</div><div class='del'>-{</div><div class='del'>-	struct _address *addr;</div><div class='del'>-</div><div class='del'>-	g_assert(IS_CAMEL_INTERNET_ADDRESS(a));</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_assert(IS_CAMEL_INTERNET_ADDRESS(a));</div><div class='del'>-</div><div class='del'>-	len = ((CamelAddress *)a)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i=0;i&lt;len;i++) {</div><div class='del'>-		addr = g_ptr_array_index( ((CamelAddress *)a)-&gt;addresses, i );</div><div class='del'>-		if (!strcmp(addr-&gt;name, name)) {</div><div class='del'>-			if (addressp)</div><div class='del'>-				*addressp = addr-&gt;address;</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_internet_address_find_address:</div><div class='del'>- * @a: </div><div class='del'>- * @address: </div><div class='del'>- * @namep: Return for the matching name, or NULL, if not required.</div><div class='del'>- * </div><div class='del'>- * Find an address by address.</div><div class='del'>- * </div><div class='del'>- * Return value: The index of the address, or -1 if not found.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_internet_address_find_address(CamelInternetAddress *a, const char *address, const char **namep)</div><div class='del'>-{</div><div class='del'>-	struct _address *addr;</div><div class='del'>-	int i, len;</div><div class='del'>-</div><div class='del'>-	g_assert(IS_CAMEL_INTERNET_ADDRESS(a));</div><div class='del'>-</div><div class='del'>-	len = ((CamelAddress *)a)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i=0;i&lt;len;i++) {</div><div class='del'>-		addr = g_ptr_array_index( ((CamelAddress *)a)-&gt;addresses, i );</div><div class='del'>-		if (!strcmp(addr-&gt;address, address)) {</div><div class='del'>-			if (namep)</div><div class='del'>-				*namep = addr-&gt;name;</div><div class='del'>-			return i;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-internet-address.h b/camel/camel-internet-address.h<br/>deleted file mode 100644<br/>index 6b303eef8f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-internet-address.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, camel_internet_address_get_type (), CamelInternetAddress)</div><div class='del'>-#define CAMEL_INTERNET_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_internet_address_get_type (), CamelInternetAddressClass)</div><div class='del'>-#define IS_CAMEL_INTERNET_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_internet_address_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelInternetAddressClass CamelInternetAddressClass;</div><div class='del'>-</div><div class='del'>-struct _CamelInternetAddress {</div><div class='del'>-	CamelAddress parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelInternetAddressPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelInternetAddressClass {</div><div class='del'>-	CamelAddressClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-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-medium.c b/camel/camel-medium.c<br/>deleted file mode 100644<br/>index 3c5954e40f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-medium.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-medium.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,266 +0,0 @@</div><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 (CAMEL_OBJECT_GET_CLASS(so))</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'>-</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'>-	/*</div><div class='del'>-	 * CamelDataWrapperClass *camel_data_wrapper_class =</div><div class='del'>-	 *	CAMEL_DATA_WRAPPER_CLASS (camel_medium_class);</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_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'>-</div><div class='del'>-static void</div><div class='del'>-camel_medium_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelMedium *camel_medium = CAMEL_MEDIUM (object);</div><div class='del'>-</div><div class='del'>-	camel_medium-&gt;content = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_medium_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMedium *medium = CAMEL_MEDIUM (object);</div><div class='del'>-</div><div class='del'>-	if (medium-&gt;content)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (medium-&gt;content));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_medium_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_medium_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_medium_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_medium_type = camel_type_register (CAMEL_DATA_WRAPPER_TYPE, "medium",</div><div class='del'>-							 sizeof (CamelMedium),</div><div class='del'>-							 sizeof (CamelMediumClass),</div><div class='del'>-							 (CamelObjectClassInitFunc) camel_medium_class_init,</div><div class='del'>-							 NULL,</div><div class='del'>-							 (CamelObjectInitFunc) camel_medium_init,</div><div class='del'>-							 (CamelObjectFinalizeFunc) camel_medium_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_medium_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_header (CamelMedium *medium, const gchar *header_name,</div><div class='del'>-	    const void *header_value)</div><div class='del'>-{</div><div class='del'>-	g_warning("No %s::add_header implemented, adding %s", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_add_header:</div><div class='del'>- * @medium: a CamelMedium</div><div class='del'>- * @header_name: name of the header</div><div class='del'>- * @header_value: value of the header</div><div class='del'>- *</div><div class='del'>- * Adds a header to a medium.</div><div class='del'>- *</div><div class='del'>- * FIXME: Where does it add it? We need to be able to prepend and</div><div class='del'>- * append headers, and also be able to insert them relative to other</div><div class='del'>- * headers.   No we dont, order isn't important! Z</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_add_header (CamelMedium *medium, const gchar *header_name,</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", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_set_header:</div><div class='del'>- * @medium: a CamelMedium</div><div class='del'>- * @header_name: name of the header</div><div class='del'>- * @header_value: value of the header</div><div class='del'>- *</div><div class='del'>- * Sets the value of a header.  Any other occurances of the header</div><div class='del'>- * will be removed.</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", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_remove_header:</div><div class='del'>- * @medium: a medium</div><div class='del'>- * @header_name: the name of the header</div><div class='del'>- *</div><div class='del'>- * Removes the named header from the medium.  All occurances of the</div><div class='del'>- * header are removed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_remove_header (CamelMedium *medium, const 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", camel_type_to_name(CAMEL_OBJECT_GET_TYPE(medium)), header_name);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_get_header:</div><div class='del'>- * @medium: a medium</div><div class='del'>- * @header_name: the name of the header</div><div class='del'>- *</div><div class='del'>- * Returns the value of the named header in the medium, or %NULL if</div><div class='del'>- * it is unset. The caller should not modify or free the data.</div><div class='del'>- *</div><div class='del'>- * FIXME: What if the header occurs more than once?</div><div class='del'>- *</div><div class='del'>- * Return value: the value of the named header, or %NULL</div><div class='del'>- **/</div><div class='del'>-const void *</div><div class='del'>-camel_medium_get_header (CamelMedium *medium, const 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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning No way to get multi-valued headers?</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	return CM_CLASS (medium)-&gt;get_header (medium, header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelDataWrapper *</div><div class='del'>-get_content_object (CamelMedium *medium)</div><div class='del'>-{</div><div class='del'>-	return medium-&gt;content;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_get_content_object:</div><div class='del'>- * @medium: a medium</div><div class='del'>- *</div><div class='del'>- * Returns a data wrapper that represents the content of the medium,</div><div class='del'>- * without its headers.</div><div class='del'>- *</div><div class='del'>- * Return value: the medium's content object.</div><div class='del'>- **/</div><div class='del'>-CamelDataWrapper *</div><div class='del'>-camel_medium_get_content_object (CamelMedium *medium)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MEDIUM (medium), NULL);</div><div class='del'>-</div><div class='del'>-	return CM_CLASS (medium)-&gt;get_content_object (medium);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_content_object (CamelMedium *medium, CamelDataWrapper *content)</div><div class='del'>-{</div><div class='del'>-	if (medium-&gt;content)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (medium-&gt;content));</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (content));</div><div class='del'>-	medium-&gt;content = content;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_medium_set_content_object:</div><div class='del'>- * @medium: a medium</div><div class='del'>- * @content: a data wrapper representing the medium's content</div><div class='del'>- *</div><div class='del'>- * Sets the content of @medium to be @content.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_medium_set_content_object (CamelMedium *medium,</div><div class='del'>-				 CamelDataWrapper *content)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MEDIUM (medium));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_DATA_WRAPPER (content));</div><div class='del'>-</div><div class='del'>-	CM_CLASS (medium)-&gt;set_content_object (medium, content);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-medium.h b/camel/camel-medium.h<br/>deleted file mode 100644<br/>index 9ce548ba1d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-medium.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_MEDIUM_TYPE, CamelMedium))</div><div class='del'>-#define CAMEL_MEDIUM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MEDIUM_TYPE, CamelMediumClass))</div><div class='del'>-#define CAMEL_IS_MEDIUM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MEDIUM_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-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 Camel function */</div><div class='del'>-CamelType camel_medium_get_type (void);</div><div class='del'>-</div><div class='del'>-/* Header get/set interface */</div><div class='del'>-void camel_medium_add_header (CamelMedium *medium, const gchar *header_name, const void *header_value);</div><div class='del'>-void camel_medium_set_header (CamelMedium *medium, const gchar *header_name, const void *header_value);</div><div class='del'>-void camel_medium_remove_header (CamelMedium *medium, const gchar *header_name);</div><div class='del'>-const void *camel_medium_get_header (CamelMedium *medium, const gchar *header_name);</div><div class='del'>-</div><div class='del'>-/* 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 8dd94e1580..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-basic.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-basic.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,214 +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 reset(CamelMimeFilter *mf);</div><div class='del'>-static void complete(CamelMimeFilter *mf, char *in, size_t len, </div><div class='del'>-		     size_t prespace, char **out, </div><div class='del'>-		     size_t *outlen, size_t *outprespace);</div><div class='del'>-static void filter(CamelMimeFilter *mf, char *in, size_t len, </div><div class='del'>-		   size_t prespace, char **out, </div><div class='del'>-		   size_t *outlen, size_t *outprespace);</div><div class='del'>-</div><div class='del'>-static void camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass);</div><div class='del'>-static void camel_mime_filter_basic_init       (CamelMimeFilterBasic *obj);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_basic_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_basic_class_init (CamelMimeFilterBasicClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_basic_parent = CAMEL_MIME_FILTER_CLASS(camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;reset = reset;</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_basic_init (CamelMimeFilterBasic *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;state = 0;</div><div class='del'>-	obj-&gt;save = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_basic_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterBasic",</div><div class='del'>-					    sizeof (CamelMimeFilterBasic),</div><div class='del'>-					    sizeof (CamelMimeFilterBasicClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_basic_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_basic_init,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* should this 'flush' outstanding state/data bytes? */</div><div class='del'>-static void</div><div class='del'>-reset(CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;</div><div class='del'>-</div><div class='del'>-	switch(f-&gt;type) {</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:</div><div class='del'>-		f-&gt;state = -1;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		f-&gt;state = 0;</div><div class='del'>-	}</div><div class='del'>-	f-&gt;save = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *f = (CamelMimeFilterBasic *)mf;</div><div class='del'>-	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, TRUE, 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'>-		/* *4 is definetly more than needed ... */</div><div class='del'>-		camel_mime_filter_set_size(mf, len*4, FALSE);</div><div class='del'>-		newlen = quoted_encode_close(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		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, TRUE, 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'>-		/* *4 is overly conservative, but will do */</div><div class='del'>-		camel_mime_filter_set_size(mf, len*4, FALSE);</div><div class='del'>-		newlen = quoted_encode_step(in, len, mf-&gt;outbuf, &amp;f-&gt;state, &amp;f-&gt;save);</div><div class='del'>-		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'>-/**</div><div class='del'>- * camel_mime_filter_basic_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterBasic object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterBasic widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterBasic *</div><div class='del'>-camel_mime_filter_basic_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *new = CAMEL_MIME_FILTER_BASIC ( camel_object_new (camel_mime_filter_basic_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilterBasic *</div><div class='del'>-camel_mime_filter_basic_new_type(CamelMimeFilterBasicType type)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterBasic *new;</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_BASE64_ENC:</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_ENC:</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_BASE64_DEC:</div><div class='del'>-	case CAMEL_MIME_FILTER_BASIC_QP_DEC:</div><div class='del'>-		new = camel_mime_filter_basic_new();</div><div class='del'>-		new-&gt;type = type;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		g_warning("Invalid type of CamelMimeFilterBasic requested: %d", type);</div><div class='del'>-		new = NULL;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	camel_mime_filter_reset((CamelMimeFilter *)new);</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-filter-basic.h b/camel/camel-mime-filter-basic.h<br/>deleted file mode 100644<br/>index 42713e334d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-basic.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, camel_mime_filter_basic_get_type (), CamelMimeFilterBasic)</div><div class='del'>-#define CAMEL_MIME_FILTER_BASIC_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_basic_get_type (), CamelMimeFilterBasicClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_BASIC(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_basic_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterBasicClass CamelMimeFilterBasicClass;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_BASE64_ENC = 1,</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_BASE64_DEC,</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_QP_ENC,</div><div class='del'>-	CAMEL_MIME_FILTER_BASIC_QP_DEC,</div><div class='del'>-} 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 c91c7f061f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-charset.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-charset.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,230 +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'>-static void camel_mime_filter_charset_finalize   (CamelObject *o);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_charset_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_charset_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterCharset",</div><div class='del'>-					    sizeof (CamelMimeFilterCharset),</div><div class='del'>-					    sizeof (CamelMimeFilterCharsetClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_charset_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_charset_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_filter_charset_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_charset_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCharset *f = (CamelMimeFilterCharset *)o;</div><div class='del'>-</div><div class='del'>-	g_free(f-&gt;from);</div><div class='del'>-	g_free(f-&gt;to);</div><div class='del'>-	if (f-&gt;ic != (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'>-</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'>-	const char *inbuf;</div><div class='del'>-	char *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'>-</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'>-	const char *inbuf;</div><div class='del'>-	char *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'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_charset_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;reset = reset;</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_charset_init (CamelMimeFilterCharset *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;ic = (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 ( camel_object_new (camel_mime_filter_charset_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilterCharset *</div><div class='del'>-camel_mime_filter_charset_new_convert(const char *from_charset, const char *to_charset)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCharset *new = CAMEL_MIME_FILTER_CHARSET ( camel_object_new (camel_mime_filter_charset_get_type ()));</div><div class='del'>-</div><div class='del'>-	new-&gt;ic = 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'>-		camel_object_unref((CamelObject *)new);</div><div class='del'>-		new = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		new-&gt;from = g_strdup(from_charset);</div><div class='del'>-		new-&gt;to = g_strdup(to_charset);</div><div class='del'>-	}</div><div class='del'>-	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 c53254c8ab..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-charset.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, camel_mime_filter_charset_get_type (), CamelMimeFilterCharset)</div><div class='del'>-#define CAMEL_MIME_FILTER_CHARSET_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_charset_get_type (), CamelMimeFilterCharsetClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_CHARSET(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_charset_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterCharsetClass CamelMimeFilterCharsetClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterCharset {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterCharsetPrivate *priv;</div><div class='del'>-</div><div class='del'>-	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 71a3e8bace..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-crlf.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-crlf.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'>- *  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'>-CamelType</div><div class='del'>-camel_mime_filter_crlf_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterCRLF",</div><div class='del'>-					    sizeof (CamelMimeFilterCRLF),</div><div class='del'>-					    sizeof (CamelMimeFilterCRLFClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_crlf_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterCRLF *crlf = (CamelMimeFilterCRLF *)f;</div><div class='del'>-	gboolean do_dots;</div><div class='del'>-	char *p, *q;</div><div class='del'>-</div><div class='del'>-	do_dots = crlf-&gt;mode == CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS;</div><div class='del'>-</div><div class='del'>-	if (crlf-&gt;direction == CAMEL_MIME_FILTER_CRLF_ENCODE) {</div><div class='del'>-		camel_mime_filter_set_size (f, 3 * len, FALSE);</div><div class='del'>-</div><div class='del'>-		p = in;</div><div class='del'>-		q = f-&gt;outbuf;</div><div class='del'>-		while (p &lt; in + len) {</div><div class='del'>-			if (*p == '\n')</div><div class='del'>-				*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 = CAMEL_MIME_FILTER_CRLF(camel_object_new (CAMEL_MIME_FILTER_CRLF_TYPE));</div><div class='del'>-</div><div class='del'>-	crlf-&gt;direction = direction;</div><div class='del'>-	crlf-&gt;mode = mode;</div><div class='del'>-	crlf-&gt;saw_cr = FALSE;</div><div class='del'>-</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 6ba109d154..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-crlf.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLF)</div><div class='del'>-#define CAMEL_MIME_FILTER_CRLF_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_CRLF_TYPE, CamelMimeFilterCRLFClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_CRLF(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_CRLF_TYPE)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterCRLFClass CamelMimeFilterCRLFClass;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-	CAMEL_MIME_FILTER_CRLF_DECODE</div><div class='del'>-} CamelMimeFilterCRLFDirection;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS,</div><div class='del'>-	CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY,</div><div class='del'>-} CamelMimeFilterCRLFMode;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterCRLF {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	CamelMimeFilterCRLFDirection direction;</div><div class='del'>-	CamelMimeFilterCRLFMode mode;</div><div class='del'>-	gboolean saw_cr;</div><div class='del'>-	gboolean saw_dot;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterCRLFClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_mime_filter_crlf_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *camel_mime_filter_crlf_new (CamelMimeFilterCRLFDirection direction, CamelMimeFilterCRLFMode mode);</div><div class='del'>-</div><div class='del'>-#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 017a256471..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-from.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-from.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,221 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  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'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_from_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_from_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterFrom",</div><div class='del'>-					    sizeof (CamelMimeFilterFrom),</div><div class='del'>-					    sizeof (CamelMimeFilterFromClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_from_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_from_init,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct fromnode {</div><div class='del'>-	struct fromnode *next;</div><div class='del'>-	char *pointer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	*out = in;</div><div class='del'>-	*outlen = len;</div><div class='del'>-	*outprespace = prespace;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Yes, it is complicated ... */</div><div class='del'>-static void</div><div class='del'>-filter(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterFrom *f = (CamelMimeFilterFrom *)mf;</div><div class='del'>-	register char *inptr, *inend;</div><div class='del'>-	int left;</div><div class='del'>-	int midline = f-&gt;midline;</div><div class='del'>-	int fromcount = 0;</div><div class='del'>-	struct fromnode *head = NULL, *tail = (struct fromnode *)&amp;head, *node;</div><div class='del'>-	char *outptr;</div><div class='del'>-</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = inptr+len;</div><div class='del'>-</div><div class='del'>-	d(printf("Filtering '%.*s'\n", len, in));</div><div class='del'>-</div><div class='del'>-	/* first, see if we need to escape any from's */</div><div class='del'>-	while (inptr&lt;inend) {</div><div class='del'>-		register int c = -1;</div><div class='del'>-</div><div class='del'>-		if (midline)</div><div class='del'>-			while (inptr &lt; inend &amp;&amp; (c = *inptr++) != '\n')</div><div class='del'>-				;</div><div class='del'>-</div><div class='del'>-		if (c == '\n' || !midline) {</div><div class='del'>-			left = inend-inptr;</div><div class='del'>-			if (left &gt; 0) {</div><div class='del'>-				midline = TRUE;</div><div class='del'>-				if (left &lt; 5) {</div><div class='del'>-					if (inptr[0] == 'F') {</div><div class='del'>-						camel_mime_filter_backup(mf, inptr, left);</div><div class='del'>-						midline = FALSE;</div><div class='del'>-						inend = inptr;</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					if (!strncmp(inptr, "From ", 5)) {</div><div class='del'>-						fromcount++;</div><div class='del'>-						/* yes, we do alloc them on the stack ... at most we're going to get</div><div class='del'>-						   len / 7 of them anyway */</div><div class='del'>-						node = alloca(sizeof(*node));</div><div class='del'>-						node-&gt;pointer = inptr;</div><div class='del'>-						node-&gt;next = NULL;</div><div class='del'>-						tail-&gt;next = node;</div><div class='del'>-						tail = node;</div><div class='del'>-						inptr += 5;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				/* \n is at end of line, check next buffer */</div><div class='del'>-				midline = FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	f-&gt;midline = midline;</div><div class='del'>-</div><div class='del'>-	if (fromcount &gt; 0) {</div><div class='del'>-		camel_mime_filter_set_size(mf, len + fromcount, FALSE);</div><div class='del'>-		node = head;</div><div class='del'>-		inptr = in;</div><div class='del'>-		outptr = mf-&gt;outbuf;</div><div class='del'>-		while (node) {</div><div class='del'>-			memcpy(outptr, inptr, node-&gt;pointer - inptr);</div><div class='del'>-			outptr += node-&gt;pointer - inptr;</div><div class='del'>-			*outptr++ = '&gt;';</div><div class='del'>-			inptr = node-&gt;pointer;</div><div class='del'>-			node = node-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		memcpy(outptr, inptr, inend - inptr);</div><div class='del'>-		outptr += inend - inptr;</div><div class='del'>-		*out = mf-&gt;outbuf;</div><div class='del'>-		*outlen = outptr - mf-&gt;outbuf;</div><div class='del'>-		*outprespace = mf-&gt;outbuf - mf-&gt;outreal;</div><div class='del'>-</div><div class='del'>-		d(printf("Filtered '%.*s'\n", *outlen, *out));</div><div class='del'>-	} else {</div><div class='del'>-		*out = in;</div><div class='del'>-		*outlen = inend - in;</div><div class='del'>-		*outprespace = prespace;</div><div class='del'>-		</div><div class='del'>-		d(printf("Filtered '%.*s'\n", *outlen, *out));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_from_class_init (CamelMimeFilterFromClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_from_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_from_init (CamelMimeFilterFrom *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelMimeFilterFromPrivate *p;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-	obj-&gt;midline = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_from_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterFrom object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterFrom widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterFrom *</div><div class='del'>-camel_mime_filter_from_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterFrom *new = CAMEL_MIME_FILTER_FROM ( camel_object_new (camel_mime_filter_from_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterFrom *f;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int len, prespace;</div><div class='del'>-</div><div class='del'>-	g_tk_init(&amp;argc, &amp;argv);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	f = camel_mime_filter_from_new();</div><div class='del'>-</div><div class='del'>-	buffer = "This is a test\nFrom Someone\nTo someone. From Someone else, From\n From blah\nFromblah\nBye! \nFrom ";</div><div class='del'>-	len = strlen(buffer);</div><div class='del'>-	prespace = 0;</div><div class='del'>-</div><div class='del'>-	printf("input = '%.*s'\n", len, buffer);</div><div class='del'>-	camel_mime_filter_filter(f, buffer, len, prespace, &amp;buffer, &amp;len, &amp;prespace);</div><div class='del'>-	printf("output = '%.*s'\n", len, buffer);</div><div class='del'>-	buffer = "";</div><div class='del'>-	len = 0;</div><div class='del'>-	prespace = 0;</div><div class='del'>-	camel_mime_filter_complete(f, buffer, len, prespace, &amp;buffer, &amp;len, &amp;prespace);</div><div class='del'>-	printf("complete = '%.*s'\n", len, buffer);</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/camel/camel-mime-filter-from.h b/camel/camel-mime-filter-from.h<br/>deleted file mode 100644<br/>index ac526b6e15..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-from.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-from.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +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;camel/camel-mime-filter.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MIME_FILTER_FROM(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_from_get_type (), CamelMimeFilterFrom)</div><div class='del'>-#define CAMEL_MIME_FILTER_FROM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_from_get_type (), CamelMimeFilterFromClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_FROM(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_from_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterFrom      CamelMimeFilterFrom;</div><div class='del'>-typedef struct _CamelMimeFilterFromClass CamelMimeFilterFromClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterFrom {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterFromPrivate *priv;</div><div class='del'>-</div><div class='del'>-	int midline;		/* are we between lines? */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterFromClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-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 46e0f3f5e8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-index.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-index.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,156 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 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_finalize   (CamelObject *o);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_index_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_index_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterIndex",</div><div class='del'>-					    sizeof (CamelMimeFilterIndex),</div><div class='del'>-					    sizeof (CamelMimeFilterIndexClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_index_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_filter_index_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_index_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterIndex *f = (CamelMimeFilterIndex *)o;</div><div class='del'>-</div><div class='del'>-	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'>-</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'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mime_filter_index_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	/*filter_class-&gt;reset = reset;*/</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-	filter_class-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_index_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilterIndex object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilterIndex widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilterIndex *</div><div class='del'>-camel_mime_filter_index_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterIndex *new = CAMEL_MIME_FILTER_INDEX ( camel_object_new (camel_mime_filter_index_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilterIndex      *camel_mime_filter_index_new_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 b0a9107852..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-index.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, camel_mime_filter_index_get_type (), CamelMimeFilterIndex)</div><div class='del'>-#define CAMEL_MIME_FILTER_INDEX_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_index_get_type (), CamelMimeFilterIndexClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_INDEX(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_index_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterIndexClass CamelMimeFilterIndexClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterIndex {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterIndexPrivate *priv;</div><div class='del'>-</div><div class='del'>-	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-linewrap.c b/camel/camel-mime-filter-linewrap.c<br/>deleted file mode 100644<br/>index dee6c19abb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-linewrap.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-linewrap.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,140 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: 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-linewrap.h"</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-static void filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-		    char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-static void complete (CamelMimeFilter *f, char *in, size_t len,</div><div class='del'>-		      size_t prespace, char **out, size_t *outlen,</div><div class='del'>-		      size_t *outprespace);</div><div class='del'>-static void reset (CamelMimeFilter *f);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_linewrap_class_init (CamelMimeFilterLinewrapClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterClass *mime_filter_class =</div><div class='del'>-		(CamelMimeFilterClass *) klass;</div><div class='del'>-	</div><div class='del'>-	mime_filter_class-&gt;filter = filter;</div><div class='del'>-	mime_filter_class-&gt;complete = complete;</div><div class='del'>-	mime_filter_class-&gt;reset = reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_linewrap_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type(), "CamelMimeFilterLinewrap",</div><div class='del'>-					    sizeof (CamelMimeFilterLinewrap),</div><div class='del'>-					    sizeof (CamelMimeFilterLinewrapClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_linewrap_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-filter (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;</div><div class='del'>-	char *inend, *last, *p, *q;</div><div class='del'>-	int nchars = linewrap-&gt;nchars;</div><div class='del'>-	</div><div class='del'>-	/* we'll be adding chars here so we need a bigger buffer */</div><div class='del'>-	camel_mime_filter_set_size (f, 3 * len, FALSE);</div><div class='del'>-	</div><div class='del'>-	p = in;</div><div class='del'>-	q = f-&gt;outbuf;</div><div class='del'>-	inend = in + len;</div><div class='del'>-	</div><div class='del'>-	while (p &lt; inend) {</div><div class='del'>-		if (*p == '\n') {</div><div class='del'>-			last = q;</div><div class='del'>-			*q++ = *p++;</div><div class='del'>-			nchars = 0;</div><div class='del'>-		} else if (isspace (*p)) {</div><div class='del'>-			last = q;</div><div class='del'>-			</div><div class='del'>-			if (nchars &gt;= linewrap-&gt;wrap_len) {</div><div class='del'>-				*q++ = '\n';</div><div class='del'>-				p++;</div><div class='del'>-				nchars = 0;</div><div class='del'>-			} else {</div><div class='del'>-				*q++ = *p++;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			*q++ = *p++;</div><div class='del'>-			nchars++;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* line is getting way too long, we must force a wrap here */</div><div class='del'>-		if (nchars &gt;= (linewrap-&gt;max_len - 1) &amp;&amp; *p != '\n') {</div><div class='del'>-			*q++ = '\n';</div><div class='del'>-			*q++ = linewrap-&gt;indent;</div><div class='del'>-			nchars = 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	linewrap-&gt;nchars = nchars;</div><div class='del'>-	</div><div class='del'>-	*out = f-&gt;outbuf;</div><div class='del'>-	*outlen = q - f-&gt;outbuf;</div><div class='del'>-	*outprespace = f-&gt;outpre;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-complete (CamelMimeFilter *f, char *in, size_t len, size_t prespace,</div><div class='del'>-	  char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	if (len)</div><div class='del'>-		filter (f, in, len, prespace, out, outlen, outprespace);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-reset (CamelMimeFilter *f)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterLinewrap *linewrap = (CamelMimeFilterLinewrap *)f;</div><div class='del'>-	</div><div class='del'>-	linewrap-&gt;nchars = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilterLinewrap *linewrap =</div><div class='del'>-		CAMEL_MIME_FILTER_LINEWRAP (camel_object_new (CAMEL_MIME_FILTER_LINEWRAP_TYPE));</div><div class='del'>-	</div><div class='del'>-	linewrap-&gt;indent = indent_char;</div><div class='del'>-	linewrap-&gt;wrap_len = preferred_len;</div><div class='del'>-	linewrap-&gt;max_len = max_len;</div><div class='del'>-	linewrap-&gt;nchars = 0;</div><div class='del'>-	</div><div class='del'>-	return (CamelMimeFilter *) linewrap;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-filter-linewrap.h b/camel/camel-mime-filter-linewrap.h<br/>deleted file mode 100644<br/>index 189b80d014..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-linewrap.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-linewrap.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: 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_LINEWRAP_H</div><div class='del'>-#define _CAMEL_MIME_FILTER_LINEWRAP_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_LINEWRAP_TYPE         (camel_mime_filter_linewrap_get_type ())</div><div class='del'>-#define CAMEL_MIME_FILTER_LINEWRAP(obj)         CAMEL_CHECK_CAST (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrap)</div><div class='del'>-#define CAMEL_MIME_FILTER_LINEWRAP_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, CAMEL_MIME_FILTER_LINEWRAP_TYPE, CamelMimeFilterLinewrapClass)</div><div class='del'>-#define CAMEL_IS_MIME_FILTER_LINEWRAP(obj)      CAMEL_CHECK_TYPE (obj, CAMEL_MIME_FILTER_LINEWRAP_TYPE)</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterLinewrapClass CamelMimeFilterLinewrapClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterLinewrap {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-	</div><div class='del'>-	guint wrap_len;</div><div class='del'>-	guint max_len;</div><div class='del'>-	char indent;</div><div class='del'>-	int nchars;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterLinewrapClass {</div><div class='del'>-	CamelMimeFilterClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType camel_mime_filter_linewrap_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelMimeFilter *camel_mime_filter_linewrap_new (guint preferred_len, guint max_len, char indent_char);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MIME_FILTER_LINEWRAP_H */</div><div class='head'>diff --git a/camel/camel-mime-filter-save.c b/camel/camel-mime-filter-save.c<br/>deleted file mode 100644<br/>index e1761994ed..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-save.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter-save.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,144 +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'>-static void camel_mime_filter_save_finalize   (CamelObject *o);</div><div class='del'>-</div><div class='del'>-static CamelMimeFilterClass *camel_mime_filter_save_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_save_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_mime_filter_get_type (), "CamelMimeFilterSave",</div><div class='del'>-					    sizeof (CamelMimeFilterSave),</div><div class='del'>-					    sizeof (CamelMimeFilterSaveClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_filter_save_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_filter_save_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_filter_save_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_save_finalize(CamelObject *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'>-</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'>-	CamelMimeFilterClass *filter_class = (CamelMimeFilterClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_mime_filter_save_parent = CAMEL_MIME_FILTER_CLASS (camel_type_get_global_classfuncs (camel_mime_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	filter_class-&gt;reset = reset;</div><div class='del'>-	filter_class-&gt;filter = filter;</div><div class='del'>-}</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 ( camel_object_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'>-			camel_object_unref((CamelObject *)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 abc1bf1186..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter-save.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, camel_mime_filter_save_get_type (), CamelMimeFilterSave)</div><div class='del'>-#define CAMEL_MIME_FILTER_SAVE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_save_get_type (), CamelMimeFilterSaveClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER_SAVE(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_save_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterSaveClass CamelMimeFilterSaveClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterSave {</div><div class='del'>-	CamelMimeFilter parent;</div><div class='del'>-</div><div class='del'>-	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 9a81dfb452..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,255 +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'>-/*#define MALLOC_CHECK */ /* for some malloc checking, requires mcheck enabled */</div><div class='del'>-</div><div class='del'>-/* only suitable for glibc */</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-#include &lt;mcheck.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilterPrivate {</div><div class='del'>-	char *inbuf;</div><div class='del'>-	size_t inlen;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define PRE_HEAD (64)</div><div class='del'>-#define BACK_HEAD (64)</div><div class='del'>-#define _PRIVATE(o) (((CamelMimeFilter *)(o))-&gt;priv)</div><div class='del'>-#define FCLASS(o) ((CamelMimeFilterClass *)(CAMEL_OBJECT_GET_CLASS(o)))</div><div class='del'>-</div><div class='del'>-static CamelObjectClass *camel_mime_filter_parent;</div><div class='del'>-</div><div class='del'>-static void complete (CamelMimeFilter *mf, char *in, size_t len, </div><div class='del'>-		      size_t prespace, char **out, size_t *outlen, </div><div class='del'>-		      size_t *outprespace);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_class_init (CamelMimeFilterClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_mime_filter_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-</div><div class='del'>-	klass-&gt;complete = complete;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_init (CamelMimeFilter *obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;outreal = NULL;</div><div class='del'>-	obj-&gt;outbuf = NULL;</div><div class='del'>-	obj-&gt;outsize = 0;</div><div class='del'>-</div><div class='del'>-	obj-&gt;backbuf = NULL;</div><div class='del'>-	obj-&gt;backsize = 0;</div><div class='del'>-	obj-&gt;backlen = 0;</div><div class='del'>-</div><div class='del'>-	_PRIVATE(obj) = g_malloc0(sizeof(*obj-&gt;priv));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_filter_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilter *f = (CamelMimeFilter *)o;</div><div class='del'>-	struct _CamelMimeFilterPrivate *p = _PRIVATE(f);</div><div class='del'>-</div><div class='del'>-	g_free(f-&gt;outreal);</div><div class='del'>-	g_free(f-&gt;backbuf);</div><div class='del'>-	g_free(p-&gt;inbuf);</div><div class='del'>-	g_free(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_filter_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mime_filter_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_mime_filter_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_mime_filter_type = camel_type_register (CAMEL_OBJECT_TYPE, "CamelMimeFilter",</div><div class='del'>-							      sizeof (CamelMimeFilter),</div><div class='del'>-							      sizeof (CamelMimeFilterClass),</div><div class='del'>-							      (CamelObjectClassInitFunc) camel_mime_filter_class_init,</div><div class='del'>-							      NULL,</div><div class='del'>-							      (CamelObjectInitFunc) camel_mime_filter_init,</div><div class='del'>-							      (CamelObjectFinalizeFunc) camel_mime_filter_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_mime_filter_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-complete(CamelMimeFilter *mf, char *in, size_t len, size_t prespace, char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	/* default - do nothing */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_filter_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeFilter object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeFilter widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeFilter *</div><div class='del'>-camel_mime_filter_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeFilter *new = CAMEL_MIME_FILTER ( camel_object_new (camel_mime_filter_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-static void</div><div class='del'>-checkmem(void *p)</div><div class='del'>-{</div><div class='del'>-	if (p) {</div><div class='del'>-		int status = mprobe(p);</div><div class='del'>-</div><div class='del'>-		switch (status) {</div><div class='del'>-		case MCHECK_HEAD:</div><div class='del'>-			printf("Memory underrun at %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		case MCHECK_TAIL:</div><div class='del'>-			printf("Memory overrun at %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		case MCHECK_FREE:</div><div class='del'>-			printf("Double free %p\n", p);</div><div class='del'>-			abort();</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void filter_run(CamelMimeFilter *f,</div><div class='del'>-		       char *in, size_t len, size_t prespace,</div><div class='del'>-		       char **out, size_t *outlen, size_t *outprespace,</div><div class='del'>-		       void (*filterfunc)(CamelMimeFilter *f,</div><div class='del'>-					  char *in, size_t len, size_t prespace,</div><div class='del'>-					  char **out, size_t *outlen, size_t *outprespace))</div><div class='del'>-{</div><div class='del'>-	struct _CamelMimeFilterPrivate *p;</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-	checkmem(f-&gt;outreal);</div><div class='del'>-	checkmem(f-&gt;backbuf);</div><div class='del'>-#endif</div><div class='del'>-	/*</div><div class='del'>-	  here we take a performance hit, if the input buffer doesn't</div><div class='del'>-	  have the pre-space required.  We make a buffer that does ...</div><div class='del'>-	*/</div><div class='del'>-	if (prespace &lt; f-&gt;backlen) {</div><div class='del'>-		int newlen = len+prespace+f-&gt;backlen;</div><div class='del'>-		p = _PRIVATE(f);</div><div class='del'>-		if (p-&gt;inlen &lt; newlen) {</div><div class='del'>-			/* NOTE: g_realloc copies data, we dont need that (slower) */</div><div class='del'>-			g_free(p-&gt;inbuf);</div><div class='del'>-			p-&gt;inbuf = g_malloc(newlen+PRE_HEAD);</div><div class='del'>-			p-&gt;inlen = newlen+PRE_HEAD;</div><div class='del'>-		}</div><div class='del'>-		/* copy to end of structure */</div><div class='del'>-		memcpy(p-&gt;inbuf+p-&gt;inlen - len, in, len);</div><div class='del'>-		in = p-&gt;inbuf+p-&gt;inlen - len;</div><div class='del'>-		prespace = p-&gt;inlen - len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-	checkmem(f-&gt;outreal);</div><div class='del'>-	checkmem(f-&gt;backbuf);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	/* preload any backed up data */</div><div class='del'>-	if (f-&gt;backlen &gt; 0) {</div><div class='del'>-		memcpy(in-f-&gt;backlen, f-&gt;backbuf, f-&gt;backlen);</div><div class='del'>-		in -= f-&gt;backlen;</div><div class='del'>-		len += f-&gt;backlen;</div><div class='del'>-		prespace -= f-&gt;backlen;</div><div class='del'>-		f-&gt;backlen = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	filterfunc(f, in, len, prespace, out, outlen, outprespace);</div><div class='del'>-</div><div class='del'>-#ifdef MALLOC_CHECK</div><div class='del'>-	checkmem(f-&gt;outreal);</div><div class='del'>-	checkmem(f-&gt;backbuf);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_filter(CamelMimeFilter *f,</div><div class='del'>-			      char *in, size_t len, size_t prespace,</div><div class='del'>-			      char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	if (FCLASS(f)-&gt;filter)</div><div class='del'>-		filter_run(f, in, len, prespace, out, outlen, outprespace, FCLASS(f)-&gt;filter);</div><div class='del'>-	else</div><div class='del'>-		g_error("Filter function unplmenented in class");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_complete(CamelMimeFilter *f,</div><div class='del'>-				char *in, size_t len, size_t prespace,</div><div class='del'>-				char **out, size_t *outlen, size_t *outprespace)</div><div class='del'>-{</div><div class='del'>-	if (FCLASS(f)-&gt;complete)</div><div class='del'>-		filter_run(f, in, len, prespace, out, outlen, outprespace, FCLASS(f)-&gt;complete);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_reset(CamelMimeFilter *f)</div><div class='del'>-{</div><div class='del'>-	if (FCLASS(f)-&gt;reset) {</div><div class='del'>-		FCLASS(f)-&gt;reset(f);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* could free some buffers, if they are really big? */</div><div class='del'>-	f-&gt;backlen = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* sets number of bytes backed up on the input, new calls replace previous ones */</div><div class='del'>-void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t length)</div><div class='del'>-{</div><div class='del'>-	if (f-&gt;backsize &lt; length) {</div><div class='del'>-		/* g_realloc copies data, unnecessary overhead */</div><div class='del'>-		g_free(f-&gt;backbuf);</div><div class='del'>-		f-&gt;backbuf = g_malloc(length+BACK_HEAD);</div><div class='del'>-		f-&gt;backsize = length+BACK_HEAD;</div><div class='del'>-	}</div><div class='del'>-	f-&gt;backlen = length;</div><div class='del'>-	memcpy(f-&gt;backbuf, data, length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ensure this much size available for filter output (if required) */</div><div class='del'>-void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep)</div><div class='del'>-{</div><div class='del'>-	if (f-&gt;outsize &lt; size) {</div><div class='del'>-		int offset = f-&gt;outptr - f-&gt;outreal;</div><div class='del'>-		if (keep) {</div><div class='del'>-			f-&gt;outreal = g_realloc(f-&gt;outreal, size + PRE_HEAD*4);</div><div class='del'>-		} else {</div><div class='del'>-			g_free(f-&gt;outreal);</div><div class='del'>-			f-&gt;outreal = g_malloc(size + PRE_HEAD*4);</div><div class='del'>-		}</div><div class='del'>-		f-&gt;outptr = f-&gt;outreal + offset;</div><div class='del'>-		f-&gt;outbuf = f-&gt;outreal + PRE_HEAD*4;</div><div class='del'>-		f-&gt;outsize = size;</div><div class='del'>-		/* this could be offset from the end of the structure, but </div><div class='del'>-		   this should be good enough */</div><div class='del'>-		f-&gt;outpre = PRE_HEAD*4;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-filter.h b/camel/camel-mime-filter.h<br/>deleted file mode 100644<br/>index 65d8590fa5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-filter.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-filter.h</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: 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_TYPE         (camel_mime_filter_get_type ())</div><div class='del'>-#define CAMEL_MIME_FILTER(obj)         CAMEL_CHECK_CAST (obj, camel_mime_filter_get_type (), CamelMimeFilter)</div><div class='del'>-#define CAMEL_MIME_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_filter_get_type (), CamelMimeFilterClass)</div><div class='del'>-#define IS_CAMEL_MIME_FILTER(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_filter_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeFilterClass CamelMimeFilterClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMimeFilter {</div><div class='del'>-	CamelObject parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelMimeFilterPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *outreal;		/* real malloc'd buffer */</div><div class='del'>-	char *outbuf;		/* first 'writable' position allowed (outreal + outpre) */</div><div class='del'>-	char *outptr;</div><div class='del'>-	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'>-CamelType	      camel_mime_filter_get_type	(void);</div><div class='del'>-CamelMimeFilter      *camel_mime_filter_new	(void);</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_filter(CamelMimeFilter *f,</div><div class='del'>-			      char *in, size_t len, size_t prespace,</div><div class='del'>-			      char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_complete(CamelMimeFilter *f,</div><div class='del'>-				char *in, size_t len, size_t prespace,</div><div class='del'>-				char **out, size_t *outlen, size_t *outprespace);</div><div class='del'>-</div><div class='del'>-void camel_mime_filter_reset(CamelMimeFilter *f);</div><div class='del'>-</div><div class='del'>-/* sets/returns number of bytes backed up on the input */</div><div class='del'>-void camel_mime_filter_backup(CamelMimeFilter *f, const char *data, size_t length);</div><div class='del'>-</div><div class='del'>-/* ensure this much size available for filter output */</div><div class='del'>-void camel_mime_filter_set_size(CamelMimeFilter *f, size_t size, int keep);</div><div class='del'>-</div><div class='del'>-#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 fd199f600d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-message.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-message.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,738 +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'>- *          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'>-</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "gmime-content-field.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "hash-table-utils.h"</div><div class='del'>-#include &lt;stdio.h&gt;</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 add_header (CamelMedium *medium, const char *header_name, const void *header_value);</div><div class='del'>-static void set_header (CamelMedium *medium, const char *header_name, const void *header_value);</div><div class='del'>-static void remove_header (CamelMedium *medium, const char *header_name);</div><div class='del'>-static int construct_from_parser (CamelMimePart *, CamelMimeParser *);</div><div class='del'>-static void unref_recipient (gpointer key, gpointer value, gpointer user_data);</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMimeMessage */</div><div class='del'>-#define CMM_CLASS(so) CAMEL_MIME_MESSAGE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_message_class_init (CamelMimeMessageClass *camel_mime_message_class)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapperClass *camel_data_wrapper_class = CAMEL_DATA_WRAPPER_CLASS (camel_mime_message_class);</div><div class='del'>-	CamelMimePartClass *camel_mime_part_class = CAMEL_MIME_PART_CLASS (camel_mime_message_class);</div><div class='del'>-	CamelMediumClass *camel_medium_class = CAMEL_MEDIUM_CLASS (camel_mime_message_class);</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_MIME_PART_CLASS(camel_type_get_global_classfuncs (camel_mime_part_get_type ()));</div><div class='del'>-</div><div class='del'>-	header_name_table = g_hash_table_new (g_strcase_hash, g_strcase_equal);</div><div class='del'>-	for (i=0;header_names[i];i++)</div><div class='del'>-		g_hash_table_insert (header_name_table, header_names[i], (gpointer)i+1);</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream = write_to_stream;</div><div class='del'>-</div><div class='del'>-	camel_medium_class-&gt;add_header = add_header;</div><div class='del'>-	camel_medium_class-&gt;set_header = set_header;</div><div class='del'>-	camel_medium_class-&gt;remove_header = remove_header;</div><div class='del'>-	</div><div class='del'>-	camel_mime_part_class-&gt;construct_from_parser = construct_from_parser;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_message_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mime_message = (CamelMimeMessage *)object;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (object), "message/rfc822");</div><div class='del'>-</div><div class='del'>-	mime_message-&gt;recipients =  g_hash_table_new(g_strcase_hash, g_strcase_equal);</div><div class='del'>-	for (i=0;recipient_names[i];i++) {</div><div class='del'>-		g_hash_table_insert(mime_message-&gt;recipients, recipient_names[i], camel_internet_address_new());</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mime_message-&gt;subject = NULL;</div><div class='del'>-	mime_message-&gt;reply_to = NULL;</div><div class='del'>-	mime_message-&gt;from = NULL;</div><div class='del'>-	mime_message-&gt;date = CAMEL_MESSAGE_DATE_CURRENT;</div><div class='del'>-	mime_message-&gt;date_offset = 0;</div><div class='del'>-	mime_message-&gt;date_str = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-camel_mime_message_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *message = CAMEL_MIME_MESSAGE (object);</div><div class='del'>-	</div><div class='del'>-	g_free (message-&gt;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, unref_recipient, NULL);</div><div class='del'>-	g_hash_table_destroy (message-&gt;recipients);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_message_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mime_message_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_mime_message_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_mime_message_type = camel_type_register (camel_mime_part_get_type(), "CamelMimeMessage",</div><div class='del'>-							       sizeof (CamelMimeMessage),</div><div class='del'>-							       sizeof (CamelMimeMessageClass),</div><div class='del'>-							       (CamelObjectClassInitFunc) camel_mime_message_class_init,</div><div class='del'>-							       NULL,</div><div class='del'>-							       (CamelObjectInitFunc) camel_mime_message_init,</div><div class='del'>-							       (CamelObjectFinalizeFunc) camel_mime_message_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_mime_message_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void unref_recipient (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (value));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *</div><div class='del'>-camel_mime_message_new (void) </div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *mime_message;</div><div class='del'>-	mime_message = CAMEL_MIME_MESSAGE(camel_object_new (CAMEL_MIME_MESSAGE_TYPE));</div><div class='del'>-	</div><div class='del'>-	return mime_message;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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'>-const gchar *</div><div class='del'>-camel_mime_message_get_received_date (CamelMimeMessage *message)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: is this the received date? and if so then get_sent_date must be wrong */</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'>-const gchar *</div><div class='del'>-camel_mime_message_get_sent_date (CamelMimeMessage *message)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: is this the sent date? and if so then get_received_date must be wrong */</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'>-	CamelInternetAddress *cia;</div><div class='del'>-	char *addr;</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_strstrip (g_strdup (reply_to));</div><div class='del'>-	</div><div class='del'>-	cia = camel_internet_address_new ();</div><div class='del'>-	camel_address_decode (CAMEL_ADDRESS (cia), mime_message-&gt;reply_to);</div><div class='del'>-	addr = camel_address_encode (CAMEL_ADDRESS (cia));</div><div class='del'>-	</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (mime_message), "Reply-To", addr);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (cia));</div><div class='del'>-	g_free (addr);</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'>-	</div><div class='del'>-	g_assert (mime_message);</div><div class='del'>-	</div><div class='del'>-	g_free (mime_message-&gt;subject);</div><div class='del'>-	mime_message-&gt;subject = g_strstrip (g_strdup (subject));</div><div class='del'>-	text = header_encode_string ((unsigned char *) mime_message-&gt;subject);</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (mime_message), "Subject", text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const 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'>-	CamelInternetAddress *cia;</div><div class='del'>-	char *addr;</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;from);</div><div class='del'>-	mime_message-&gt;from = g_strstrip (g_strdup (from));</div><div class='del'>-	</div><div class='del'>-	cia = camel_internet_address_new ();</div><div class='del'>-	camel_address_decode (CAMEL_ADDRESS (cia), mime_message-&gt;from);</div><div class='del'>-	</div><div class='del'>-	addr = camel_address_encode (CAMEL_ADDRESS (cia));</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (mime_message), "From", addr);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (cia));</div><div class='del'>-	g_free (addr);</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 (CAMEL_ADDRESS (addr));</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (mime_message), type, text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_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'>-	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'>-	</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 (CAMEL_ADDRESS (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 (CAMEL_ADDRESS (addr));</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (mime_message), type, text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_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 (CAMEL_ADDRESS (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 (CAMEL_ADDRESS (addr));</div><div class='del'>-	CAMEL_MEDIUM_CLASS (parent_class)-&gt;set_header (CAMEL_MEDIUM (mime_message), type, text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "return a real error code"</div><div class='del'>-#endif</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'>-	if (!camel_medium_get_header ((CamelMedium *)mm, "Mime-Version"))</div><div class='del'>-		camel_medium_set_header((CamelMedium *)mm, "Mime-Version", "1.0");</div><div class='del'>-</div><div class='del'>-	return CAMEL_DATA_WRAPPER_CLASS (parent_class)-&gt;write_to_stream (data_wrapper, stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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'>-	</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 = g_strstrip (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 (CAMEL_ADDRESS (addr), header_value);</div><div class='del'>-		else</div><div class='del'>-			camel_address_remove (CAMEL_ADDRESS (addr), -1);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_DATE:</div><div class='del'>-		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='del'>-static gboolean</div><div class='del'>-multipart_has_8bit_parts (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	gboolean has_8bit = FALSE;</div><div class='del'>-	int i, nparts;</div><div class='del'>-	</div><div class='del'>-	nparts = camel_multipart_get_number (multipart);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; nparts &amp;&amp; !has_8bit; i++) {</div><div class='del'>-		GMimeContentField *content;</div><div class='del'>-		CamelMimePart *mime_part;</div><div class='del'>-		</div><div class='del'>-		mime_part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		content = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-		</div><div class='del'>-		if (gmime_content_field_is_type (content, "multipart", "*")) {</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelMultipart *mpart;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			mpart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-			</div><div class='del'>-			has_8bit = multipart_has_8bit_parts (mpart);</div><div class='del'>-		} else {</div><div class='del'>-			/* see if this part is 8bit */</div><div class='del'>-			has_8bit = camel_mime_part_get_encoding (mime_part) == CAMEL_MIME_PART_ENCODING_8BIT;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return has_8bit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_mime_message_has_8bit_parts (CamelMimeMessage *mime_message)</div><div class='del'>-{</div><div class='del'>-	GMimeContentField *content;</div><div class='del'>-	gboolean has_8bit = FALSE;</div><div class='del'>-	</div><div class='del'>-	content = camel_mime_part_get_content_type (CAMEL_MIME_PART (mime_message));</div><div class='del'>-	</div><div class='del'>-	if (gmime_content_field_is_type (content, "multipart", "*")) {</div><div class='del'>-		CamelDataWrapper *wrapper;</div><div class='del'>-		CamelMultipart *multipart;</div><div class='del'>-		</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (mime_message)));</div><div class='del'>-		multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-		</div><div class='del'>-		has_8bit = multipart_has_8bit_parts (multipart);</div><div class='del'>-	} else {</div><div class='del'>-		/* single-part message so just check this part */</div><div class='del'>-		has_8bit = camel_mime_part_get_encoding (CAMEL_MIME_PART (mime_message)) == CAMEL_MIME_PART_ENCODING_8BIT;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return has_8bit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-best_encoding (const guchar *text)</div><div class='del'>-{</div><div class='del'>-	guchar *ch;</div><div class='del'>-	int count = 0;</div><div class='del'>-	int total;</div><div class='del'>-	</div><div class='del'>-	for (ch = (guchar *) text; *ch; ch++)</div><div class='del'>-		if (*ch &gt; (guchar) 127)</div><div class='del'>-			count++;</div><div class='del'>-	</div><div class='del'>-	total = (int) (ch - text);</div><div class='del'>-	</div><div class='del'>-	if ((float) count &lt;= total * 0.17)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;</div><div class='del'>-	else</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_BASE64;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-multipart_encode_8bit_parts (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	int i, nparts;</div><div class='del'>-	</div><div class='del'>-	nparts = camel_multipart_get_number (multipart);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; nparts; i++) {</div><div class='del'>-		GMimeContentField *content;</div><div class='del'>-		CamelMimePart *mime_part;</div><div class='del'>-		</div><div class='del'>-		mime_part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		content = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-		</div><div class='del'>-		if (gmime_content_field_is_type (content, "multipart", "*")) {</div><div class='del'>-			/* ...and the search for Spock continues */</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelMultipart *mpart;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			mpart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-			</div><div class='del'>-			multipart_encode_8bit_parts (mpart);</div><div class='del'>-		} else {</div><div class='del'>-			/* re-encode this if necessary */</div><div class='del'>-			gboolean is_8bit;</div><div class='del'>-			</div><div class='del'>-			is_8bit = camel_mime_part_get_encoding (mime_part) == CAMEL_MIME_PART_ENCODING_8BIT;</div><div class='del'>-			if (is_8bit) {</div><div class='del'>-				CamelStream *stream;</div><div class='del'>-				GByteArray *array;</div><div class='del'>-				guchar *content;</div><div class='del'>-				</div><div class='del'>-				array = g_byte_array_new ();</div><div class='del'>-				stream = camel_stream_mem_new_with_byte_array (array);</div><div class='del'>-				camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (mime_part), stream);</div><div class='del'>-				g_byte_array_append (array, "", 1);</div><div class='del'>-				</div><div class='del'>-				content = array-&gt;data;</div><div class='del'>-				g_byte_array_free (array, FALSE);</div><div class='del'>-				</div><div class='del'>-				camel_mime_part_set_encoding (mime_part, best_encoding (content));</div><div class='del'>-				g_free (content);</div><div class='del'>-				camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message)</div><div class='del'>-{</div><div class='del'>-	GMimeContentField *content;</div><div class='del'>-	</div><div class='del'>-	content = camel_mime_part_get_content_type (CAMEL_MIME_PART (mime_message));</div><div class='del'>-	</div><div class='del'>-	if (gmime_content_field_is_type (content, "multipart", "*")) {</div><div class='del'>-		/* search for Spock */</div><div class='del'>-		CamelDataWrapper *wrapper;</div><div class='del'>-		CamelMultipart *multipart;</div><div class='del'>-		</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (mime_message)));</div><div class='del'>-		multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-		</div><div class='del'>-		multipart_encode_8bit_parts (multipart);</div><div class='del'>-	} else {</div><div class='del'>-		/* re-encode if we need to */</div><div class='del'>-		gboolean is_8bit;</div><div class='del'>-		</div><div class='del'>-		is_8bit = camel_mime_part_get_encoding (CAMEL_MIME_PART (mime_message)) == CAMEL_MIME_PART_ENCODING_8BIT;</div><div class='del'>-		if (is_8bit) {</div><div class='del'>-			/* FIXME: is there a better way of doing this? */</div><div class='del'>-			CamelStream *stream;</div><div class='del'>-			GByteArray *array;</div><div class='del'>-			guchar *content;</div><div class='del'>-			</div><div class='del'>-			array = g_byte_array_new ();</div><div class='del'>-			stream = camel_stream_mem_new_with_byte_array (array);</div><div class='del'>-			camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (CAMEL_MIME_PART (mime_message)), stream);</div><div class='del'>-			g_byte_array_append (array, "", 1);</div><div class='del'>-			</div><div class='del'>-			content = array-&gt;data;</div><div class='del'>-			g_byte_array_free (array, FALSE);</div><div class='del'>-						</div><div class='del'>-			camel_mime_part_set_encoding (CAMEL_MIME_PART (mime_message), best_encoding (content));</div><div class='del'>-			g_free (content);</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-message.h b/camel/camel-mime-message.h<br/>deleted file mode 100644<br/>index 33436c6dad..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-message.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-message.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; 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)     (CAMEL_CHECK_CAST((obj), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessage))</div><div class='del'>-#define CAMEL_MIME_MESSAGE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_MESSAGE_TYPE, CamelMimeMessageClass))</div><div class='del'>-#define CAMEL_IS_MIME_MESSAGE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MIME_MESSAGE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* specify local time */</div><div class='del'>-#define CAMEL_MESSAGE_DATE_CURRENT (~0)</div><div class='del'>-</div><div class='del'>-struct _CamelMimeMessage</div><div class='del'>-{</div><div class='del'>-	CamelMimePart parent_object;</div><div class='del'>-</div><div class='del'>-	/* header fields */</div><div class='del'>-	time_t date;</div><div class='del'>-	int date_offset;	/* GMT offset */</div><div class='del'>-	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 Camel function */</div><div class='del'>-CamelType camel_mime_message_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelMimeMessage * camel_mime_message_new                  (void);</div><div class='del'>-</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'>-</div><div class='del'>-/* utility functions */</div><div class='del'>-gboolean camel_mime_message_has_8bit_parts    (CamelMimeMessage *mime_message);</div><div class='del'>-void     camel_mime_message_encode_8bit_parts (CamelMimeMessage *mime_message);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* 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 efa808170e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-parser.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-parser.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1902 +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'>-/* Do not change this code without asking me (Michael Zucchi) first</div><div class='del'>-</div><div class='del'>-   There is almost always a reason something was done a certain way.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;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'>-	/* filters to apply to all content before output */</div><div class='del'>-	int filterid;		/* id of next filter */</div><div class='del'>-	struct _header_scan_filter *filters;</div><div class='del'>-</div><div class='del'>-    /* per message/part info */</div><div class='del'>-	struct _header_scan_stack *parts;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _header_scan_stack {</div><div class='del'>-	struct _header_scan_stack *parent;</div><div class='del'>-</div><div class='del'>-	enum _header_state savestate; /* state at invocation of this part */</div><div class='del'>-</div><div class='del'>-#ifdef MEMPOOL</div><div class='del'>-	MemPool *pool;		/* memory pool to keep track of headers/etc at this level */</div><div class='del'>-#endif</div><div class='del'>-	struct _header_raw *headers;	/* headers for this part */</div><div class='del'>-</div><div class='del'>-	struct _header_content_type *content_type;</div><div class='del'>-</div><div class='del'>-	/* I dont use GString's casue you can't efficiently append a buffer to them */</div><div class='del'>-	GByteArray *pretext;	/* for multipart types, save the pre-boundary data here */</div><div class='del'>-	GByteArray *posttext;	/* for multipart types, save the post-boundary data here */</div><div class='del'>-	int prestage;		/* used to determine if it is a pre-boundary or post-boundary data segment */</div><div class='del'>-</div><div class='del'>-	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/news 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'>-static void</div><div class='del'>-camel_mime_parser_class_init (CamelMimeParserClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_mime_parser_parent = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_parser_init (CamelMimeParser *obj)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s;</div><div class='del'>-</div><div class='del'>-	s = folder_scan_init();</div><div class='del'>-	_PRIVATE(obj) = s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_parser_finalise(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(o);</div><div class='del'>-#ifdef PURIFY</div><div class='del'>-	purify_watch_remove_all();</div><div class='del'>-#endif</div><div class='del'>-	folder_scan_close(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_parser_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_object_get_type (), "CamelMimeParser",</div><div class='del'>-					    sizeof (CamelMimeParser),</div><div class='del'>-					    sizeof (CamelMimeParserClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_mime_parser_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_mime_parser_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_mime_parser_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMimeParser object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelMimeParser widget.</div><div class='del'>- **/</div><div class='del'>-CamelMimeParser *</div><div class='del'>-camel_mime_parser_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMimeParser *new = CAMEL_MIME_PARSER ( camel_object_new (camel_mime_parser_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_filter_add:</div><div class='del'>- * @m: </div><div class='del'>- * @mf: </div><div class='del'>- * </div><div class='del'>- * Add a filter that will be applied to any body content before it is passed</div><div class='del'>- * to the caller.  Filters may be pipelined to perform multi-pass operations</div><div class='del'>- * on the content, and are applied in the order they were added.</div><div class='del'>- *</div><div class='del'>- * Note that filters are only applied to the body content of messages, and once</div><div class='del'>- * a filter has been set, all content returned by a filter_step() with a state</div><div class='del'>- * of HSCAN_BODY will have passed through the filter.</div><div class='del'>- * </div><div class='del'>- * Return value: An id that may be passed to filter_remove() to remove</div><div class='del'>- * the filter, or -1 if the operation failed.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_mime_parser_filter_add(CamelMimeParser *m, CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	struct _header_scan_filter *f, *new;</div><div class='del'>-</div><div class='del'>-	new = g_malloc(sizeof(*new));</div><div class='del'>-	new-&gt;filter = mf;</div><div class='del'>-	new-&gt;id = s-&gt;filterid++;</div><div class='del'>-	if (s-&gt;filterid == -1)</div><div class='del'>-		s-&gt;filterid++;</div><div class='del'>-	new-&gt;next = 0;</div><div class='del'>-	camel_object_ref((CamelObject *)mf);</div><div class='del'>-</div><div class='del'>-	/* yes, this is correct, since 'next' is the first element of the struct */</div><div class='del'>-	f = (struct _header_scan_filter *)&amp;s-&gt;filters;</div><div class='del'>-	while (f-&gt;next)</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	f-&gt;next = new;</div><div class='del'>-	return new-&gt;id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_filter_remove:</div><div class='del'>- * @m: </div><div class='del'>- * @id: </div><div class='del'>- * </div><div class='del'>- * Remove a processing filter from the pipeline.  There is no</div><div class='del'>- * restriction on the order the filters can be removed.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_mime_parser_filter_remove(CamelMimeParser *m, int id)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-	struct _header_scan_filter *f, *old;</div><div class='del'>-	</div><div class='del'>-	f = (struct _header_scan_filter *)&amp;s-&gt;filters;</div><div class='del'>-	while (f &amp;&amp; f-&gt;next) {</div><div class='del'>-		old = f-&gt;next;</div><div class='del'>-		if (old-&gt;id == id) {</div><div class='del'>-			camel_object_unref((CamelObject *)old-&gt;filter);</div><div class='del'>-			f-&gt;next = old-&gt;next;</div><div class='del'>-			g_free(old);</div><div class='del'>-			/* there should only be a single matching id, but</div><div class='del'>-			   scan the whole lot anyway */</div><div class='del'>-		}</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_header:</div><div class='del'>- * @m: </div><div class='del'>- * @name: Name of header.</div><div class='del'>- * @offset: Pointer that can receive the offset of the header in</div><div class='del'>- * the stream from the start of parsing.</div><div class='del'>- * </div><div class='del'>- * Lookup a header by name.</div><div class='del'>- * </div><div class='del'>- * Return value: The header value, or NULL if the header is not</div><div class='del'>- * defined.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_mime_parser_header(CamelMimeParser *m, const char *name, int *offset)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts &amp;&amp;</div><div class='del'>-	    s-&gt;parts-&gt;headers) {</div><div class='del'>-		return header_raw_find(&amp;s-&gt;parts-&gt;headers, name, offset);</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_headers_raw:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Get the list of the raw headers which are defined for the</div><div class='del'>- * current state of the parser.  These headers are valid</div><div class='del'>- * until the next call to parser_step(), or parser_drop_step().</div><div class='del'>- * </div><div class='del'>- * Return value: The raw headers, or NULL if there are no headers</div><div class='del'>- * defined for the current part or state.  These are READ ONLY.</div><div class='del'>- **/</div><div class='del'>-struct _header_raw *</div><div class='del'>-camel_mime_parser_headers_raw(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return s-&gt;parts-&gt;headers;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-byte_array_to_string(GByteArray *array)</div><div class='del'>-{</div><div class='del'>-	if (array == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (array-&gt;len == 0 || array-&gt;data[array-&gt;len-1] != '\0')</div><div class='del'>-		g_byte_array_append(array, "", 1);</div><div class='del'>-</div><div class='del'>-	return array-&gt;data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_preface:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Retrieve the preface text for the current multipart.</div><div class='del'>- * Can only be used when the state is HSCAN_MULTIPART_END.</div><div class='del'>- * </div><div class='del'>- * Return value: The preface text, or NULL if there wasn't any.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_mime_parser_preface(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return byte_array_to_string(s-&gt;parts-&gt;pretext);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_postface:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Retrieve the postface text for the current multipart.</div><div class='del'>- * Only returns valid data when the current state if</div><div class='del'>- * HSCAN_MULTIPART_END.</div><div class='del'>- * </div><div class='del'>- * Return value: The postface text, or NULL if there wasn't any.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_mime_parser_postface(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return byte_array_to_string(s-&gt;parts-&gt;posttext);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</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 it's found the 'right'</div><div class='del'>-	   content-type?  can it? */</div><div class='del'>-	if (s-&gt;parts)</div><div class='del'>-		return s-&gt;parts-&gt;content_type;</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_unstep:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Cause the last step operation to repeat itself.  If this is </div><div class='del'>- * called repeated times, then the same step will be repeated</div><div class='del'>- * that many times.</div><div class='del'>- *</div><div class='del'>- * Note that it is not possible to scan back using this function,</div><div class='del'>- * only to have a way of peeking the next state.</div><div class='del'>- **/</div><div class='del'>-void camel_mime_parser_unstep(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	s-&gt;unstep++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_drop_step:</div><div class='del'>- * @m: </div><div class='del'>- * </div><div class='del'>- * Drop the last step call.  This should only be used</div><div class='del'>- * in conjunction with seeking of the stream as the</div><div class='del'>- * stream may be in an undefined state relative to the</div><div class='del'>- * state of the parser.</div><div class='del'>- *</div><div class='del'>- * Use this call with care.</div><div class='del'>- **/</div><div class='del'>-void camel_mime_parser_drop_step(CamelMimeParser *m)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	s-&gt;unstep = 0;</div><div class='del'>-	folder_scan_drop_step(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_step:</div><div class='del'>- * @m: </div><div class='del'>- * @databuffer: Pointer to accept a pointer to the data</div><div class='del'>- * associated with this step (if any).  May be #NULL,</div><div class='del'>- * in which case datalength is also ingored.</div><div class='del'>- * @datalength: Pointer to accept a pointer to the data</div><div class='del'>- * length associated with this step (if any).</div><div class='del'>- * </div><div class='del'>- * Parse the next part of the MIME message.  If _unstep()</div><div class='del'>- * has been called, then continue to return the same state</div><div class='del'>- * for that many calls.</div><div class='del'>- *</div><div class='del'>- * If the step is HSCAN_BODY then the databuffer and datalength</div><div class='del'>- * pointers will be setup to point to the internal data buffer</div><div class='del'>- * of the scanner and may be processed as required.  Any</div><div class='del'>- * filters will have already been applied to this data.</div><div class='del'>- *</div><div class='del'>- * Refer to the state diagram elsewhere for a full listing of</div><div class='del'>- * the states an application is gauranteed to get from the</div><div class='del'>- * scanner.</div><div class='del'>- *</div><div class='del'>- * Return value: The current new state of the parser</div><div class='del'>- * is returned.</div><div class='del'>- **/</div><div class='del'>-enum _header_state</div><div class='del'>-camel_mime_parser_step(CamelMimeParser *m, char **databuffer, int *datalength)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s = _PRIVATE(m);</div><div class='del'>-</div><div class='del'>-	d(printf("OLD STATE:  '%s' :\n", states[s-&gt;state]));</div><div class='del'>-</div><div class='del'>-	if (s-&gt;unstep &lt;= 0) {</div><div class='del'>-		char *dummy;</div><div class='del'>-		int dummylength;</div><div class='del'>-</div><div class='del'>-		if (databuffer == NULL) {</div><div class='del'>-			databuffer = &amp;dummy;</div><div class='del'>-			datalength = &amp;dummylength;</div><div class='del'>-		}</div><div class='del'>-			</div><div class='del'>-		folder_scan_step(s, databuffer, datalength);</div><div class='del'>-	} else</div><div class='del'>-		s-&gt;unstep--;</div><div class='del'>-</div><div class='del'>-	d(printf("NEW STATE:  '%s' :\n", states[s-&gt;state]));</div><div class='del'>-</div><div class='del'>-	return s-&gt;state;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_parser_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'>-		if (h-&gt;pretext)</div><div class='del'>-			g_byte_array_free(h-&gt;pretext, TRUE);</div><div class='del'>-		if (h-&gt;posttext)</div><div class='del'>-			g_byte_array_free(h-&gt;posttext, TRUE);</div><div class='del'>-		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'>-	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'>-					do</div><div class='del'>-						start++;</div><div class='del'>-					while (*start == ' ' || *start == '\t');</div><div class='del'>-					start--;</div><div class='del'>-					*start = ' ';</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("midline = %s\n", s-&gt;midline?"TRUE":"FALSE"));</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'>-			h(printf("inptr[0] = %02x '%c' inptr[1] = %02x '%c'\n",</div><div class='del'>-				 inptr[0], isprint(inptr[0])?inptr[0]:'.',</div><div class='del'>-				 inptr[1], isprint(inptr[1])?inptr[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'>-				h(printf("ok, checking\n"));</div><div class='del'>-				if (s-&gt;outbuf == s-&gt;outptr</div><div class='del'>-				    || 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'>-					h(printf("header done?\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 &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'>-				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'>-	int onboundary = FALSE;</div><div class='del'>-</div><div class='del'>-	c(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'>-					onboundary = TRUE;</div><div class='del'>-					goto content;</div><div class='del'>-				}</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'>-	/* if we hit a boundary, we should not include the closing \n */</div><div class='del'>-	if (onboundary)</div><div class='del'>-		*length = inptr-start-1;</div><div class='del'>-	else</div><div class='del'>-		*length = inptr-start;</div><div class='del'>-</div><div class='del'>-/*	printf("got %scontent: %.*s", s-&gt;midline?"partial ":"", inptr-start, start);*/</div><div class='del'>-</div><div class='del'>-	return part;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_scan_close(struct _header_scan_state *s)</div><div class='del'>-{</div><div class='del'>-	g_free(s-&gt;realbuf);</div><div class='del'>-	g_free(s-&gt;outbuf);</div><div class='del'>-	while (s-&gt;parts)</div><div class='del'>-		folder_pull_part(s);</div><div class='del'>-	if (s-&gt;fd != -1)</div><div class='del'>-		close(s-&gt;fd);</div><div class='del'>-	if (s-&gt;stream) {</div><div class='del'>-		camel_object_unref((CamelObject *)s-&gt;stream);</div><div class='del'>-	}</div><div class='del'>-	g_free(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct _header_scan_state *</div><div class='del'>-folder_scan_init(void)</div><div class='del'>-{</div><div class='del'>-	struct _header_scan_state *s;</div><div class='del'>-</div><div class='del'>-	s = g_malloc(sizeof(*s));</div><div class='del'>-</div><div class='del'>-	s-&gt;fd = -1;</div><div class='del'>-	s-&gt;stream = NULL;</div><div class='del'>-</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'>-			camel_object_unref((CamelObject *)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'>-			camel_object_unref((CamelObject *)s-&gt;stream);</div><div class='del'>-		s-&gt;stream = stream;</div><div class='del'>-		camel_object_ref((CamelObject *)stream);</div><div class='del'>-		if (s-&gt;fd != -1) {</div><div class='del'>-			close(s-&gt;fd);</div><div class='del'>-			s-&gt;fd = -1;</div><div class='del'>-		}</div><div class='del'>-		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, "news")</div><div class='del'>-				    /*|| !strcasecmp(ct-&gt;subtype, "partial")*/) {</div><div class='del'>-					type = HSCAN_MESSAGE;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* make the default type for multipart/digest be message/rfc822 */</div><div class='del'>-			if ((s-&gt;parts</div><div class='del'>-			     &amp;&amp; header_content_type_is(s-&gt;parts-&gt;content_type, "multipart", "digest"))) {</div><div class='del'>-				ct = header_content_type_decode("message/rfc822");</div><div class='del'>-				type = HSCAN_MESSAGE;</div><div class='del'>-				d(printf("parent was multipart/digest, autoupgrading to message/rfc822?\n"));</div><div class='del'>-				/* maybe we should do this too?</div><div class='del'>-				   header_raw_append_parse(&amp;h-&gt;headers, "Content-Type: message/rfc822", -1);*/</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		h-&gt;content_type = ct;</div><div class='del'>-		folder_push_part(s, h);</div><div class='del'>-		s-&gt;state = type;</div><div class='del'>-		return;</div><div class='del'>-		</div><div class='del'>-	case HSCAN_HEADER:</div><div class='del'>-		s-&gt;state = HSCAN_BODY;</div><div class='del'>-		</div><div class='del'>-	case HSCAN_BODY:</div><div class='del'>-		h = s-&gt;parts;</div><div class='del'>-		*datalength = 0;</div><div class='del'>-		presize = SCAN_HEAD;</div><div class='del'>-		f = s-&gt;filters;</div><div class='del'>-		</div><div class='del'>-		do {</div><div class='del'>-			hb = folder_scan_content (s, &amp;state, databuffer, datalength);</div><div class='del'>-</div><div class='del'>-			d(printf ("\n\nOriginal content: '"));</div><div class='del'>-			d(fwrite(*databuffer, sizeof(char), *datalength, stdout));</div><div class='del'>-			d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-			if (*datalength &gt; 0) {</div><div class='del'>-				while (f) {</div><div class='del'>-					camel_mime_filter_filter(f-&gt;filter, *databuffer, *datalength, presize,</div><div class='del'>-								 databuffer, datalength, &amp;presize);</div><div class='del'>-					d(printf ("Filtered content (%s): '",</div><div class='del'>-						  camel_type_to_name(((CamelObject *)f-&gt;filter)-&gt;s.type)));</div><div class='del'>-					d(fwrite(*databuffer, sizeof(char), *datalength, stdout));</div><div class='del'>-					d(printf("'\n"));</div><div class='del'>-					f = f-&gt;next;</div><div class='del'>-				}</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		} while (hb == h &amp;&amp; *datalength &gt; 0);</div><div class='del'>-		</div><div class='del'>-		/* check for any filter completion data */</div><div class='del'>-		if (*datalength &gt; 0) {</div><div class='del'>-			while (f) {</div><div class='del'>-				camel_mime_filter_filter(f-&gt;filter, *databuffer, *datalength, presize,</div><div class='del'>-							 databuffer, datalength, &amp;presize);</div><div class='del'>-				f = f-&gt;next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (*datalength &gt; 0)</div><div class='del'>-			return;</div><div class='del'>-		</div><div class='del'>-		s-&gt;state = HSCAN_BODY_END;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case HSCAN_MULTIPART:</div><div class='del'>-		h = s-&gt;parts;</div><div class='del'>-		do {</div><div class='del'>-			do {</div><div class='del'>-				hb = folder_scan_content(s, &amp;state, databuffer, datalength);</div><div class='del'>-				if (*datalength&gt;0) {</div><div class='del'>-					/* instead of a new state, we'll just store it locally and provide</div><div class='del'>-					   an accessor function */</div><div class='del'>-					d(printf("Multipart %s Content %p: '%.*s'\n",</div><div class='del'>-						 h-&gt;prestage&gt;0?"post":"pre", h, *datalength, *databuffer));</div><div class='del'>-					if (h-&gt;prestage &gt; 0) {</div><div class='del'>-						if (h-&gt;posttext == NULL)</div><div class='del'>-							h-&gt;posttext = g_byte_array_new();</div><div class='del'>-						g_byte_array_append(h-&gt;posttext, *databuffer, *datalength);</div><div class='del'>-					} else {</div><div class='del'>-						if (h-&gt;pretext == NULL)</div><div class='del'>-							h-&gt;pretext = g_byte_array_new();</div><div class='del'>-						g_byte_array_append(h-&gt;pretext, *databuffer, *datalength);</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			} while (hb==h &amp;&amp; *datalength&gt;0);</div><div class='del'>-			h-&gt;prestage++;</div><div class='del'>-			if (*datalength==0 &amp;&amp; hb==h) {</div><div class='del'>-				d(printf("got boundary: %s\n", hb-&gt;boundary));</div><div class='del'>-				folder_scan_skip_line(s);</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();</div><div class='del'>-		folder_scan_init_with_fd(s, fd);</div><div class='del'>-		s-&gt;scan_from = FALSE;</div><div class='del'>-#if 0</div><div class='del'>-		h = g_malloc0(sizeof(*h));</div><div class='del'>-		h-&gt;savestate = HSCAN_EOF;</div><div class='del'>-		folder_push_part(s, h);</div><div class='del'>-#endif	</div><div class='del'>-		while (s-&gt;state != HSCAN_EOF) {</div><div class='del'>-			folder_scan_step(s, &amp;data, &amp;len);</div><div class='del'>-			printf("\n -- PARSER STEP RETURN -- %d '%s'\n\n", s-&gt;state, states[s-&gt;state]);</div><div class='del'>-			switch (s-&gt;state) {</div><div class='del'>-			case HSCAN_HEADER:</div><div class='del'>-				if (s-&gt;parts-&gt;content_type</div><div class='del'>-				    &amp;&amp; (charset = header_content_type_param(s-&gt;parts-&gt;content_type, "charset"))) {</div><div class='del'>-					if (strcasecmp(charset, "us-ascii")) {</div><div class='del'>-#if 0</div><div class='del'>-						folder_push_filter_charset(s, "UTF-8", charset);</div><div class='del'>-#endif</div><div class='del'>-					} else {</div><div class='del'>-						charset = NULL;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					charset = NULL;</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				encoding = header_raw_find(&amp;s-&gt;parts-&gt;headers, "Content-transfer-encoding", 0);</div><div class='del'>-				printf("encoding = '%s'\n", encoding);</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " base64", 7)) {</div><div class='del'>-					printf("adding base64 filter\n");</div><div class='del'>-					attachname = g_strdup_printf("attach.%d.%d", i, attach++);</div><div class='del'>-#if 0</div><div class='del'>-					folder_push_filter_save(s, attachname);</div><div class='del'>-#endif</div><div class='del'>-					g_free(attachname);</div><div class='del'>-#if 0</div><div class='del'>-					folder_push_filter_mime(s, 0);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " quoted-printable", 17)) {</div><div class='del'>-					printf("adding quoted-printable filter\n");</div><div class='del'>-					attachname = g_strdup_printf("attach.%d.%d", i, attach++);</div><div class='del'>-#if 0</div><div class='del'>-					folder_push_filter_save(s, attachname);</div><div class='del'>-#endif</div><div class='del'>-					g_free(attachname);</div><div class='del'>-#if 0</div><div class='del'>-					folder_push_filter_mime(s, 1);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				break;</div><div class='del'>-			case HSCAN_BODY:</div><div class='del'>-				printf("got body %d '%.*s'\n",  len, len, data);</div><div class='del'>-				break;</div><div class='del'>-			case HSCAN_BODY_END:</div><div class='del'>-				printf("end body %d '%.*s'\n",  len, len, data);</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " base64", 7)) {</div><div class='del'>-					printf("removing filters\n");</div><div class='del'>-#if 0</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-				if (encoding &amp;&amp; !strncasecmp(encoding, " quoted-printable", 17)) {</div><div class='del'>-					printf("removing filters\n");</div><div class='del'>-#if 0</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-				if (charset) {</div><div class='del'>-#if 0</div><div class='del'>-					folder_filter_pull(s);</div><div class='del'>-#endif</div><div class='del'>-					charset = NULL;</div><div class='del'>-				}</div><div class='del'>-				encoding = NULL;</div><div class='del'>-				break;</div><div class='del'>-			default:</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		folder_scan_close(s);</div><div class='del'>-		close(fd);</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* STANDALONE */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-mime-parser.h b/camel/camel-mime-parser.h<br/>deleted file mode 100644<br/>index d9a6e8bbb3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-parser.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-parser.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,123 +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)         CAMEL_CHECK_CAST (obj, camel_mime_parser_get_type (), CamelMimeParser)</div><div class='del'>-#define CAMEL_MIME_PARSER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mime_parser_get_type (), CamelMimeParserClass)</div><div class='del'>-#define IS_CAMEL_MIME_PARSER(obj)      CAMEL_CHECK_TYPE (obj, camel_mime_parser_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMimeParserClass CamelMimeParserClass;</div><div class='del'>-</div><div class='del'>-/* NOTE: if you add more states, you may need to bump the</div><div class='del'>-   start of the END tags to 16 or 32, etc - so they are</div><div class='del'>-   the same as the matching start tag, with a bit difference */</div><div class='del'>-enum _header_state {</div><div class='del'>-	HSCAN_INITIAL,</div><div class='del'>-	HSCAN_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'>-/* get multipart pre/postface */</div><div class='del'>-const char *camel_mime_parser_preface(CamelMimeParser *m);</div><div class='del'>-const char *camel_mime_parser_postface(CamelMimeParser *m);</div><div class='del'>-</div><div class='del'>-/* 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 2809346a00..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-part-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,241 +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 = 0, end;</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;</div><div class='del'>-	CamelStream *source;</div><div class='del'>-	CamelSeekableStream *seekable_source = NULL;</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'>-		camel_object_ref((CamelObject *)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'>-		}</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, "utf-8")==0)) {</div><div class='del'>-			d(printf("Adding conversion filter from %s to UTF-8\n", charset));</div><div class='del'>-			fch = (CamelMimeFilter *)camel_mime_filter_charset_new_convert(charset, "UTF-8");</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 'UTF-8', 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 (seekable_source /* !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; seekable_source) {</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'>-		camel_object_unref ((CamelObject *)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'>-			camel_object_unref ((CamelObject *)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'>-		camel_object_unref ((CamelObject *)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'>-		camel_object_unref((CamelObject *)fdec);</div><div class='del'>-	if (fcrlf)</div><div class='del'>-		camel_object_unref((CamelObject *)fcrlf);</div><div class='del'>-	if (fch)</div><div class='del'>-		camel_object_unref((CamelObject *)fch);</div><div class='del'>-	if (source)</div><div class='del'>-		camel_object_unref((CamelObject *)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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning This should use a camel-mime-multipart</div><div class='del'>-#endif</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'>-			camel_object_unref ((CamelObject *)bodypart);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* these are only return valid data in the MULTIPART_END state */</div><div class='del'>-		camel_multipart_set_preface((CamelMultipart *)content, camel_mime_parser_preface(mp));</div><div class='del'>-		camel_multipart_set_postface((CamelMultipart *)content, camel_mime_parser_postface(mp));</div><div class='del'>-</div><div class='del'>-		d(printf("Created multi-part\n"));</div><div class='del'>-		break; }</div><div class='del'>-	default:</div><div class='del'>-		g_warning("Invalid state encountered???: %d", camel_mime_parser_state(mp));</div><div class='del'>-	}</div><div class='del'>-	if (content) {</div><div class='del'>-#ifndef NO_WARNINGS</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'>-#endif</div><div class='del'>-		/* would you believe you have to set this BEFORE you set the content object???  oh my god !!!! */</div><div class='del'>-		camel_data_wrapper_set_mime_type_field (content, </div><div class='del'>-							camel_mime_part_get_content_type ((CamelMimePart *)dw));</div><div class='del'>-		camel_medium_set_content_object((CamelMedium *)dw, content);</div><div class='del'>-		camel_object_unref ((CamelObject *)content);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 e661e0caf5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-part.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,747 +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-mime-filter-charset.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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMD_CLASS(so) CAMEL_MEDIUM_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-/* from CamelDataWrapper */</div><div class='del'>-static int             write_to_stream                 (CamelDataWrapper *data_wrapper, CamelStream *stream);</div><div class='del'>-static int	       construct_from_stream	       (CamelDataWrapper *dw, CamelStream *s);</div><div class='del'>-</div><div class='del'>-/* from CamelMedia */ </div><div class='del'>-static void            add_header                      (CamelMedium *medium, const char *header_name, const void *header_value);</div><div class='del'>-static void            set_header                      (CamelMedium *medium, const char *header_name, const void *header_value);</div><div class='del'>-static void            remove_header                   (CamelMedium *medium, const char *header_name);</div><div class='del'>-static const void     *get_header                      (CamelMedium *medium, const char *header_name);</div><div class='del'>-</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'>-</div><div class='del'>-	parent_class = CAMEL_MEDIUM_CLASS (camel_type_get_global_classfuncs (camel_medium_get_type ()));</div><div class='del'>-	init_header_name_table();</div><div class='del'>-</div><div class='del'>-	camel_mime_part_class-&gt;construct_from_parser = construct_from_parser;</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */	</div><div class='del'>-	camel_medium_class-&gt;add_header                = add_header;</div><div class='del'>-	camel_medium_class-&gt;set_header                = set_header;</div><div class='del'>-	camel_medium_class-&gt;get_header                = get_header;</div><div class='del'>-	camel_medium_class-&gt;remove_header             = remove_header;</div><div class='del'>-	camel_medium_class-&gt;set_content_object        = set_content_object;</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream     = write_to_stream;</div><div class='del'>-	camel_data_wrapper_class-&gt;construct_from_stream= construct_from_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mime_part_init (gpointer   object,  gpointer   klass)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *camel_mime_part = CAMEL_MIME_PART (object);</div><div class='del'>-	</div><div class='del'>-	camel_mime_part-&gt;content_type         = 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'>-</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-camel_mime_part_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *mime_part = CAMEL_MIME_PART (object);</div><div class='del'>-</div><div class='del'>-	g_free (mime_part-&gt;description);</div><div class='del'>-	g_free (mime_part-&gt;content_id);</div><div class='del'>-	g_free (mime_part-&gt;content_MD5);</div><div class='del'>-	string_list_free (mime_part-&gt;content_languages);</div><div class='del'>-	header_disposition_unref(mime_part-&gt;disposition);</div><div class='del'>-	</div><div class='del'>-	if (mime_part-&gt;content_type)</div><div class='del'>-		gmime_content_field_unref (mime_part-&gt;content_type);</div><div class='del'>-</div><div class='del'>-	header_raw_clear(&amp;mime_part-&gt;headers);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mime_part_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mime_part_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_mime_part_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_mime_part_type = camel_type_register (CAMEL_MEDIUM_TYPE, "CamelMimePart",</div><div class='del'>-							    sizeof (CamelMimePart),</div><div class='del'>-							    sizeof (CamelMimePartClass),</div><div class='del'>-							    (CamelObjectClassInitFunc) camel_mime_part_class_init,</div><div class='del'>-							    NULL,</div><div class='del'>-							    (CamelObjectInitFunc) camel_mime_part_init,</div><div class='del'>-							    (CamelObjectFinalizeFunc) camel_mime_part_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_mime_part_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* **** */</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-process_header(CamelMedium *medium, const char *header_name, const char *header_value)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *mime_part = CAMEL_MIME_PART (medium);</div><div class='del'>-	CamelHeaderType header_type;</div><div class='del'>-	char *text;</div><div class='del'>-</div><div class='del'>-	/* Try to parse the header pair. If it corresponds to something   */</div><div class='del'>-	/* known, the job is done in the parsing routine. If not,         */</div><div class='del'>-	/* we simply add the header in a raw fashion                      */</div><div class='del'>-</div><div class='del'>-	header_type = (CamelHeaderType) g_hash_table_lookup (header_name_table, header_name);</div><div class='del'>-	switch (header_type) {</div><div class='del'>-	case HEADER_DESCRIPTION: /* raw header-&gt;utf8 conversion */</div><div class='del'>-		text = header_decode_string(header_value);</div><div class='del'>-		g_free(mime_part-&gt;description);</div><div class='del'>-		mime_part-&gt;description = g_strstrip (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'>-/* Note: It is my understanding that we need to encode the values here as they are</div><div class='del'>-   not being encoded at the header_raw_* level. */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-   NO: This is absolutely wrong.  The medium interface is entirely raw.</div><div class='del'>-   You cannot just go blingingly encoding headers because it depends entirely</div><div class='del'>-   on the header being encoded.  process_header decodes and mirrors the</div><div class='del'>-   known headers, appropriately, and we just add this raw header to our</div><div class='del'>-   list.</div><div class='del'>-</div><div class='del'>-   Please read the comments, they explained it already!!!!!!!</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_header (CamelMedium *medium, const char *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = CAMEL_MIME_PART (medium);</div><div class='del'>-	</div><div class='del'>-	process_header(medium, header_name, header_value);</div><div class='del'>-	header_raw_replace(&amp;part-&gt;headers, header_name, header_value, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_header (CamelMedium *medium, const char *header_name, const void *header_value)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = CAMEL_MIME_PART (medium);</div><div class='del'>-	</div><div class='del'>-	/* Try to parse the header pair. If it corresponds to something   */</div><div class='del'>-	/* known, the job is done in the parsing routine. If not,         */</div><div class='del'>-	/* we simply add the header in a raw fashion                      */</div><div class='del'>-</div><div class='del'>-	/* If it was one of the headers we handled, it must be unique, set it instead of add */</div><div class='del'>-	if (process_header(medium, header_name, header_value))</div><div class='del'>-		header_raw_replace(&amp;part-&gt;headers, header_name, header_value, -1);</div><div class='del'>-	else</div><div class='del'>-		header_raw_append(&amp;part-&gt;headers, header_name, header_value, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_header (CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = (CamelMimePart *)medium;</div><div class='del'>-	</div><div class='del'>-	process_header(medium, header_name, NULL);</div><div class='del'>-	header_raw_remove(&amp;part-&gt;headers, header_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const void *</div><div class='del'>-get_header (CamelMedium *medium, const char *header_name)</div><div class='del'>-{</div><div class='del'>-	CamelMimePart *part = (CamelMimePart *)medium;</div><div class='del'>-</div><div class='del'>-	return header_raw_find(&amp;part-&gt;headers, header_name, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* **** Content-Description */</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_description (CamelMimePart *mime_part, const gchar *description)</div><div class='del'>-{</div><div class='del'>-	char *text = header_encode_string (description);</div><div class='del'>-	</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-				 "Content-Description", text);</div><div class='del'>-	g_free (text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_get_description (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	return mime_part-&gt;description;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* **** Content-Disposition */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_disposition (CamelMimePart *mime_part, const gchar *disposition)</div><div class='del'>-{</div><div class='del'>-	header_disposition_unref(mime_part-&gt;disposition);</div><div class='del'>-	if (disposition)</div><div class='del'>-		mime_part-&gt;disposition = header_disposition_decode(disposition);</div><div class='del'>-	else</div><div class='del'>-		mime_part-&gt;disposition = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_disposition (CamelMimePart *mime_part, const gchar *disposition)</div><div class='del'>-{</div><div class='del'>-	char *text;</div><div class='del'>-</div><div class='del'>-	/* we poke in a new disposition (so we dont lose 'filename', etc) */</div><div class='del'>-	if (mime_part-&gt;disposition == NULL) {</div><div class='del'>-		set_disposition(mime_part, disposition);</div><div class='del'>-	}</div><div class='del'>-	if (mime_part-&gt;disposition != NULL) {</div><div class='del'>-		g_free(mime_part-&gt;disposition-&gt;disposition);</div><div class='del'>-		mime_part-&gt;disposition-&gt;disposition = g_strdup(disposition);</div><div class='del'>-	}</div><div class='del'>-	text = header_disposition_format(mime_part-&gt;disposition);</div><div class='del'>-</div><div class='del'>-	camel_medium_set_header (CAMEL_MEDIUM (mime_part),</div><div class='del'>-				 "Content-Disposition", text);</div><div class='del'>-</div><div class='del'>-	g_free(text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_mime_part_get_disposition (CamelMimePart *mime_part)</div><div class='del'>-{</div><div class='del'>-	if (mime_part-&gt;disposition)</div><div class='del'>-		return (mime_part-&gt;disposition)-&gt;disposition;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* **** Content-Disposition: filename="xxx" */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_filename (CamelMimePart *mime_part, const gchar *filename)</div><div class='del'>-{</div><div class='del'>-	char *str;</div><div class='del'>-	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'>-		const gchar *name = header_param (mime_part-&gt;disposition-&gt;params, "filename");</div><div class='del'>-		if (name)</div><div class='del'>-			return name;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return gmime_content_field_get_parameter (mime_part-&gt;content_type, "name");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* **** Content-ID: */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_mime_part_set_content_id (CamelMimePart *mime_part, const char *contentid)</div><div class='del'>-{</div><div class='del'>-	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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning content-languages should be stored as a header</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (mp-&gt;headers) {</div><div class='del'>-		struct _header_raw *h = mp-&gt;headers;</div><div class='del'>-</div><div class='del'>-		while (h) {</div><div class='del'>-			if (h-&gt;value == NULL){</div><div class='del'>-				g_warning("h-&gt;value is NULL here for %s", h-&gt;name);</div><div class='del'>-				count = 0;</div><div class='del'>-			} else {</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'>-			}</div><div class='del'>-			if (count == -1)</div><div class='del'>-				return -1;</div><div class='del'>-			total += count;</div><div class='del'>-			h = h-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	count = camel_stream_write(stream, "\n", 1);</div><div class='del'>-	if (count == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	total += count;</div><div class='del'>-</div><div class='del'>-	content = camel_medium_get_content_object(medium);</div><div class='del'>-	if (content) {</div><div class='del'>-		/* I dont really like this here, but i dont know where else it might go ... */</div><div class='del'>-#define CAN_THIS_GO_ELSEWHERE</div><div class='del'>-#ifdef CAN_THIS_GO_ELSEWHERE</div><div class='del'>-		CamelMimeFilter *filter = NULL;</div><div class='del'>-		CamelStreamFilter *filter_stream = NULL;</div><div class='del'>-		CamelMimeFilter *charenc = NULL;</div><div class='del'>-		const char *charset;</div><div class='del'>-</div><div class='del'>-		switch(mp-&gt;encoding) {</div><div class='del'>-		case CAMEL_MIME_PART_ENCODING_BASE64:</div><div class='del'>-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_BASE64_ENC);</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE:</div><div class='del'>-			filter = (CamelMimeFilter *)camel_mime_filter_basic_new_type(CAMEL_MIME_FILTER_BASIC_QP_ENC);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (gmime_content_field_is_type(mp-&gt;content_type, "text", "*")) {</div><div class='del'>-			charset = gmime_content_field_get_parameter(mp-&gt;content_type, "charset");</div><div class='del'>-			if (!(charset == NULL || !strcasecmp(charset, "us-ascii") || !strcasecmp(charset, "utf-8"))) {</div><div class='del'>-				charenc = (CamelMimeFilter *)camel_mime_filter_charset_new_convert("utf-8", charset);</div><div class='del'>-			} </div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (filter || charenc) {</div><div class='del'>-			filter_stream = camel_stream_filter_new_with_stream(stream);</div><div class='del'>-</div><div class='del'>-			/* if we have a character encoder, add that always */</div><div class='del'>-			if (charenc) {</div><div class='del'>-				camel_stream_filter_add(filter_stream, charenc);</div><div class='del'>-				camel_object_unref((CamelObject *)charenc);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* we only re-do crlf on encoded blocks */</div><div class='del'>-			if (filter &amp;&amp; gmime_content_field_is_type(mp-&gt;content_type, "text", "*")) {</div><div class='del'>-				CamelMimeFilter *crlf = camel_mime_filter_crlf_new(CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-										   CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-</div><div class='del'>-				camel_stream_filter_add(filter_stream, crlf);</div><div class='del'>-				camel_object_unref((CamelObject *)crlf);</div><div class='del'>-</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (filter) {</div><div class='del'>-				camel_stream_filter_add(filter_stream, filter);</div><div class='del'>-				camel_object_unref((CamelObject *)filter);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			stream = (CamelStream *)filter_stream;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-		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'>-			camel_object_unref((CamelObject *)filter_stream);</div><div class='del'>-		}</div><div class='del'>-		if (count == -1)</div><div class='del'>-			return -1;</div><div class='del'>-		total += count;</div><div class='del'>-	} 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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "Need to work out how to detect a (fatally) bad parse in the parser"</div><div class='del'>-#endif</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_part_construct_from_parser:</div><div class='del'>- * @mime_part: </div><div class='del'>- * @mp: </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * </div><div class='del'>- * Return value: </div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_mime_part_construct_from_parser(CamelMimePart *mime_part, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	return CMP_CLASS (mime_part)-&gt;construct_from_parser (mime_part, mp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-construct_from_stream(CamelDataWrapper *dw, CamelStream *s)</div><div class='del'>-{</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-	int ret;</div><div class='del'>-</div><div class='del'>-	d(printf("mime_part::construct_from_stream()\n"));</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	if (camel_mime_parser_init_with_stream(mp, s) == -1) {</div><div class='del'>-		g_warning("Cannot create parser for stream");</div><div class='del'>-		ret = -1;</div><div class='del'>-	} else {</div><div class='del'>-		ret = camel_mime_part_construct_from_parser((CamelMimePart *)dw, mp);</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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 *)camel_object_new (CAMEL_MIME_PART_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mime_part_set_content:</div><div class='del'>- * @camel_mime_part: Mime part</div><div class='del'>- * @data: data to put into the part</div><div class='del'>- * @length: length of @data</div><div class='del'>- * @type: Content-Type of the data</div><div class='del'>- * </div><div class='del'>- * Utility function used to set the content of a mime part object to </div><div class='del'>- * be the provided data. If @length is 0, this routine can be used as</div><div class='del'>- * a way to remove old content (in which case @data and @type are</div><div class='del'>- * ignored and may be %NULL).</div><div class='del'>- **/</div><div class='del'>-void </div><div class='del'>-camel_mime_part_set_content (CamelMimePart *camel_mime_part,</div><div class='del'>-			     const char *data, int length,</div><div class='del'>-			     const char *type) /* why on earth is the type last? */</div><div class='del'>-{</div><div class='del'>-	CamelMedium *medium = CAMEL_MEDIUM (camel_mime_part);</div><div class='del'>-</div><div class='del'>-	if (length) {</div><div class='del'>-		CamelDataWrapper *dw;</div><div class='del'>-		CamelStream *stream;</div><div class='del'>-</div><div class='del'>-		dw = camel_data_wrapper_new ();</div><div class='del'>-		camel_data_wrapper_set_mime_type (dw, type);</div><div class='del'>-		stream = camel_stream_mem_new_with_buffer (data, length);</div><div class='del'>-		camel_data_wrapper_construct_from_stream (dw, stream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		camel_medium_set_content_object (medium, dw);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (dw));</div><div class='del'>-	} else {</div><div class='del'>-		if (medium-&gt;content)</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (medium-&gt;content));</div><div class='del'>-		medium-&gt;content = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-part.h b/camel/camel-mime-part.h<br/>deleted file mode 100644<br/>index ed0df94a4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-part.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-part.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,129 +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)     (CAMEL_CHECK_CAST((obj), CAMEL_MIME_PART_TYPE, CamelMimePart))</div><div class='del'>-#define CAMEL_MIME_PART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MIME_PART_TYPE, CamelMimePartClass))</div><div class='del'>-#define CAMEL_IS_MIME_PART(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MIME_PART_TYPE))</div><div class='del'>-</div><div class='del'>-</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'>-	GMimeContentField *content_type;</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 Camel function */</div><div class='del'>-CamelType camel_mime_part_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelMimePart *  camel_mime_part_new                    (void);</div><div class='del'>-</div><div class='del'>-void	         camel_mime_part_set_description	(CamelMimePart *mime_part, const gchar *description);</div><div class='del'>-const     gchar *camel_mime_part_get_description	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void	         camel_mime_part_set_disposition	(CamelMimePart *mime_part, const gchar *disposition);</div><div class='del'>-const     gchar *camel_mime_part_get_disposition	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void	         camel_mime_part_set_filename		(CamelMimePart *mime_part, const gchar *filename);</div><div class='del'>-const	  gchar *camel_mime_part_get_filename		(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void             camel_mime_part_set_content_id		(CamelMimePart *mime_part, const char *contentid);</div><div class='del'>-const	  gchar *camel_mime_part_get_content_id		(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void		 camel_mime_part_set_content_MD5	(CamelMimePart *mime_part, const char *);</div><div class='del'>-const	  gchar *camel_mime_part_get_content_MD5	(CamelMimePart *mime_part);</div><div class='del'>-</div><div class='del'>-void	         camel_mime_part_set_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 d2df6cac76..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3070 +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'>- *           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'>-/* dont touch this file without my permission - Michael */</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'>-#include &lt;unistd.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'>-#include "camel-charset-map.h"</div><div class='del'>-</div><div class='del'>-#ifndef CLEAN_DATE</div><div class='del'>-#include "broken-date-parser.h"</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-int strdup_count = 0;</div><div class='del'>-int malloc_count = 0;</div><div class='del'>-int free_count = 0;</div><div class='del'>-</div><div class='del'>-#define g_strdup(x) (strdup_count++, g_strdup(x))</div><div class='del'>-#define g_malloc(x) (malloc_count++, g_malloc(x))</div><div class='del'>-#define g_free(x) (free_count++, g_free(x))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* for all 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'>-#define	CAMEL_UUDECODE_CHAR(c)	(((c) - ' ') &amp; 077)</div><div class='del'>-</div><div class='del'>-static char *base64_alphabet =</div><div class='del'>-"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";</div><div class='del'>-</div><div class='del'>-static unsigned char tohex[16] = {</div><div class='del'>-	'0', '1', '2', '3', '4', '5', '6', '7',</div><div class='del'>-	'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static unsigned short camel_mime_special_table[256] = {</div><div class='del'>-	  5,  5,  5,  5,  5,  5,  5,  5,  5,231,  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'>-	242,448, 76,192,192,192,192,192, 76, 76,448,448, 76,448, 72,324,</div><div class='del'>-	448,448,448,448,448,448,448,448,448,448, 76, 76, 76,  4, 76, 68,</div><div class='del'>-	 76,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,</div><div class='del'>-	448,448,448,448,448,448,448,448,448,448,448,108,236,108,192, 64,</div><div class='del'>-	192,448,448,448,448,448,448,448,448,448,448,448,448,448,448,448,</div><div class='del'>-	448,448,448,448,448,448,448,448,448,448,448,192,192,192,192,  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 -DCLEAN_DATE -o buildtable -I.. `glib-config --cflags --libs` -lunicode -DBUILD_TABLE camel-mime-utils.c camel-charset-map.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_QPSAFE	= 1&lt;&lt;6,</div><div class='del'>-	IS_ESAFE	= 1&lt;&lt;7,	/* encoded word safe */</div><div class='del'>-	IS_PSAFE	= 1&lt;&lt;8,	/* encoded word in phrase safe */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define is_ctrl(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_CTRL) != 0)</div><div class='del'>-#define is_lwsp(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_LWSP) != 0)</div><div class='del'>-#define is_tspecial(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_TSPECIAL) != 0)</div><div class='del'>-#define is_type(x, t) ((camel_mime_special_table[(unsigned char)(x)] &amp; (t)) != 0)</div><div class='del'>-#define is_ttoken(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; (IS_TSPECIAL|IS_LWSP|IS_CTRL)) == 0)</div><div class='del'>-#define is_atom(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; (IS_SPECIAL|IS_SPACE|IS_CTRL)) == 0)</div><div class='del'>-#define is_dtext(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_DSPECIAL) == 0)</div><div class='del'>-#define is_fieldname(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; (IS_CTRL|IS_SPACE)) == 0)</div><div class='del'>-#define is_qpsafe(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_QPSAFE) != 0)</div><div class='del'>-#define is_especial(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_ESPECIAL) != 0)</div><div class='del'>-#define is_psafe(x) ((camel_mime_special_table[(unsigned char)(x)] &amp; IS_PSAFE) != 0)</div><div class='del'>-</div><div class='del'>-/* 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'>-#define CHARS_ESPECIAL "()&lt;&gt;@,;:\"/[]?.=_" /* list of characters that must be encoded.</div><div class='del'>-					      encoded word in text specials: rfc 2047 5(1)*/</div><div class='del'>-#define CHARS_PSPECIAL "!*+-/" /* list of additional characters that can be left unencoded.</div><div class='del'>-				  encoded word in phrase specials: rfc 2047 5(3) */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_remove_bits(unsigned short bit, unsigned char *vals)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;vals[i];i++)</div><div class='del'>-		camel_mime_special_table[vals[i]] &amp;= ~ bit;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_init_bits(unsigned short bit, unsigned short bitcopy, int remove, unsigned char *vals)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int len = strlen(vals);</div><div class='del'>-</div><div class='del'>-	if (!remove) {</div><div class='del'>-		for (i=0;i&lt;len;i++) {</div><div class='del'>-			camel_mime_special_table[vals[i]] |= bit;</div><div class='del'>-		}</div><div class='del'>-		if (bitcopy) {</div><div class='del'>-			for (i=0;i&lt;256;i++) {</div><div class='del'>-				if (camel_mime_special_table[i] &amp; bitcopy)</div><div class='del'>-					camel_mime_special_table[i] |= bit;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		for (i=0;i&lt;256;i++)</div><div class='del'>-			camel_mime_special_table[i] |= bit;</div><div class='del'>-		for (i=0;i&lt;len;i++) {</div><div class='del'>-			camel_mime_special_table[vals[i]] &amp;= ~bit;</div><div class='del'>-		}</div><div class='del'>-		if (bitcopy) {</div><div class='del'>-			for (i=0;i&lt;256;i++) {</div><div class='del'>-				if (camel_mime_special_table[i] &amp; bitcopy)</div><div class='del'>-					camel_mime_special_table[i] &amp;= ~bit;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_decode_init(void)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;256;i++) {</div><div class='del'>-		camel_mime_special_table[i] = 0;</div><div class='del'>-		if (i&lt;32)</div><div class='del'>-			camel_mime_special_table[i] |= IS_CTRL;</div><div class='del'>-		if ((i&gt;=33 &amp;&amp; i&lt;=60) || (i&gt;=62 &amp;&amp; i&lt;=126) || i==32 || i==9)</div><div class='del'>-			camel_mime_special_table[i] |= (IS_QPSAFE|IS_ESAFE);</div><div class='del'>-		if ((i&gt;='0' &amp;&amp; i&lt;='9') || (i&gt;='a' &amp;&amp; i&lt;='z') || (i&gt;='A' &amp;&amp; i&lt;= 'Z'))</div><div class='del'>-			camel_mime_special_table[i] |= IS_PSAFE;</div><div class='del'>-	}</div><div class='del'>-	camel_mime_special_table[127] |= IS_CTRL;</div><div class='del'>-	camel_mime_special_table[' '] |= IS_SPACE;</div><div class='del'>-	header_init_bits(IS_LWSP, 0, 0, CHARS_LWSP);</div><div class='del'>-	header_init_bits(IS_TSPECIAL, IS_CTRL, 0, CHARS_TSPECIAL);</div><div class='del'>-	header_init_bits(IS_SPECIAL, 0, 0, CHARS_SPECIAL);</div><div class='del'>-	header_init_bits(IS_DSPECIAL, 0, FALSE, CHARS_DSPECIAL);</div><div class='del'>-	header_remove_bits(IS_ESAFE, CHARS_ESPECIAL);</div><div class='del'>-	header_init_bits(IS_PSAFE, 0, 0, CHARS_PSPECIAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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 short 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, gboolean break_lines, unsigned char *out, int *state, int *save)</div><div class='del'>-{</div><div class='del'>-	int c1, c2;</div><div class='del'>-	unsigned char *outptr = out;</div><div class='del'>-</div><div class='del'>-	if (inlen&gt;0)</div><div class='del'>-		outptr += base64_encode_step(in, inlen, break_lines, outptr, state, save);</div><div class='del'>-</div><div class='del'>-	c1 = ((unsigned char *)save)[1];</div><div class='del'>-	c2 = ((unsigned char *)save)[2];</div><div class='del'>-</div><div class='del'>-	switch (((char *)save)[0]) {</div><div class='del'>-	case 2:</div><div class='del'>-		outptr[2] = base64_alphabet[ ( (c2 &amp;0x0f) &lt;&lt; 2 ) ];</div><div class='del'>-		g_assert(outptr[2] != 0);</div><div class='del'>-		goto skip;</div><div class='del'>-	case 1:</div><div class='del'>-		outptr[2] = '=';</div><div class='del'>-	skip:</div><div class='del'>-		outptr[0] = base64_alphabet[ c1 &gt;&gt; 2 ];</div><div class='del'>-		outptr[1] = base64_alphabet[ c2 &gt;&gt; 4 | ( (c1&amp;0x3) &lt;&lt; 4 )];</div><div class='del'>-		outptr[3] = '=';</div><div class='del'>-		outptr += 4;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	if (break_lines)</div><div class='del'>-		*outptr++ = '\n';</div><div class='del'>-</div><div class='del'>-	*save = 0;</div><div class='del'>-	*state = 0;</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  performs an 'encode step', only encodes blocks of 3 characters to the</div><div class='del'>-  output at a time, saves left-over state in state and save (initialise to</div><div class='del'>-  0 on first invocation).</div><div class='del'>-*/</div><div class='del'>-int</div><div class='del'>-base64_encode_step(unsigned char *in, int len, gboolean break_lines, unsigned char *out, int *state, int *save)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-</div><div class='del'>-	if (len&lt;=0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	inptr = in;</div><div class='del'>-	outptr = out;</div><div class='del'>-</div><div class='del'>-	d(printf("we have %d chars, and %d saved chars\n", len, ((char *)save)[0]));</div><div class='del'>-</div><div class='del'>-	if (len + ((char *)save)[0] &gt; 2) {</div><div class='del'>-		unsigned char *inend = in+len-2;</div><div class='del'>-		register int c1, c2, c3;</div><div class='del'>-		register int already;</div><div class='del'>-</div><div class='del'>-		already = *state;</div><div class='del'>-</div><div class='del'>-		switch (((char *)save)[0]) {</div><div class='del'>-		case 1:	c1 = ((unsigned char *)save)[1]; goto skip1;</div><div class='del'>-		case 2:	c1 = ((unsigned char *)save)[1];</div><div class='del'>-			c2 = ((unsigned char *)save)[2]; goto skip2;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		/* yes, we jump into the loop, no i'm not going to change it, it's beautiful! */</div><div class='del'>-		while (inptr &lt; inend) {</div><div class='del'>-			c1 = *inptr++;</div><div class='del'>-		skip1:</div><div class='del'>-			c2 = *inptr++;</div><div class='del'>-		skip2:</div><div class='del'>-			c3 = *inptr++;</div><div class='del'>-			*outptr++ = base64_alphabet[ c1 &gt;&gt; 2 ];</div><div class='del'>-			*outptr++ = base64_alphabet[ c2 &gt;&gt; 4 | ( (c1&amp;0x3) &lt;&lt; 4 ) ];</div><div class='del'>-			*outptr++ = base64_alphabet[ ( (c2 &amp;0x0f) &lt;&lt; 2 ) | (c3 &gt;&gt; 6) ];</div><div class='del'>-			*outptr++ = base64_alphabet[ c3 &amp; 0x3f ];</div><div class='del'>-			/* this is a bit ugly ... */</div><div class='del'>-			if (break_lines &amp;&amp; (++already)&gt;=19) {</div><div class='del'>-				*outptr++='\n';</div><div class='del'>-				already = 0;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		((char *)save)[0] = 0;</div><div class='del'>-		len = 2-(inptr-inend);</div><div class='del'>-		*state = already;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("state = %d, len = %d\n",</div><div class='del'>-		 (int)((char *)save)[0],</div><div class='del'>-		 len));</div><div class='del'>-</div><div class='del'>-	if (len&gt;0) {</div><div class='del'>-		register char *saveout;</div><div class='del'>-</div><div class='del'>-		/* points to the slot for the next char to save */</div><div class='del'>-		saveout = &amp; (((char *)save)[1]) + ((char *)save)[0];</div><div class='del'>-</div><div class='del'>-		/* len can only be 0 1 or 2 */</div><div class='del'>-		switch(len) {</div><div class='del'>-		case 2:	*saveout++ = *inptr++;</div><div class='del'>-		case 1:	*saveout++ = *inptr++;</div><div class='del'>-		}</div><div class='del'>-		((char *)save)[0]+=len;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	d(printf("mode = %d\nc1 = %c\nc2 = %c\n",</div><div class='del'>-		 (int)((char *)save)[0],</div><div class='del'>-		 (int)((char *)save)[1],</div><div class='del'>-		 (int)((char *)save)[2]));</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * base64_decode_step: decode a chunk of base64 encoded data</div><div class='del'>- * @in: input stream</div><div class='del'>- * @len: max length of data to decode</div><div class='del'>- * @out: output stream</div><div class='del'>- * @state: holds the number of bits that are stored in @save</div><div class='del'>- * @save: leftover bits that have not yet been decoded</div><div class='del'>- *</div><div class='del'>- * Decodes a chunk of base64 encoded data</div><div class='del'>- **/</div><div class='del'>-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'>-</div><div class='del'>-/**</div><div class='del'>- * uudecode_step: uudecode a chunk of data</div><div class='del'>- * @in: input stream</div><div class='del'>- * @len: max length of data to decode ( normally strlen(in) ??)</div><div class='del'>- * @out: output stream</div><div class='del'>- * @state: holds the number of bits that are stored in @save</div><div class='del'>- * @save: leftover bits that have not yet been decoded</div><div class='del'>- * @uulen: holds the value of the length-char which is used to calculate</div><div class='del'>- *         how many more chars need to be decoded for that 'line'</div><div class='del'>- *</div><div class='del'>- * uudecodes a chunk of data. Assumes the "begin &lt;mode&gt; &lt;file name&gt;" line</div><div class='del'>- * has been stripped off.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-uudecode_step (unsigned char *in, int len, unsigned char *out, int *state, guint32 *save, char *uulen)</div><div class='del'>-{</div><div class='del'>-	register unsigned char *inptr, *outptr;</div><div class='del'>-	unsigned char *inend, ch;</div><div class='del'>-	register guint32 saved;</div><div class='del'>-	gboolean last_was_eoln;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (*uulen &lt;= 0)</div><div class='del'>-		last_was_eoln = TRUE;</div><div class='del'>-	else</div><div class='del'>-		last_was_eoln = FALSE;</div><div class='del'>-	</div><div class='del'>-	inend = in + len;</div><div class='del'>-	outptr = out;</div><div class='del'>-	saved = *save;</div><div class='del'>-	i = *state;</div><div class='del'>-	inptr = in;</div><div class='del'>-	while (inptr &lt; inend &amp;&amp; *inptr) {</div><div class='del'>-		if (*inptr == '\n' || last_was_eoln) {</div><div class='del'>-			if (last_was_eoln) {</div><div class='del'>-				*uulen = CAMEL_UUDECODE_CHAR (*inptr);</div><div class='del'>-				last_was_eoln = FALSE;</div><div class='del'>-			} else {</div><div class='del'>-				last_was_eoln = TRUE;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			inptr++;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		ch = *inptr++;</div><div class='del'>-		</div><div class='del'>-		if (*uulen &gt; 0) {</div><div class='del'>-			/* save the byte */</div><div class='del'>-			saved = (saved &lt;&lt; 8) | ch;</div><div class='del'>-			i++;</div><div class='del'>-			if (i == 4) {</div><div class='del'>-				/* convert 4 uuencoded bytes to 3 normal bytes */</div><div class='del'>-				unsigned char b0, b1, b2, b3;</div><div class='del'>-</div><div class='del'>-				b0 = saved &gt;&gt; 24;</div><div class='del'>-				b1 = saved &gt;&gt; 16 &amp; 0xff;</div><div class='del'>-				b2 = saved &gt;&gt; 8 &amp; 0xff;</div><div class='del'>-				b3 = saved &amp; 0xff;</div><div class='del'>-</div><div class='del'>-				if (*uulen &gt;= 3) {</div><div class='del'>-					*outptr++ = CAMEL_UUDECODE_CHAR (b0) &lt;&lt; 2 | CAMEL_UUDECODE_CHAR (b1) &gt;&gt; 4;</div><div class='del'>-					*outptr++ = CAMEL_UUDECODE_CHAR (b1) &lt;&lt; 4 | CAMEL_UUDECODE_CHAR (b2) &gt;&gt; 2;</div><div class='del'>-				        *outptr++ = CAMEL_UUDECODE_CHAR (b2) &lt;&lt; 6 | CAMEL_UUDECODE_CHAR (b3);</div><div class='del'>-				} else {</div><div class='del'>-					if (*uulen &gt;= 1) {</div><div class='del'>-						*outptr++ = CAMEL_UUDECODE_CHAR (b0) &lt;&lt; 2 | CAMEL_UUDECODE_CHAR (b1) &gt;&gt; 4;</div><div class='del'>-					}</div><div class='del'>-					if (*uulen &gt;= 2) {</div><div class='del'>-						*outptr++ = CAMEL_UUDECODE_CHAR (b1) &lt;&lt; 4 | CAMEL_UUDECODE_CHAR (b2) &gt;&gt; 2;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-</div><div class='del'>-				i = 0;</div><div class='del'>-				saved = 0;</div><div class='del'>-				*uulen -= 3;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*save = saved;</div><div class='del'>-	*state = i;</div><div class='del'>-</div><div class='del'>-	return outptr - out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* complete qp encoding */</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'>-	int last;</div><div class='del'>-</div><div class='del'>-	if (len&gt;0)</div><div class='del'>-		outptr += quoted_encode_step(in, len, outptr, state, save);</div><div class='del'>-</div><div class='del'>-	last = *state;</div><div class='del'>-	if (last != -1) {</div><div class='del'>-		/* space/tab must be encoded if it's the last character on</div><div class='del'>-		   the line */</div><div class='del'>-		if (is_qpsafe(last) &amp;&amp; last!=' ' &amp;&amp; last!=9) {</div><div class='del'>-			*outptr++ = last;</div><div class='del'>-		} else {</div><div class='del'>-			*outptr++ = '=';</div><div class='del'>-			*outptr++ = tohex[(last&gt;&gt;4) &amp; 0xf];</div><div class='del'>-			*outptr++ = tohex[last &amp; 0xf];</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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 = -1;</div><div class='del'>-</div><div class='del'>-	return outptr-out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* perform qp encoding, initialise state to -1 and save to 0 on first invocation */</div><div class='del'>-int</div><div class='del'>-quoted_encode_step (unsigned char *in, int len, unsigned char *out, int *statep, int *save)</div><div class='del'>-{</div><div class='del'>-	register guchar *inptr, *outptr, *inend;</div><div class='del'>-	guchar c;</div><div class='del'>-	register int sofar = *save;  /* keeps track of how many chars on a line */</div><div class='del'>-	register int last = *statep; /* keeps track if last char to end was a space cr etc */</div><div class='del'>-	</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = in + len;</div><div class='del'>-	outptr = out;</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		c = *inptr++;</div><div class='del'>-		if (c == '\r') {</div><div class='del'>-			if (last != -1) {</div><div class='del'>-				*outptr++ = '=';</div><div class='del'>-				*outptr++ = tohex[(last &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-				*outptr++ = tohex[last &amp; 0xf];</div><div class='del'>-				sofar += 3;</div><div class='del'>-			}</div><div class='del'>-			last = c;</div><div class='del'>-		} else if (c == '\n') {</div><div class='del'>-			if (last != -1 &amp;&amp; last != '\r') {</div><div class='del'>-				*outptr++ = '=';</div><div class='del'>-				*outptr++ = tohex[(last &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-				*outptr++ = tohex[last &amp; 0xf];</div><div class='del'>-			}</div><div class='del'>-			*outptr++ = '\n';</div><div class='del'>-			sofar = 0;</div><div class='del'>-			last = -1;</div><div class='del'>-		} else {</div><div class='del'>-			if (last != -1) {</div><div class='del'>-				if (is_qpsafe(last)) {</div><div class='del'>-					*outptr++ = last;</div><div class='del'>-					sofar++;</div><div class='del'>-				} else {</div><div class='del'>-					*outptr++ = '=';</div><div class='del'>-					*outptr++ = tohex[(last &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-					*outptr++ = tohex[last &amp; 0xf];</div><div class='del'>-					sofar += 3;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			if (is_qpsafe(c)) {</div><div class='del'>-				if (sofar &gt; 74) {</div><div class='del'>-					*outptr++ = '=';</div><div class='del'>-					*outptr++ = '\n';</div><div class='del'>-					sofar = 0;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				/* delay output of space char */</div><div class='del'>-				if (c==' ' || c=='\t') {</div><div class='del'>-					last = c;</div><div class='del'>-				} else {</div><div class='del'>-					*outptr++ = c;</div><div class='del'>-					sofar++;</div><div class='del'>-					last = -1;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				if (sofar &gt; 72) {</div><div class='del'>-					*outptr++ = '=';</div><div class='del'>-					*outptr++ = '\n';</div><div class='del'>-					sofar = 3;</div><div class='del'>-				} else</div><div class='del'>-					sofar += 3;</div><div class='del'>-				</div><div class='del'>-				*outptr++ = '=';</div><div class='del'>-				*outptr++ = tohex[(c &gt;&gt; 4) &amp; 0xf];</div><div class='del'>-				*outptr++ = tohex[c &amp; 0xf];</div><div class='del'>-				last = -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	*save = sofar;</div><div class='del'>-	*statep = last;</div><div class='del'>-	</div><div class='del'>-	return (outptr - out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  FIXME: this does not strip trailing spaces from lines (as it should, rfc 2045, section 6.7)</div><div class='del'>-  Should it also canonicalise the end of line to CR LF??</div><div class='del'>-</div><div class='del'>-  Note: Trailing rubbish (at the end of input), like = or =x or =\r will be lost.</div><div class='del'>-*/ </div><div class='del'>-</div><div class='del'>-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 (mainly by allowing 0x20 &lt;&gt; _)</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'>-/* safemask is the mask to apply to the camel_mime_special_table to determine what</div><div class='del'>-   characters can safely be included without encoding */</div><div class='del'>-static int</div><div class='del'>-quoted_encode(const unsigned char *in, int len, unsigned char *out, unsigned short safemask)</div><div class='del'>-{</div><div class='del'>-	register const unsigned char *inptr, *inend;</div><div class='del'>-	unsigned char *outptr;</div><div class='del'>-	unsigned char c;</div><div class='del'>-</div><div class='del'>-	inptr = in;</div><div class='del'>-	inend = in + len;</div><div class='del'>-	outptr = out;</div><div class='del'>-	while (inptr &lt; inend) {</div><div class='del'>-		c = *inptr++;</div><div class='del'>-		if (camel_mime_special_table[c] &amp; safemask) {</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'>-	d(printf("encoding '%.*s' = '%.*s'\n", len, in, outptr-out, out));</div><div class='del'>-</div><div class='del'>-	return (outptr - out);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_decode_lwsp(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in;</div><div class='del'>-	char c;</div><div class='del'>-</div><div class='del'>-	d2(printf("is ws: '%s'\n", *in));</div><div class='del'>-</div><div class='del'>-	while (is_lwsp(*inptr) || (*inptr =='(' &amp;&amp; *inptr != '\0')) {</div><div class='del'>-		while (is_lwsp(*inptr) &amp;&amp; inptr != '\0') {</div><div class='del'>-			d2(printf("(%c)", *inptr));</div><div class='del'>-			inptr++;</div><div class='del'>-		}</div><div class='del'>-		d2(printf("\n"));</div><div class='del'>-</div><div class='del'>-		/* check for comments */</div><div class='del'>-		if (*inptr == '(') {</div><div class='del'>-			int depth = 1;</div><div class='del'>-			inptr++;</div><div class='del'>-			while (depth &amp;&amp; (c=*inptr) &amp;&amp; *inptr != '\0') {</div><div class='del'>-				if (c=='\\' &amp;&amp; inptr[1]) {</div><div class='del'>-					inptr++;</div><div class='del'>-				} else if (c=='(') {</div><div class='del'>-					depth++;</div><div class='del'>-				} else if (c==')') {</div><div class='del'>-					depth--;</div><div class='del'>-				}</div><div class='del'>-				inptr++;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	*in = inptr;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* decode rfc 2047 encoded string segment */</div><div class='del'>-static char *</div><div class='del'>-rfc2047_decode_word(const char *in, 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("UTF-8", 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'>-/* ok, a lot of mailers are BROKEN, and send iso-latin1 encoded</div><div class='del'>-   headers, when they should just be sticking to US-ASCII</div><div class='del'>-   according to the rfc's.  Anyway, since the conversion to utf-8</div><div class='del'>-   is trivial, just do it here without iconv */</div><div class='del'>-static GString *</div><div class='del'>-append_latin1(GString *out, const char *in, int len)</div><div class='del'>-{</div><div class='del'>-	unsigned int c;</div><div class='del'>-</div><div class='del'>-	while (len) {</div><div class='del'>-		c = (unsigned int)*in++;</div><div class='del'>-		len--;</div><div class='del'>-		if (c &amp; 0x80) {</div><div class='del'>-			out = g_string_append_c(out, 0xc0 | ((c&gt;&gt;6) &amp; 0x3));		/* 110000xx */</div><div class='del'>-			out = g_string_append_c(out, 0x80 | (c&amp;0x3f)); 	/* 10xxxxxx */</div><div class='del'>-		} else {</div><div class='del'>-			out = g_string_append_c(out, c);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 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'>-	char *inptr, *inend, *start;</div><div class='del'>-	char *decoded;</div><div class='del'>-	</div><div class='del'>-	out = g_string_new ("");</div><div class='del'>-	start = inptr = (char *) in;</div><div class='del'>-	inend = inptr + inlen;</div><div class='del'>-	</div><div class='del'>-	while (inptr &amp;&amp; inptr &lt; inend) {</div><div class='del'>-		char c = *inptr++;</div><div class='del'>-		</div><div class='del'>-		if (isspace (c)) {</div><div class='del'>-			char *word, *dword;</div><div class='del'>-			guint len;</div><div class='del'>-			</div><div class='del'>-			len = inptr - start - 1;</div><div class='del'>-			word = start;</div><div class='del'>-			</div><div class='del'>-			dword = rfc2047_decode_word (word, len);</div><div class='del'>-			</div><div class='del'>-			if (dword) {</div><div class='del'>-				g_string_append (out, dword);</div><div class='del'>-				g_free (dword);</div><div class='del'>-			} else {</div><div class='del'>-				out = append_latin1 (out, word, len);</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			g_string_append_c (out, c);</div><div class='del'>-			</div><div class='del'>-			start = inptr;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (inptr - start) {</div><div class='del'>-		char *word, *dword;</div><div class='del'>-		guint len;</div><div class='del'>-		</div><div class='del'>-		len = inptr - start;</div><div class='del'>-		word = start;</div><div class='del'>-		</div><div class='del'>-		dword = rfc2047_decode_word (word, len);</div><div class='del'>-		</div><div class='del'>-		if (dword) {</div><div class='del'>-			g_string_append (out, dword);</div><div class='del'>-			g_free (dword);</div><div class='del'>-		} else {</div><div class='del'>-			out = g_string_append_len (out, word, len);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	decoded = out-&gt;str;</div><div class='del'>-	g_string_free (out, FALSE);</div><div class='del'>-	</div><div class='del'>-	return decoded;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0     /* This is broken */</div><div class='del'>-</div><div class='del'>-/* so in what way is it broken? */</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'>-			g_free (decword);</div><div class='del'>-		} else {</div><div class='del'>-			out = append_latin1(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 = append_latin1(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'>-#endif</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 void</div><div class='del'>-rfc2047_encode_word(GString *outstring, const char *in, int len, const char *type, unsigned short safemask)</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, safemask);</div><div class='del'>-	sprintf(out, "?=");</div><div class='del'>-</div><div class='del'>-	d(printf("converted = %s\n", ascii));</div><div class='del'>-	g_string_append(outstring, ascii);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* 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'>-			/* we've reached the end of a 'word' */</div><div class='del'>-			switch (encoding) {</div><div class='del'>-			case 0:</div><div class='del'>-				out = g_string_append_len(out, start, inptr-start);</div><div class='del'>-				break;</div><div class='del'>-			case 1:</div><div class='del'>-				rfc2047_encode_word(out, start, inptr-start-1, "ISO-8859-1", IS_ESAFE);</div><div class='del'>-				out = g_string_append_c (out, c);</div><div class='del'>-				break;</div><div class='del'>-			case 2:</div><div class='del'>-				rfc2047_encode_word(out, start, inptr-start-1,</div><div class='del'>-						    camel_charset_best(start, inptr-start-1), IS_ESAFE);</div><div class='del'>-				out = g_string_append_c(out, c);</div><div class='del'>-				break;</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'>-		switch (encoding) {</div><div class='del'>-		case 0:</div><div class='del'>-			out = g_string_append_len(out, start, inptr-start);</div><div class='del'>-			break;</div><div class='del'>-		case 1:</div><div class='del'>-			rfc2047_encode_word(out, start, inptr-start, "ISO-8859-1", IS_ESAFE);</div><div class='del'>-			break;</div><div class='del'>-		case 2:</div><div class='del'>-			rfc2047_encode_word(out, start, inptr-start,</div><div class='del'>-					    camel_charset_best(start, inptr-start-1), IS_ESAFE);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	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'>-/* apply quoted-string rules to a string */</div><div class='del'>-static void</div><div class='del'>-quote_word(GString *out, gboolean do_quotes, const char *start, int len)</div><div class='del'>-{</div><div class='del'>-	int i, c;</div><div class='del'>-</div><div class='del'>-	/* TODO: What about folding on long lines? */</div><div class='del'>-	if (do_quotes)</div><div class='del'>-		g_string_append_c(out, '"');</div><div class='del'>-	for (i=0;i&lt;len;i++) {</div><div class='del'>-		c = *start++;</div><div class='del'>-		if (c == '\"' || c=='\\' || c=='\r')</div><div class='del'>-			g_string_append_c(out, '\\');</div><div class='del'>-		g_string_append_c(out, c);</div><div class='del'>-	}</div><div class='del'>-	if (do_quotes)</div><div class='del'>-		g_string_append_c(out, '"');</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* incrementing possibility for the word type */</div><div class='del'>-enum _phrase_word_t {</div><div class='del'>-	WORD_ATOM,</div><div class='del'>-	WORD_QSTRING,</div><div class='del'>-	WORD_2047</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _phrase_word {</div><div class='del'>-	const unsigned char *start, *end;</div><div class='del'>-	enum _phrase_word_t type;</div><div class='del'>-	int encoding;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* split the input into words</div><div class='del'>-   with info about each word</div><div class='del'>-   merge common word types</div><div class='del'>-   clean up</div><div class='del'>-*/</div><div class='del'>-/* encodes a phrase sequence (different quoting/encoding rules to strings) */</div><div class='del'>-char *</div><div class='del'>-header_encode_phrase(const unsigned char *in)</div><div class='del'>-{</div><div class='del'>-	GString *out;</div><div class='del'>-	const unsigned char *inptr = in, *start, *last;</div><div class='del'>-	int encoding;</div><div class='del'>-	char *outstr;</div><div class='del'>-	struct _phrase_word *word, *next;</div><div class='del'>-	enum _phrase_word_t type;</div><div class='del'>-	GList *words = NULL, *wordl, *nextl;</div><div class='del'>-	int count;</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'>-	out = g_string_new("");</div><div class='del'>-</div><div class='del'>-	/* break the input into words */</div><div class='del'>-	type = WORD_ATOM;</div><div class='del'>-	count = 0;</div><div class='del'>-	last = inptr;</div><div class='del'>-	start = inptr;</div><div class='del'>-	encoding = 0;</div><div class='del'>-	while (inptr &amp;&amp; *inptr) {</div><div class='del'>-		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'>-		/* save this word out, multiple whitespace is not explicitly counted (?) */</div><div class='del'>-		if (unicode_isspace(c)) {</div><div class='del'>-			if (count &gt; 0) {</div><div class='del'>-				word = g_malloc0(sizeof(*word));</div><div class='del'>-				word-&gt;start = start;</div><div class='del'>-				word-&gt;end = last;</div><div class='del'>-				word-&gt;type = type;</div><div class='del'>-				word-&gt;encoding = encoding;</div><div class='del'>-				words = g_list_append(words, word);</div><div class='del'>-				count = 0;</div><div class='del'>-			}</div><div class='del'>-			start = inptr;</div><div class='del'>-			type = WORD_ATOM;</div><div class='del'>-			encoding = 0;</div><div class='del'>-		} else {</div><div class='del'>-			count++;</div><div class='del'>-			if (c&lt;128) {</div><div class='del'>-				if (!is_atom(c))</div><div class='del'>-					type = MAX(type, WORD_QSTRING);</div><div class='del'>-			} else if (c&gt;127 &amp;&amp; c &lt; 256) {</div><div class='del'>-				type = WORD_2047;</div><div class='del'>-				encoding = MAX(encoding, 1);</div><div class='del'>-			} else if (c &gt;=256) {</div><div class='del'>-				type = WORD_2047;</div><div class='del'>-				encoding = MAX(encoding, 2);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		last = inptr;</div><div class='del'>-	}</div><div class='del'>-	if (count &gt; 0) {</div><div class='del'>-		word = g_malloc0(sizeof(*word));</div><div class='del'>-		word-&gt;start = start;</div><div class='del'>-		word-&gt;end = last;</div><div class='del'>-		word-&gt;type = type;</div><div class='del'>-		word-&gt;encoding = encoding;</div><div class='del'>-		words = g_list_append(words, word);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* now scan the list, checking for words of similar types that can be merged */</div><div class='del'>-	wordl = words;</div><div class='del'>-	while (wordl) {</div><div class='del'>-		word = wordl-&gt;data;</div><div class='del'>-		/* leave atoms as atoms (unless they're surrounded by quoted words??) */</div><div class='del'>-		if (word-&gt;type != WORD_ATOM) {</div><div class='del'>-			nextl = g_list_next(wordl);</div><div class='del'>-			while (nextl) {</div><div class='del'>-				next = nextl-&gt;data;</div><div class='del'>-				/* merge nodes of the same (or lower?) type*/</div><div class='del'>-				if (word-&gt;type == next-&gt;type || (next-&gt;type &lt; word-&gt;type &amp;&amp; word-&gt;type &lt; WORD_2047) ) {</div><div class='del'>-					word-&gt;end = next-&gt;end;</div><div class='del'>-					words = g_list_remove_link(words, nextl);</div><div class='del'>-					g_free(next);</div><div class='del'>-					nextl = g_list_next(wordl);</div><div class='del'>-				} else {</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		wordl = g_list_next(wordl);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* output words now with spaces between them */</div><div class='del'>-	wordl = words;</div><div class='del'>-	while (wordl) {</div><div class='del'>-		word = wordl-&gt;data;</div><div class='del'>-		switch (word-&gt;type) {</div><div class='del'>-		case WORD_ATOM:</div><div class='del'>-			out = g_string_append_len(out, word-&gt;start, word-&gt;end-word-&gt;start);</div><div class='del'>-			break;</div><div class='del'>-		case WORD_QSTRING:</div><div class='del'>-			quote_word(out, TRUE, word-&gt;start, word-&gt;end-word-&gt;start);</div><div class='del'>-			break;</div><div class='del'>-		case WORD_2047:</div><div class='del'>-			if (word-&gt;encoding == 1)</div><div class='del'>-				rfc2047_encode_word(out, word-&gt;start, word-&gt;end-word-&gt;start, "ISO-8859-1", IS_PSAFE);</div><div class='del'>-			else</div><div class='del'>-				rfc2047_encode_word(out, word-&gt;start, word-&gt;end-word-&gt;start,</div><div class='del'>-						    camel_charset_best(word-&gt;start, word-&gt;end-word-&gt;start), IS_PSAFE);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* copy across the right number of spaces between words */</div><div class='del'>-		nextl = g_list_next(wordl);</div><div class='del'>-		if (nextl) {</div><div class='del'>-			int i;</div><div class='del'>-			next = nextl-&gt;data;</div><div class='del'>-			for (i=next-&gt;start-word-&gt;end;i&gt;0;i--)</div><div class='del'>-				out = g_string_append_c(out, ' ');</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free(word);</div><div class='del'>-		wordl = g_list_next(wordl);</div><div class='del'>-	}</div><div class='del'>-	/* and we no longer need the list */</div><div class='del'>-	g_list_free(words);</div><div class='del'>-</div><div class='del'>-	outstr = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	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!= '"' &amp;&amp; c != '\0') {</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!= '"' &amp;&amp; c != '\0') {</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 || (ct-&gt;type == NULL &amp;&amp; ct-&gt;subtype == NULL)) {</div><div class='del'>-		return (!strcasecmp(type, "text")</div><div class='del'>-			&amp;&amp; (!strcasecmp(subtype, "plain")</div><div class='del'>-			    || !strcasecmp(subtype, "*")));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (ct-&gt;type != NULL</div><div class='del'>-		&amp;&amp; (!strcasecmp(ct-&gt;type, type)</div><div class='del'>-		    &amp;&amp; ((ct-&gt;subtype != NULL</div><div class='del'>-			 &amp;&amp; !strcasecmp(ct-&gt;subtype, subtype))</div><div class='del'>-			|| !strcasecmp("*", subtype))));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_param_list_free(struct _header_param *p)</div><div class='del'>-{</div><div class='del'>-	struct _header_param *n;</div><div class='del'>-</div><div class='del'>-	while (p) {</div><div class='del'>-		n = p-&gt;next;</div><div class='del'>-		g_free(p-&gt;name);</div><div class='del'>-		g_free(p-&gt;value);</div><div class='del'>-		g_free(p);</div><div class='del'>-		p = n;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_content_type *</div><div class='del'>-header_content_type_new(const char *type, const char *subtype)</div><div class='del'>-{</div><div class='del'>-	struct _header_content_type *t = g_malloc(sizeof(*t));</div><div class='del'>-</div><div class='del'>-	t-&gt;type = g_strdup(type);</div><div class='del'>-	t-&gt;subtype = g_strdup(subtype);</div><div class='del'>-	t-&gt;params = NULL;</div><div class='del'>-	t-&gt;refcount = 1;</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_content_type_ref(struct _header_content_type *ct)</div><div class='del'>-{</div><div class='del'>-	if (ct)</div><div class='del'>-		ct-&gt;refcount++;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_content_type_unref(struct _header_content_type *ct)</div><div class='del'>-{</div><div class='del'>-	if (ct) {</div><div class='del'>-		if (ct-&gt;refcount &lt;= 1) {</div><div class='del'>-			header_param_list_free(ct-&gt;params);</div><div class='del'>-			g_free(ct-&gt;type);</div><div class='del'>-			g_free(ct-&gt;subtype);</div><div class='del'>-			g_free(ct);</div><div class='del'>-		} else {</div><div class='del'>-			ct-&gt;refcount--;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* for decoding email addresses, canonically */</div><div class='del'>-static char *</div><div class='del'>-header_decode_domain(const char **in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = *in, *start;</div><div class='del'>-	int go = TRUE;</div><div class='del'>-	char *ret;</div><div class='del'>-	GString *domain = g_string_new("");</div><div class='del'>-</div><div class='del'>-				/* domain ref | domain literal */</div><div class='del'>-	header_decode_lwsp(&amp;inptr);</div><div class='del'>-	while (go) {</div><div class='del'>-		if (*inptr == '[') { /* domain literal */</div><div class='del'>-			domain = g_string_append(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')) {</div><div class='del'>-		/* ',' and '\0' required incase it is a simple address, no @ domain part (buggy writer) */</div><div class='del'>-		name = g_string_new("");</div><div class='del'>-		while (pre) {</div><div class='del'>-			char *text;</div><div class='del'>-</div><div class='del'>-			/* perform internationalised decoding, and appent */</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'>-			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;</div><div class='del'>-	struct _header_references *head = NULL, *node;</div><div class='del'>-	char *id, *word;</div><div class='del'>-</div><div class='del'>-	if (in == NULL || in[0] == '\0')</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	while (*inptr) {</div><div class='del'>-		header_decode_lwsp(&amp;inptr);</div><div class='del'>-		if (*inptr == '&lt;') {</div><div class='del'>-			id = header_msgid_decode_internal(&amp;inptr);</div><div class='del'>-			if (id) {</div><div class='del'>-				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'>-		} else {</div><div class='del'>-			word = header_decode_word(&amp;inptr);</div><div class='del'>-			if (word)</div><div class='del'>-				g_free (word);</div><div class='del'>-			else if (*inptr != '\0')</div><div class='del'>-				inptr++; /* Stupid mailer tricks */</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return head;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_references *</div><div class='del'>-header_references_dup(const struct _header_references *list)</div><div class='del'>-{</div><div class='del'>-	struct _header_references *new = NULL, *tmp;</div><div class='del'>-</div><div class='del'>-	while (list) {</div><div class='del'>-		tmp = g_new(struct _header_references, 1);</div><div class='del'>-		tmp-&gt;next = new;</div><div class='del'>-		tmp-&gt;id = g_strdup(list-&gt;id);</div><div class='del'>-		new = tmp;</div><div class='del'>-		list = list-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_address *</div><div class='del'>-header_mailbox_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return header_decode_mailbox(&amp;in);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _header_address *</div><div class='del'>-header_address_decode(const char *in)</div><div class='del'>-{</div><div class='del'>-	const char *inptr = in, *last;</div><div class='del'>-	struct _header_address *list = NULL, *addr;</div><div class='del'>-</div><div class='del'>-	d(printf("decoding To: '%s'\n", in));</div><div class='del'>-</div><div class='del'>-	if (in == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	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'>-	char *ch;</div><div class='del'>-</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'>-</div><div class='del'>-		g_string_sprintfa(out, " ; %s=", p-&gt;name);</div><div class='del'>-</div><div class='del'>-		for (ch = p-&gt;value; *ch; ch++) {</div><div class='del'>-			if (is_tspecial(*ch))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (!*ch)</div><div class='del'>-			g_string_append(out, p-&gt;value);</div><div class='del'>-		else</div><div class='del'>-			quote_word(out, TRUE, p-&gt;value, strlen(p-&gt;value));</div><div class='del'>-</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, it's only for display */</div><div class='del'>-		if (day) {</div><div class='del'>-			d(printf ("got day: %s\n", day));</div><div class='del'>-			g_free (day);</div><div class='del'>-			header_decode_lwsp (&amp;inptr);</div><div class='del'>-			if (*inptr == ',') {</div><div class='del'>-				inptr++;</div><div class='del'>-			} else {</div><div class='del'>-#ifndef CLEAN_DATE</div><div class='del'>-				char *newdate;</div><div class='del'>-</div><div class='del'>-				w(g_warning("day not followed by ',' it's probably a broken mail client, so we'll ignore its date entirely"));</div><div class='del'>-				printf ("Giving it one last chance...\n");</div><div class='del'>-				newdate = parse_broken_date (in);</div><div class='del'>-				if (newdate) {</div><div class='del'>-					printf ("Got: %s\n", newdate);</div><div class='del'>-					t = header_decode_date (newdate, saveoffset);</div><div class='del'>-					g_free (newdate);</div><div class='del'>-					return t;</div><div class='del'>-				}</div><div class='del'>-#endif</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) || *in==':')</div><div class='del'>-		in++;</div><div class='del'>-	fieldlen = in-header-1;</div><div class='del'>-	while (is_lwsp(*in))</div><div class='del'>-		in++;</div><div class='del'>-	if (fieldlen == 0 || header[fieldlen] != ':') {</div><div class='del'>-		printf("Invalid header line: '%s'\n", header);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	name = alloca(fieldlen+1);</div><div class='del'>-	memcpy(name, header, fieldlen);</div><div class='del'>-	name[fieldlen] = 0;</div><div class='del'>-</div><div class='del'>-	header_raw_append(list, name, in, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_append(struct _header_raw **list, const char *name, const char *value, int offset)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l, *n;</div><div class='del'>-</div><div class='del'>-	d(printf("Header: %s: %s\n", name, value));</div><div class='del'>-</div><div class='del'>-	n = g_malloc(sizeof(*n));</div><div class='del'>-	n-&gt;next = NULL;</div><div class='del'>-	n-&gt;name = g_strdup(name);</div><div class='del'>-	n-&gt;value = g_strdup(value);</div><div class='del'>-	n-&gt;offset = offset;</div><div class='del'>-#ifdef CHECKS</div><div class='del'>-	check_header(n);</div><div class='del'>-#endif</div><div class='del'>-	l = (struct _header_raw *)list;</div><div class='del'>-	while (l-&gt;next) {</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	l-&gt;next = n;</div><div class='del'>-</div><div class='del'>-	/* debug */</div><div class='del'>-#if 0</div><div class='del'>-	if (!strcasecmp(name, "To")) {</div><div class='del'>-		printf("- Decoding To\n");</div><div class='del'>-		header_to_decode(value);</div><div class='del'>-	} else if (!strcasecmp(name, "Content-type")) {</div><div class='del'>-		printf("- Decoding content-type\n");</div><div class='del'>-		header_content_type_dump(header_content_type_decode(value));		</div><div class='del'>-	} else if (!strcasecmp(name, "MIME-Version")) {</div><div class='del'>-		printf("- Decoding mime version\n");</div><div class='del'>-		header_mime_decode(value);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _header_raw *</div><div class='del'>-header_raw_find_node(struct _header_raw **list, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l;</div><div class='del'>-</div><div class='del'>-	l = *list;</div><div class='del'>-	while (l) {</div><div class='del'>-		if (!strcasecmp(l-&gt;name, name))</div><div class='del'>-			break;</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	return l;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-header_raw_find(struct _header_raw **list, const char *name, int *offset)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l;</div><div class='del'>-</div><div class='del'>-	l = header_raw_find_node(list, name);</div><div class='del'>-	if (l) {</div><div class='del'>-		if (offset)</div><div class='del'>-			*offset = l-&gt;offset;</div><div class='del'>-		return l-&gt;value;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-header_raw_find_next(struct _header_raw **list, const char *name, int *offset, const char *last)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l;</div><div class='del'>-</div><div class='del'>-	if (last == NULL || name == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	l = *list;</div><div class='del'>-	while (l &amp;&amp; l-&gt;value != last)</div><div class='del'>-		l = l-&gt;next;</div><div class='del'>-	return header_raw_find(&amp;l, name, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-header_raw_free(struct _header_raw *l)</div><div class='del'>-{</div><div class='del'>-	g_free(l-&gt;name);</div><div class='del'>-	g_free(l-&gt;value);</div><div class='del'>-	g_free(l);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_remove(struct _header_raw **list, const char *name)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l, *p;</div><div class='del'>-</div><div class='del'>-	/* the next pointer is at the head of the structure, so this is safe */</div><div class='del'>-	p = (struct _header_raw *)list;</div><div class='del'>-	l = *list;</div><div class='del'>-	while (l) {</div><div class='del'>-		if (!strcasecmp(l-&gt;name, name)) {</div><div class='del'>-			p-&gt;next = l-&gt;next;</div><div class='del'>-			header_raw_free(l);</div><div class='del'>-			l = p-&gt;next;</div><div class='del'>-		} else {</div><div class='del'>-			p = l;</div><div class='del'>-			l = l-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_replace(struct _header_raw **list, const char *name, const char *value, int offset)</div><div class='del'>-{</div><div class='del'>-	header_raw_remove(list, name);</div><div class='del'>-	header_raw_append(list, name, value, offset);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-header_raw_clear(struct _header_raw **list)</div><div class='del'>-{</div><div class='del'>-	struct _header_raw *l, *n;</div><div class='del'>-	l = *list;</div><div class='del'>-	while (l) {</div><div class='del'>-		n = l-&gt;next;</div><div class='del'>-		header_raw_free(l);</div><div class='del'>-		l = n;</div><div class='del'>-	}</div><div class='del'>-	*list = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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'>-			text = header_encode_phrase (a-&gt;name);</div><div class='del'>-			if (text &amp;&amp; *text)</div><div class='del'>-				g_string_sprintfa(out, "%s &lt;%s&gt;", text, a-&gt;v.addr);</div><div class='del'>-			else</div><div class='del'>-				g_string_append(out, a-&gt;v.addr);</div><div class='del'>-			g_free (text);</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'>-		if (a)</div><div class='del'>-			g_string_append(out, ", ");</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 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'>-/* simple header folding */</div><div class='del'>-/* note: assumes the input has not already been folded */</div><div class='del'>-char *</div><div class='del'>-header_fold(const char *in)</div><div class='del'>-{</div><div class='del'>-	int len, outlen, i;</div><div class='del'>-	const char *inptr = in, *space;</div><div class='del'>-	GString *out;</div><div class='del'>-	char *ret;</div><div class='del'>-</div><div class='del'>-	len = strlen(in);</div><div class='del'>-	if (len &lt;= CAMEL_FOLD_SIZE)</div><div class='del'>-		return g_strdup(in);</div><div class='del'>-</div><div class='del'>-	out = g_string_new("");</div><div class='del'>-	outlen = 0;</div><div class='del'>-	while (*inptr) {</div><div class='del'>-		space = strchr(inptr, ' ');</div><div class='del'>-		if (space) {</div><div class='del'>-			len = space-inptr+1;</div><div class='del'>-		} else {</div><div class='del'>-			len = strlen(inptr);</div><div class='del'>-		}</div><div class='del'>-		if (outlen + len &gt; CAMEL_FOLD_SIZE) {</div><div class='del'>-			g_string_append(out, "\n\t");</div><div class='del'>-			outlen = 1;</div><div class='del'>-			/* check for very long words, just cut them up */</div><div class='del'>-			while (outlen+len &gt; CAMEL_FOLD_SIZE) {</div><div class='del'>-				for (i=0;i&lt;CAMEL_FOLD_SIZE-outlen;i++)</div><div class='del'>-					g_string_append_c(out, inptr[i]);</div><div class='del'>-				inptr += CAMEL_FOLD_SIZE-outlen;</div><div class='del'>-				len -= CAMEL_FOLD_SIZE-outlen;</div><div class='del'>-				g_string_append(out, "\n\t");</div><div class='del'>-				outlen = 1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		outlen += len;</div><div class='del'>-		for (i=0;i&lt;len;i++) {</div><div class='del'>-			g_string_append_c(out, inptr[i]);</div><div class='del'>-		}</div><div class='del'>-		inptr += len;</div><div class='del'>-	}</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	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 test_phrase(const char *in)</div><div class='del'>-{</div><div class='del'>-	printf("'%s' -&gt; '%s'\n", in, header_encode_phrase(in));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void test_fold(const char *in)</div><div class='del'>-{</div><div class='del'>-	printf("'%s'\n -&gt;\n '%s'\n", in, header_fold(in));</div><div class='del'>-}</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'>-#if 0</div><div class='del'>-	header_to_decode(to);</div><div class='del'>-</div><div class='del'>-	header_mime_decode("1.0", 0, 0);</div><div class='del'>-	header_mime_decode("1.3 (produced by metasend V1.0)", 0, 0);</div><div class='del'>-	header_mime_decode("(produced by metasend V1.0) 5.2", 0, 0);</div><div class='del'>-	header_mime_decode("7(produced by metasend 1.0) . (produced by helix/send/1.0) 9 . 5", 0, 0);</div><div class='del'>-	header_mime_decode("3.", 0, 0);</div><div class='del'>-	header_mime_decode(".", 0, 0);</div><div class='del'>-	header_mime_decode(".5", 0, 0);</div><div class='del'>-	header_mime_decode("c.d", 0, 0);</div><div class='del'>-	header_mime_decode("", 0, 0);</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'>-#endif</div><div class='del'>-</div><div class='del'>-	test_fold("Header: This is a long header that should be folded properly at the right place, or so i hope.  I should probably set the fold value to something lower for testing");</div><div class='del'>-	test_fold("Header: nowletstryfoldingsomethingthatistoolongtofold,iwonderwhatitshoulddointsteadtofoldit?hmm,iguessicanjusttruncateitatsomepointortrytorefoldthepreviousstuff(yuck)tofit");</div><div class='del'>-	test_phrase("Michael Zucchi (NotZed)");</div><div class='del'>-	test_phrase("Zucchi, ( \\ NotZed \\ ) Michael");</div><div class='del'>-	{</div><div class='del'>-		int ic;</div><div class='del'>-		char *outbuf, *inbuf, buffer[256];</div><div class='del'>-		int inlen, outlen;</div><div class='del'>-</div><div class='del'>-		outlen = 256;</div><div class='del'>-		inbuf = "Dra¾en Kaèar";</div><div class='del'>-		inlen = strlen(inbuf);</div><div class='del'>-		outbuf = buffer;</div><div class='del'>-		ic = unicode_iconv_open("UTF-8", "ISO-8859-1");</div><div class='del'>-		unicode_iconv(ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-		test_phrase(buffer);</div><div class='del'>-</div><div class='del'>-		outlen = 256;</div><div class='del'>-		inbuf = "This is an encoded phrase Tomasz K³oczko";</div><div class='del'>-		inlen = strlen(inbuf);</div><div class='del'>-		outbuf = buffer;</div><div class='del'>-		ic = unicode_iconv_open("UTF-8", "ISO-8859-2");</div><div class='del'>-		unicode_iconv(ic, &amp;inbuf, &amp;inlen, &amp;outbuf, &amp;outlen);</div><div class='del'>-		test_phrase(buffer);</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	{</div><div class='del'>-		char *str = "Blah blah\n\t = ? =? ?= This is a TEST For quoted-printable-encoding-encoding-of</div><div class='del'>-	long lines, and lines that end in spaces                                                                       </div><div class='del'>-	and line sthat end in tabs 						</div><div class='del'>-	And lines that just end.";</div><div class='del'>-</div><div class='del'>-		char encoded[256];</div><div class='del'>-		int state=-1,save=0;</div><div class='del'>-		int len;</div><div class='del'>-</div><div class='del'>-		len = quoted_encode_step(str, strlen(str), encoded, &amp;state, &amp;save);</div><div class='del'>-		len += quoted_encode_close("", 0, encoded+len, &amp;state, &amp;save);</div><div class='del'>-		printf("encoded = '%.*s'\n", len, encoded);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif /* BUILD_TABLE */</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-header_msgid_generate (void)</div><div class='del'>-{</div><div class='del'>-	gchar host [256], domain [768];</div><div class='del'>-	static gint count = 0;</div><div class='del'>-</div><div class='del'>-	gethostname (host, sizeof (host));</div><div class='del'>-	getdomainname (domain, sizeof (domain));</div><div class='del'>-</div><div class='del'>-	return g_strdup_printf ("%d.%d.%d.camel@%s.%s", (gint) time (NULL), getpid (), count++, host, domain);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-mime-utils.h b/camel/camel-mime-utils.h<br/>deleted file mode 100644<br/>index a1f8bb549d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-mime-utils.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-mime-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,183 +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'>- *           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_UTILS_H</div><div class='del'>-#define _CAMEL_MIME_UTILS_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'>-/* maximum size of a line from header_fold() */</div><div class='del'>-#define CAMEL_FOLD_SIZE (72)</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'>-/* fold a header */</div><div class='del'>-char *header_fold(const char *in);</div><div class='del'>-</div><div class='del'>-/* decode a header which is a simple token */</div><div class='del'>-char *header_token_decode(const char *in);</div><div class='del'>-</div><div class='del'>-/* 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'>-/* encode a phrase, like the real name of an address */</div><div class='del'>-char *header_encode_phrase(const unsigned char *in);</div><div class='del'>-</div><div class='del'>-/* decode an email date field into a GMT time, + optional offset */</div><div class='del'>-time_t header_decode_date(const char *in, int *saveoffset);</div><div class='del'>-char *header_format_date(time_t time, int offset);</div><div class='del'>-</div><div class='del'>-/* decode a message id */</div><div class='del'>-char *header_msgid_decode(const char *in);</div><div class='del'>-</div><div class='del'>-/* generate msg id */</div><div class='del'>-char *header_msgid_generate (void);</div><div class='del'>-</div><div class='del'>-/* decode a References 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'>-struct _header_references *header_references_dup(const 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, gboolean break_lines, unsigned char *out, int *state, int *save);</div><div class='del'>-int base64_encode_close(unsigned char *in, int inlen, gboolean break_lines, unsigned char *out, int *state, int *save);</div><div class='del'>-</div><div class='del'>-int uudecode_step (unsigned char *in, int len, unsigned char *out, int *state, guint32 *save, char *uulen);</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 ea3fdb3da0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-movemail.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-movemail.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,592 +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'>-#include &lt;signal.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'>-#ifdef MOVEMAIL_PATH</div><div class='del'>-#include &lt;sys/wait.h&gt;</div><div class='del'>-</div><div class='del'>-static void movemail_external (const char *source, const char *dest,</div><div class='del'>-			       CamelException *ex);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* these could probably be exposed as a utility? (but only mbox needs it) */</div><div class='del'>-#if 0</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'>-#endif</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_movemail: Copy an mbox file from a shared spool directory to a</div><div class='del'>- * new folder in a Camel store</div><div class='del'>- * @source: source file</div><div class='del'>- * @dest: destination file</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This copies an mbox file from a shared directory with multiple</div><div class='del'>- * readers and writers into a private (presumably Camel-controlled)</div><div class='del'>- * directory. Dot locking is used on the source file (but not the</div><div class='del'>- * destination).</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_movemail (const char *source, const char *dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gboolean locked;</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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Could not check mail file "</div><div class='del'>-						"%s: %s"), source,</div><div class='del'>-					      g_strerror (errno));</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (st.st_size == 0)</div><div class='del'>-		return;</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'>-		g_free (locktmpfile);</div><div class='del'>-#ifdef MOVEMAIL_PATH</div><div class='del'>-		if (errno == EACCES) {</div><div class='del'>-			/* movemail_external will fail if the dest file</div><div class='del'>-			 * already exists, so if it does, return now,</div><div class='del'>-			 * let the fetch code process the mail that's</div><div class='del'>-			 * already there, and then the user can try again.</div><div class='del'>-			 */</div><div class='del'>-			if (stat (dest, &amp;st) == 0)</div><div class='del'>-				return;</div><div class='del'>-</div><div class='del'>-			movemail_external (source, dest, ex);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-#endif</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,</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	close (tmpfd);</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'>-		unlink (locktmpfile);</div><div class='del'>-		g_free (locktmpfile);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	dfd = open (dest, O_WRONLY | O_CREAT | O_APPEND, S_IRUSR | S_IWUSR);</div><div class='del'>-	if (dfd == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not open temporary mail "</div><div class='del'>-					"file %s: %s"), dest,</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		close (sfd);</div><div class='del'>-		unlink (locktmpfile);</div><div class='del'>-		g_free (locktmpfile);</div><div class='del'>-		return;</div><div class='del'>-	}</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'>-		return;</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'>-	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'>-			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'>-				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'>-	 */</div><div class='del'>-	if (!camel_exception_is_set (ex)) {</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'>-		}</div><div class='del'>-	} else</div><div class='del'>-		close (dfd);</div><div class='del'>-	close (sfd);</div><div class='del'>-</div><div class='del'>-	/* 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'>-</div><div class='del'>-#ifdef MOVEMAIL_PATH</div><div class='del'>-static void</div><div class='del'>-movemail_external (const char *source, const char *dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	sigset_t mask, omask;</div><div class='del'>-	pid_t pid;</div><div class='del'>-	int fd[2], len = 0, nread, status;</div><div class='del'>-	char buf[BUFSIZ], *output = NULL;</div><div class='del'>-</div><div class='del'>-	/* Block SIGCHLD so the app can't mess us up. */</div><div class='del'>-	sigemptyset (&amp;mask);</div><div class='del'>-	sigaddset (&amp;mask, SIGCHLD);</div><div class='del'>-	sigprocmask (SIG_BLOCK, &amp;mask, &amp;omask);</div><div class='del'>-</div><div class='del'>-	if (pipe (fd) == -1) {</div><div class='del'>-		sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not create pipe: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pid = fork ();</div><div class='del'>-	switch (pid) {</div><div class='del'>-	case -1:</div><div class='del'>-		close (fd[0]);</div><div class='del'>-		close (fd[1]);</div><div class='del'>-		sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not fork: %s"),</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	case 0:</div><div class='del'>-		/* Child */</div><div class='del'>-		close (fd[0]);</div><div class='del'>-		close (STDIN_FILENO);</div><div class='del'>-		dup2 (fd[1], STDOUT_FILENO);</div><div class='del'>-		dup2 (fd[1], STDERR_FILENO);</div><div class='del'>-</div><div class='del'>-		execl (MOVEMAIL_PATH, MOVEMAIL_PATH, source, dest, NULL);</div><div class='del'>-		_exit (255);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Parent */</div><div class='del'>-	close (fd[1]);</div><div class='del'>-</div><div class='del'>-	/* Read movemail's output. */</div><div class='del'>-	while ((nread = read (fd[0], buf, sizeof (buf))) &gt; 0) {</div><div class='del'>-		output = g_realloc (output, len + nread + 1);</div><div class='del'>-		memcpy (output + len, buf, nread);</div><div class='del'>-		len += nread;</div><div class='del'>-		output[len] = '\0';</div><div class='del'>-	}</div><div class='del'>-	close (fd[0]);</div><div class='del'>-</div><div class='del'>-	/* Now get the exit status. */</div><div class='del'>-	while (waitpid (pid, &amp;status, 0) == -1 &amp;&amp; errno == EINTR)</div><div class='del'>-		;</div><div class='del'>-	sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-</div><div class='del'>-	if (!WIFEXITED (status) || WEXITSTATUS (status) != 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Movemail program failed: %s"),</div><div class='del'>-				      output ? output : _("(Unknown error)"));</div><div class='del'>-	}</div><div class='del'>-	g_free (output);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static int</div><div class='del'>-camel_movemail_copy(int fromfd, int tofd, off_t start, size_t bytes)</div><div class='del'>-{</div><div class='del'>-        char buffer[4096];</div><div class='del'>-        int written = 0;</div><div class='del'>-</div><div class='del'>-	d(printf("writing %d bytes ... ", bytes));</div><div class='del'>-</div><div class='del'>-	if (lseek(fromfd, start, SEEK_SET) != start)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-        while (bytes&gt;0) {</div><div class='del'>-                int toread, towrite;</div><div class='del'>-</div><div class='del'>-                toread = bytes;</div><div class='del'>-                if (bytes&gt;4096)</div><div class='del'>-                        toread = 4096;</div><div class='del'>-                else</div><div class='del'>-                        toread = bytes;</div><div class='del'>-		do {</div><div class='del'>-			towrite = read(fromfd, buffer, toread);</div><div class='del'>-		} while (towrite == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-</div><div class='del'>-		if (towrite == -1)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-                /* check for 'end of file' */</div><div class='del'>-                if (towrite == 0) {</div><div class='del'>-			d(printf("end of file?\n"));</div><div class='del'>-                        break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		do {</div><div class='del'>-			toread = write(tofd, buffer, towrite);</div><div class='del'>-		} while (toread == -1 &amp;&amp; errno == EINTR);</div><div class='del'>-</div><div class='del'>-		if (toread == -1)</div><div class='del'>-			return -1;</div><div class='del'>-</div><div class='del'>-                written += toread;</div><div class='del'>-                bytes -= toread;</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-        d(printf("written %d bytes\n", written));</div><div class='del'>-</div><div class='del'>-        return written;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define PRE_SIZE (32)</div><div class='del'>-</div><div class='del'>-#if 0</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'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	camel_object_unref((CamelObject *)ffrom);</div><div class='del'>-</div><div class='del'>-	return ret;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	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'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	camel_object_unref((CamelObject *)ffrom);</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/camel/camel-movemail.h b/camel/camel-movemail.h<br/>deleted file mode 100644<br/>index 8b73435a43..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-movemail.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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'>-void 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 c5a5f81b22..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-multipart.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-multipart.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,520 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-multipart.c : Abstract class for a multipart */</div><div class='del'>-</div><div class='del'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning This should be a mostly abstract class, but it is not!</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *</div><div class='del'>- * Author :</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 1999, 2000 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                  unref_part        (gpointer data, gpointer user_data);</div><div class='del'>-</div><div class='del'>-static CamelDataWrapperClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMultipart */</div><div class='del'>-#define CMP_CLASS(so) CAMEL_MULTIPART_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelDataWrapper */</div><div class='del'>-#define CDW_CLASS(so) CAMEL_DATA_WRAPPER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_multipart_class_init (CamelMultipartClass *camel_multipart_class)</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapperClass *camel_data_wrapper_class =</div><div class='del'>-		CAMEL_DATA_WRAPPER_CLASS (camel_multipart_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_DATA_WRAPPER_CLASS (camel_type_get_global_classfuncs (camel_data_wrapper_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_multipart_class-&gt;add_part = add_part;</div><div class='del'>-	camel_multipart_class-&gt;add_part_at = add_part_at;</div><div class='del'>-	camel_multipart_class-&gt;remove_part = remove_part;</div><div class='del'>-	camel_multipart_class-&gt;remove_part_at = remove_part_at;</div><div class='del'>-	camel_multipart_class-&gt;get_part = get_part;</div><div class='del'>-	camel_multipart_class-&gt;get_number = get_number;</div><div class='del'>-	camel_multipart_class-&gt;set_boundary = set_boundary;</div><div class='del'>-	camel_multipart_class-&gt;get_boundary = get_boundary;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_data_wrapper_class-&gt;write_to_stream = write_to_stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_multipart_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart = CAMEL_MULTIPART (object);</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (multipart),</div><div class='del'>-					  "multipart/mixed");</div><div class='del'>-	multipart-&gt;preface = NULL;</div><div class='del'>-	multipart-&gt;postface = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_multipart_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart = CAMEL_MULTIPART (object);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (multipart-&gt;parts, unref_part, NULL);</div><div class='del'>-</div><div class='del'>-	if (multipart-&gt;boundary)</div><div class='del'>-		g_free (multipart-&gt;boundary);</div><div class='del'>-	if (multipart-&gt;preface)</div><div class='del'>-		g_free (multipart-&gt;preface);</div><div class='del'>-	if (multipart-&gt;postface)</div><div class='del'>-		g_free (multipart-&gt;postface);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_multipart_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_multipart_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_multipart_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_multipart_type = camel_type_register (camel_data_wrapper_get_type (), "CamelMultipart",</div><div class='del'>-							    sizeof (CamelMultipart),</div><div class='del'>-							    sizeof (CamelMultipartClass),</div><div class='del'>-							    (CamelObjectClassInitFunc) camel_multipart_class_init,</div><div class='del'>-							    NULL,</div><div class='del'>-							    (CamelObjectInitFunc) camel_multipart_init,</div><div class='del'>-							    (CamelObjectFinalizeFunc) camel_multipart_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_multipart_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unref_part (gpointer data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelObject *part = CAMEL_OBJECT (data);</div><div class='del'>-</div><div class='del'>-	camel_object_unref (part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMultipart object.</div><div class='del'>- *</div><div class='del'>- * Return value: a new CamelMultipart</div><div class='del'>- **/</div><div class='del'>-CamelMultipart *</div><div class='del'>-camel_multipart_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelMultipart *multipart;</div><div class='del'>-</div><div class='del'>-	multipart = (CamelMultipart *)camel_object_new (CAMEL_MULTIPART_TYPE);</div><div class='del'>-	multipart-&gt;preface = NULL;</div><div class='del'>-	multipart-&gt;postface = NULL;</div><div class='del'>-</div><div class='del'>-	return multipart;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_part (CamelMultipart *multipart, CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	multipart-&gt;parts = g_list_append (multipart-&gt;parts, part);</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (part));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_add_part:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @part: the part to add</div><div class='del'>- *</div><div class='del'>- * Appends the part to the multipart object.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_add_part (CamelMultipart *multipart, CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (part));</div><div class='del'>-</div><div class='del'>-	CMP_CLASS (multipart)-&gt;add_part (multipart, part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_part_at (CamelMultipart *multipart, CamelMimePart *part, guint index)</div><div class='del'>-{</div><div class='del'>-	multipart-&gt;parts = g_list_insert (multipart-&gt;parts, part, index);</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (part));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_add_part_at:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @part: the part to add</div><div class='del'>- * @index: index to add the multipart at</div><div class='del'>- *</div><div class='del'>- * Adds the part to the multipart object after the @index'th</div><div class='del'>- * element. If @index is greater than the number of parts, it is</div><div class='del'>- * equivalent to camel_multipart_add_part().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_add_part_at (CamelMultipart *multipart,</div><div class='del'>-			     CamelMimePart *part, guint index)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (part));</div><div class='del'>-</div><div class='del'>-	CMP_CLASS (multipart)-&gt;add_part_at (multipart, part, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_part (CamelMultipart *multipart, CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	if (!multipart-&gt;parts)</div><div class='del'>-		return;</div><div class='del'>-	multipart-&gt;parts = g_list_remove (multipart-&gt;parts, part);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_remove_part:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @part: the part to remove</div><div class='del'>- *</div><div class='del'>- * Removes @part from @multipart.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_remove_part (CamelMultipart *multipart,</div><div class='del'>-			     CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MULTIPART (multipart));</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_PART (part));</div><div class='del'>-</div><div class='del'>-	CMP_CLASS (multipart)-&gt;remove_part (multipart, part);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimePart *</div><div class='del'>-remove_part_at (CamelMultipart *multipart, guint index)</div><div class='del'>-{</div><div class='del'>-	GList *parts_list;</div><div class='del'>-	GList *part_to_remove;</div><div class='del'>-	CamelMimePart *removed_part;</div><div class='del'>-</div><div class='del'>-	if (!(multipart-&gt;parts))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	parts_list = multipart-&gt;parts;</div><div class='del'>-	part_to_remove = g_list_nth (parts_list, index);</div><div class='del'>-	if (!part_to_remove) {</div><div class='del'>-		g_warning ("CamelMultipart::remove_part_at: "</div><div class='del'>-			   "part to remove is NULL\n");</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	removed_part = CAMEL_MIME_PART (part_to_remove-&gt;data);</div><div class='del'>-</div><div class='del'>-	multipart-&gt;parts = g_list_remove_link (parts_list, part_to_remove);</div><div class='del'>-	if (part_to_remove-&gt;data)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part_to_remove-&gt;data));</div><div class='del'>-	g_list_free_1 (part_to_remove);</div><div class='del'>-</div><div class='del'>-	return removed_part;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_remove_part_at:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @index: a zero-based index indicating the part to remove</div><div class='del'>- *</div><div class='del'>- * Remove the indicated part from the multipart object.</div><div class='del'>- *</div><div class='del'>- * Return value: the removed part. Note that it is camel_object_unref()ed</div><div class='del'>- * before being returned, which may cause it to be destroyed.</div><div class='del'>- **/</div><div class='del'>-CamelMimePart *</div><div class='del'>-camel_multipart_remove_part_at (CamelMultipart *multipart, guint index)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), NULL);</div><div class='del'>-</div><div class='del'>-	return CMP_CLASS (multipart)-&gt;remove_part_at (multipart, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelMimePart *</div><div class='del'>-get_part (CamelMultipart *multipart, guint index)</div><div class='del'>-{</div><div class='del'>-	GList *part;</div><div class='del'>-</div><div class='del'>-	if (!(multipart-&gt;parts))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	part = g_list_nth (multipart-&gt;parts, index);</div><div class='del'>-	if (part)</div><div class='del'>-		return CAMEL_MIME_PART (part-&gt;data);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_get_part:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- * @index: a zero-based index indicating the part to get</div><div class='del'>- *</div><div class='del'>- * Return value: the indicated subpart, or %NULL</div><div class='del'>- **/</div><div class='del'>-CamelMimePart *</div><div class='del'>-camel_multipart_get_part (CamelMultipart *multipart, guint index)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), NULL);</div><div class='del'>-</div><div class='del'>-	return CMP_CLASS (multipart)-&gt;get_part (multipart, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-get_number (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	return g_list_length (multipart-&gt;parts);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_get_number:</div><div class='del'>- * @multipart: a CamelMultipart</div><div class='del'>- *</div><div class='del'>- * Return value: the number of subparts in @multipart</div><div class='del'>- **/</div><div class='del'>-guint</div><div class='del'>-camel_multipart_get_number (CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MULTIPART (multipart), 0);</div><div class='del'>-</div><div class='del'>-	return CMP_CLASS (multipart)-&gt;get_number (multipart);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_boundary (CamelMultipart *multipart, 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, FALSE, p, &amp;state, &amp;save);</div><div class='del'>-		*p = '\0';</div><div class='del'>-</div><div class='del'>-		boundary = bbuf;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	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='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_set_preface:</div><div class='del'>- * @multipart: </div><div class='del'>- * @preface: </div><div class='del'>- * </div><div class='del'>- * Set the preface text for this multipart.  Will be written out infront</div><div class='del'>- * of the multipart.  This text should only include US-ASCII strings, and</div><div class='del'>- * be relatively short, and will be ignored by any MIME mail client.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_set_preface(CamelMultipart *multipart, const char *preface)</div><div class='del'>-{</div><div class='del'>-	if (multipart-&gt;preface != preface) {</div><div class='del'>-		g_free(multipart-&gt;preface);</div><div class='del'>-		if (preface)</div><div class='del'>-			multipart-&gt;preface = g_strdup(preface);</div><div class='del'>-		else</div><div class='del'>-			multipart-&gt;preface = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_multipart_set_postface:</div><div class='del'>- * @multipart: </div><div class='del'>- * @postface: </div><div class='del'>- * </div><div class='del'>- * Set the postfix text for this multipart.  Will be written out after</div><div class='del'>- * the last boundary of the multipart, and ignored by any MIME mail</div><div class='del'>- * client.</div><div class='del'>- *</div><div class='del'>- * Generally postface texts should not be sent with multipart messages.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_multipart_set_postface(CamelMultipart *multipart, const char *postface)</div><div class='del'>-{</div><div class='del'>-	if (multipart-&gt;postface != postface) {</div><div class='del'>-		g_free(multipart-&gt;postface);</div><div class='del'>-		if (postface)</div><div class='del'>-			multipart-&gt;postface = g_strdup(postface);</div><div class='del'>-		else</div><div class='del'>-			multipart-&gt;postface = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-multipart.h b/camel/camel-multipart.h<br/>deleted file mode 100644<br/>index 3058b8f2e0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-multipart.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-multipart.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,105 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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)     (CAMEL_CHECK_CAST((obj), CAMEL_MULTIPART_TYPE, CamelMultipart))</div><div class='del'>-#define CAMEL_MULTIPART_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MULTIPART_TYPE, CamelMultipartClass))</div><div class='del'>-#define CAMEL_IS_MULTIPART(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MULTIPART_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _CamelMultipart</div><div class='del'>-{</div><div class='del'>-	CamelDataWrapper parent_object;</div><div class='del'>-</div><div class='del'>-	CamelMimePart *parent;</div><div class='del'>-	GList *parts;</div><div class='del'>-	gchar *boundary;</div><div class='del'>-	gchar *preface;</div><div class='del'>-	gchar *postface;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelDataWrapperClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	void (*add_part) (CamelMultipart *multipart, CamelMimePart *part);</div><div class='del'>-	void (*add_part_at) (CamelMultipart *multipart, CamelMimePart *part, guint index);</div><div class='del'>-	void (*remove_part) (CamelMultipart *multipart, CamelMimePart *part);</div><div class='del'>-	CamelMimePart * (*remove_part_at) (CamelMultipart *multipart, guint index);</div><div class='del'>-	CamelMimePart * (*get_part) (CamelMultipart *multipart, guint index);</div><div class='del'>-	guint (*get_number) (CamelMultipart *multipart);</div><div class='del'>-	void (*set_boundary) (CamelMultipart *multipart, 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 Camel function */</div><div class='del'>-CamelType camel_multipart_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelMultipart *    camel_multipart_new            (void);</div><div class='del'>-void                camel_multipart_add_part       (CamelMultipart *multipart,</div><div class='del'>-						    CamelMimePart *part);</div><div class='del'>-void                camel_multipart_add_part_at    (CamelMultipart *multipart,</div><div class='del'>-						    CamelMimePart *part,</div><div class='del'>-						    guint index);</div><div class='del'>-void                camel_multipart_remove_part    (CamelMultipart *multipart,</div><div class='del'>-						    CamelMimePart *part);</div><div class='del'>-CamelMimePart *     camel_multipart_remove_part_at (CamelMultipart *multipart,</div><div class='del'>-						    guint index);</div><div class='del'>-CamelMimePart *     camel_multipart_get_part       (CamelMultipart *multipart,</div><div class='del'>-						    guint index);</div><div class='del'>-guint               camel_multipart_get_number     (CamelMultipart *multipart);</div><div class='del'>-void                camel_multipart_set_boundary   (CamelMultipart *multipart,</div><div class='del'>-						    gchar *boundary);</div><div class='del'>-const gchar *       camel_multipart_get_boundary   (CamelMultipart *multipart);</div><div class='del'>-</div><div class='del'>-void		    camel_multipart_set_preface	   (CamelMultipart *multipart, const char *preface);</div><div class='del'>-void		    camel_multipart_set_postface   (CamelMultipart *multipart, const char *postface);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MULTIPART_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-news-address.c b/camel/camel-news-address.c<br/>deleted file mode 100644<br/>index ebd35b80c7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-news-address.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-news-address.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 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'>-</div><div class='del'>-static CamelAddressClass *camel_news_address_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_news_address_class_init (CamelNewsAddressClass *klass)</div><div class='del'>-{</div><div class='del'>-	camel_news_address_parent = CAMEL_ADDRESS_CLASS (camel_type_get_global_classfuncs (camel_address_get_type ()));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_news_address_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_address_get_type (), "CamelNewsAddress",</div><div class='del'>-					    sizeof (CamelNewsAddress),</div><div class='del'>-					    sizeof (CamelNewsAddressClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_news_address_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_news_address_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelNewsAddress object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelNewsAddress widget.</div><div class='del'>- **/</div><div class='del'>-CamelNewsAddress *</div><div class='del'>-camel_news_address_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelNewsAddress *new = CAMEL_NEWS_ADDRESS ( camel_object_new (camel_news_address_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-news-address.h b/camel/camel-news-address.h<br/>deleted file mode 100644<br/>index 8d2aa03968..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-news-address.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, camel_news_address_get_type (), CamelNewsAddress)</div><div class='del'>-#define CAMEL_NEWS_ADDRESS_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_news_address_get_type (), CamelNewsAddressClass)</div><div class='del'>-#define IS_CAMEL_NEWS_ADDRESS(obj)      CAMEL_CHECK_TYPE (obj, camel_news_address_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelNewsAddressClass CamelNewsAddressClass;</div><div class='del'>-</div><div class='del'>-struct _CamelNewsAddress {</div><div class='del'>-	CamelAddress parent;</div><div class='del'>-</div><div class='del'>-	struct _CamelNewsAddressPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelNewsAddressClass {</div><div class='del'>-	CamelAddressClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-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 75c14b8978..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-object.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-object.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,973 +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'>-/* I just mashed the keyboard for these... */</div><div class='del'>-#define CAMEL_OBJECT_MAGIC_VALUE           0x77A344EF</div><div class='del'>-#define CAMEL_OBJECT_CLASS_MAGIC_VALUE     0xEE26A990</div><div class='del'>-#define CAMEL_OBJECT_FINALIZED_VALUE       0x84AC3656</div><div class='del'>-#define CAMEL_OBJECT_CLASS_FINALIZED_VALUE 0x7621ABCD</div><div class='del'>-</div><div class='del'>-#define DEFAULT_PREALLOCS 8</div><div class='del'>-</div><div class='del'>-#define BAST_CASTARD 1		/* Define to return NULL when casts fail */</div><div class='del'>-</div><div class='del'>-#define NULL_PREP_VALUE ((gpointer)make_global_classfuncs)	/* See camel_object_class_declare_event */</div><div class='del'>-</div><div class='del'>-/* ** Quickie type system ************************************************* */</div><div class='del'>-</div><div class='del'>-typedef struct _CamelTypeInfo</div><div class='del'>-{</div><div class='del'>-	CamelType self;</div><div class='del'>-	CamelType parent;</div><div class='del'>-	const gchar *name;</div><div class='del'>-</div><div class='del'>-	size_t instance_size;</div><div class='del'>-	GMemChunk *instance_chunk;</div><div class='del'>-	CamelObjectInitFunc instance_init;</div><div class='del'>-	CamelObjectFinalizeFunc instance_finalize;</div><div class='del'>-	GList *free_instances;</div><div class='del'>-</div><div class='del'>-	size_t classfuncs_size;</div><div class='del'>-	CamelObjectClassInitFunc class_init;</div><div class='del'>-	CamelObjectClassFinalizeFunc class_finalize;</div><div class='del'>-	CamelObjectClass *global_classfuncs;</div><div class='del'>-}</div><div class='del'>-CamelTypeInfo;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelHookPair</div><div class='del'>-{</div><div class='del'>-	CamelObjectEventHookFunc func;</div><div class='del'>-	gpointer user_data;</div><div class='del'>-}</div><div class='del'>-CamelHookPair;</div><div class='del'>-</div><div class='del'>-/* ************************************************************************ */</div><div class='del'>-</div><div class='del'>-static void camel_type_lock_up (void);</div><div class='del'>-static void camel_type_lock_down (void);</div><div class='del'>-</div><div class='del'>-static void obj_init (CamelObject * obj);</div><div class='del'>-static void obj_finalize (CamelObject * obj);</div><div class='del'>-static void obj_class_init (CamelObjectClass * class);</div><div class='del'>-static void obj_class_finalize (CamelObjectClass * class);</div><div class='del'>-</div><div class='del'>-static gboolean shared_is_of_type (CamelObjectShared * sh, CamelType ctype,</div><div class='del'>-				   gboolean is_obj);</div><div class='del'>-static void make_global_classfuncs (CamelTypeInfo * type_info);</div><div class='del'>-</div><div class='del'>-/* ************************************************************************ */</div><div class='del'>-</div><div class='del'>-G_LOCK_DEFINE_STATIC (type_system);</div><div class='del'>-G_LOCK_DEFINE_STATIC (type_system_level);</div><div class='del'>-static GPrivate *type_system_locklevel = NULL;</div><div class='del'>-</div><div class='del'>-G_LOCK_DEFINE_STATIC (refcount);</div><div class='del'>-</div><div class='del'>-static gboolean type_system_initialized = FALSE;</div><div class='del'>-static GHashTable *ctype_to_typeinfo = NULL;</div><div class='del'>-static const CamelType camel_object_type = 1;</div><div class='del'>-static CamelType cur_max_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-/* ************************************************************************ */</div><div class='del'>-</div><div class='del'>-#define LOCK_VAL (GPOINTER_TO_INT (g_private_get (type_system_locklevel)))</div><div class='del'>-#define LOCK_SET( val ) g_private_set (type_system_locklevel, GINT_TO_POINTER (val))</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_type_lock_up (void)</div><div class='del'>-{</div><div class='del'>-	G_LOCK (type_system_level);</div><div class='del'>-</div><div class='del'>-	if (type_system_locklevel == NULL)</div><div class='del'>-		type_system_locklevel = g_private_new (GINT_TO_POINTER (0));</div><div class='del'>-</div><div class='del'>-	if (LOCK_VAL == 0) {</div><div class='del'>-		G_UNLOCK (type_system_level);</div><div class='del'>-		G_LOCK (type_system);</div><div class='del'>-		G_LOCK (type_system_level);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	LOCK_SET (LOCK_VAL + 1);</div><div class='del'>-</div><div class='del'>-	G_UNLOCK (type_system_level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_type_lock_down (void)</div><div class='del'>-{</div><div class='del'>-	G_LOCK (type_system_level);</div><div class='del'>-</div><div class='del'>-	if (type_system_locklevel == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_type_lock_down: lock down before a lock up?");</div><div class='del'>-		type_system_locklevel = g_private_new (GINT_TO_POINTER (0));</div><div class='del'>-		G_UNLOCK (type_system_level);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	LOCK_SET (LOCK_VAL - 1);</div><div class='del'>-</div><div class='del'>-	if (LOCK_VAL == 0)</div><div class='del'>-		G_UNLOCK (type_system);</div><div class='del'>-</div><div class='del'>-	G_UNLOCK (type_system_level);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_type_init (void)</div><div class='del'>-{</div><div class='del'>-	CamelTypeInfo *obj_info;</div><div class='del'>-</div><div class='del'>-	camel_type_lock_up ();</div><div class='del'>-</div><div class='del'>-	if (type_system_initialized) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_type_init: type system already initialized.");</div><div class='del'>-		camel_type_lock_down ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	type_system_initialized = TRUE;</div><div class='del'>-	ctype_to_typeinfo = g_hash_table_new (g_direct_hash, g_direct_equal);</div><div class='del'>-</div><div class='del'>-	obj_info = g_new (CamelTypeInfo, 1);</div><div class='del'>-	obj_info-&gt;self = camel_object_type;</div><div class='del'>-	obj_info-&gt;parent = CAMEL_INVALID_TYPE;</div><div class='del'>-	obj_info-&gt;name = "CamelObject";</div><div class='del'>-</div><div class='del'>-	obj_info-&gt;instance_size = sizeof (CamelObject);</div><div class='del'>-	obj_info-&gt;instance_chunk =</div><div class='del'>-		g_mem_chunk_create (CamelObject, DEFAULT_PREALLOCS,</div><div class='del'>-				    G_ALLOC_ONLY);</div><div class='del'>-	obj_info-&gt;instance_init = obj_init;</div><div class='del'>-	obj_info-&gt;instance_finalize = obj_finalize;</div><div class='del'>-	obj_info-&gt;free_instances = NULL;</div><div class='del'>-</div><div class='del'>-	obj_info-&gt;classfuncs_size = sizeof (CamelObjectClass);</div><div class='del'>-	obj_info-&gt;class_init = obj_class_init;</div><div class='del'>-	obj_info-&gt;class_finalize = obj_class_finalize;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (ctype_to_typeinfo,</div><div class='del'>-			     GINT_TO_POINTER (CAMEL_INVALID_TYPE), NULL);</div><div class='del'>-	g_hash_table_insert (ctype_to_typeinfo,</div><div class='del'>-			     GINT_TO_POINTER (camel_object_type), obj_info);</div><div class='del'>-</div><div class='del'>-	/* Sigh. Ugly */</div><div class='del'>-	make_global_classfuncs (obj_info);</div><div class='del'>-</div><div class='del'>-	cur_max_type = camel_object_type;</div><div class='del'>-</div><div class='del'>-	camel_type_lock_down ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_type_register (CamelType parent, const gchar * name,</div><div class='del'>-		     size_t instance_size, size_t classfuncs_size,</div><div class='del'>-		     CamelObjectClassInitFunc class_init,</div><div class='del'>-		     CamelObjectClassFinalizeFunc class_finalize,</div><div class='del'>-		     CamelObjectInitFunc instance_init,</div><div class='del'>-		     CamelObjectFinalizeFunc instance_finalize)</div><div class='del'>-{</div><div class='del'>-	CamelTypeInfo *parent_info;</div><div class='del'>-	CamelTypeInfo *obj_info;</div><div class='del'>-	gchar *chunkname;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != CAMEL_INVALID_TYPE,</div><div class='del'>-			      CAMEL_INVALID_TYPE);</div><div class='del'>-	g_return_val_if_fail (name, CAMEL_INVALID_TYPE);</div><div class='del'>-	g_return_val_if_fail (instance_size, CAMEL_INVALID_TYPE);</div><div class='del'>-	g_return_val_if_fail (classfuncs_size, CAMEL_INVALID_TYPE);</div><div class='del'>-</div><div class='del'>-	camel_type_lock_up ();</div><div class='del'>-</div><div class='del'>-	if (type_system_initialized == FALSE) {</div><div class='del'>-		G_UNLOCK (type_system);</div><div class='del'>-		camel_type_init ();</div><div class='del'>-		G_LOCK (type_system);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parent_info =</div><div class='del'>-		g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-				     GINT_TO_POINTER (parent));</div><div class='del'>-</div><div class='del'>-	if (parent_info == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_type_register: no such parent type %d of class `%s'",</div><div class='del'>-			 parent, name);</div><div class='del'>-		camel_type_lock_down ();</div><div class='del'>-		return CAMEL_INVALID_TYPE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (parent_info-&gt;instance_size &gt; instance_size) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_type_register: instance of class `%s' would be smaller than parent `%s'",</div><div class='del'>-			 name, parent_info-&gt;name);</div><div class='del'>-		camel_type_lock_down ();</div><div class='del'>-		return CAMEL_INVALID_TYPE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (parent_info-&gt;classfuncs_size &gt; classfuncs_size) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_type_register: classfuncs of class `%s' would be smaller than parent `%s'",</div><div class='del'>-			 name, parent_info-&gt;name);</div><div class='del'>-		camel_type_lock_down ();</div><div class='del'>-		return CAMEL_INVALID_TYPE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	cur_max_type++;</div><div class='del'>-</div><div class='del'>-	obj_info = g_new (CamelTypeInfo, 1);</div><div class='del'>-	obj_info-&gt;self = cur_max_type;</div><div class='del'>-	obj_info-&gt;parent = parent;</div><div class='del'>-	obj_info-&gt;name = name;</div><div class='del'>-</div><div class='del'>-	obj_info-&gt;instance_size = instance_size;</div><div class='del'>-	chunkname =</div><div class='del'>-		g_strdup_printf ("chunk for instances of Camel type `%s'",</div><div class='del'>-				 name);</div><div class='del'>-	obj_info-&gt;instance_chunk =</div><div class='del'>-		g_mem_chunk_new (chunkname, instance_size,</div><div class='del'>-				 instance_size * DEFAULT_PREALLOCS,</div><div class='del'>-				 G_ALLOC_ONLY);</div><div class='del'>-	g_free (chunkname);</div><div class='del'>-	obj_info-&gt;instance_init = instance_init;</div><div class='del'>-	obj_info-&gt;instance_finalize = instance_finalize;</div><div class='del'>-	obj_info-&gt;free_instances = NULL;</div><div class='del'>-</div><div class='del'>-	obj_info-&gt;classfuncs_size = classfuncs_size;</div><div class='del'>-	obj_info-&gt;class_init = class_init;</div><div class='del'>-	obj_info-&gt;class_finalize = class_finalize;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (ctype_to_typeinfo,</div><div class='del'>-			     GINT_TO_POINTER (obj_info-&gt;self), obj_info);</div><div class='del'>-</div><div class='del'>-	/* Sigh. Ugly. */</div><div class='del'>-	make_global_classfuncs (obj_info);</div><div class='del'>-</div><div class='del'>-	camel_type_lock_down ();</div><div class='del'>-	return obj_info-&gt;self;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelObjectClass *</div><div class='del'>-camel_type_get_global_classfuncs (CamelType type)</div><div class='del'>-{</div><div class='del'>-	CamelTypeInfo *type_info;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE, NULL);</div><div class='del'>-</div><div class='del'>-	camel_type_lock_up ();</div><div class='del'>-	type_info =</div><div class='del'>-		g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-				     GINT_TO_POINTER (type));</div><div class='del'>-	camel_type_lock_down ();</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (type_info != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return type_info-&gt;global_classfuncs;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *</div><div class='del'>-camel_type_to_name (CamelType type)</div><div class='del'>-{</div><div class='del'>-	CamelTypeInfo *type_info;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE,</div><div class='del'>-			      "(the invalid type)");</div><div class='del'>-</div><div class='del'>-	camel_type_lock_up ();</div><div class='del'>-	type_info =</div><div class='del'>-		g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-				     GINT_TO_POINTER (type));</div><div class='del'>-	camel_type_lock_down ();</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (type_info != NULL,</div><div class='del'>-			      "(a bad type parameter was specified)");</div><div class='del'>-</div><div class='del'>-	return type_info-&gt;name;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ** The CamelObject ***************************************************** */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-obj_init (CamelObject * obj)</div><div class='del'>-{</div><div class='del'>-	obj-&gt;s.magic = CAMEL_OBJECT_MAGIC_VALUE;</div><div class='del'>-	obj-&gt;ref_count = 1;</div><div class='del'>-	obj-&gt;event_to_hooklist = NULL;</div><div class='del'>-	obj-&gt;in_event = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-obj_finalize (CamelObject * obj)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (obj-&gt;s.magic == CAMEL_OBJECT_MAGIC_VALUE);</div><div class='del'>-	g_return_if_fail (obj-&gt;ref_count == 0);</div><div class='del'>-	g_return_if_fail (obj-&gt;in_event == 0);</div><div class='del'>-</div><div class='del'>-	obj-&gt;s.magic = CAMEL_OBJECT_FINALIZED_VALUE;</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;event_to_hooklist) {</div><div class='del'>-		g_hash_table_foreach (obj-&gt;event_to_hooklist, (GHFunc) g_free,</div><div class='del'>-				      NULL);</div><div class='del'>-		g_hash_table_destroy (obj-&gt;event_to_hooklist);</div><div class='del'>-		obj-&gt;event_to_hooklist = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-obj_class_init (CamelObjectClass * class)</div><div class='del'>-{</div><div class='del'>-	class-&gt;s.magic = CAMEL_OBJECT_CLASS_MAGIC_VALUE;</div><div class='del'>-</div><div class='del'>-	camel_object_class_declare_event (class, "finalize", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-obj_class_finalize (CamelObjectClass * class)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (class-&gt;s.magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE);</div><div class='del'>-</div><div class='del'>-	class-&gt;s.magic = CAMEL_OBJECT_CLASS_FINALIZED_VALUE;</div><div class='del'>-</div><div class='del'>-	if (class-&gt;event_to_preplist) {</div><div class='del'>-		g_hash_table_foreach (class-&gt;event_to_preplist,</div><div class='del'>-				      (GHFunc) g_free, NULL);</div><div class='del'>-		g_hash_table_destroy (class-&gt;event_to_preplist);</div><div class='del'>-		class-&gt;event_to_preplist = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_object_get_type (void)</div><div class='del'>-{</div><div class='del'>-	if (type_system_initialized == FALSE)</div><div class='del'>-		camel_type_init ();</div><div class='del'>-</div><div class='del'>-	return camel_object_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelObject *</div><div class='del'>-camel_object_new (CamelType type)</div><div class='del'>-{</div><div class='del'>-	CamelTypeInfo *type_info;</div><div class='del'>-	GSList *parents = NULL;</div><div class='del'>-	GSList *head = NULL;</div><div class='del'>-	CamelObject *instance;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (type != CAMEL_INVALID_TYPE, NULL);</div><div class='del'>-</div><div class='del'>-	/* Look up the type */</div><div class='del'>-</div><div class='del'>-	camel_type_lock_up ();</div><div class='del'>-</div><div class='del'>-	type_info =</div><div class='del'>-		g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-				     GINT_TO_POINTER (type));</div><div class='del'>-</div><div class='del'>-	if (type_info == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_object_new: trying to create object of invalid type %d",</div><div class='del'>-			 type);</div><div class='del'>-		camel_type_lock_down ();</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Grab an instance out of the freed ones if possible, alloc otherwise */</div><div class='del'>-</div><div class='del'>-	if (type_info-&gt;free_instances) {</div><div class='del'>-		GList *first;</div><div class='del'>-</div><div class='del'>-		first = g_list_first (type_info-&gt;free_instances);</div><div class='del'>-		instance = first-&gt;data;</div><div class='del'>-		type_info-&gt;free_instances =</div><div class='del'>-			g_list_remove_link (type_info-&gt;free_instances, first);</div><div class='del'>-		g_list_free_1 (first);</div><div class='del'>-	} else {</div><div class='del'>-		instance = g_mem_chunk_alloc0 (type_info-&gt;instance_chunk);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Init the instance and classfuncs a bit */</div><div class='del'>-</div><div class='del'>-	instance-&gt;s.type = type;</div><div class='del'>-	instance-&gt;classfuncs = type_info-&gt;global_classfuncs;</div><div class='del'>-</div><div class='del'>-	/* Loop through the parents in simplest -&gt; most complex order, initing the class and instance.</div><div class='del'>-</div><div class='del'>-	 * When parent = CAMEL_INVALID_TYPE and we're at the end of the line, _lookup returns NULL</div><div class='del'>-	 * because we inserted it as corresponding to CAMEL_INVALID_TYPE. Clever, eh?</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	while (type_info) {</div><div class='del'>-		parents = g_slist_prepend (parents, type_info);</div><div class='del'>-		type_info =</div><div class='del'>-			g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-					     GINT_TO_POINTER (type_info-&gt;</div><div class='del'>-							      parent));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	head = parents;</div><div class='del'>-</div><div class='del'>-	for (; parents &amp;&amp; parents-&gt;data; parents = parents-&gt;next) {</div><div class='del'>-		CamelTypeInfo *thisinfo;</div><div class='del'>-</div><div class='del'>-		thisinfo = parents-&gt;data;</div><div class='del'>-		if (thisinfo-&gt;instance_init)</div><div class='del'>-			(thisinfo-&gt;instance_init) (instance);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (head);</div><div class='del'>-</div><div class='del'>-	camel_type_lock_down ();</div><div class='del'>-	return instance;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_ref (CamelObject * obj)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT (obj));</div><div class='del'>-</div><div class='del'>-	G_LOCK (refcount);</div><div class='del'>-	obj-&gt;ref_count++;</div><div class='del'>-	G_UNLOCK (refcount);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_unref (CamelObject * obj)</div><div class='del'>-{</div><div class='del'>-	CamelTypeInfo *type_info;</div><div class='del'>-	CamelTypeInfo *iter;</div><div class='del'>-	GSList *parents = NULL;</div><div class='del'>-	GSList *head = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT (obj));</div><div class='del'>-</div><div class='del'>-	G_LOCK (refcount);</div><div class='del'>-	obj-&gt;ref_count--;</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;ref_count &gt; 0) {</div><div class='del'>-		G_UNLOCK (refcount);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	G_UNLOCK (refcount);</div><div class='del'>-</div><div class='del'>-	/* Oh no! We want to emit a "finalized" event, but that function refs the object</div><div class='del'>-	 * because it's not supposed to get finalized in an event, but it is being finalized</div><div class='del'>-	 * right now, and AAUGH AAUGH AUGH AUGH!</div><div class='del'>-	 *</div><div class='del'>-	 * So we don't call camel_object_trigger_event. We do it ourselves. We even know</div><div class='del'>-	 * that CamelObject doesn't provide a prep for the finalized event, so we plunge</div><div class='del'>-	 * right in and call our hooks.</div><div class='del'>-	 *</div><div class='del'>-	 * And there was much rejoicing.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-#define hooklist parents	/*cough */</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;event_to_hooklist) {</div><div class='del'>-		CamelHookPair *pair;</div><div class='del'>-</div><div class='del'>-		hooklist =</div><div class='del'>-			g_hash_table_lookup (obj-&gt;event_to_hooklist,</div><div class='del'>-					     "finalize");</div><div class='del'>-</div><div class='del'>-		while (hooklist &amp;&amp; hooklist-&gt;data) {</div><div class='del'>-			pair = hooklist-&gt;data;</div><div class='del'>-			(pair-&gt;func) (obj, NULL, pair-&gt;user_data);</div><div class='del'>-			hooklist = hooklist-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hooklist = NULL;	/* Don't mess with this line */</div><div class='del'>-</div><div class='del'>-#undef hooklist</div><div class='del'>-</div><div class='del'>-	/* Destroy it! hahaha! */</div><div class='del'>-</div><div class='del'>-	camel_type_lock_up ();</div><div class='del'>-</div><div class='del'>-	type_info =</div><div class='del'>-		g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-				     GINT_TO_POINTER (obj-&gt;s.type));</div><div class='del'>-</div><div class='del'>-	if (type_info == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_object_unref: seemingly valid object has a bad type %d",</div><div class='del'>-			 obj-&gt;s.type);</div><div class='del'>-		camel_type_lock_down ();</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Loop through the parents in most complex -&gt; simplest order, finalizing the class </div><div class='del'>-	 * and instance.</div><div class='del'>-	 *</div><div class='del'>-	 * When parent = CAMEL_INVALID_TYPE and we're at the end of the line, _lookup returns NULL</div><div class='del'>-	 * because we inserted it as corresponding to CAMEL_INVALID_TYPE. Clever, eh?</div><div class='del'>-	 *</div><div class='del'>-	 * Use iter to preserve type_info for free_{instance,classfunc}s</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	iter = type_info;</div><div class='del'>-</div><div class='del'>-	while (iter) {</div><div class='del'>-		parents = g_slist_prepend (parents, iter);</div><div class='del'>-		iter =</div><div class='del'>-			g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-					     GINT_TO_POINTER (iter-&gt;parent));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	parents = g_slist_reverse (parents);</div><div class='del'>-	head = parents;</div><div class='del'>-</div><div class='del'>-	for (; parents &amp;&amp; parents-&gt;data; parents = parents-&gt;next) {</div><div class='del'>-		CamelTypeInfo *thisinfo;</div><div class='del'>-</div><div class='del'>-		thisinfo = parents-&gt;data;</div><div class='del'>-		if (thisinfo-&gt;instance_finalize)</div><div class='del'>-			(thisinfo-&gt;instance_finalize) (obj);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (head);</div><div class='del'>-</div><div class='del'>-	/* A little bit of cleaning up.</div><div class='del'>-</div><div class='del'>-	 * Don't erase the type, so we can peek at it if a finalized object</div><div class='del'>-	 * is check_cast'ed somewhere.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	memset (obj, 0, type_info-&gt;instance_size);</div><div class='del'>-	obj-&gt;s.type = type_info-&gt;self;</div><div class='del'>-	obj-&gt;s.magic = CAMEL_OBJECT_FINALIZED_VALUE;</div><div class='del'>-</div><div class='del'>-	/* Tuck away the pointer for use in a new object */</div><div class='del'>-</div><div class='del'>-	type_info-&gt;free_instances =</div><div class='del'>-		g_list_prepend (type_info-&gt;free_instances, obj);</div><div class='del'>-</div><div class='del'>-	camel_type_lock_down ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_object_is_of_type (CamelObject * obj, CamelType ctype)</div><div class='del'>-{</div><div class='del'>-	return shared_is_of_type ((CamelObjectShared *) obj, ctype, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_object_class_is_of_type (CamelObjectClass * class, CamelType ctype)</div><div class='del'>-{</div><div class='del'>-	return shared_is_of_type ((CamelObjectShared *) class, ctype, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef BAST_CASTARD</div><div class='del'>-#define ERRVAL NULL</div><div class='del'>-#else</div><div class='del'>-#define ERRVAL obj</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-CamelObject *</div><div class='del'>-camel_object_check_cast (CamelObject * obj, CamelType ctype)</div><div class='del'>-{</div><div class='del'>-	if (shared_is_of_type ((CamelObjectShared *) obj, ctype, TRUE))</div><div class='del'>-		return obj;</div><div class='del'>-	return ERRVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelObjectClass *</div><div class='del'>-camel_object_class_check_cast (CamelObjectClass * class, CamelType ctype)</div><div class='del'>-{</div><div class='del'>-	if (shared_is_of_type ((CamelObjectShared *) class, ctype, FALSE))</div><div class='del'>-		return class;</div><div class='del'>-	return ERRVAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#undef ERRVAL</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-camel_object_describe (CamelObject * obj)</div><div class='del'>-{</div><div class='del'>-	if (obj == NULL)</div><div class='del'>-		return g_strdup ("a NULL pointer");</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;s.magic == CAMEL_OBJECT_MAGIC_VALUE) {</div><div class='del'>-		return g_strdup_printf ("an instance of `%s' at %p",</div><div class='del'>-					camel_type_to_name (obj-&gt;s.type),</div><div class='del'>-					obj);</div><div class='del'>-	} else if (obj-&gt;s.magic == CAMEL_OBJECT_FINALIZED_VALUE) {</div><div class='del'>-		return g_strdup_printf ("a finalized instance of `%s' at %p",</div><div class='del'>-					camel_type_to_name (obj-&gt;s.type),</div><div class='del'>-					obj);</div><div class='del'>-	} else if (obj-&gt;s.magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE) {</div><div class='del'>-		return g_strdup_printf ("the classfuncs of `%s' at %p",</div><div class='del'>-					camel_type_to_name (obj-&gt;s.type),</div><div class='del'>-					obj);</div><div class='del'>-	} else if (obj-&gt;s.magic == CAMEL_OBJECT_CLASS_FINALIZED_VALUE) {</div><div class='del'>-		return</div><div class='del'>-			g_strdup_printf</div><div class='del'>-			("the finalized classfuncs of `%s' at %p",</div><div class='del'>-			 camel_type_to_name (obj-&gt;s.type), obj);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return g_strdup ("not a CamelObject");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* This is likely to be called in the class_init callback,</div><div class='del'>- * and the type will likely be somewhat uninitialized. </div><div class='del'>- * Is this a problem? We'll see....</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-camel_object_class_declare_event (CamelObjectClass * class,</div><div class='del'>-				  const gchar * name,</div><div class='del'>-				  CamelObjectEventPrepFunc prep)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT_CLASS (class));</div><div class='del'>-	g_return_if_fail (name);</div><div class='del'>-</div><div class='del'>-	if (class-&gt;event_to_preplist == NULL)</div><div class='del'>-		class-&gt;event_to_preplist =</div><div class='del'>-			g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	else if (g_hash_table_lookup (class-&gt;event_to_preplist, name) != NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_object_class_declare_event: event `%s' already declared for `%s'",</div><div class='del'>-			 name, camel_type_to_name (class-&gt;s.type));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* AIEEEEEEEEEEEEEEEEEEEEEE</div><div class='del'>-</div><div class='del'>-	 * I feel so naughty. Since it's valid to declare an event and not</div><div class='del'>-	 * provide a hook, it should be valid to insert a NULL value into</div><div class='del'>-	 * the table. However, then our lookup in trigger_event would be</div><div class='del'>-	 * ambiguous, not telling us whether the event is undefined or whether</div><div class='del'>-	 * it merely has no hook.</div><div class='del'>-	 *</div><div class='del'>-	 * So we create an 'NULL prep' value that != NULL... specifically, it</div><div class='del'>-	 * equals the address of one of our static functions , because that</div><div class='del'>-	 * can't possibly be your hook.</div><div class='del'>-	 *</div><div class='del'>-	 * Just don't forget to check for the 'evil value' and it'll work,</div><div class='del'>-	 * I promise.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (prep == NULL)</div><div class='del'>-		prep = NULL_PREP_VALUE;</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (class-&gt;event_to_preplist, g_strdup (name), prep);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_hook_event (CamelObject * obj, const gchar * name,</div><div class='del'>-			 CamelObjectEventHookFunc hook, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GSList *hooklist;</div><div class='del'>-	CamelHookPair *pair;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT (obj));</div><div class='del'>-	g_return_if_fail (name);</div><div class='del'>-	g_return_if_fail (hook);</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;event_to_hooklist == NULL)</div><div class='del'>-		obj-&gt;event_to_hooklist =</div><div class='del'>-			g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	pair = g_new (CamelHookPair, 1);</div><div class='del'>-	pair-&gt;func = hook;</div><div class='del'>-	pair-&gt;user_data = user_data;</div><div class='del'>-</div><div class='del'>-	hooklist = g_hash_table_lookup (obj-&gt;event_to_hooklist, name);</div><div class='del'>-	hooklist = g_slist_prepend (hooklist, pair);</div><div class='del'>-	g_hash_table_insert (obj-&gt;event_to_hooklist, g_strdup (name),</div><div class='del'>-			     hooklist);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_unhook_event (CamelObject * obj, const gchar * name,</div><div class='del'>-			   CamelObjectEventHookFunc hook, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GSList *hooklist;</div><div class='del'>-	GSList *head;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT (obj));</div><div class='del'>-	g_return_if_fail (name);</div><div class='del'>-	g_return_if_fail (hook);</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;event_to_hooklist == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_object_unhook_event: trying to unhook `%s' from an instance "</div><div class='del'>-			 "of `%s' with no hooks attached", name,</div><div class='del'>-			 camel_type_to_name (obj-&gt;s.type));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hooklist = g_hash_table_lookup (obj-&gt;event_to_hooklist, name);</div><div class='del'>-</div><div class='del'>-	if (hooklist == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_object_unhook_event: trying to unhook `%s' from an instance "</div><div class='del'>-			 "of `%s' with no hooks attached to that event.",</div><div class='del'>-			 name, camel_type_to_name (obj-&gt;s.type));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	head = hooklist;</div><div class='del'>-</div><div class='del'>-	while (hooklist) {</div><div class='del'>-		CamelHookPair *pair = (CamelHookPair *) hooklist-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (pair-&gt;func == hook &amp;&amp; pair-&gt;user_data == user_data) {</div><div class='del'>-			g_free (hooklist-&gt;data);</div><div class='del'>-			head = g_slist_remove_link (head, hooklist);</div><div class='del'>-			g_slist_free_1 (hooklist);</div><div class='del'>-			g_hash_table_insert (obj-&gt;event_to_hooklist, (char *) name,</div><div class='del'>-					     head);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		hooklist = hooklist-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_warning</div><div class='del'>-		("camel_object_unhook_event: cannot find hook/data pair %p/%p in an "</div><div class='del'>-		 "instance of `%s' attached to `%s'", hook, user_data,</div><div class='del'>-		 camel_type_to_name (obj-&gt;s.type), name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_object_trigger_event (CamelObject * obj, const gchar * name,</div><div class='del'>-			    gpointer event_data)</div><div class='del'>-{</div><div class='del'>-	GSList *hooklist;</div><div class='del'>-	CamelHookPair *pair;</div><div class='del'>-	CamelObjectEventPrepFunc prep;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_OBJECT (obj));</div><div class='del'>-	g_return_if_fail (name);</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;in_event) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_object_trigger_event: trying to trigger `%s' in class "</div><div class='del'>-			 "`%s' while already triggering another event", name,</div><div class='del'>-			 camel_type_to_name (obj-&gt;s.type));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (obj-&gt;classfuncs-&gt;event_to_preplist == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_object_trigger_event: trying to trigger `%s' in class "</div><div class='del'>-			 "`%s' with no defined events.", name,</div><div class='del'>-			 camel_type_to_name (obj-&gt;s.type));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	prep = g_hash_table_lookup (obj-&gt;classfuncs-&gt;event_to_preplist, name);</div><div class='del'>-</div><div class='del'>-	if (prep == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("camel_object_trigger_event: trying to trigger undefined "</div><div class='del'>-			 "event `%s' in class `%s'.", name,</div><div class='del'>-			 camel_type_to_name (obj-&gt;s.type));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Ref so that it can't get destroyed in the event, which would</div><div class='del'>-	 * be Bad. And it's a valid ref anyway...</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	camel_object_ref (obj);</div><div class='del'>-	obj-&gt;in_event = 1;</div><div class='del'>-</div><div class='del'>-	if ((prep != NULL_PREP_VALUE &amp;&amp; !prep (obj, event_data))</div><div class='del'>-	    || obj-&gt;event_to_hooklist == NULL) {</div><div class='del'>-		obj-&gt;in_event = 0;</div><div class='del'>-		camel_object_unref (obj);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	hooklist = g_hash_table_lookup (obj-&gt;event_to_hooklist, name);</div><div class='del'>-</div><div class='del'>-	while (hooklist &amp;&amp; hooklist-&gt;data) {</div><div class='del'>-		pair = hooklist-&gt;data;</div><div class='del'>-		(pair-&gt;func) (obj, event_data, pair-&gt;user_data);</div><div class='del'>-		hooklist = hooklist-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	obj-&gt;in_event = 0;</div><div class='del'>-	camel_object_unref (obj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* ** Static helpers ****************************************************** */</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-shared_is_of_type (CamelObjectShared * sh, CamelType ctype, gboolean is_obj)</div><div class='del'>-{</div><div class='del'>-	CamelTypeInfo *type_info;</div><div class='del'>-	gchar *targtype;</div><div class='del'>-</div><div class='del'>-	if (is_obj)</div><div class='del'>-		targtype = "instance";</div><div class='del'>-	else</div><div class='del'>-		targtype = "classdata";</div><div class='del'>-</div><div class='del'>-	if (ctype == CAMEL_INVALID_TYPE) {</div><div class='del'>-		g_warning</div><div class='del'>-			("shared_is_of_type: trying to cast to CAMEL_INVALID_TYPE");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sh == NULL) {</div><div class='del'>-		g_warning</div><div class='del'>-			("shared_is_of_type: trying to cast NULL to %s of `%s'",</div><div class='del'>-			 targtype, camel_type_to_name (ctype));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sh-&gt;magic == CAMEL_OBJECT_FINALIZED_VALUE) {</div><div class='del'>-		g_warning</div><div class='del'>-			("shared_is_of_type: trying to cast finalized instance "</div><div class='del'>-			 "of `%s' into %s of `%s'",</div><div class='del'>-			 camel_type_to_name (sh-&gt;type), targtype,</div><div class='del'>-			 camel_type_to_name (ctype));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (sh-&gt;magic == CAMEL_OBJECT_CLASS_FINALIZED_VALUE) {</div><div class='del'>-		g_warning</div><div class='del'>-			("shared_is_of_type: trying to cast finalized classdata "</div><div class='del'>-			 "of `%s' into %s of `%s'",</div><div class='del'>-			 camel_type_to_name (sh-&gt;type), targtype,</div><div class='del'>-			 camel_type_to_name (ctype));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (is_obj) {</div><div class='del'>-		if (sh-&gt;magic == CAMEL_OBJECT_CLASS_MAGIC_VALUE) {</div><div class='del'>-			g_warning</div><div class='del'>-				("shared_is_of_type: trying to cast classdata "</div><div class='del'>-				 "of `%s' into instance of `%s'",</div><div class='del'>-				 camel_type_to_name (sh-&gt;type),</div><div class='del'>-				 camel_type_to_name (ctype));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sh-&gt;magic != CAMEL_OBJECT_MAGIC_VALUE) {</div><div class='del'>-			g_warning</div><div class='del'>-				("shared_is_of_type: trying to cast junk data "</div><div class='del'>-				 "into instance of `%s'",</div><div class='del'>-				 camel_type_to_name (ctype));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		if (sh-&gt;magic == CAMEL_OBJECT_MAGIC_VALUE) {</div><div class='del'>-			g_warning</div><div class='del'>-				("shared_is_of_type: trying to cast instance "</div><div class='del'>-				 "of `%s' into classdata of `%s'",</div><div class='del'>-				 camel_type_to_name (sh-&gt;type),</div><div class='del'>-				 camel_type_to_name (ctype));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (sh-&gt;magic != CAMEL_OBJECT_CLASS_MAGIC_VALUE) {</div><div class='del'>-			g_warning</div><div class='del'>-				("shared_is_of_type: trying to cast junk data "</div><div class='del'>-				 "into classdata of `%s'",</div><div class='del'>-				 camel_type_to_name (ctype));</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_type_lock_up ();</div><div class='del'>-</div><div class='del'>-	type_info =</div><div class='del'>-		g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-				     GINT_TO_POINTER (sh-&gt;type));</div><div class='del'>-</div><div class='del'>-	if (type_info == NULL) {</div><div class='del'>-		g_warning ("shared_is_of_type: seemingly valid %s has "</div><div class='del'>-			   "bad type %d.", targtype, sh-&gt;type);</div><div class='del'>-		camel_type_lock_down ();</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (type_info) {</div><div class='del'>-		if (type_info-&gt;self == ctype) {</div><div class='del'>-			camel_type_lock_down ();</div><div class='del'>-			return TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		type_info =</div><div class='del'>-			g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-					     GINT_TO_POINTER (type_info-&gt;</div><div class='del'>-							      parent));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* this isn't an error, e.g. CAMEL_IS_FOLDER(folder), its upto  the</div><div class='del'>-	   caller to handle the false case */</div><div class='del'>-	/*g_warning</div><div class='del'>-		("shared_is_of_type: %s of `%s' (@%p) is not also %s of `%s'",</div><div class='del'>-		 targtype, camel_type_to_name (sh-&gt;type), sh, targtype,</div><div class='del'>-		 camel_type_to_name (ctype));*/</div><div class='del'>-</div><div class='del'>-	camel_type_lock_down ();</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-make_global_classfuncs (CamelTypeInfo * type_info)</div><div class='del'>-{</div><div class='del'>-	CamelObjectClass *funcs;</div><div class='del'>-	GSList *parents;</div><div class='del'>-	GSList *head;</div><div class='del'>-</div><div class='del'>-	g_assert (type_info);</div><div class='del'>-</div><div class='del'>-	funcs = g_malloc0 (type_info-&gt;classfuncs_size);</div><div class='del'>-	funcs-&gt;s.type = type_info-&gt;self;</div><div class='del'>-</div><div class='del'>-	type_info-&gt;global_classfuncs = funcs;</div><div class='del'>-</div><div class='del'>-	parents = NULL;</div><div class='del'>-	while (type_info) {</div><div class='del'>-		parents = g_slist_prepend (parents, type_info);</div><div class='del'>-		type_info =</div><div class='del'>-			g_hash_table_lookup (ctype_to_typeinfo,</div><div class='del'>-					     GINT_TO_POINTER (type_info-&gt;</div><div class='del'>-							      parent));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	head = parents;</div><div class='del'>-</div><div class='del'>-	for (; parents &amp;&amp; parents-&gt;data; parents = parents-&gt;next) {</div><div class='del'>-		CamelTypeInfo *thisinfo;</div><div class='del'>-</div><div class='del'>-		thisinfo = parents-&gt;data;</div><div class='del'>-		if (thisinfo-&gt;class_init)</div><div class='del'>-			(thisinfo-&gt;class_init) (funcs);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_slist_free (head);</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 1308e075d5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-object.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-object.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,147 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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'>-#ifdef __cplusplus</div><div class='del'>-extern "C"</div><div class='del'>-{</div><div class='del'>-#pragma }</div><div class='del'>-#endif				/* __cplusplus } */</div><div class='del'>-</div><div class='del'>-#include &lt;stdlib.h&gt;		/* size_t */</div><div class='del'>-#include &lt;camel/camel-types.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnome/gnome-i18n.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef G_DISABLE_CHECKS</div><div class='del'>-#define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) obj)</div><div class='del'>-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) class)</div><div class='del'>-#define CAMEL_CHECK_TYPE( obj, ctype )                (TRUE)</div><div class='del'>-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (TRUE)</div><div class='del'>-#else</div><div class='del'>-#define CAMEL_CHECK_CAST( obj, ctype, ptype )         ((ptype *) camel_object_check_cast( (CamelObject *)(obj), (CamelType)(ctype) ))</div><div class='del'>-#define CAMEL_CHECK_CLASS_CAST( class, ctype, ptype ) ((ptype *) camel_object_class_check_cast( (CamelObjectClass *)(class), (CamelType)(ctype) ))</div><div class='del'>-#define CAMEL_CHECK_TYPE( obj, ctype )                (camel_object_is_of_type( (CamelObject *)(obj), (CamelType)(ctype) ))</div><div class='del'>-#define CAMEL_CHECK_CLASS_TYPE( class, ctype )        (camel_object_class_is_of_type( (CamelObjectClass *)(class), (CamelType)(ctype) ))</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CAMEL_INVALID_TYPE ((CamelType)0)</div><div class='del'>-</div><div class='del'>-#define CAMEL_OBJECT_TYPE        (camel_object_get_type ())</div><div class='del'>-</div><div class='del'>-#define CAMEL_OBJECT(obj)        (CAMEL_CHECK_CAST((obj), CAMEL_OBJECT_TYPE, CamelObject))</div><div class='del'>-#define CAMEL_OBJECT_CLASS(k)    (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_OBJECT_TYPE, CamelObjectClass))</div><div class='del'>-#define CAMEL_IS_OBJECT(o)       (CAMEL_CHECK_TYPE((o), CAMEL_OBJECT_TYPE))</div><div class='del'>-#define CAMEL_IS_OBJECT_CLASS(k) (CAMEL_CHECK_CLASS_TYPE((k), CAMEL_OBJECT_TYPE))</div><div class='del'>-</div><div class='del'>-#define CAMEL_OBJECT_GET_CLASS(o) ((CamelObjectClass *)(CAMEL_OBJECT(o))-&gt;classfuncs)</div><div class='del'>-#define CAMEL_OBJECT_GET_TYPE(o)  ((CamelType)(CAMEL_OBJECT(o))-&gt;s.type)</div><div class='del'>-</div><div class='del'>-	typedef guint32 CamelType;</div><div class='del'>-</div><div class='del'>-	typedef struct _CamelObjectShared</div><div class='del'>-	{</div><div class='del'>-		guint32 magic;</div><div class='del'>-		CamelType type;</div><div class='del'>-	}</div><div class='del'>-	CamelObjectShared;</div><div class='del'>-</div><div class='del'>-	typedef struct _CamelObjectClass</div><div class='del'>-	{</div><div class='del'>-		CamelObjectShared s;</div><div class='del'>-</div><div class='del'>-		GHashTable *event_to_preplist;</div><div class='del'>-	}</div><div class='del'>-	CamelObjectClass;</div><div class='del'>-</div><div class='del'>-	typedef struct _CamelObject</div><div class='del'>-	{</div><div class='del'>-		CamelObjectShared s;</div><div class='del'>-		guint32 ref_count:31;</div><div class='del'>-		guint32 in_event:1;</div><div class='del'>-		CamelObjectClass *classfuncs;</div><div class='del'>-		GHashTable *event_to_hooklist;</div><div class='del'>-	}</div><div class='del'>-	CamelObject;</div><div class='del'>-</div><div class='del'>-	typedef void (*CamelObjectClassInitFunc) (CamelObjectClass *);</div><div class='del'>-	typedef void (*CamelObjectClassFinalizeFunc) (CamelObjectClass *);</div><div class='del'>-	typedef void (*CamelObjectInitFunc) (CamelObject *);</div><div class='del'>-	typedef void (*CamelObjectFinalizeFunc) (CamelObject *);</div><div class='del'>-</div><div class='del'>-	typedef gboolean (*CamelObjectEventPrepFunc) (CamelObject *,</div><div class='del'>-						      gpointer);</div><div class='del'>-	typedef void (*CamelObjectEventHookFunc) (CamelObject *, gpointer,</div><div class='del'>-						  gpointer);</div><div class='del'>-</div><div class='del'>-/* The type system .... it's pretty simple..... */</div><div class='del'>-</div><div class='del'>-	void camel_type_init (void);</div><div class='del'>-	CamelType camel_type_register (CamelType parent, const gchar * name,</div><div class='del'>-				       size_t instance_size,</div><div class='del'>-				       size_t classfuncs_size,</div><div class='del'>-				       CamelObjectClassInitFunc class_init,</div><div class='del'>-				       CamelObjectClassFinalizeFunc</div><div class='del'>-				       class_finalize,</div><div class='del'>-				       CamelObjectInitFunc instance_init,</div><div class='del'>-				       CamelObjectFinalizeFunc</div><div class='del'>-				       instance_finalize);</div><div class='del'>-	CamelObjectClass *camel_type_get_global_classfuncs (CamelType type);</div><div class='del'>-	const gchar *camel_type_to_name (CamelType type);</div><div class='del'>-</div><div class='del'>-	CamelType camel_object_get_type (void);</div><div class='del'>-	CamelObject *camel_object_new (CamelType type);</div><div class='del'>-	void camel_object_ref (CamelObject * obj);</div><div class='del'>-	void camel_object_unref (CamelObject * obj);</div><div class='del'>-	CamelObject *camel_object_check_cast (CamelObject * obj,</div><div class='del'>-					      CamelType ctype);</div><div class='del'>-	CamelObjectClass *camel_object_class_check_cast (CamelObjectClass *</div><div class='del'>-							 class,</div><div class='del'>-							 CamelType ctype);</div><div class='del'>-	gboolean camel_object_is_of_type (CamelObject * obj, CamelType ctype);</div><div class='del'>-	gboolean camel_object_class_is_of_type (CamelObjectClass * class,</div><div class='del'>-						CamelType ctype);</div><div class='del'>-	gchar *camel_object_describe (CamelObject * obj);</div><div class='del'>-	void camel_object_class_declare_event (CamelObjectClass * class,</div><div class='del'>-					       const gchar * name,</div><div class='del'>-					       CamelObjectEventPrepFunc prep);</div><div class='del'>-	void camel_object_hook_event (CamelObject * obj, const gchar * name,</div><div class='del'>-				      CamelObjectEventHookFunc hook,</div><div class='del'>-				      gpointer user_data);</div><div class='del'>-	void camel_object_unhook_event (CamelObject * obj, const gchar * name,</div><div class='del'>-					CamelObjectEventHookFunc hook,</div><div class='del'>-					gpointer user_data);</div><div class='del'>-	void camel_object_trigger_event (CamelObject * obj,</div><div class='del'>-					 const gchar * name,</div><div class='del'>-					 gpointer event_data);</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-provider.c b/camel/camel-provider.c<br/>deleted file mode 100644<br/>index 03be7cdf1e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,148 +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'>-/**</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'>-					"code in module."), path);</div><div class='del'>-		g_module_close (module);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_provider_module_init (session);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-provider.h b/camel/camel-provider.h<br/>deleted file mode 100644<br/>index f5a434cde5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-provider.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-provider.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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;camel/camel-types.h&gt;</div><div class='del'>-#include &lt;camel/camel-object.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'>-/* _IS_SOURCE means the user can get mail from there.</div><div class='del'>- * _IS_STORAGE means the user can read mail from there.</div><div class='del'>- */</div><div class='del'>-#define CAMEL_PROVIDER_IS_REMOTE	(1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_PROVIDER_IS_SOURCE	(1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_PROVIDER_IS_STORAGE	(1 &lt;&lt; 2)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Flags for url_flags. "ALLOW" means the config dialog will let</div><div class='del'>- * the user configure it. "NEED" implies "ALLOW" but means the user</div><div class='del'>- * must configure it. Service code can assume that any url part</div><div class='del'>- * for which it has set the NEED flag will be set when the service</div><div class='del'>- * is created.</div><div class='del'>- */</div><div class='del'>-#define CAMEL_URL_ALLOW_USER	 (1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_URL_ALLOW_AUTH	 (1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_URL_ALLOW_PASSWORD (1 &lt;&lt; 2)</div><div class='del'>-#define CAMEL_URL_ALLOW_HOST	 (1 &lt;&lt; 3)</div><div class='del'>-#define CAMEL_URL_ALLOW_PORT	 (1 &lt;&lt; 4)</div><div class='del'>-#define CAMEL_URL_ALLOW_PATH	 (1 &lt;&lt; 5)</div><div class='del'>-</div><div class='del'>-#define CAMEL_URL_NEED_USER	 (1 &lt;&lt; 6 | 1 &lt;&lt; 0)</div><div class='del'>-#define CAMEL_URL_NEED_AUTH	 (1 &lt;&lt; 7 | 1 &lt;&lt; 1)</div><div class='del'>-#define CAMEL_URL_NEED_PASSWORD	 (1 &lt;&lt; 8 | 1 &lt;&lt; 2)</div><div class='del'>-#define CAMEL_URL_NEED_HOST	 (1 &lt;&lt; 9 | 1 &lt;&lt; 3)</div><div class='del'>-#define CAMEL_URL_NEED_PORT	 (1 &lt;&lt; 10 | 1 &lt;&lt; 4)</div><div class='del'>-#define CAMEL_URL_NEED_PATH	 (1 &lt;&lt; 11 | 1 &lt;&lt; 5)</div><div class='del'>-</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, url_flags;</div><div class='del'>-</div><div class='del'>-	CamelType 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-remote-store.c b/camel/camel-remote-store.c<br/>deleted file mode 100644<br/>index eeca0d4080..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-remote-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-remote-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,491 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-remote-store.c : class for an remote store */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors: Peter Williams &lt;peterw@helixcode.com&gt;</div><div class='del'>- *           based on camel-imap-provider.c</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'>-#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'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-remote-store.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-stream-fs.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 d(x) x</div><div class='del'>-#if d(!)0</div><div class='del'>-extern gboolean camel_verbose_debug;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#define CSRVC(obj) (CAMEL_SERVICE_CLASS      (CAMEL_OBJECT_GET_CLASS (obj)))</div><div class='del'>-#define CSTRC(obj) (CAMEL_STORE_CLASS        (CAMEL_OBJECT_GET_CLASS (obj)))</div><div class='del'>-#define CRSC(obj)  (CAMEL_REMOTE_STORE_CLASS (CAMEL_OBJECT_GET_CLASS (obj)))</div><div class='del'>-</div><div class='del'>-static CamelStoreClass *store_class = NULL;</div><div class='del'>-</div><div class='del'>-static gboolean remote_connect         (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean remote_disconnect      (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static GList   *remote_query_auth_types_generic   (CamelService *service, CamelException *ex);</div><div class='del'>-static GList   *remote_query_auth_types_connected (CamelService *service, CamelException *ex);</div><div class='del'>-static void     remote_free_auth_types (CamelService *service, GList *authtypes);</div><div class='del'>-static char    *remote_get_name        (CamelService *service, gboolean brief);</div><div class='del'>-static char    *remote_get_folder_name (CamelStore *store, </div><div class='del'>-					const char *folder_name, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-static gint     remote_send_string     (CamelRemoteStore *store, CamelException *ex, </div><div class='del'>-					char *fmt, va_list ap);</div><div class='del'>-static gint     remote_send_stream     (CamelRemoteStore *store, CamelStream *stream,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-static gint     remote_recv_line       (CamelRemoteStore *store, char **dest, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_remote_store_class_init (CamelRemoteStoreClass *camel_remote_store_class)</div><div class='del'>-{</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_remote_store_class);</div><div class='del'>-	CamelStoreClass *camel_store_class =</div><div class='del'>-		CAMEL_STORE_CLASS (camel_remote_store_class);</div><div class='del'>-	</div><div class='del'>-	store_class = CAMEL_STORE_CLASS (camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;connect = remote_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = remote_disconnect;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_generic = remote_query_auth_types_generic;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_connected = remote_query_auth_types_connected;</div><div class='del'>-	camel_service_class-&gt;free_auth_types = remote_free_auth_types;</div><div class='del'>-	camel_service_class-&gt;get_name = remote_get_name;</div><div class='del'>-	</div><div class='del'>-	camel_store_class-&gt;get_folder_name = remote_get_folder_name;</div><div class='del'>-	</div><div class='del'>-	camel_remote_store_class-&gt;send_string = remote_send_string;</div><div class='del'>-	camel_remote_store_class-&gt;send_stream = remote_send_stream;</div><div class='del'>-	camel_remote_store_class-&gt;recv_line = remote_recv_line;</div><div class='del'>-	camel_remote_store_class-&gt;keepalive = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_remote_store_init (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</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'>-	remote_store-&gt;istream = NULL;</div><div class='del'>-	remote_store-&gt;ostream = NULL;</div><div class='del'>-	remote_store-&gt;timeout_id = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *static void</div><div class='del'>- *camel_remote_store_finalize (CamelObject *object)</div><div class='del'>- *{</div><div class='del'>- *	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</div><div class='del'>- *</div><div class='del'>- *	g_free (remote_store-&gt;nice_name);</div><div class='del'>- *}</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_remote_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_remote_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_remote_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_remote_store_type =</div><div class='del'>-			camel_type_register (CAMEL_STORE_TYPE, "CamelRemoteStore",</div><div class='del'>-					     sizeof (CamelRemoteStore),</div><div class='del'>-					     sizeof (CamelRemoteStoreClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_remote_store_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_remote_store_init,</div><div class='del'>-					     (CamelObjectFinalizeFunc) NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_remote_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Auth stuff */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-static CamelServiceAuthType password_authtype = {</div><div class='del'>-	N_("SSH Tunneling"),</div><div class='del'>-	</div><div class='del'>-	N_("This option will connect to the server using a "</div><div class='del'>-	   "SSH tunnel."),</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'>-</div><div class='del'>-static GList *</div><div class='del'>-remote_query_auth_types_connected (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'>-static GList *</div><div class='del'>-remote_query_auth_types_generic (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'>-static void</div><div class='del'>-remote_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 char *</div><div class='del'>-remote_get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup_printf (_("%s server %s"),</div><div class='del'>-					service-&gt;provider-&gt;name,</div><div class='del'>-					service-&gt;url-&gt;host);</div><div class='del'>-	else {</div><div class='del'>-		return g_strdup_printf (_("%s service for %s on %s"),</div><div class='del'>-					service-&gt;provider-&gt;name,</div><div class='del'>-					service-&gt;url-&gt;user,</div><div class='del'>-					service-&gt;url-&gt;host);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-timeout_cb (gpointer data)</div><div class='del'>-{</div><div class='del'>-	CRSC (data)-&gt;keepalive (CAMEL_REMOTE_STORE (data));</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-remote_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	struct sockaddr_in sin;</div><div class='del'>-	gint fd;</div><div class='del'>-	gint port;</div><div class='del'>-	</div><div class='del'>-	h = camel_service_gethost (service, ex);</div><div class='del'>-	if (!h)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* connect to the server */</div><div class='del'>-	sin.sin_family = h-&gt;h_addrtype;</div><div class='del'>-	</div><div class='del'>-	if (service-&gt;url-&gt;port)</div><div class='del'>-		port = service-&gt;url-&gt;port;</div><div class='del'>-	else</div><div class='del'>-		port = store-&gt;default_port;	</div><div class='del'>-	sin.sin_port = htons (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 %d): %s"),</div><div class='del'>-				      service-&gt;url-&gt;host ? service-&gt;url-&gt;host : _("(unknown host)"),</div><div class='del'>-				      port, g_strerror (errno));</div><div class='del'>-		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'>-	/* parent class connect initialization */</div><div class='del'>-	if (CAMEL_SERVICE_CLASS (store_class)-&gt;connect (service, ex) == FALSE)</div><div class='del'>-		return FALSE;</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, CAMEL_STREAM_BUFFER_READ);</div><div class='del'>-	</div><div class='del'>-	/* Okay, good enough for us */</div><div class='del'>-	CAMEL_SERVICE (store)-&gt;connected = TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Add a timeout so that we can hopefully prevent getting disconnected */</div><div class='del'>-	/* (Only if the implementation supports it) */</div><div class='del'>-	if (CRSC (store)-&gt;keepalive) {</div><div class='del'>-		CamelSession *session = camel_service_get_session (CAMEL_SERVICE (store));</div><div class='del'>-		</div><div class='del'>-		store-&gt;timeout_id = camel_session_register_timeout (session, 10 * 60 * 1000, </div><div class='del'>-								    timeout_cb, </div><div class='del'>-								    store);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-remote_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelRemoteStore *store = CAMEL_REMOTE_STORE (service);</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;timeout_id) {</div><div class='del'>-		camel_session_remove_timeout (camel_service_get_session (CAMEL_SERVICE (store)),</div><div class='del'>-					      store-&gt;timeout_id);</div><div class='del'>-		store-&gt;timeout_id = 0;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!CAMEL_SERVICE_CLASS (store_class)-&gt;disconnect (service, clean, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;istream) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (store-&gt;istream));</div><div class='del'>-		store-&gt;istream = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;ostream) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (store-&gt;ostream));</div><div class='del'>-		store-&gt;ostream = NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-remote_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 gint</div><div class='del'>-remote_send_string (CamelRemoteStore *store, CamelException *ex, char *fmt, va_list ap)</div><div class='del'>-{</div><div class='del'>-	gchar *cmdbuf;</div><div class='del'>-	</div><div class='del'>-	/* Check for connectedness. Failed (or cancelled) operations will</div><div class='del'>-	 * close the connection. */</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;ostream == NULL) {</div><div class='del'>-		d(g_message ("remote: (send) disconnected, reconnecting."));</div><div class='del'>-		</div><div class='del'>-		if (!camel_service_connect (CAMEL_SERVICE (store), ex))</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* create the command */</div><div class='del'>-	cmdbuf = g_strdup_vprintf (fmt, ap);</div><div class='del'>-</div><div class='del'>-#if d(!)0</div><div class='del'>-	if (camel_verbose_debug) {</div><div class='del'>-		if (strncmp (cmdbuf, "PASS ", 5) == 0)</div><div class='del'>-			fprintf (stderr, "sending : PASS xxxx\n");</div><div class='del'>-		else if (strstr (cmdbuf, "LOGIN \""))</div><div class='del'>-			fprintf (stderr, "sending : ---- LOGIN \"xxxx\" \"xxxx\"\n");</div><div class='del'>-		else</div><div class='del'>-			fprintf (stderr, "sending : %s", cmdbuf);</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_printf (store-&gt;ostream, "%s", cmdbuf) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				     g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_send_string: Writes a string to the server</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * @fmt: the printf-style format to use for creating the string to send</div><div class='del'>- * @...: the arguments to the printf string @fmt</div><div class='del'>- * Return value: 0 on success, nonzero on error</div><div class='del'>- *</div><div class='del'>- * Formats the string and sends it to the server.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-camel_remote_store_send_string (CamelRemoteStore *store, CamelException *ex,</div><div class='del'>-				char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	va_list ap;</div><div class='del'>-	gint ret;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);</div><div class='del'>-	g_return_val_if_fail (fmt, -1);</div><div class='del'>-	</div><div class='del'>-	va_start (ap, fmt);</div><div class='del'>-	ret = CRSC (store)-&gt;send_string (store, ex, fmt, ap);</div><div class='del'>-	va_end (ap);</div><div class='del'>-	</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-remote_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* Check for connectedness. Failed (or cancelled) operations will</div><div class='del'>-	 * close the connection. */</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;ostream == NULL) {</div><div class='del'>-		d(g_message ("remote: (sendstream) disconnected, reconnecting."));</div><div class='del'>-		</div><div class='del'>-		if (!camel_service_connect (CAMEL_SERVICE (store), ex))</div><div class='del'>-			return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "(sending stream)\n"));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write_to_stream (stream, store-&gt;ostream) &lt; 0) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				     g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_send_stream: Writes a CamelStream to the server</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @stream: the stream to write</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * Return value: 0 on success, nonzero on error</div><div class='del'>- *</div><div class='del'>- * Sends the stream to the server.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-camel_remote_store_send_stream (CamelRemoteStore *store, CamelStream *stream, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-	</div><div class='del'>-	return CRSC (store)-&gt;send_stream (store, stream, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-remote_recv_line (CamelRemoteStore *store, char **dest, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *stream = CAMEL_STREAM_BUFFER (store-&gt;istream);</div><div class='del'>-	</div><div class='del'>-	*dest = NULL;</div><div class='del'>-	</div><div class='del'>-	/* Check for connectedness. Failed (or cancelled) operations will</div><div class='del'>-	 * close the connection. We can't expect a read to have any</div><div class='del'>-	 * meaning if we reconnect, so always set an exception.</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;istream == NULL) {</div><div class='del'>-		g_message ("remote: (recv) disconnected, reconnecting.");</div><div class='del'>-		</div><div class='del'>-		camel_service_connect (CAMEL_SERVICE (store), ex);</div><div class='del'>-		</div><div class='del'>-		if (!camel_exception_is_set (ex))</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,</div><div class='del'>-					     g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*dest = camel_stream_buffer_read_line (stream);</div><div class='del'>-	</div><div class='del'>-	if (!*dest) {</div><div class='del'>-		camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				     g_strerror (errno));</div><div class='del'>-		</div><div class='del'>-		camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-#if d(!)0</div><div class='del'>-	if (camel_verbose_debug)</div><div class='del'>-		fprintf (stderr, "received: %s\n", *dest);</div><div class='del'>-#endif</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_recv_line: Reads a line from the server</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @dest: a pointer that will be set to the location of a buffer</div><div class='del'>- *        holding the server's response</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * Return value: 0 on success, -1 on error</div><div class='del'>- *</div><div class='del'>- * Reads a line from the server (terminated by \n or \r\n).</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gint </div><div class='del'>-camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,</div><div class='del'>-			      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_REMOTE_STORE (store), -1);</div><div class='del'>-	g_return_val_if_fail (dest, -1);</div><div class='del'>-	</div><div class='del'>-	return CRSC (store)-&gt;recv_line (store, dest, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-refresh_folder_info (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (value);</div><div class='del'>-	</div><div class='del'>-	camel_folder_refresh_info (folder, (CamelException *) data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_remote_store_refresh_folders: Refresh the folders that I</div><div class='del'>- * contain</div><div class='del'>- * @store: a CamelRemoteStore</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Refreshes the folders listed in the folders hashtable.</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_remote_store_refresh_folders (CamelRemoteStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_foreach (CAMEL_STORE (store)-&gt;folders, refresh_folder_info, ex);</div><div class='del'>-}	</div><div class='head'>diff --git a/camel/camel-remote-store.h b/camel/camel-remote-store.h<br/>deleted file mode 100644<br/>index 2d6bc829c2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-remote-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-remote-store.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'>-/* camel-remote-store.h : class for a remote store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Peter Williams &lt;peterw@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'>-#ifndef CAMEL_REMOTE_STORE_H</div><div class='del'>-#define CAMEL_REMOTE_STORE_H 1</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_REMOTE_STORE_TYPE     (camel_remote_store_get_type ())</div><div class='del'>-#define CAMEL_REMOTE_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_REMOTE_STORE_TYPE, CamelRemoteStore))</div><div class='del'>-#define CAMEL_REMOTE_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_REMOTE_STORE_TYPE, CamelRemoteStoreClass))</div><div class='del'>-#define CAMEL_IS_REMOTE_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_REMOTE_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStore parent_object;	</div><div class='del'>-	</div><div class='del'>-	CamelStream *istream, *ostream;</div><div class='del'>-	guint timeout_id, default_port;</div><div class='del'>-} CamelRemoteStore;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-	gint (*send_string)   (CamelRemoteStore *store, CamelException *ex, </div><div class='del'>-			       char *fmt, va_list ap);</div><div class='del'>-	gint (*send_stream)   (CamelRemoteStore *store, CamelStream *stream, </div><div class='del'>-			       CamelException *ex);</div><div class='del'>-	gint (*recv_line)     (CamelRemoteStore *store, char **dest, </div><div class='del'>-			       CamelException *ex);</div><div class='del'>-	void (*keepalive)     (CamelRemoteStore *store);</div><div class='del'>-} CamelRemoteStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_remote_store_get_type (void);</div><div class='del'>-</div><div class='del'>-/* Extra public functions */</div><div class='del'>-gint camel_remote_store_send_string (CamelRemoteStore *store, CamelException *ex,</div><div class='del'>-				     char *fmt, ...);</div><div class='del'>-gint camel_remote_store_send_stream (CamelRemoteStore *store, CamelStream *stream, </div><div class='del'>-				     CamelException *ex);</div><div class='del'>-gint camel_remote_store_recv_line (CamelRemoteStore *store, char **dest,</div><div class='del'>-				   CamelException *ex);</div><div class='del'>-void camel_remote_store_refresh_folders (CamelRemoteStore *store, </div><div class='del'>-					 CamelException *ex);</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_REMOTE_STORE_H */</div><div class='head'>diff --git a/camel/camel-seekable-stream.c b/camel/camel-seekable-stream.c<br/>deleted file mode 100644<br/>index c4ca950baa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-stream.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-seekable-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static off_t seek        (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			  CamelStreamSeekPolicy policy);</div><div class='del'>-static off_t stream_tell (CamelSeekableStream *stream);</div><div class='del'>-static int   reset       (CamelStream *stream);</div><div class='del'>-static int   set_bounds  (CamelSeekableStream *stream, off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_seekable_stream_class_init (CamelSeekableStreamClass *camel_seekable_stream_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_seekable_stream_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_STREAM_TYPE ) );</div><div class='del'>-</div><div class='del'>-	/* seekable stream methods */</div><div class='del'>-	camel_seekable_stream_class-&gt;seek = seek;</div><div class='del'>-	camel_seekable_stream_class-&gt;tell = stream_tell;</div><div class='del'>-	camel_seekable_stream_class-&gt;set_bounds = set_bounds;</div><div class='del'>-</div><div class='del'>-	/* camel stream methods overload */</div><div class='del'>-	camel_stream_class-&gt;reset = reset;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_seekable_stream_init (void *o)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *stream = (CamelSeekableStream *)o;</div><div class='del'>-</div><div class='del'>-	stream-&gt;bound_start = 0;</div><div class='del'>-	stream-&gt;bound_end = CAMEL_STREAM_UNBOUND;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_seekable_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_seekable_stream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_seekable_stream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_seekable_stream_type = camel_type_register( CAMEL_STREAM_TYPE,</div><div class='del'>-								  "CamelSeekableStream",</div><div class='del'>-								  sizeof( CamelSeekableStream ),</div><div class='del'>-								  sizeof( CamelSeekableStreamClass ),</div><div class='del'>-								  (CamelObjectClassInitFunc) camel_seekable_stream_class_init,</div><div class='del'>-								  NULL,</div><div class='del'>-								  (CamelObjectInitFunc) camel_seekable_stream_init,</div><div class='del'>-								  NULL );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_seekable_stream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static off_t</div><div class='del'>-seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-      CamelStreamSeekPolicy policy)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelSeekableStream::seek called on default "</div><div class='del'>-		   "implementation\n");</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_seek:</div><div class='del'>- * @stream: a CamelStream object.</div><div class='del'>- * @offset: offset value</div><div class='del'>- * @policy: what to do with the offset</div><div class='del'>- *</div><div class='del'>- * Seek to the specified position in @stream.</div><div class='del'>- *</div><div class='del'>- * If @policy is CAMEL_STREAM_SET, seeks to @offset.</div><div class='del'>- *</div><div class='del'>- * If @policy is CAMEL_STREAM_CUR, seeks to the current position plus</div><div class='del'>- * @offset.</div><div class='del'>- *</div><div class='del'>- * If @policy is CAMEL_STREAM_END, seeks to the end of the stream plus</div><div class='del'>- * @offset.</div><div class='del'>- *</div><div class='del'>- * Regardless of @policy, the stream's final position will be clamped</div><div class='del'>- * to the range specified by its lower and upper bounds, and the</div><div class='del'>- * stream's eos state will be updated.</div><div class='del'>- *</div><div class='del'>- * Return value: new position, -1 if operation failed.</div><div class='del'>- **/</div><div class='del'>-off_t</div><div class='del'>-camel_seekable_stream_seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			    CamelStreamSeekPolicy policy)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CSS_CLASS (stream)-&gt;seek (stream, offset, policy);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static off_t</div><div class='del'>-stream_tell (CamelSeekableStream *stream)</div><div class='del'>-{</div><div class='del'>-	return stream-&gt;position;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_seekable_stream_tell:</div><div class='del'>- * @stream: seekable stream object</div><div class='del'>- *</div><div class='del'>- * Get the current position of a seekable stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the position.</div><div class='del'>- **/</div><div class='del'>-off_t</div><div class='del'>-camel_seekable_stream_tell (CamelSeekableStream *stream)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);</div><div class='del'>-</div><div class='del'>-	return CSS_CLASS (stream)-&gt;tell (stream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-set_bounds (CamelSeekableStream *stream, off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	/* store the bounds */</div><div class='del'>-	stream-&gt;bound_start = start;</div><div class='del'>-	stream-&gt;bound_end = end;</div><div class='del'>-</div><div class='del'>-	if (start &gt; stream-&gt;position)</div><div class='del'>-		return camel_seekable_stream_seek (stream, start, CAMEL_STREAM_SET);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_seekable_stream_set_bounds:</div><div class='del'>- * @stream: a seekable stream</div><div class='del'>- * @start: the first valid position</div><div class='del'>- * @end: the first invalid position, or CAMEL_STREAM_UNBOUND</div><div class='del'>- *</div><div class='del'>- * Set the range of valid data this stream is allowed to cover.  If</div><div class='del'>- * there is to be no @end value, then @end should be set to</div><div class='del'>- * #CAMEL_STREAM_UNBOUND.</div><div class='del'>- *</div><div class='del'>- * Return value: -1 on error.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_seekable_stream_set_bounds (CamelSeekableStream *stream,</div><div class='del'>-				  off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (stream), -1);</div><div class='del'>-	g_return_val_if_fail (end == CAMEL_STREAM_UNBOUND || end &gt;= start, -1);</div><div class='del'>-</div><div class='del'>-	return CSS_CLASS (stream)-&gt;set_bounds (stream, start, end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* a default implementation of reset for seekable streams */</div><div class='del'>-static int</div><div class='del'>-reset (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *seekable_stream;</div><div class='del'>-</div><div class='del'>-	seekable_stream = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-</div><div class='del'>-	return camel_seekable_stream_seek (seekable_stream,</div><div class='del'>-					   seekable_stream-&gt;bound_start,</div><div class='del'>-					   CAMEL_STREAM_SET);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-seekable-stream.h b/camel/camel-seekable-stream.h<br/>deleted file mode 100644<br/>index 0fc67d59f8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-stream.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStream))</div><div class='del'>-#define CAMEL_SEEKABLE_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_STREAM_TYPE, CamelSeekableStreamClass))</div><div class='del'>-#define CAMEL_IS_SEEKABLE_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_STREAM_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef enum</div><div class='del'>-{</div><div class='del'>-	CAMEL_STREAM_SET = SEEK_SET,</div><div class='del'>-	CAMEL_STREAM_CUR = SEEK_CUR,</div><div class='del'>-	CAMEL_STREAM_END = SEEK_END</div><div class='del'>-} CamelStreamSeekPolicy;</div><div class='del'>-</div><div class='del'>-#define CAMEL_STREAM_UNBOUND (~0)</div><div class='del'>-</div><div class='del'>-struct _CamelSeekableStream</div><div class='del'>-{</div><div class='del'>-	CamelStream parent_object;</div><div class='del'>-</div><div class='del'>-	off_t position;		/* current postion in the stream */</div><div class='del'>-	off_t bound_start;	/* first valid position */</div><div class='del'>-	off_t bound_end;	/* first invalid position */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-	off_t (*seek)       (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			     CamelStreamSeekPolicy policy);</div><div class='del'>-	off_t (*tell)	    (CamelSeekableStream *stream);</div><div class='del'>-	int  (*set_bounds)  (CamelSeekableStream *stream,</div><div class='del'>-			     off_t start, off_t end);</div><div class='del'>-} CamelSeekableStreamClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_seekable_stream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-off_t    camel_seekable_stream_seek            (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-						CamelStreamSeekPolicy policy);</div><div class='del'>-off_t	 camel_seekable_stream_tell    	       (CamelSeekableStream *stream);</div><div class='del'>-int	 camel_seekable_stream_set_bounds      (CamelSeekableStream *, off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SEEKABLE_STREAM_H */</div><div class='head'>diff --git a/camel/camel-seekable-substream.c b/camel/camel-seekable-substream.c<br/>deleted file mode 100644<br/>index 9b197f97bd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-substream.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-seekable-substream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,271 +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 (CAMEL_OBJECT(so)-&gt;klass)</div><div class='del'>-</div><div class='del'>-static	int	 stream_read  (CamelStream *stream, char *buffer, unsigned int n);</div><div class='del'>-static	int	 stream_write (CamelStream *stream, const char *buffer, unsigned int n);</div><div class='del'>-static	int	 stream_flush (CamelStream *stream);</div><div class='del'>-static	int	 stream_close (CamelStream *stream);</div><div class='del'>-static	gboolean eos	      (CamelStream *stream);</div><div class='del'>-static	off_t	 stream_seek  (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			       CamelStreamSeekPolicy policy);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_seekable_substream_class_init (CamelSeekableSubstreamClass *camel_seekable_substream_class)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStreamClass *camel_seekable_stream_class =</div><div class='del'>-		CAMEL_SEEKABLE_STREAM_CLASS (camel_seekable_substream_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_seekable_substream_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;eos = eos;</div><div class='del'>-</div><div class='del'>-	camel_seekable_stream_class-&gt;seek = stream_seek;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_seekable_substream_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableSubstream *seekable_substream =</div><div class='del'>-		CAMEL_SEEKABLE_SUBSTREAM (object);</div><div class='del'>-</div><div class='del'>-	if (seekable_substream-&gt;parent_stream)</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (seekable_substream-&gt;parent_stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_seekable_substream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_seekable_substream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_seekable_substream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_seekable_substream_type = camel_type_register (camel_seekable_stream_get_type (), "CamelSeekableSubstream",</div><div class='del'>-								     sizeof (CamelSeekableSubstream),</div><div class='del'>-								     sizeof (CamelSeekableSubstreamClass),</div><div class='del'>-								     (CamelObjectClassInitFunc) camel_seekable_substream_class_init,</div><div class='del'>-								     NULL,</div><div class='del'>-								     NULL,</div><div class='del'>-								     (CamelObjectFinalizeFunc) camel_seekable_substream_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_seekable_substream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_seekable_substream_new_with_seekable_stream_and_bounds:</div><div class='del'>- * @parent_stream: a seekable parent stream</div><div class='del'>- * @inf_bound: a lower bound</div><div class='del'>- * @sup_bound: an upper bound</div><div class='del'>- *</div><div class='del'>- * Creates a new CamelSeekableSubstream that references the portion</div><div class='del'>- * of @parent_stream from @inf_bound to @sup_bound. (If @sup_bound is</div><div class='del'>- * #CAMEL_STREAM_UNBOUND, it references to the end of stream, even if</div><div class='del'>- * the stream grows.)</div><div class='del'>- *</div><div class='del'>- * While the substream is open, the caller cannot assume anything about</div><div class='del'>- * the current position of @parent_stream. After the substream has been</div><div class='del'>- * closed, @parent_stream will stabilize again.</div><div class='del'>- *</div><div class='del'>- * Return value: the substream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream *parent_stream,</div><div class='del'>-							      off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableSubstream *seekable_substream;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SEEKABLE_STREAM (parent_stream), NULL);</div><div class='del'>-</div><div class='del'>-	/* Create the seekable substream. */</div><div class='del'>-	seekable_substream = CAMEL_SEEKABLE_SUBSTREAM (camel_object_new (camel_seekable_substream_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* Initialize it. */</div><div class='del'>-	seekable_substream-&gt;parent_stream = parent_stream;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (parent_stream));</div><div class='del'>-</div><div class='del'>-	/* Set the bound of the substream. We can ignore any possible error</div><div class='del'>-	 * here, because if we fail to seek now, it will try again later.</div><div class='del'>-	 */</div><div class='del'>-	camel_seekable_stream_set_bounds ((CamelSeekableStream *)seekable_substream, start, end);</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (seekable_substream);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-parent_reset (CamelSeekableSubstream *seekable_substream, CamelSeekableStream *parent)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream *seekable_stream =</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 - it's an error, let the caller deal */</div><div class='del'>-	if (v &gt; 0)</div><div class='del'>-		seekable_stream-&gt;position += v;</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-stream_write (CamelStream *stream, const char *buffer, unsigned int n)</div><div class='del'>-{</div><div class='del'>-	/* NOT VALID ON SEEKABLE SUBSTREAM */</div><div class='del'>-	/* Well, it's 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 6ac5588a42..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-seekable-substream.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)       (CAMEL_CHECK_CAST((obj), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstream))</div><div class='del'>-#define CAMEL_SEEKABLE_SUBSTREAM_CLASS(k)   (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SEEKABLE_SUBSTREAM_TYPE, CamelSeekableSubstreamClass))</div><div class='del'>-#define CAMEL_IS_SEEKABLE_SUBSTREAM(o)      (CAMEL_CHECK_TYPE((o), CAMEL_SEEKABLE_SUBSTREAM_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelSeekableSubstream</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream parent_object;</div><div class='del'>-</div><div class='del'>-	/*  --**-- Private fields --**--  */</div><div class='del'>-	CamelSeekableStream *parent_stream;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelSeekableStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelSeekableSubstreamClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_seekable_substream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* obtain a new seekable substream */</div><div class='del'>-CamelStream *</div><div class='del'>-camel_seekable_substream_new_with_seekable_stream_and_bounds (CamelSeekableStream    *parent_stream,</div><div class='del'>-							      off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SEEKABLE_SUBSTREAM_H */</div><div class='head'>diff --git a/camel/camel-service.c b/camel/camel-service.c<br/>deleted file mode 100644<br/>index 15702db42f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-service.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-service.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,496 +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 (CAMEL_OBJECT_GET_CLASS(so))</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, gboolean clean,</div><div class='del'>-				   CamelException *ex);</div><div class='del'>-/*static gboolean is_connected (CamelService *service);*/</div><div class='del'>-static GList *  query_auth_types_func (CamelService *service, CamelException *ex);</div><div class='del'>-static void     free_auth_types (CamelService *service, GList *authtypes);</div><div class='del'>-static char *   get_name (CamelService *service, gboolean brief);</div><div class='del'>-static char *   get_path (CamelService *service);</div><div class='del'>-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'>-	parent_class = camel_type_get_global_classfuncs (CAMEL_OBJECT_TYPE);</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_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_connected = query_auth_types_func;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_generic = query_auth_types_func;</div><div class='del'>-	camel_service_class-&gt;free_auth_types = free_auth_types;</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-	camel_service_class-&gt;get_path = get_path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_service_finalize (CamelObject *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;connected) {</div><div class='del'>-		CamelException ex;</div><div class='del'>-</div><div class='del'>-		/*g_warning ("camel_service_finalize: finalizing while still connected!");*/</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		CSERV_CLASS (camel_service)-&gt;disconnect (camel_service, FALSE, &amp;ex);</div><div class='del'>-		if (camel_exception_is_set (&amp;ex)) {</div><div class='del'>-			g_warning ("camel_service_finalize: silent disconnect failure: %s",</div><div class='del'>-				   camel_exception_get_description(&amp;ex));</div><div class='del'>-		}</div><div class='del'>-		camel_exception_clear (&amp;ex);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (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'>-		camel_object_unref (CAMEL_OBJECT (camel_service-&gt;session));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_service_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_service_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_service_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_service_type = camel_type_register( CAMEL_OBJECT_TYPE, "CamelService",</div><div class='del'>-							  sizeof (CamelService),</div><div class='del'>-							  sizeof (CamelServiceClass),</div><div class='del'>-							  (CamelObjectClassInitFunc) camel_service_class_init,</div><div class='del'>-							  NULL,</div><div class='del'>-							  NULL,</div><div class='del'>-							  camel_service_finalize );</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 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;provider-&gt;url_flags &amp; CAMEL_URL_NEED_USER)</div><div class='del'>-	     == CAMEL_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;provider-&gt;url_flags &amp; CAMEL_URL_NEED_HOST)</div><div class='del'>-		    == CAMEL_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;provider-&gt;url_flags &amp; CAMEL_URL_NEED_PATH)</div><div class='del'>-		    == CAMEL_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 CamelType of the class to create</div><div class='del'>- * @session: the session for the service</div><div class='del'>- * @provider: the service's provider</div><div class='del'>- * @url: the default URL for the service (may be NULL)</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * 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 (CamelType type, CamelSession *session,</div><div class='del'>-		   CamelProvider *provider, 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 (camel_object_new (type));</div><div class='del'>-</div><div class='del'>-	/*service-&gt;connect_level = 0;*/</div><div class='del'>-</div><div class='del'>-	service-&gt;provider = provider;</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'>-		camel_object_unref (CAMEL_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'>-	camel_object_ref (CAMEL_OBJECT (session));</div><div class='del'>-</div><div class='del'>-	service-&gt;connected = FALSE;</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'>-	/* Things like the CamelMboxStore can validly</div><div class='del'>-	 * not define a connect function.</div><div class='del'>-	 */</div><div class='del'>-	 return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_connect:</div><div class='del'>- * @service: CamelService object</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Connect to the service using the parameters it was initialized</div><div class='del'>- * with.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the connection succeeded</div><div class='del'>- **/</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-camel_service_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	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'>-	if (service-&gt;connected) {</div><div class='del'>-		/* But we're still connected, so no exception</div><div class='del'>-		 * and return true.</div><div class='del'>-		 */</div><div class='del'>-		g_warning ("camel_service_connect: trying to connect to an already connected service");</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (CSERV_CLASS (service)-&gt;connect (service, ex)) {</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'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-service_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/*service-&gt;connect_level--;*/</div><div class='del'>-</div><div class='del'>-	/* We let people get away with not having a disconnect</div><div class='del'>-	 * function -- CamelMboxStore, for example. </div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_disconnect:</div><div class='del'>- * @service: CamelService object</div><div class='del'>- * @clean: whether or not to try to disconnect cleanly.</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Disconnect from the service. If @clean is %FALSE, it should not</div><div class='del'>- * try to do any synchronizing or other cleanup of the connection.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the disconnection succeeded without</div><div class='del'>- * errors. (Consult @ex if %FALSE.)</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_service_disconnect (CamelService *service, gboolean clean,</div><div class='del'>-			  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gboolean res;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (service-&gt;connected, FALSE);	</div><div class='del'>-	res = CSERV_CLASS (service)-&gt;disconnect (service, clean, ex);</div><div class='del'>-	service-&gt;connected = FALSE;</div><div class='del'>-	return res;</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'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelService::get_name not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (service)));</div><div class='del'>-	return "???";</div><div class='del'>-}		</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_name:</div><div class='del'>- * @service: the service</div><div class='del'>- * @brief: whether or not to use a briefer form</div><div class='del'>- *</div><div class='del'>- * This gets the name of the service in a "friendly" (suitable for</div><div class='del'>- * humans) form. If @brief is %TRUE, this should be a brief description</div><div class='del'>- * such as for use in the folder tree. If @brief is %FALSE, it should</div><div class='del'>- * be a more complete and mostly unambiguous description.</div><div class='del'>- *</div><div class='del'>- * Return value: the description, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_service_get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);</div><div class='del'>-	g_return_val_if_fail (service-&gt;url, NULL);</div><div class='del'>-</div><div class='del'>-	return CSERV_CLASS (service)-&gt;get_name (service, brief);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_path (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	GString *gpath;</div><div class='del'>-	char *path;</div><div class='del'>-	CamelURL *url = service-&gt;url;</div><div class='del'>-	int flags = service-&gt;provider-&gt;url_flags;</div><div class='del'>-</div><div class='del'>-	/* A sort of ad-hoc default implementation that works for our</div><div class='del'>-	 * current set of services.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	gpath = g_string_new (service-&gt;provider-&gt;protocol);</div><div class='del'>-	if (flags &amp; CAMEL_URL_ALLOW_USER) {</div><div class='del'>-		if (flags &amp; CAMEL_URL_ALLOW_HOST) {</div><div class='del'>-			g_string_sprintfa (gpath, "/%s@%s",</div><div class='del'>-					   url-&gt;user ? url-&gt;user : "",</div><div class='del'>-					   url-&gt;host ? url-&gt;host : "");</div><div class='del'>-		} else {</div><div class='del'>-			g_string_sprintfa (gpath, "/%s%s",</div><div class='del'>-			   url-&gt;user ? url-&gt;user : "",</div><div class='del'>-			   ((flags &amp; CAMEL_URL_NEED_USER) == CAMEL_URL_NEED_USER) ? "" : "@");</div><div class='del'>-		}</div><div class='del'>-	} else if (flags &amp; CAMEL_URL_ALLOW_HOST) {</div><div class='del'>-		g_string_sprintfa (gpath, "/%s%s",</div><div class='del'>-		   ((flags &amp; CAMEL_URL_NEED_HOST) == CAMEL_URL_NEED_HOST) ? "" : "@",</div><div class='del'>-		   url-&gt;host ? url-&gt;host : "");</div><div class='del'>-	}</div><div class='del'>-	if ((flags &amp; CAMEL_URL_NEED_PATH) == CAMEL_URL_NEED_PATH) {</div><div class='del'>-		g_string_sprintfa (gpath, "%s%s",</div><div class='del'>-				   *url-&gt;path == '/' ? "" : "/",</div><div class='del'>-				   url-&gt;path);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	path = gpath-&gt;str;</div><div class='del'>-	g_string_free (gpath, FALSE);</div><div class='del'>-	return path;</div><div class='del'>-}		</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_path:</div><div class='del'>- * @service: the service</div><div class='del'>- *</div><div class='del'>- * This gets a valid UNIX relative path describing the service, which</div><div class='del'>- * is guaranteed to be different from the path returned for any</div><div class='del'>- * different service. This path MUST start with the name of the</div><div class='del'>- * provider, followed by a "/", but after that, it is up to the</div><div class='del'>- * provider.</div><div class='del'>- *</div><div class='del'>- * Return value: the path, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_service_get_path (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SERVICE (service), NULL);</div><div class='del'>-	g_return_val_if_fail (service-&gt;url, NULL);</div><div class='del'>-</div><div class='del'>-	return CSERV_CLASS (service)-&gt;get_path (service);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_session:</div><div class='del'>- * @service: a service</div><div class='del'>- *</div><div class='del'>- * Returns the CamelSession associated with the service.</div><div class='del'>- *</div><div class='del'>- * Return value: the session</div><div class='del'>- **/</div><div class='del'>-CamelSession *</div><div class='del'>-camel_service_get_session (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	return service-&gt;session;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_service_get_provider:</div><div class='del'>- * @service: a service</div><div class='del'>- *</div><div class='del'>- * Returns the CamelProvider associated with the service.</div><div class='del'>- *</div><div class='del'>- * Return value: the provider</div><div class='del'>- **/</div><div class='del'>-CamelProvider *</div><div class='del'>-camel_service_get_provider (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	return service-&gt;provider;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GList *</div><div class='del'>-query_auth_types_func (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'>-	if (service-&gt;url-&gt;empty)</div><div class='del'>-		return CSERV_CLASS (service)-&gt;query_auth_types_generic (service, ex);</div><div class='del'>-	else</div><div class='del'>-		return CSERV_CLASS (service)-&gt;query_auth_types_connected (service, ex);</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'>-/* 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 "</div><div class='del'>-						"up 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 3f5acabbb5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-service.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-service.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,125 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-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;camel/camel-provider.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)     (CAMEL_CHECK_CAST((obj), CAMEL_SERVICE_TYPE, CamelService))</div><div class='del'>-#define CAMEL_SERVICE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SERVICE_TYPE, CamelServiceClass))</div><div class='del'>-#define CAMEL_IS_SERVICE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SERVICE_TYPE))</div><div class='del'>-</div><div class='del'>-</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'>-	CamelProvider *provider;</div><div class='del'>-	gboolean connected;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	gboolean  (*connect)           (CamelService *service, </div><div class='del'>-					CamelException *ex);</div><div class='del'>-	gboolean  (*disconnect)        (CamelService *service,</div><div class='del'>-					gboolean clean,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-	/*gboolean  (*is_connected)      (CamelService *service);*/</div><div class='del'>-</div><div class='del'>-	GList *   (*query_auth_types_connected)  (CamelService *service,</div><div class='del'>-						  CamelException *ex);</div><div class='del'>-	GList *   (*query_auth_types_generic)  (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'>-	char *    (*get_name)          (CamelService *service,</div><div class='del'>-					gboolean brief);</div><div class='del'>-	char *    (*get_path)          (CamelService *service);</div><div class='del'>-</div><div class='del'>-} CamelServiceClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* query_auth_types returns a GList of these */</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name, *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                (CamelType type, </div><div class='del'>-						      CamelSession *session,</div><div class='del'>-						      CamelProvider *provider,</div><div class='del'>-						      CamelURL *url, </div><div class='del'>-						      CamelException *ex);</div><div class='del'>-gboolean            camel_service_connect            (CamelService *service, </div><div class='del'>-						      CamelException *ex);</div><div class='del'>-gboolean            camel_service_disconnect         (CamelService *service,</div><div class='del'>-						      gboolean clean,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-char *              camel_service_get_url            (CamelService *service);</div><div class='del'>-char *              camel_service_get_name           (CamelService *service,</div><div class='del'>-						      gboolean brief);</div><div class='del'>-char *              camel_service_get_path           (CamelService *service);</div><div class='del'>-CamelSession *      camel_service_get_session        (CamelService *service);</div><div class='del'>-CamelProvider *     camel_service_get_provider       (CamelService *service);</div><div class='del'>-GList *             camel_service_query_auth_types   (CamelService *service,</div><div class='del'>-						      CamelException *ex);</div><div class='del'>-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 Camel function */</div><div class='del'>-CamelType camel_service_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SERVICE_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-session.c b/camel/camel-session.c<br/>deleted file mode 100644<br/>index ac85005da2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-session.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-session.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,455 +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;errno.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.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 (CamelObject *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'>-</div><div class='del'>-static void</div><div class='del'>-camel_session_class_init (CamelSessionClass *camel_session_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = camel_type_get_global_classfuncs (camel_object_get_type ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_session_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_session_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_session_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_session_type = camel_type_register (camel_object_get_type (), "CamelSession",</div><div class='del'>-							  sizeof (CamelSession),</div><div class='del'>-							  sizeof (CamelSessionClass),</div><div class='del'>-							  (CamelObjectClassInitFunc) camel_session_class_init,</div><div class='del'>-							  NULL,</div><div class='del'>-							  (CamelObjectInitFunc) camel_session_init,</div><div class='del'>-							  (CamelObjectFinalizeFunc) camel_session_finalise);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_session_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_new:</div><div class='del'>- * @storage_path: Path to a directory Camel can use for persistent storage.</div><div class='del'>- * (This directory must already exist.)</div><div class='del'>- * @authenticator: A callback for discussing authentication information</div><div class='del'>- * @registrar: A callback for registering timeout callbacks</div><div class='del'>- * @remove: A callback for removing timeout callbacks</div><div class='del'>- *</div><div class='del'>- * This creates a new CamelSession object, which represents global state</div><div class='del'>- * for the Camel library, and contains callbacks that can be used to</div><div class='del'>- * interact with the main application.</div><div class='del'>- *</div><div class='del'>- * Return value: the new CamelSession</div><div class='del'>- **/</div><div class='del'>-CamelSession *</div><div class='del'>-camel_session_new (const char *storage_path,</div><div class='del'>-		   CamelAuthCallback authenticator,</div><div class='del'>-		   CamelTimeoutRegisterCallback registrar,</div><div class='del'>-		   CamelTimeoutRemoveCallback remover)</div><div class='del'>-{</div><div class='del'>-	CamelSession *session = CAMEL_SESSION (camel_object_new (CAMEL_SESSION_TYPE));</div><div class='del'>-</div><div class='del'>-	session-&gt;storage_path = g_strdup (storage_path);</div><div class='del'>-	session-&gt;authenticator = authenticator;</div><div class='del'>-	session-&gt;registrar = registrar;</div><div class='del'>-	session-&gt;remover = remover;</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, gpointer event_data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelProvider *provider;</div><div class='del'>-	CamelSession *session = CAMEL_SESSION (user_data);</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (CAMEL_IS_SESSION (session));</div><div class='del'>-	g_return_if_fail (service != NULL);</div><div class='del'>-	g_return_if_fail (service-&gt;url != NULL);</div><div class='del'>-	</div><div class='del'>-	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'>-/**</div><div class='del'>- * camel_session_get_service:</div><div class='del'>- * @session: the CamelSession</div><div class='del'>- * @url_string: a Camel URL describing the service to get</div><div class='del'>- * @type: the provider type (%CAMEL_PROVIDER_STORE or</div><div class='del'>- * %CAMEL_PROVIDER_TRANSPORT) to get, since some URLs may be able</div><div class='del'>- * to specify either type.</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This resolves a CamelURL into a CamelService, including loading the</div><div class='del'>- * provider library for that service if it has not already been loaded.</div><div class='del'>- *</div><div class='del'>- * Services are cached, and asking for "the same" @url_string multiple</div><div class='del'>- * times will return the same CamelService (with its reference count</div><div class='del'>- * incremented by one each time). What constitutes "the same" URL</div><div class='del'>- * depends in part on the provider.</div><div class='del'>- *</div><div class='del'>- * Return value: the requested CamelService, or %NULL</div><div class='del'>- **/</div><div class='del'>-CamelService *</div><div class='del'>-camel_session_get_service (CamelSession *session, const char *url_string,</div><div class='del'>-			   CamelProviderType type, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url;</div><div class='del'>-	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 provider available for protocol `%s'"),</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'>-	service = g_hash_table_lookup (provider-&gt;service_cache, url);</div><div class='del'>-	if (service != NULL) {</div><div class='del'>-		camel_url_free (url);</div><div class='del'>-		camel_object_ref (CAMEL_OBJECT (service));</div><div class='del'>-		return service;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	service = camel_service_new (provider-&gt;object_types[type], session, provider, 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'>-		camel_object_hook_event (CAMEL_OBJECT (service), "finalize", (CamelObjectEventHookFunc) 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'>- * camel_session_get_service_connected:</div><div class='del'>- * @session: the CamelSession</div><div class='del'>- * @url_string: a Camel URL describing the service to get</div><div class='del'>- * @type: the provider type</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This works like camel_session_get_service(), but also ensures that</div><div class='del'>- * the returned service will have been successfully connected (via</div><div class='del'>- * camel_service_connect().)</div><div class='del'>- *</div><div class='del'>- * Return value: the requested CamelService, or %NULL</div><div class='del'>- **/</div><div class='del'>-CamelService *</div><div class='del'>-camel_session_get_service_connected (CamelSession *session,</div><div class='del'>-				     const char *url_string,</div><div class='del'>-				     CamelProviderType type,</div><div class='del'>-				     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelService *svc;</div><div class='del'>-</div><div class='del'>-	svc = camel_session_get_service (session, url_string, type, ex);</div><div class='del'>-	if (svc == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (svc-&gt;connected == FALSE) {</div><div class='del'>-		if (camel_service_connect (svc, ex) == FALSE) {</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (svc));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return svc;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_get_storage_path:</div><div class='del'>- * @session: session object</div><div class='del'>- * @service: a CamelService</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This returns the path to a directory which the service can use for</div><div class='del'>- * its own purposes. Data stored there will remain between Evolution</div><div class='del'>- * sessions. No code outside of that service should ever touch the</div><div class='del'>- * files in this directory. If the directory does not exist, it will</div><div class='del'>- * be created.</div><div class='del'>- *</div><div class='del'>- * Return value: the path (which the caller must free), or %NULL if</div><div class='del'>- * an error occurs.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_session_get_storage_path (CamelSession *session, CamelService *service,</div><div class='del'>-				CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *path, *p;</div><div class='del'>-</div><div class='del'>-	p = camel_service_get_path (service);</div><div class='del'>-	path = g_strdup_printf ("%s/%s", session-&gt;storage_path, p);</div><div class='del'>-	g_free (p);</div><div class='del'>-</div><div class='del'>-	if (access (path, F_OK) == 0)</div><div class='del'>-		return path;</div><div class='del'>-</div><div class='del'>-	if (e_mkdir_hier (path, S_IRWXU) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not create directory %s:\n%s"),</div><div class='del'>-				      path, g_strerror (errno));</div><div class='del'>-		g_free (path);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_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='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_register_timeout: Register a timeout to be called</div><div class='del'>- * periodically.</div><div class='del'>- *</div><div class='del'>- * @session: the CamelSession</div><div class='del'>- * @interval: the number of milliseconds interval between calls</div><div class='del'>- * @callback: the function to call</div><div class='del'>- * @user_data: extra data to be passed to the callback</div><div class='del'>- *</div><div class='del'>- * This function will use the registrar callback provided upon</div><div class='del'>- * camel_session_new to register the timeout. The callback will</div><div class='del'>- * be called every @interval milliseconds until it returns @FALSE.</div><div class='del'>- * It will be passed one argument, @user_data.</div><div class='del'>- *</div><div class='del'>- * Returns a nonzero handle that can be used with </div><div class='del'>- * camel_session_remove_timeout on success, and 0 on failure to </div><div class='del'>- * register the timeout.</div><div class='del'>- **/</div><div class='del'>-guint</div><div class='del'>-camel_session_register_timeout (CamelSession *session,</div><div class='del'>-				guint32 interval,</div><div class='del'>-				CamelTimeoutCallback callback,</div><div class='del'>-				gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_SESSION (session), FALSE);</div><div class='del'>-</div><div class='del'>-	return session-&gt;registrar (interval, callback, user_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_session_remove_timeout: Remove a previously registered</div><div class='del'>- * timeout.</div><div class='del'>- *</div><div class='del'>- * @session: the CamelSession</div><div class='del'>- * @handle: a value returned from camel_session_register_timeout</div><div class='del'>- *</div><div class='del'>- * This function will use the remover callback provided upon</div><div class='del'>- * camel_session_new to remove the timeout.</div><div class='del'>- *</div><div class='del'>- * Returns TRUE on success and FALSE on failure.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_session_remove_timeout (CamelSession *session, guint handle)</div><div class='del'>-{</div><div class='del'>-	return session-&gt;remover (handle);</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 fed21be6f1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-session.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-session.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,132 +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)     (CAMEL_CHECK_CAST((obj), CAMEL_SESSION_TYPE, CamelSession))</div><div class='del'>-#define CAMEL_SESSION_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SESSION_TYPE, CamelSessionClass))</div><div class='del'>-#define CAMEL_IS_SESSION(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SESSION_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef 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'>-typedef gboolean (*CamelTimeoutCallback) (gpointer data);</div><div class='del'>-typedef guint (*CamelTimeoutRegisterCallback) (guint32 interval,</div><div class='del'>-					       CamelTimeoutCallback cb,</div><div class='del'>-					       gpointer camel_data);</div><div class='del'>-typedef gboolean (*CamelTimeoutRemoveCallback) (guint id);</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'>-	char *storage_path;</div><div class='del'>-	CamelAuthCallback authenticator;</div><div class='del'>-	CamelTimeoutRegisterCallback registrar;</div><div class='del'>-	CamelTimeoutRemoveCallback remover;</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 Camel function */</div><div class='del'>-CamelType camel_session_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelSession *  camel_session_new (const char *storage_path,</div><div class='del'>-				   CamelAuthCallback authenticator,</div><div class='del'>-				   CamelTimeoutRegisterCallback registrar,</div><div class='del'>-				   CamelTimeoutRemoveCallback remover);</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'>-CamelService *  camel_session_get_service_connected   (CamelSession *session, </div><div class='del'>-						       const char *url_string,</div><div class='del'>-						       CamelProviderType type, </div><div class='del'>-						       CamelException *ex);</div><div class='del'>-</div><div class='del'>-#define camel_session_get_store(session, url_string, ex) \</div><div class='del'>-	((CamelStore *) camel_session_get_service_connected (session, url_string, CAMEL_PROVIDER_STORE, ex))</div><div class='del'>-#define camel_session_get_transport(session, url_string, ex) \</div><div class='del'>-	((CamelTransport *) camel_session_get_service_connected (session, url_string, CAMEL_PROVIDER_TRANSPORT, ex))</div><div class='del'>-</div><div class='del'>-char *          camel_session_get_storage_path (CamelSession *session,</div><div class='del'>-						CamelService *service,</div><div class='del'>-						CamelException *ex);</div><div class='del'>-</div><div class='del'>-char *          camel_session_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'>-guint           camel_session_register_timeout (CamelSession *session,</div><div class='del'>-						guint32 interval,</div><div class='del'>-						CamelTimeoutCallback callback,</div><div class='del'>-						gpointer user_data);</div><div class='del'>-</div><div class='del'>-gboolean        camel_session_remove_timeout (CamelSession *session,</div><div class='del'>-					      guint handle);</div><div class='del'>-</div><div class='del'>-#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 c9236676b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,652 +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 &lt;string.h&gt;</div><div class='del'>-</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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-				guint32 flags, CamelException *ex);</div><div class='del'>-static void delete_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			   CamelException *ex);</div><div class='del'>-static void rename_folder (CamelStore *store, const char *old_name,</div><div class='del'>-			   const char *new_name, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static 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 CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-					 gboolean fast, gboolean recursive,</div><div class='del'>-					 gboolean subscribed_only,</div><div class='del'>-					 CamelException *ex);</div><div class='del'>-static void free_folder_info (CamelStore *store, CamelFolderInfo *tree);</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 gboolean folder_subscribed (CamelStore *store, const char *folder_name);</div><div class='del'>-static void subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_class_init (CamelStoreClass *camel_store_class)</div><div class='del'>-{</div><div class='del'>-	parent_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;delete_folder = delete_folder;</div><div class='del'>-	camel_store_class-&gt;rename_folder = rename_folder;</div><div class='del'>-	camel_store_class-&gt;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;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = free_folder_info;</div><div class='del'>-	camel_store_class-&gt;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'>-	camel_store_class-&gt;folder_subscribed = folder_subscribed;</div><div class='del'>-	camel_store_class-&gt;subscribe_folder = subscribe_folder;</div><div class='del'>-	camel_store_class-&gt;unsubscribe_folder = unsubscribe_folder;</div><div class='del'>-}</div><div class='del'>-</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'>-	store-&gt;flags = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_store_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-</div><div class='del'>-	if (store-&gt;folders) {</div><div class='del'>-		if (g_hash_table_size (store-&gt;folders) != 0) {</div><div class='del'>-			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'>-CamelType</div><div class='del'>-camel_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_store_type = camel_type_register (CAMEL_SERVICE_TYPE, "CamelStore",</div><div class='del'>-							sizeof (CamelStore),</div><div class='del'>-							sizeof (CamelStoreClass),</div><div class='del'>-							(CamelObjectClassInitFunc) camel_store_class_init,</div><div class='del'>-							NULL,</div><div class='del'>-							(CamelObjectInitFunc) camel_store_init,</div><div class='del'>-							(CamelObjectFinalizeFunc) camel_store_finalize );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning("CamelStore::get_folder not implemented for `%s'",</div><div class='del'>-		  camel_type_to_name(CAMEL_OBJECT_GET_TYPE(store)));</div><div class='del'>-	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'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rename_folder (CamelStore *store, const char *old_name,</div><div class='del'>-	       const char *new_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelStore::rename_folder not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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'>-		   camel_type_to_name (CAMEL_OBJECT_GET_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'>-			camel_object_ref(CAMEL_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 folder_finalize (CamelObject *folder, gpointer event_data, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CS_CLASS (user_data)-&gt;uncache_folder (CAMEL_STORE(user_data), CAMEL_FOLDER(folder));</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'>-</div><div class='del'>-	camel_object_hook_event (CAMEL_OBJECT (folder), "finalize", folder_finalize, store);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * gt_k so as not to get caught by my little gt_k cleanliness detector.</div><div class='del'>-	 *</div><div class='del'>-	 * gt_k_signal_connect_object (CAMEL_OBJECT (folder), "destroy",</div><div class='del'>-	 *			   GT_K_SIGNAL_FUNC (CS_CLASS (store)-&gt;uncache_folder),</div><div class='del'>-	 *			   CAMEL_OBJECT (store));</div><div class='del'>-	 */</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, guint32 flags, 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, flags, 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, guint32 flags, 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, flags, 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'>- * camel_store_rename_folder:</div><div class='del'>- * @store: </div><div class='del'>- * @old_name: </div><div class='del'>- * @new_name: </div><div class='del'>- * @ex: </div><div class='del'>- * </div><div class='del'>- * Rename a named folder to a new name.</div><div class='del'>- **/</div><div class='del'>-void             camel_store_rename_folder      (CamelStore *store,</div><div class='del'>-						 const char *old_name,</div><div class='del'>-						 const char *new_name,</div><div class='del'>-						 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *old, *new;</div><div class='del'>-</div><div class='del'>-	old = CS_CLASS (store)-&gt;get_folder_name(store, old_name, ex);</div><div class='del'>-	if (old) {</div><div class='del'>-		new = CS_CLASS (store)-&gt;get_folder_name(store, new_name, ex);</div><div class='del'>-		if (new) {</div><div class='del'>-			CS_CLASS (store)-&gt;rename_folder(store, old, new, ex);</div><div class='del'>-			g_free(new);</div><div class='del'>-		}</div><div class='del'>-		g_free(old);</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='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-		 gboolean fast, gboolean recursive,</div><div class='del'>-		 gboolean subscribed_only,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelStore::get_folder_info not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_get_folder_info:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @top: the name of the folder to start from</div><div class='del'>- * @fast: whether or not to do a "fast" scan.</div><div class='del'>- * @recursive: whether to include information for subfolders</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This fetches information about the folder structure of @store,</div><div class='del'>- * starting with @top, and returns a tree of CamelFolderInfo</div><div class='del'>- * structures. If @fast is %TRUE, the message_count or</div><div class='del'>- * unread_message_count fields of some or all of the structures may be</div><div class='del'>- * set to -1, if the store cannot determine that information quickly.</div><div class='del'>- * If @recursive is %TRUE, the returned tree will include all levels of</div><div class='del'>- * hierarchy below @top. If it is %FALSE, it will only include the</div><div class='del'>- * immediate subfolders of @top.</div><div class='del'>- *</div><div class='del'>- * Return value: a CamelFolderInfo tree, which must be freed with</div><div class='del'>- * camel_store_free_folder_info.</div><div class='del'>- **/</div><div class='del'>-CamelFolderInfo *</div><div class='del'>-camel_store_get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-			     gboolean fast, gboolean recursive,</div><div class='del'>-			     gboolean subscribed_only,</div><div class='del'>-			     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STORE (store), NULL);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (store)-&gt;get_folder_info (store, top, fast,</div><div class='del'>-						  recursive, subscribed_only,</div><div class='del'>-						  ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_folder_info (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelStore::free_folder_info not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_free_folder_info:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @tree: the tree returned by camel_store_get_folder_info()</div><div class='del'>- *</div><div class='del'>- * Frees the data returned by camel_store_get_folder_info().</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_free_folder_info (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (store));</div><div class='del'>-</div><div class='del'>-	CS_CLASS (store)-&gt;free_folder_info (store, fi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_free_folder_info_full:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @tree: the tree returned by camel_store_get_folder_info()</div><div class='del'>- *</div><div class='del'>- * An implementation for CamelStore::free_folder_info. Frees all</div><div class='del'>- * of the data.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_free_folder_info_full (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	camel_folder_info_free (fi);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_free_folder_info_nop:</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @tree: the tree returned by camel_store_get_folder_info()</div><div class='del'>- *</div><div class='del'>- * An implementation for CamelStore::free_folder_info. Does nothing.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_free_folder_info_nop (CamelStore *store, CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_info_free:</div><div class='del'>- * @fi: the CamelFolderInfo</div><div class='del'>- *</div><div class='del'>- * Frees @fi.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_info_free (CamelFolderInfo *fi)</div><div class='del'>-{</div><div class='del'>-	if (fi) {</div><div class='del'>-		camel_folder_info_free (fi-&gt;sibling);</div><div class='del'>-		camel_folder_info_free (fi-&gt;child);</div><div class='del'>-		g_free (fi-&gt;name);</div><div class='del'>-		g_free (fi-&gt;full_name);</div><div class='del'>-		g_free (fi-&gt;url);</div><div class='del'>-		g_free (fi);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_folder_info_build:</div><div class='del'>- * @folders: an array of CamelFolderInfo</div><div class='del'>- * @top: the top of the folder tree</div><div class='del'>- * @separator: the hieararchy separator character</div><div class='del'>- * @short_names: %TRUE if the (short) name of a folder is the part after</div><div class='del'>- * the last @separator in the full name. %FALSE if it is the full name.</div><div class='del'>- *</div><div class='del'>- * This takes an array of folders and attaches them together. @top points</div><div class='del'>- * to the (or at least, "a") top-level element of the tree: it may or may</div><div class='del'>- * not also be an element of @folders. If necessary, camel_folder_info_build</div><div class='del'>- * will create additional CamelFolderInfo with %NULL urls to fill in gaps</div><div class='del'>- * in the tree. The value of @short_names is used in constructing the</div><div class='del'>- * names of these intermediate folders.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_folder_info_build (GPtrArray *folders, CamelFolderInfo *top,</div><div class='del'>-			 char separator, gboolean short_names)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi, *pfi;</div><div class='del'>-	GHashTable *hash;</div><div class='del'>-	char *p, *pname;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Hash the folders. */</div><div class='del'>-	hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	pfi = top;</div><div class='del'>-	for (i = 0; i &lt; folders-&gt;len; i++) {</div><div class='del'>-		fi = folders-&gt;pdata[i];</div><div class='del'>-		if (fi == top)</div><div class='del'>-			pfi = NULL;</div><div class='del'>-		g_hash_table_insert (hash, fi-&gt;full_name, fi);</div><div class='del'>-	}</div><div class='del'>-	if (pfi)</div><div class='del'>-		g_hash_table_insert (hash, pfi-&gt;full_name, pfi);</div><div class='del'>-</div><div class='del'>-	/* Now find parents. */</div><div class='del'>-	for (i = 0; i &lt; folders-&gt;len; i++) {</div><div class='del'>-		fi = folders-&gt;pdata[i];</div><div class='del'>-		if (fi == top)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		p = strrchr (fi-&gt;full_name, separator);</div><div class='del'>-		if (p) {</div><div class='del'>-			pname = g_strndup (fi-&gt;full_name, p - fi-&gt;full_name);</div><div class='del'>-			pfi = g_hash_table_lookup (hash, pname);</div><div class='del'>-			if (pfi) {</div><div class='del'>-				g_free (pname);</div><div class='del'>-			} else {</div><div class='del'>-				pfi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-				pfi-&gt;full_name = pname;</div><div class='del'>-				if (short_names) {</div><div class='del'>-					pfi-&gt;name = strrchr (pname, separator);</div><div class='del'>-					if (pfi-&gt;name)</div><div class='del'>-						pfi-&gt;name = g_strdup (pfi-&gt;name + 1);</div><div class='del'>-					else</div><div class='del'>-						pfi-&gt;name = g_strdup (pname);</div><div class='del'>-				} else</div><div class='del'>-					pfi-&gt;name = g_strdup (pname);</div><div class='del'>-				g_hash_table_insert (hash, pname, pfi);</div><div class='del'>-				g_ptr_array_add (folders, pfi);</div><div class='del'>-			}</div><div class='del'>-			fi-&gt;sibling = pfi-&gt;child;</div><div class='del'>-			fi-&gt;parent = pfi;</div><div class='del'>-			pfi-&gt;child = fi;</div><div class='del'>-		} else {</div><div class='del'>-			fi-&gt;sibling = top-&gt;child;</div><div class='del'>-			fi-&gt;parent = top;</div><div class='del'>-			top-&gt;child = fi;</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'>-camel_store_supports_subscriptions (CamelStore *store)</div><div class='del'>-{</div><div class='del'>-	return (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-folder_subscribed (CamelStore *store, const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelStore::folder_subscribed not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_folder_subscribed: Tell whether or not a folder has been subscribed to.</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @folder_name: the folder on which we're querying subscribed status.</div><div class='del'>- * Return value: TRUE if folder is subscribed, FALSE if not.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_store_folder_subscribed (CamelStore *store,</div><div class='del'>-			       const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);</div><div class='del'>-	g_return_val_if_fail (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS, FALSE);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (store)-&gt;folder_subscribed (store, folder_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-subscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelStore::subscribe_folder not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_subscribe_folder: marks a folder as subscribed.</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @folder_name: the folder to subscribe to.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_subscribe_folder (CamelStore *store,</div><div class='del'>-			      const char *folder_name,</div><div class='del'>-			      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (store));</div><div class='del'>-	g_return_if_fail (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS);</div><div class='del'>-</div><div class='del'>-	CS_CLASS (store)-&gt;subscribe_folder (store, folder_name, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unsubscribe_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("CamelStore::unsubscribe_folder not implemented for `%s'",</div><div class='del'>-		   camel_type_to_name (CAMEL_OBJECT_GET_TYPE (store)));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_store_unsubscribe_folder: marks a folder as unsubscribed.</div><div class='del'>- * @store: a CamelStore</div><div class='del'>- * @folder_name: the folder to unsubscribe from.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_store_unsubscribe_folder (CamelStore *store,</div><div class='del'>-				const char *folder_name,</div><div class='del'>-				CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (CAMEL_IS_STORE (store));</div><div class='del'>-	g_return_if_fail (store-&gt;flags &amp; CAMEL_STORE_SUBSCRIPTIONS);</div><div class='del'>-</div><div class='del'>-	CS_CLASS (store)-&gt;unsubscribe_folder (store, folder_name, ex);</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 7558c0eb5a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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-object.h&gt;</div><div class='del'>-#include &lt;camel/camel-service.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _CamelFolderInfo {</div><div class='del'>-	struct _CamelFolderInfo *parent, *sibling, *child;</div><div class='del'>-	char *url, *full_name, *name;</div><div class='del'>-	int message_count, unread_message_count;</div><div class='del'>-} CamelFolderInfo;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define CAMEL_STORE_TYPE     (camel_store_get_type ())</div><div class='del'>-#define CAMEL_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_STORE_TYPE, CamelStore))</div><div class='del'>-#define CAMEL_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STORE_TYPE, CamelStoreClass))</div><div class='del'>-#define CAMEL_IS_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Flags for store flags */</div><div class='del'>-#define CAMEL_STORE_SUBSCRIPTIONS (1 &lt;&lt; 0)</div><div class='del'>-</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'>-	int flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* open mode for folder */</div><div class='del'>-#define CAMEL_STORE_FOLDER_CREATE (1&lt;&lt;0)</div><div class='del'>-#define CAMEL_STORE_FOLDER_BODY_INDEX (1&lt;&lt;1)</div><div class='del'>-</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'>-						     guint32 flags,</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'>-	void		(*rename_folder)	    (CamelStore *store,</div><div class='del'>-						     const char *old_name,</div><div class='del'>-						     const char *new_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	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'>-	CamelFolderInfo *(*get_folder_info)         (CamelStore *store,</div><div class='del'>-						     const char *top,</div><div class='del'>-						     gboolean fast,</div><div class='del'>-						     gboolean recursive,</div><div class='del'>-						     gboolean subscribed_only,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	void            (*free_folder_info)         (CamelStore *store,</div><div class='del'>-						     CamelFolderInfo *fi);</div><div class='del'>-</div><div class='del'>-	gboolean        (*folder_subscribed)        (CamelStore *store,</div><div class='del'>-						     const char *folder_name);</div><div class='del'>-	void            (*subscribe_folder)         (CamelStore *store,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-	void            (*unsubscribe_folder)       (CamelStore *store,</div><div class='del'>-						     const char *folder_name,</div><div class='del'>-						     CamelException *ex);</div><div class='del'>-} CamelStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_store_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelFolder *    camel_store_get_folder         (CamelStore *store,</div><div class='del'>-					         const char *folder_name,</div><div class='del'>-						 guint32 flags,</div><div class='del'>-					         CamelException *ex);</div><div class='del'>-CamelFolder *    camel_store_get_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'>-void             camel_store_rename_folder      (CamelStore *store,</div><div class='del'>-						 const char *old_name,</div><div class='del'>-						 const char *new_name,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-</div><div class='del'>-CamelFolderInfo *camel_store_get_folder_info    (CamelStore *store,</div><div class='del'>-						 const char *top,</div><div class='del'>-						 gboolean fast,</div><div class='del'>-						 gboolean recursive,</div><div class='del'>-						 gboolean subscribed_only,</div><div class='del'>-						 CamelException *ex);</div><div class='del'>-void             camel_store_free_folder_info   (CamelStore *store,</div><div class='del'>-						 CamelFolderInfo *fi);</div><div class='del'>-</div><div class='del'>-void             camel_store_free_folder_info_full (CamelStore *store,</div><div class='del'>-						    CamelFolderInfo *fi);</div><div class='del'>-void             camel_store_free_folder_info_nop  (CamelStore *store,</div><div class='del'>-						    CamelFolderInfo *fi);</div><div class='del'>-</div><div class='del'>-void             camel_folder_info_free            (CamelFolderInfo *fi);</div><div class='del'>-void             camel_folder_info_build           (GPtrArray *folders,</div><div class='del'>-						    CamelFolderInfo *top,</div><div class='del'>-						    char separator,</div><div class='del'>-						    gboolean short_names);</div><div class='del'>-</div><div class='del'>-gboolean         camel_store_supports_subscriptions   (CamelStore *store);</div><div class='del'>-</div><div class='del'>-gboolean         camel_store_folder_subscribed        (CamelStore *store,</div><div class='del'>-						       const char *folder_name);</div><div class='del'>-void             camel_store_subscribe_folder         (CamelStore *store,</div><div class='del'>-						       const char *folder_name,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-void             camel_store_unsubscribe_folder       (CamelStore *store,</div><div class='del'>-						       const char *folder_name,</div><div class='del'>-						       CamelException *ex);</div><div class='del'>-</div><div class='del'>-#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 c25cda09bc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-buffer.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-stream-buffer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,453 +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 CamelStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	BUF_USER = 1&lt;&lt;0,	/* user-supplied buffer, do not free */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define BUF_SIZE 1024</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static int stream_flush (CamelStream *stream);</div><div class='del'>-static int stream_close (CamelStream *stream);</div><div class='del'>-static gboolean stream_eos (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static void init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size);</div><div class='del'>-static void init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_buffer_class_init (CamelStreamBufferClass *camel_stream_buffer_class)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class = CAMEL_STREAM_CLASS (camel_stream_buffer_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_stream_buffer_class-&gt;init = init;</div><div class='del'>-	camel_stream_buffer_class-&gt;init_vbuf = init_vbuf;</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-	camel_stream_class-&gt;eos = stream_eos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_buffer_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);</div><div class='del'>-</div><div class='del'>-	sbf-&gt;flags = 0;</div><div class='del'>-	sbf-&gt;size = BUF_SIZE;</div><div class='del'>-	sbf-&gt;buf = g_malloc(BUF_SIZE);</div><div class='del'>-	sbf-&gt;ptr = sbf-&gt;buf;</div><div class='del'>-	sbf-&gt;end = sbf-&gt;buf;</div><div class='del'>-	sbf-&gt;mode = CAMEL_STREAM_BUFFER_READ | CAMEL_STREAM_BUFFER_BUFFER;</div><div class='del'>-	sbf-&gt;stream = 0;</div><div class='del'>-	sbf-&gt;linesize = 80;</div><div class='del'>-	sbf-&gt;linebuf = g_malloc(sbf-&gt;linesize);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_buffer_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (object);</div><div class='del'>-</div><div class='del'>-	if (!(sbf-&gt;flags &amp; BUF_USER)) {</div><div class='del'>-		g_free(sbf-&gt;buf);</div><div class='del'>-	}</div><div class='del'>-	if (sbf-&gt;stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(sbf-&gt;stream));</div><div class='del'>-</div><div class='del'>-	g_free(sbf-&gt;linebuf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_buffer_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_buffer_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_buffer_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_stream_buffer_type = camel_type_register (camel_stream_get_type (), "CamelStreamBuffer",</div><div class='del'>-								sizeof (CamelStreamBuffer),</div><div class='del'>-								sizeof (CamelStreamBufferClass),</div><div class='del'>-								(CamelObjectClassInitFunc) camel_stream_buffer_class_init,</div><div class='del'>-								NULL,</div><div class='del'>-								(CamelObjectInitFunc) camel_stream_buffer_init,</div><div class='del'>-								(CamelObjectFinalizeFunc) camel_stream_buffer_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_buffer_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_vbuf(CamelStreamBuffer *sbf, char *buf, CamelStreamBufferMode mode, int size)</div><div class='del'>-{</div><div class='del'>-	if (sbf-&gt;buf &amp;&amp; !(sbf-&gt;flags &amp; BUF_USER)) {</div><div class='del'>-		g_free(sbf-&gt;buf);</div><div class='del'>-	}</div><div class='del'>-	if (buf) {</div><div class='del'>-		sbf-&gt;buf = buf;</div><div class='del'>-		sbf-&gt;flags |= BUF_USER;</div><div class='del'>-	} else {</div><div class='del'>-		sbf-&gt;buf = g_malloc(size);</div><div class='del'>-		sbf-&gt;flags &amp;= ~BUF_USER;</div><div class='del'>-	}</div><div class='del'>-	sbf-&gt;size = size;</div><div class='del'>-	sbf-&gt;mode = mode;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_vbuf(CamelStreamBuffer *sbf, CamelStream *s, CamelStreamBufferMode mode, char *buf, guint32 size)</div><div class='del'>-{</div><div class='del'>-	set_vbuf(sbf, buf, mode, size);</div><div class='del'>-	if (sbf-&gt;stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(sbf-&gt;stream));</div><div class='del'>-	sbf-&gt;stream = s;</div><div class='del'>-	camel_object_ref(CAMEL_OBJECT(sbf-&gt;stream));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init(CamelStreamBuffer *sbuf, CamelStream *s, CamelStreamBufferMode mode)</div><div class='del'>-{</div><div class='del'>-	init_vbuf(sbuf, s, mode, NULL, BUF_SIZE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_buffer_new:</div><div class='del'>- * @stream: Existing stream to buffer.</div><div class='del'>- * @mode: Operational mode of buffered stream.</div><div class='del'>- *</div><div class='del'>- * Create a new buffered stream of another stream.  A default</div><div class='del'>- * buffer size (1024 bytes), automatically managed will be used</div><div class='del'>- * for buffering.</div><div class='del'>- *</div><div class='del'>- * See camel_stream_buffer_new_with_vbuf() for details on the</div><div class='del'>- * @mode parameter.</div><div class='del'>- *</div><div class='del'>- * Return value: A newly created buffered stream.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_buffer_new (CamelStream *stream, CamelStreamBufferMode mode)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf;</div><div class='del'>-	sbf = CAMEL_STREAM_BUFFER (camel_object_new (camel_stream_buffer_get_type ()));</div><div class='del'>-	CAMEL_STREAM_BUFFER_CLASS (CAMEL_OBJECT_GET_CLASS(sbf))-&gt;init (sbf, stream, mode);</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (sbf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_buffer_new_with_vbuf:</div><div class='del'>- * @stream: An existing stream to buffer.</div><div class='del'>- * @mode: Mode to buffer in.</div><div class='del'>- * @buf: Memory to use for buffering.</div><div class='del'>- * @size: Size of buffer to use.</div><div class='del'>- *</div><div class='del'>- * Create a new stream which buffers another stream, @stream.</div><div class='del'>- *</div><div class='del'>- * The following values are available for @mode:</div><div class='del'>- *</div><div class='del'>- * CAMEL_STREAM_BUFFER_BUFFER, Buffer the input/output in blocks.</div><div class='del'>- * CAMEL_STREAM_BUFFER_NEWLINE, Buffer on newlines (for output).</div><div class='del'>- * CAMEL_STREAM_BUFFER_NONE, Perform no buffering.</div><div class='del'>- *</div><div class='del'>- * Note that currently this is ignored and CAMEL_STREAM_BUFFER_BUFFER</div><div class='del'>- * is always used.</div><div class='del'>- *</div><div class='del'>- * In addition, one of the following mode options should be or'd</div><div class='del'>- * together with the buffering mode:</div><div class='del'>- *</div><div class='del'>- * CAMEL_STREAM_BUFFER_WRITE, Buffer in write mode.</div><div class='del'>- * CAMEL_STREAM_BUFFER_READ, Buffer in read mode.</div><div class='del'>- *</div><div class='del'>- * Buffering can only be done in one direction for any</div><div class='del'>- * buffer instance.</div><div class='del'>- *</div><div class='del'>- * If @buf is non-NULL, then use the memory pointed to</div><div class='del'>- * (for upto @size bytes) as the buffer for all buffering</div><div class='del'>- * operations.  It is upto the application to free this buffer.</div><div class='del'>- * If @buf is NULL, then allocate and manage @size bytes</div><div class='del'>- * for all buffering.</div><div class='del'>- *</div><div class='del'>- * Return value: A new stream with buffering applied.</div><div class='del'>- **/</div><div class='del'>-CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *stream, CamelStreamBufferMode mode, char *buf, guint32 size)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf;</div><div class='del'>-	sbf = CAMEL_STREAM_BUFFER (camel_object_new (camel_stream_buffer_get_type ()));</div><div class='del'>-	CAMEL_STREAM_BUFFER_CLASS (CAMEL_OBJECT_GET_CLASS(sbf))-&gt;init_vbuf (sbf, stream, mode, buf, size);</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (sbf);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamBuffer *sbf = CAMEL_STREAM_BUFFER (stream);</div><div class='del'>-	ssize_t bytes_read = 1;</div><div class='del'>-	ssize_t bytes_left;</div><div class='del'>-	char *bptr = buffer;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail( (sbf-&gt;mode &amp; CAMEL_STREAM_BUFFER_MODE) == CAMEL_STREAM_BUFFER_READ, 0);</div><div class='del'>-</div><div class='del'>-	while (n &amp;&amp; bytes_read &gt; 0) {</div><div class='del'>-		bytes_left = sbf-&gt;end - sbf-&gt;ptr;</div><div class='del'>-		if (bytes_left &lt; n) {</div><div class='del'>-			if (bytes_left &gt; 0) {</div><div class='del'>-				memcpy(bptr, sbf-&gt;ptr, bytes_left);</div><div class='del'>-				n -= bytes_left;</div><div class='del'>-				bptr += bytes_left;</div><div class='del'>-				sbf-&gt;ptr += bytes_left;</div><div class='del'>-			}</div><div class='del'>-			/* if we are reading a lot, then read directly to the destination buffer */</div><div class='del'>-			if (n &gt;= sbf-&gt;size/3) {</div><div class='del'>-				bytes_read = camel_stream_read(sbf-&gt;stream, bptr, n);</div><div class='del'>-				if (bytes_read&gt;0) {</div><div class='del'>-					n -= bytes_read;</div><div class='del'>-					bptr += bytes_read;</div><div class='del'>-				}</div><div class='del'>-			} else {</div><div class='del'>-				bytes_read = camel_stream_read(sbf-&gt;stream, sbf-&gt;buf, sbf-&gt;size);</div><div class='del'>-				if (bytes_read&gt;0) {</div><div class='del'>-					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 5c9037595a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-buffer.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBuffer))</div><div class='del'>-#define CAMEL_STREAM_BUFFER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_BUFFER_TYPE, CamelStreamBufferClass))</div><div class='del'>-#define CAMEL_IS_STREAM_BUFFER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_BUFFER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum</div><div class='del'>-{</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 Camel function */</div><div class='del'>-CamelType camel_stream_buffer_get_type (void);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream *camel_stream_buffer_new (CamelStream *s,</div><div class='del'>-				      CamelStreamBufferMode mode);</div><div class='del'>-CamelStream *camel_stream_buffer_new_with_vbuf (CamelStream *s,</div><div class='del'>-						CamelStreamBufferMode mode,</div><div class='del'>-						char *buf, guint32 size);</div><div class='del'>-</div><div class='del'>-/* unimplemented</div><div class='del'>-   CamelStream *camel_stream_buffer_set_vbuf (CamelStreamBuffer *b, CamelStreamBufferMode mode, char *buf, guint32 size); */</div><div class='del'>-</div><div class='del'>-/* read a line of characters */</div><div class='del'>-int camel_stream_buffer_gets (CamelStreamBuffer *b, char *buf, unsigned int max);</div><div class='del'>-</div><div class='del'>-char *camel_stream_buffer_read_line (CamelStreamBuffer *sbf);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STREAM_BUFFER_H */</div><div class='head'>diff --git a/camel/camel-stream-filter.c b/camel/camel-stream-filter.c<br/>deleted file mode 100644<br/>index 211db36e7f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-filter.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-stream-filter.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,384 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; 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'>-#define d(x)</div><div class='del'>-/*#include &lt;stdio.h&gt;*/</div><div class='del'>-</div><div class='del'>-struct _filter {</div><div class='del'>-	struct _filter *next;</div><div class='del'>-	int id;</div><div class='del'>-	CamelMimeFilter *filter;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStreamFilterPrivate {</div><div class='del'>-	struct _filter *filters;</div><div class='del'>-	int filterid;		/* next filter id */</div><div class='del'>-	</div><div class='del'>-	char *realbuffer;	/* buffer - READ_PAD */</div><div class='del'>-	char *buffer;		/* READ_SIZE bytes */</div><div class='del'>-</div><div class='del'>-	char *filtered;		/* the filtered data */</div><div class='del'>-	size_t filteredlen;</div><div class='del'>-</div><div class='del'>-	int last_was_read;	/* was the last op read or write? */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define READ_PAD (64)		/* bytes padded before buffer */</div><div class='del'>-#define READ_SIZE (4096)</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(o) (((CamelStreamFilter *)(o))-&gt;priv)</div><div class='del'>-</div><div class='del'>-static void camel_stream_filter_class_init (CamelStreamFilterClass *klass);</div><div class='del'>-static void camel_stream_filter_init       (CamelStreamFilter *obj);</div><div class='del'>-</div><div class='del'>-static	ssize_t   do_read       (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static	ssize_t   do_write      (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static	int       do_flush      (CamelStream *stream);</div><div class='del'>-static	int       do_close      (CamelStream *stream);</div><div class='del'>-static	gboolean  do_eos        (CamelStream *stream);</div><div class='del'>-static	int       do_reset      (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-static CamelStreamClass *camel_stream_filter_parent;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_filter_class_init (CamelStreamFilterClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelStreamClass *camel_stream_class = (CamelStreamClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_stream_filter_parent = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));</div><div class='del'>-</div><div class='del'>-	camel_stream_class-&gt;read = do_read;</div><div class='del'>-	camel_stream_class-&gt;write = do_write;</div><div class='del'>-	camel_stream_class-&gt;flush = do_flush;</div><div class='del'>-	camel_stream_class-&gt;close = do_close;</div><div class='del'>-	camel_stream_class-&gt;eos = do_eos; </div><div class='del'>-	camel_stream_class-&gt;reset = do_reset;</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_filter_init (CamelStreamFilter *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelStreamFilterPrivate *p;</div><div class='del'>-	</div><div class='del'>-	_PRIVATE(obj) = p = g_malloc0(sizeof(*p));</div><div class='del'>-	p-&gt;realbuffer = g_malloc(READ_SIZE + READ_PAD);</div><div class='del'>-	p-&gt;buffer = p-&gt;realbuffer + READ_PAD;</div><div class='del'>-	p-&gt;last_was_read = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_filter_finalize(CamelObject *o)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)o;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *fn, *f;</div><div class='del'>-</div><div class='del'>-	f = p-&gt;filters;</div><div class='del'>-	while (f) {</div><div class='del'>-		fn = f-&gt;next;</div><div class='del'>-		camel_object_unref((CamelObject *)f-&gt;filter);</div><div class='del'>-		g_free(f);</div><div class='del'>-		f = fn;</div><div class='del'>-	}</div><div class='del'>-	g_free(p-&gt;realbuffer);</div><div class='del'>-	g_free(p);</div><div class='del'>-	camel_object_unref((CamelObject *)filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_filter_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (CAMEL_STREAM_TYPE, "CamelStreamFilter",</div><div class='del'>-					    sizeof (CamelStreamFilter),</div><div class='del'>-					    sizeof (CamelStreamFilterClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_stream_filter_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_stream_filter_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_stream_filter_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_filter_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelStreamFilter object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelStreamFilter object.</div><div class='del'>- **/</div><div class='del'>-CamelStreamFilter *</div><div class='del'>-camel_stream_filter_new_with_stream(CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *new = CAMEL_STREAM_FILTER ( camel_object_new (camel_stream_filter_get_type ()));</div><div class='del'>-</div><div class='del'>-	new-&gt;source = stream;</div><div class='del'>-	camel_object_ref ((CamelObject *)stream);</div><div class='del'>-</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_filter_add:</div><div class='del'>- * @filter: Initialised CamelStreamFilter.</div><div class='del'>- * @mf:  Filter to perform processing on stream.</div><div class='del'>- * </div><div class='del'>- * Add a new CamelMimeFilter to execute during the processing of this</div><div class='del'>- * stream.  Each filter added is processed after the previous one.</div><div class='del'>- *</div><div class='del'>- * Note that a filter should only be added to a single stream</div><div class='del'>- * at a time, otherwise unpredictable results may occur.</div><div class='del'>- * </div><div class='del'>- * Return value: A filter id for this CamelStreamFilter.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-camel_stream_filter_add(CamelStreamFilter *filter, CamelMimeFilter *mf)</div><div class='del'>-{</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *fn, *f;</div><div class='del'>-</div><div class='del'>-	fn = g_malloc(sizeof(*fn));</div><div class='del'>-	fn-&gt;id = p-&gt;filterid++;</div><div class='del'>-	fn-&gt;filter = mf;</div><div class='del'>-	camel_object_ref((CamelObject *)mf);</div><div class='del'>-</div><div class='del'>-	/* sure, we could use a GList, but we wouldn't save much */</div><div class='del'>-	f = (struct _filter *)&amp;p-&gt;filters;</div><div class='del'>-	while (f-&gt;next)</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	f-&gt;next = fn;</div><div class='del'>-	fn-&gt;next = NULL;</div><div class='del'>-	return fn-&gt;id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_filter_remove:</div><div class='del'>- * @filter: Initialised CamelStreamFilter.</div><div class='del'>- * @id: Filter id, as returned from camel_stream_filter_add().</div><div class='del'>- * </div><div class='del'>- * Remove a processing filter from the stream, by id.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_stream_filter_remove(CamelStreamFilter *filter, int id)</div><div class='del'>-{</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *fn, *f;</div><div class='del'>-</div><div class='del'>-	f = (struct _filter *)&amp;p-&gt;filters;</div><div class='del'>-	while (f &amp;&amp; f-&gt;next) {</div><div class='del'>-		fn = f-&gt;next;</div><div class='del'>-		if (fn-&gt;id == id) {</div><div class='del'>-			f-&gt;next = fn-&gt;next;</div><div class='del'>-			camel_object_unref((CamelObject *)fn-&gt;filter);</div><div class='del'>-			g_free(fn);</div><div class='del'>-		}</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-do_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	ssize_t size;</div><div class='del'>-	struct _filter *f;</div><div class='del'>-</div><div class='del'>-	p-&gt;last_was_read = TRUE;</div><div class='del'>-</div><div class='del'>-	if (p-&gt;filteredlen&lt;=0) {</div><div class='del'>-		int presize = READ_SIZE;</div><div class='del'>-</div><div class='del'>-		size = camel_stream_read(filter-&gt;source, p-&gt;buffer, READ_SIZE);</div><div class='del'>-		if (size &lt;= 0) {</div><div class='del'>-			/* this is somewhat untested */</div><div class='del'>-			if (camel_stream_eos(filter-&gt;source)) {</div><div class='del'>-				f = p-&gt;filters;</div><div class='del'>-				p-&gt;filtered = p-&gt;buffer;</div><div class='del'>-				p-&gt;filteredlen = 0;</div><div class='del'>-				while (f) {</div><div class='del'>-					camel_mime_filter_complete(f-&gt;filter, p-&gt;filtered, p-&gt;filteredlen,</div><div class='del'>-								   presize, &amp;p-&gt;filtered, &amp;p-&gt;filteredlen, &amp;presize);</div><div class='del'>-					f = f-&gt;next;</div><div class='del'>-				}</div><div class='del'>-				size = p-&gt;filteredlen;</div><div class='del'>-			}</div><div class='del'>-			if (size &lt;= 0)</div><div class='del'>-				return size;</div><div class='del'>-		} else {</div><div class='del'>-			f = p-&gt;filters;</div><div class='del'>-			p-&gt;filtered = p-&gt;buffer;</div><div class='del'>-			p-&gt;filteredlen = size;</div><div class='del'>-</div><div class='del'>-			d(printf ("\n\nOriginal content: '"));</div><div class='del'>-			d(fwrite(p-&gt;filtered, sizeof(char), p-&gt;filteredlen, stdout));</div><div class='del'>-			d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-			while (f) {</div><div class='del'>-				camel_mime_filter_filter(f-&gt;filter, p-&gt;filtered, p-&gt;filteredlen, presize,</div><div class='del'>-							 &amp;p-&gt;filtered, &amp;p-&gt;filteredlen, &amp;presize);</div><div class='del'>-</div><div class='del'>-				d(printf ("Filtered content (%s): '",</div><div class='del'>-					  camel_type_to_name(((CamelObject *)f-&gt;filter)-&gt;s.type)));</div><div class='del'>-				d(fwrite(p-&gt;filtered, sizeof(char), p-&gt;filteredlen, stdout));</div><div class='del'>-				d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-				f = f-&gt;next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	size = MIN(n, p-&gt;filteredlen);</div><div class='del'>-	memcpy(buffer, p-&gt;filtered, size);</div><div class='del'>-	p-&gt;filteredlen -= size;</div><div class='del'>-	p-&gt;filtered += size;</div><div class='del'>-</div><div class='del'>-	return size;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Note: Since the caller expects to write out as much as they asked us to</div><div class='del'>-   write (for 'success'), we return what they asked us to write (for 'success')</div><div class='del'>-   rather than the true number of written bytes */</div><div class='del'>-static ssize_t</div><div class='del'>-do_write (CamelStream *stream, const char *buf, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *f;</div><div class='del'>-	int presize;</div><div class='del'>-	char *buffer = (char *)buf;</div><div class='del'>-	size_t len = n;</div><div class='del'>-</div><div class='del'>-	p-&gt;last_was_read = FALSE;</div><div class='del'>-</div><div class='del'>-	d(printf ("\n\nWriting: Original content: '"));</div><div class='del'>-	d(fwrite(buffer, sizeof(char), len, stdout));</div><div class='del'>-	d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-	f = p-&gt;filters;</div><div class='del'>-	presize = 0;</div><div class='del'>-	while (f) {</div><div class='del'>-		camel_mime_filter_filter(f-&gt;filter, buffer, len, presize, &amp;buffer, &amp;len, &amp;presize);</div><div class='del'>-</div><div class='del'>-		d(printf ("Filtered content (%s): '",</div><div class='del'>-			  camel_type_to_name(((CamelObject *)f-&gt;filter)-&gt;s.type)));</div><div class='del'>-		d(fwrite(buffer, sizeof(char), len, stdout));</div><div class='del'>-		d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (camel_stream_write(filter-&gt;source, buffer, len) != len)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return n;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_flush (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *f;</div><div class='del'>-	char *buffer;</div><div class='del'>-	int 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'>-	</div><div class='del'>-	d(printf ("\n\nFlushing: Original content: '"));</div><div class='del'>-	d(fwrite(buffer, sizeof(char), len, stdout));</div><div class='del'>-	d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-	while (f) {</div><div class='del'>-		camel_mime_filter_complete(f-&gt;filter, buffer, len, presize, &amp;buffer, &amp;len, &amp;presize);</div><div class='del'>-</div><div class='del'>-		d(printf ("Filtered content (%s): '",</div><div class='del'>-			  camel_type_to_name(((CamelObject *)f-&gt;filter)-&gt;s.type)));</div><div class='del'>-		d(fwrite(buffer, sizeof(char), len, stdout));</div><div class='del'>-		d(printf("'\n"));</div><div class='del'>-</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-	if (len &gt; 0 &amp;&amp; camel_stream_write(filter-&gt;source, buffer, len) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-	return camel_stream_flush(filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_close (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-</div><div class='del'>-	if (!p-&gt;last_was_read) {</div><div class='del'>-		do_flush(stream);</div><div class='del'>-	}</div><div class='del'>-	return camel_stream_close(filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-do_eos (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-</div><div class='del'>-	if (p-&gt;filteredlen &gt; 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return camel_stream_eos(filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-do_reset (CamelStream *stream)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFilter *filter = (CamelStreamFilter *)stream;</div><div class='del'>-	struct _CamelStreamFilterPrivate *p = _PRIVATE(filter);</div><div class='del'>-	struct _filter *f;</div><div class='del'>-</div><div class='del'>-	p-&gt;filteredlen = 0;</div><div class='del'>-</div><div class='del'>-	/* and reset filters */</div><div class='del'>-	f = p-&gt;filters;</div><div class='del'>-	while (f) {</div><div class='del'>-		camel_mime_filter_reset(f-&gt;filter);</div><div class='del'>-		f = f-&gt;next;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_reset(filter-&gt;source);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/camel-stream-filter.h b/camel/camel-stream-filter.h<br/>deleted file mode 100644<br/>index d0683135c7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-filter.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)         CAMEL_CHECK_CAST (obj, camel_stream_filter_get_type (), CamelStreamFilter)</div><div class='del'>-#define CAMEL_STREAM_FILTER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_stream_filter_get_type (), CamelStreamFilterClass)</div><div class='del'>-#define IS_CAMEL_STREAM_FILTER(obj)      CAMEL_CHECK_TYPE (obj, camel_stream_filter_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelStreamFilterClass CamelStreamFilterClass;</div><div class='del'>-</div><div class='del'>-struct _CamelStreamFilter {</div><div class='del'>-	CamelStream parent;</div><div class='del'>-</div><div class='del'>-	CamelStream *source;</div><div class='del'>-</div><div class='del'>-	struct _CamelStreamFilterPrivate *priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStreamFilterClass {</div><div class='del'>-	CamelStreamClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-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 17c6b98e08..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-fs.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-stream-fs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,298 +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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read   (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write  (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static int stream_flush  (CamelStream *stream);</div><div class='del'>-static int stream_close  (CamelStream *stream);</div><div class='del'>-static off_t stream_seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			  CamelStreamSeekPolicy policy);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_fs_class_init (CamelStreamFsClass *camel_stream_fs_class)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStreamClass *camel_seekable_stream_class =</div><div class='del'>-		CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_fs_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_stream_fs_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS (camel_type_get_global_classfuncs (camel_seekable_stream_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;flush = stream_flush;</div><div class='del'>-	camel_stream_class-&gt;close = stream_close;</div><div class='del'>-</div><div class='del'>-	camel_seekable_stream_class-&gt;seek = stream_seek;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_fs_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream = CAMEL_STREAM_FS (object);</div><div class='del'>-</div><div class='del'>-	stream-&gt;fd = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_fs_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (object);</div><div class='del'>-</div><div class='del'>-	if (stream_fs-&gt;fd != -1)</div><div class='del'>-		close (stream_fs-&gt;fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_fs_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_fs_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_fs_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_stream_fs_type = camel_type_register (camel_seekable_stream_get_type (), "CamelStreamFs",</div><div class='del'>-							    sizeof (CamelStreamFs),</div><div class='del'>-							    sizeof (CamelStreamFsClass),</div><div class='del'>-							    (CamelObjectClassInitFunc) camel_stream_fs_class_init,</div><div class='del'>-							    NULL,</div><div class='del'>-							    (CamelObjectInitFunc) camel_stream_fs_init,</div><div class='del'>-							    (CamelObjectFinalizeFunc) camel_stream_fs_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_fs_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_fs_new_with_fd:</div><div class='del'>- * @fd: a file descriptor</div><div class='del'>- *</div><div class='del'>- * Returns a stream associated with the given file descriptor.</div><div class='del'>- * When the stream is destroyed, the file descriptor will be closed.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_fs_new_with_fd (int fd)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream_fs;</div><div class='del'>-	off_t offset;</div><div class='del'>-</div><div class='del'>-	stream_fs = CAMEL_STREAM_FS (camel_object_new (camel_stream_fs_get_type ()));</div><div class='del'>-	stream_fs-&gt;fd = fd;</div><div class='del'>-	offset = lseek (fd, 0, SEEK_CUR);</div><div class='del'>-	if (offset == -1)</div><div class='del'>-		offset = 0;</div><div class='del'>-	CAMEL_SEEKABLE_STREAM (stream_fs)-&gt;position = offset;</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (stream_fs);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_fs_new_with_fd_and_bounds:</div><div class='del'>- * @fd: a file descriptor</div><div class='del'>- * @start: the first valid position in the file</div><div class='del'>- * @end: the first invalid position in the file, or CAMEL_STREAM_UNBOUND</div><div class='del'>- *</div><div class='del'>- * Returns a stream associated with the given file descriptor and bounds.</div><div class='del'>- * When the stream is destroyed, the file descriptor will be closed.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_fs_new_with_fd_and_bounds (int fd, off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	stream = camel_stream_fs_new_with_fd (fd);</div><div class='del'>-	camel_seekable_stream_set_bounds (CAMEL_SEEKABLE_STREAM (stream), start, end);</div><div class='del'>-</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_fs_new_with_name:</div><div class='del'>- * @name: a local filename</div><div class='del'>- * @flags: flags as in open(2)</div><div class='del'>- * @mode: a file mode</div><div class='del'>- *</div><div class='del'>- * Creates a new CamelStream corresponding to the named file, flags,</div><div class='del'>- * and mode.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream, or #NULL on error.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_fs_new_with_name (const char *name, int flags, mode_t mode)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-</div><div class='del'>-	fd = open (name, flags, mode);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_fs_new_with_fd (fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_fs_new_with_name_and_bounds:</div><div class='del'>- * @name: a local filename</div><div class='del'>- * @flags: flags as in open(2)</div><div class='del'>- * @mode: a file mode</div><div class='del'>- * @start: the first valid position in the file</div><div class='del'>- * @end: the first invalid position in the file, or CAMEL_STREAM_UNBOUND</div><div class='del'>- *</div><div class='del'>- * Creates a new CamelStream corresponding to the given arguments.</div><div class='del'>- *</div><div class='del'>- * Return value: the stream, or NULL on error.</div><div class='del'>- **/</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_fs_new_with_name_and_bounds (const char *name, int flags,</div><div class='del'>-					  mode_t mode, off_t start, off_t end)</div><div class='del'>-{</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-</div><div class='del'>-	stream = camel_stream_fs_new_with_name (name, flags, mode);</div><div class='del'>-	if (stream == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	camel_seekable_stream_set_bounds (CAMEL_SEEKABLE_STREAM (stream),</div><div class='del'>-					  start, end);</div><div class='del'>-</div><div class='del'>-	return stream;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamFs *stream_fs = CAMEL_STREAM_FS (stream);</div><div class='del'>-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-	ssize_t nread;</div><div class='del'>-</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 ea403f584f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-fs.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_FS_TYPE, CamelStreamFs))</div><div class='del'>-#define CAMEL_STREAM_FS_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_FS_TYPE, CamelStreamFsClass))</div><div class='del'>-#define CAMEL_IS_STREAM_FS(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_FS_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelStreamFs</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStream parent_object;</div><div class='del'>-</div><div class='del'>-	int fd;             /* file descriptor on the underlying file */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelSeekableStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelStreamFsClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_stream_fs_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream * camel_stream_fs_new_with_name            (const char *name, int flags, mode_t mode);</div><div class='del'>-CamelStream * camel_stream_fs_new_with_name_and_bounds (const char *name, int flags, mode_t mode,</div><div class='del'>-							off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-CamelStream * camel_stream_fs_new_with_fd              (int fd);</div><div class='del'>-CamelStream * camel_stream_fs_new_with_fd_and_bounds   (int fd, off_t start, off_t end);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STREAM_FS_H */</div><div class='head'>diff --git a/camel/camel-stream-mem.c b/camel/camel-stream-mem.c<br/>deleted file mode 100644<br/>index 77941894b7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-mem.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-stream-mem.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,249 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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 CamelSeekableStreamClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelStreamMem */</div><div class='del'>-#define CSM_CLASS(so) CAMEL_STREAM_MEM_CLASS(CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static ssize_t stream_write (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-static gboolean stream_eos (CamelStream *stream);</div><div class='del'>-static off_t stream_seek (CamelSeekableStream *stream, off_t offset,</div><div class='del'>-			  CamelStreamSeekPolicy policy);</div><div class='del'>-</div><div class='del'>-static void camel_stream_mem_finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_mem_class_init (CamelStreamMemClass *camel_stream_mem_class)</div><div class='del'>-{</div><div class='del'>-	CamelSeekableStreamClass *camel_seekable_stream_class =</div><div class='del'>-		CAMEL_SEEKABLE_STREAM_CLASS (camel_stream_mem_class);</div><div class='del'>-	CamelStreamClass *camel_stream_class =</div><div class='del'>-		CAMEL_STREAM_CLASS (camel_stream_mem_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_SEEKABLE_STREAM_CLASS( camel_type_get_global_classfuncs( CAMEL_SEEKABLE_STREAM_TYPE ) );</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read = stream_read;</div><div class='del'>-	camel_stream_class-&gt;write = stream_write;</div><div class='del'>-	camel_stream_class-&gt;eos = stream_eos;</div><div class='del'>-</div><div class='del'>-	camel_seekable_stream_class-&gt;seek = stream_seek;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_stream_mem_init (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);</div><div class='del'>-</div><div class='del'>-	stream_mem-&gt;owner = FALSE;</div><div class='del'>-	stream_mem-&gt;buffer = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_stream_mem_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_mem_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_mem_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_stream_mem_type = camel_type_register( CAMEL_SEEKABLE_STREAM_TYPE,</div><div class='del'>-							     "CamelStreamMem",</div><div class='del'>-							     sizeof( CamelStreamMem ),</div><div class='del'>-							     sizeof( CamelStreamMemClass ),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_stream_mem_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) camel_stream_mem_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) camel_stream_mem_finalize );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_mem_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_mem_new (void)</div><div class='del'>-{</div><div class='del'>-	return camel_stream_mem_new_with_byte_array (g_byte_array_new ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_mem_new_with_buffer (const char *buffer, size_t len)</div><div class='del'>-{</div><div class='del'>-	GByteArray *ba;</div><div class='del'>-</div><div class='del'>-	ba = g_byte_array_new ();</div><div class='del'>-	g_byte_array_append (ba, (const guint8 *)buffer, len);</div><div class='del'>-	return camel_stream_mem_new_with_byte_array (ba);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelStream *</div><div class='del'>-camel_stream_mem_new_with_byte_array (GByteArray *byte_array)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *stream_mem;</div><div class='del'>-</div><div class='del'>-	stream_mem = CAMEL_STREAM_MEM( camel_object_new (CAMEL_STREAM_MEM_TYPE) );</div><div class='del'>-	stream_mem-&gt;buffer = byte_array;</div><div class='del'>-	stream_mem-&gt;owner = TRUE;</div><div class='del'>-</div><div class='del'>-	return CAMEL_STREAM (stream_mem);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* note: with these functions the caller is the 'owner' of the buffer */</div><div class='del'>-void camel_stream_mem_set_byte_array (CamelStreamMem *s, GByteArray *buffer)</div><div class='del'>-{</div><div class='del'>-	if (s-&gt;buffer &amp;&amp; s-&gt;owner)</div><div class='del'>-		g_byte_array_free(s-&gt;buffer, TRUE);</div><div class='del'>-	s-&gt;owner = FALSE;</div><div class='del'>-	s-&gt;buffer = buffer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_stream_mem_set_buffer (CamelStreamMem *s, const char *buffer,</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'>-camel_stream_mem_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *stream_mem = CAMEL_STREAM_MEM (object);</div><div class='del'>-</div><div class='del'>-	if (stream_mem-&gt;buffer &amp;&amp; stream_mem-&gt;owner)</div><div class='del'>-		g_byte_array_free (stream_mem-&gt;buffer, TRUE);</div><div class='del'>-</div><div class='del'>-	/* Will be called automagically in the Camel Type System!</div><div class='del'>-	 * Wheeee!</div><div class='del'>-	 * G_TK_OBJECT_CLASS (parent_class)-&gt;finalize (object);</div><div class='del'>-	 */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ssize_t</div><div class='del'>-stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	CamelStreamMem *camel_stream_mem = CAMEL_STREAM_MEM (stream);</div><div class='del'>-	CamelSeekableStream *seekable = CAMEL_SEEKABLE_STREAM (stream);</div><div class='del'>-	ssize_t nread;</div><div class='del'>-</div><div class='del'>-	if (seekable-&gt;bound_end != CAMEL_STREAM_UNBOUND)</div><div class='del'>-		n = MIN(seekable-&gt;bound_end - seekable-&gt;position, n);</div><div class='del'>-</div><div class='del'>-	nread = MIN (n, camel_stream_mem-&gt;buffer-&gt;len - seekable-&gt;position);</div><div class='del'>-	if (nread &gt; 0) {</div><div class='del'>-		memcpy (buffer, camel_stream_mem-&gt;buffer-&gt;data +</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'>-#ifndef NO_WARNINGS</div><div class='del'>-#warning "g_byte_arrays use g_malloc and so are totally unsuitable for this object"</div><div class='del'>-#endif</div><div class='del'>-	if (seekable-&gt;position == stream_mem-&gt;buffer-&gt;len) {</div><div class='del'>-		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='head'>diff --git a/camel/camel-stream-mem.h b/camel/camel-stream-mem.h<br/>deleted file mode 100644<br/>index 422d05426c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream-mem.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_MEM_TYPE, CamelStreamMem))</div><div class='del'>-#define CAMEL_STREAM_MEM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_MEM_TYPE, CamelStreamMemClass))</div><div class='del'>-#define CAMEL_IS_STREAM_MEM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_MEM_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _CamelStreamMemClass CamelStreamMemClass;</div><div class='del'>-</div><div class='del'>-struct _CamelStreamMem {</div><div class='del'>-	CamelSeekableStream parent_object;</div><div class='del'>-</div><div class='del'>-	gboolean owner;		/* do we own the buffer? */</div><div class='del'>-	GByteArray *buffer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelStreamMemClass {</div><div class='del'>-	CamelSeekableStreamClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_stream_mem_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelStream *camel_stream_mem_new(void);</div><div class='del'>-CamelStream *camel_stream_mem_new_with_byte_array(GByteArray *buffer);</div><div class='del'>-CamelStream *camel_stream_mem_new_with_buffer(const char *buffer, size_t len);</div><div class='del'>-</div><div class='del'>-/* these are really only here for implementing classes */</div><div class='del'>-void camel_stream_mem_set_byte_array(CamelStreamMem *, GByteArray *buffer);</div><div class='del'>-void camel_stream_mem_set_buffer(CamelStreamMem *, const char *buffer, size_t len);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STREAM_MEM_H */</div><div class='head'>diff --git a/camel/camel-stream.c b/camel/camel-stream.c<br/>deleted file mode 100644<br/>index f649494b2d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-stream.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,289 +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(CAMEL_OBJECT_GET_CLASS(so))</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 = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	camel_stream_class-&gt;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'>-CamelType</div><div class='del'>-camel_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_stream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_stream_type = camel_type_register( CAMEL_OBJECT_TYPE,</div><div class='del'>-							 "CamelStream",</div><div class='del'>-							 sizeof( CamelStream ),</div><div class='del'>-							 sizeof( CamelStreamClass ),</div><div class='del'>-							 (CamelObjectClassInitFunc) camel_stream_class_init,</div><div class='del'>-							 NULL,</div><div class='del'>-							 NULL,</div><div class='del'>-							 NULL );</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_stream_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_read:</div><div class='del'>- * @stream: a CamelStream.</div><div class='del'>- * @buffer: buffer where bytes pulled from the stream are stored.</div><div class='del'>- * @n: max number of bytes to read.</div><div class='del'>- *</div><div class='del'>- * Read at most @n bytes from the @stream object and stores them</div><div class='del'>- * in the buffer pointed at by @buffer.</div><div class='del'>- *</div><div class='del'>- * Return value: number of bytes actually read, or -1 on error and</div><div class='del'>- * set errno.</div><div class='del'>- **/</div><div class='del'>-ssize_t</div><div class='del'>-camel_stream_read (CamelStream *stream, char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-	g_return_val_if_fail (n == 0 || buffer, -1);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (stream)-&gt;read (stream, buffer, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_write:</div><div class='del'>- * @stream: a CamelStream object.</div><div class='del'>- * @buffer: buffer to write.</div><div class='del'>- * @n: number of bytes to write</div><div class='del'>- *</div><div class='del'>- * Write @n bytes from the buffer pointed at by @buffer into @stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the number of bytes actually written to the stream,</div><div class='del'>- * or -1 on error.</div><div class='del'>- **/</div><div class='del'>-ssize_t</div><div class='del'>-camel_stream_write (CamelStream *stream, const char *buffer, size_t n)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-	g_return_val_if_fail (n == 0 || buffer, -1);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (stream)-&gt;write (stream, buffer, n);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-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'>-ssize_t</div><div class='del'>-camel_stream_write_string (CamelStream *stream, const char *string)</div><div class='del'>-{</div><div class='del'>-	return camel_stream_write (stream, string, strlen (string));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_stream_printf:</div><div class='del'>- * @stream: a stream object</div><div class='del'>- * @fmt: a printf-style format string</div><div class='del'>- *</div><div class='del'>- * This printfs the given data to @stream.</div><div class='del'>- *</div><div class='del'>- * Return value: the number of characters output, -1 on error.</div><div class='del'>- **/</div><div class='del'>-ssize_t</div><div class='del'>-camel_stream_printf (CamelStream *stream, const char *fmt, ... )</div><div class='del'>-{</div><div class='del'>-	va_list args;</div><div class='del'>-	char *string;</div><div class='del'>-	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'>-ssize_t</div><div class='del'>-camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream)</div><div class='del'>-{</div><div class='del'>-	char tmp_buf[4096];</div><div class='del'>-	ssize_t total = 0;</div><div class='del'>-	ssize_t nb_read;</div><div class='del'>-	ssize_t nb_written;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (stream), -1);</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_STREAM (output_stream), -1);</div><div class='del'>-</div><div class='del'>-	while (!camel_stream_eos (stream)) {</div><div class='del'>-		nb_read = camel_stream_read (stream, tmp_buf, sizeof (tmp_buf));</div><div class='del'>-		if (nb_read &lt; 0)</div><div class='del'>-			return -1;</div><div class='del'>-		else if (nb_read &gt; 0) {</div><div class='del'>-			nb_written = 0;</div><div class='del'>-</div><div class='del'>-			while (nb_written &lt; nb_read) {</div><div class='del'>-				ssize_t len = camel_stream_write (output_stream, tmp_buf + nb_written,</div><div class='del'>-								  nb_read - nb_written);</div><div class='del'>-				if (len &lt; 0)</div><div class='del'>-					return -1;</div><div class='del'>-				nb_written += len;</div><div class='del'>-			}</div><div class='del'>-			total += nb_written;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return total;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-stream.h b/camel/camel-stream.h<br/>deleted file mode 100644<br/>index dec4e638e1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-stream.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_STREAM_TYPE, CamelStream))</div><div class='del'>-#define CAMEL_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_STREAM_TYPE, CamelStreamClass))</div><div class='del'>-#define CAMEL_IS_STREAM(o)    (CAMEL_CHECK_TYPE((o), CAMEL_STREAM_TYPE))</div><div class='del'>-</div><div class='del'>-struct _CamelStream</div><div class='del'>-{</div><div class='del'>-	CamelObject parent_object;</div><div class='del'>-</div><div class='del'>-	gboolean eos;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */</div><div class='del'>-</div><div class='del'>-	ssize_t   (*read)       (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-	ssize_t   (*write)      (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-	int       (*close)      (CamelStream *stream);</div><div class='del'>-	int       (*flush)      (CamelStream *stream);</div><div class='del'>-	gboolean  (*eos)        (CamelStream *stream);</div><div class='del'>-	int       (*reset)      (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-} CamelStreamClass;</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_stream_get_type (void);</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-ssize_t    camel_stream_read       (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-ssize_t    camel_stream_write      (CamelStream *stream, const char *buffer, size_t n);</div><div class='del'>-int        camel_stream_flush      (CamelStream *stream);</div><div class='del'>-int        camel_stream_close      (CamelStream *stream);</div><div class='del'>-gboolean   camel_stream_eos        (CamelStream *stream);</div><div class='del'>-int        camel_stream_reset      (CamelStream *stream);</div><div class='del'>-</div><div class='del'>-/* utility macros and funcs */</div><div class='del'>-ssize_t camel_stream_write_string (CamelStream *stream, const char *string);</div><div class='del'>-ssize_t camel_stream_printf (CamelStream *stream, const char *fmt, ... ) G_GNUC_PRINTF (2, 3);</div><div class='del'>-ssize_t camel_stream_vprintf (CamelStream *stream, const char *fmt, va_list ap);</div><div class='del'>-</div><div class='del'>-/* Write a whole stream to another stream, until eof or error on</div><div class='del'>- * either stream.</div><div class='del'>- */</div><div class='del'>-ssize_t camel_stream_write_to_stream (CamelStream *stream, CamelStream *output_stream);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_STREAM_H */</div><div class='head'>diff --git a/camel/camel-transport.c b/camel/camel-transport.c<br/>deleted file mode 100644<br/>index ff07728f5f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-transport.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,104 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_transport_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_transport_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_transport_type = camel_type_register (CAMEL_SERVICE_TYPE, "CamelTransport",</div><div class='del'>-							    sizeof (CamelTransport),</div><div class='del'>-							    sizeof (CamelTransportClass),</div><div class='del'>-							    NULL,</div><div class='del'>-							    NULL,</div><div class='del'>-							    NULL,</div><div class='del'>-							    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_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 48ab0ea1ff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-transport.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-transport.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,86 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-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)     (CAMEL_CHECK_CAST((obj), CAMEL_TRANSPORT_TYPE, CamelTransport))</div><div class='del'>-#define CAMEL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_TRANSPORT_TYPE, CamelTransportClass))</div><div class='del'>-#define CAMEL_IS_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_TRANSPORT_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _CamelTransport</div><div class='del'>-{</div><div class='del'>-	CamelService parent_object;</div><div class='del'>-	</div><div class='del'>-	gboolean supports_8bit;</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 Camel function */</div><div class='del'>-CamelType camel_transport_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_TRANSPORT_H */</div><div class='head'>diff --git a/camel/camel-types.h b/camel/camel-types.h<br/>deleted file mode 100644<br/>index 79abc26a7d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-types.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 _CamelMimeFilterLinewrap CamelMimeFilterLinewrap;</div><div class='del'>-typedef struct _CamelMimeFilterSave CamelMimeFilterSave;</div><div class='del'>-typedef struct _CamelMimeFilterCRLF CamelMimeFilterCRLF;</div><div class='del'>-typedef struct _CamelMimeMessage CamelMimeMessage;</div><div class='del'>-typedef struct _CamelMimeParser CamelMimeParser;</div><div class='del'>-typedef struct _CamelMimePart CamelMimePart;</div><div class='del'>-typedef struct _CamelMultipart CamelMultipart;</div><div class='del'>-typedef struct _CamelNewsAddress CamelNewsAddress;</div><div class='del'>-typedef struct _CamelSeekableStream CamelSeekableStream;</div><div class='del'>-typedef struct _CamelSeekableSubstream CamelSeekableSubstream;</div><div class='del'>-typedef struct _CamelService CamelService;</div><div class='del'>-typedef struct _CamelSession CamelSession;</div><div class='del'>-typedef struct _CamelSimpleDataWrapper CamelSimpleDataWrapper;</div><div class='del'>-typedef struct _CamelStore CamelStore;</div><div class='del'>-typedef struct _CamelStream CamelStream;</div><div class='del'>-typedef struct _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-uid-cache.c b/camel/camel-uid-cache.c<br/>deleted file mode 100644<br/>index 2b5faddb91..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-uid-cache.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-uid-cache.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,186 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-uid-cache.c: UID caching code. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *  Dan Winship &lt;danw@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 "config.h"</div><div class='del'>-#include "camel-uid-cache.h"</div><div class='del'>-</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-static void free_uid (gpointer key, gpointer value, gpointer data);</div><div class='del'>-static void maybe_write_uid (gpointer key, gpointer value, gpointer data);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_new:</div><div class='del'>- * @filename: path to load the cache from</div><div class='del'>- *</div><div class='del'>- * Creates a new UID cache, initialized from @filename. If @filename</div><div class='del'>- * doesn't already exist, the UID cache will be empty. Otherwise, if</div><div class='del'>- * it does exist but can't be read, the function will return %NULL.</div><div class='del'>- *</div><div class='del'>- * Return value: a new UID cache, or %NULL</div><div class='del'>- **/</div><div class='del'>-CamelUIDCache *</div><div class='del'>-camel_uid_cache_new (const char *filename)</div><div class='del'>-{</div><div class='del'>-	CamelUIDCache *cache;</div><div class='del'>-	struct stat st;</div><div class='del'>-	char *buf, **uids;</div><div class='del'>-	int fd, i;</div><div class='del'>-</div><div class='del'>-	fd = open (filename, O_RDWR | O_CREAT, 0700);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (fstat (fd, &amp;st) != 0) {</div><div class='del'>-		close (fd);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	buf = g_malloc (st.st_size + 1);</div><div class='del'>-</div><div class='del'>-	if (read (fd, buf, st.st_size) == -1) {</div><div class='del'>-		close (fd);</div><div class='del'>-		g_free (buf);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	buf[st.st_size] = '\0';</div><div class='del'>-</div><div class='del'>-	cache = g_new (CamelUIDCache, 1);</div><div class='del'>-	cache-&gt;fd = fd;</div><div class='del'>-	cache-&gt;level = 1;</div><div class='del'>-	cache-&gt;uids = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	uids = g_strsplit (buf, "\n", 0);</div><div class='del'>-	g_free (buf);</div><div class='del'>-	for (i = 0; uids[i]; i++) {</div><div class='del'>-		g_hash_table_insert (cache-&gt;uids, uids[i],</div><div class='del'>-				     GINT_TO_POINTER (cache-&gt;level));</div><div class='del'>-	}</div><div class='del'>-	g_free (uids);</div><div class='del'>-</div><div class='del'>-	return cache;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_save:</div><div class='del'>- * @cache: a CamelUIDCache</div><div class='del'>- *</div><div class='del'>- * Attempts to save @cache back to disk.</div><div class='del'>- *</div><div class='del'>- * Return value: success or failure</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-camel_uid_cache_save (CamelUIDCache *cache)</div><div class='del'>-{</div><div class='del'>-	if (lseek (cache-&gt;fd, 0, SEEK_SET) != 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-	g_hash_table_foreach (cache-&gt;uids, maybe_write_uid, cache);</div><div class='del'>-	return ftruncate (cache-&gt;fd, lseek (cache-&gt;fd, 0, SEEK_CUR)) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-maybe_write_uid (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelUIDCache *cache = data;</div><div class='del'>-</div><div class='del'>-	if (GPOINTER_TO_INT (value) == cache-&gt;level) {</div><div class='del'>-		write (cache-&gt;fd, key, strlen (key));</div><div class='del'>-		write (cache-&gt;fd, "\n", 1);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_destroy:</div><div class='del'>- * @cache: a CamelUIDCache</div><div class='del'>- *</div><div class='del'>- * Destroys @cache and frees its data.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_uid_cache_destroy (CamelUIDCache *cache)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_foreach (cache-&gt;uids, free_uid, NULL);</div><div class='del'>-	g_hash_table_destroy (cache-&gt;uids);</div><div class='del'>-	close (cache-&gt;fd);</div><div class='del'>-	g_free (cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_uid (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_get_new_uids:</div><div class='del'>- * @cache: a CamelUIDCache</div><div class='del'>- * @uids: an array of UIDs</div><div class='del'>- *</div><div class='del'>- * Returns an array of UIDs from @uids that are not in @cache, and</div><div class='del'>- * removes UIDs from @cache that aren't in @uids.</div><div class='del'>- *</div><div class='del'>- * Return value: an array of new UIDs, which must be freed with</div><div class='del'>- * camel_uid_cache_free_uids().</div><div class='del'>- **/</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_uid_cache_get_new_uids (CamelUIDCache *cache, GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *new_uids;</div><div class='del'>-	char *uid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	new_uids = g_ptr_array_new ();</div><div class='del'>-	cache-&gt;level++;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++) {</div><div class='del'>-		uid = uids-&gt;pdata[i];</div><div class='del'>-		if (g_hash_table_lookup (cache-&gt;uids, uid))</div><div class='del'>-			g_hash_table_remove (cache-&gt;uids, uid);</div><div class='del'>-		else</div><div class='del'>-			g_ptr_array_add (new_uids, g_strdup (uid));</div><div class='del'>-		g_hash_table_insert (cache-&gt;uids, g_strdup (uid),</div><div class='del'>-				     GINT_TO_POINTER (cache-&gt;level));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return new_uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_uid_cache_free_uids:</div><div class='del'>- * @uids: an array returned from camel_uid_cache_get_new_uids()</div><div class='del'>- *</div><div class='del'>- * Frees the array of UIDs.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_uid_cache_free_uids (GPtrArray *uids)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; uids-&gt;len; i++)</div><div class='del'>-		g_free (uids-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (uids, TRUE);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/camel-uid-cache.h b/camel/camel-uid-cache.h<br/>deleted file mode 100644<br/>index 92226a3afd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-uid-cache.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-uid-cache.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'>-/* camel-uid-cache.h: UID caching code. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *  Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright 2000 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_UID_CACHE_H</div><div class='del'>-#define CAMEL_UID_CACHE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	int fd, level;</div><div class='del'>-	GHashTable *uids;</div><div class='del'>-} CamelUIDCache;</div><div class='del'>-</div><div class='del'>-CamelUIDCache *camel_uid_cache_new (const char *filename);</div><div class='del'>-gboolean camel_uid_cache_save (CamelUIDCache *cache);</div><div class='del'>-void camel_uid_cache_destroy (CamelUIDCache *cache);</div><div class='del'>-</div><div class='del'>-GPtrArray *camel_uid_cache_get_new_uids (CamelUIDCache *cache,</div><div class='del'>-					 GPtrArray *uids);</div><div class='del'>-void camel_uid_cache_free_uids (GPtrArray *uids);</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'>-</div><div class='del'>-#endif /* CAMEL_UID_CACHE_H */</div><div class='head'>diff --git a/camel/camel-url.c b/camel/camel-url.c<br/>deleted file mode 100644<br/>index 18575782dc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-url.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-url.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,375 +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'>- *  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'>-</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-mime-utils.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-object.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 * "//",</div><div class='del'>- * 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'>-	</div><div class='del'>-	if (url-&gt;authmech)</div><div class='del'>-		authmech = camel_url_encode (url-&gt;authmech, TRUE, ":@/");</div><div class='del'>-	</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'>-	</div><div class='del'>-	if (url-&gt;host)</div><div class='del'>-		host = camel_url_encode (url-&gt;host, TRUE, ":/");</div><div class='del'>-	</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'>-	</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%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 &amp;&amp; host &amp;&amp; *path != '/' ? "/" : "",</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'>-void camel_url_set_protocol(CamelURL *url, const char *p)</div><div class='del'>-{</div><div class='del'>-	g_free(url-&gt;protocol);</div><div class='del'>-	url-&gt;protocol = g_strdup(p);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_url_set_host(CamelURL *url, const char *h)</div><div class='del'>-{</div><div class='del'>-	g_free(url-&gt;host);</div><div class='del'>-	url-&gt;host = g_strdup(h);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void camel_url_set_port(CamelURL *url, int port)</div><div class='del'>-{</div><div class='del'>-	url-&gt;port = port;</div><div class='del'>-}</div><div class='del'>-void camel_url_set_path(CamelURL *url, const char *p)</div><div class='del'>-{</div><div class='del'>-	g_free(url-&gt;path);</div><div class='del'>-	url-&gt;path = g_strdup(p);</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 aba903c08b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel-url.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel-url.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-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, char *escape_extra);</div><div class='del'>-void camel_url_decode (char *part);</div><div class='del'>-</div><div class='del'>-/* for editing url's */</div><div class='del'>-void camel_url_set_protocol(CamelURL *url, const char *);</div><div class='del'>-void camel_url_set_host(CamelURL *url, const char *);</div><div class='del'>-void camel_url_set_port(CamelURL *url, int port);</div><div class='del'>-void camel_url_set_path(CamelURL *url, const char *);</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 846d946b9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/camel.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><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'>-gboolean camel_verbose_debug = FALSE;</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-camel_init(void)</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'>-	if (getenv ("CAMEL_VERBOSE_DEBUG"))</div><div class='del'>-		camel_verbose_debug = TRUE;</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 fefadafb18..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/camel.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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-uid-cache.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/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='head'>diff --git a/camel/providers/Makefile.am b/camel/providers/Makefile.am<br/>deleted file mode 100644<br/>index dedeaa0b3b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,7 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-# SUBDIRS = mbox pop3 sendmail smtp vee</div><div class='del'>-SUBDIRS = mbox pop3 sendmail smtp vee imap mh nntp</div><div class='del'>-</div><div class='del'>-# these ones are disabled for the moment.</div><div class='del'>-# maildir</div><div class='head'>diff --git a/camel/providers/cache/.cvsignore b/camel/providers/cache/.cvsignore<br/>deleted file mode 100644<br/>index fd6b811c68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/.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/cache/Makefile.am b/camel/providers/cache/Makefile.am<br/>deleted file mode 100644<br/>index 7f9f6a9df5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/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'>-libcamelcacheincludedir = $(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 = libcamelcache.la</div><div class='del'>-provider_DATA = libcamelcache.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-cache-provider\"</div><div class='del'>-</div><div class='del'>-libcamelcache_la_SOURCES = 			\</div><div class='del'>-	camel-cache-folder.c			\</div><div class='del'>-	camel-cache-provider.c			\</div><div class='del'>-	camel-cache-store.c			\</div><div class='del'>-	camel-cache-map.c</div><div class='del'>-</div><div class='del'>-libcamelcacheinclude_HEADERS =			\</div><div class='del'>-	camel-cache-folder.h			\</div><div class='del'>-	camel-cache-store.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-libcamelcache_la_LDFLAGS = -version-info 0:0:0</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelcache.urls</div><div class='head'>diff --git a/camel/providers/cache/camel-cache-folder.c b/camel/providers/cache/camel-cache-folder.c<br/>deleted file mode 100644<br/>index c4379f8135..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/camel-cache-folder.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/camel-cache-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,810 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-cache-folder.c : class for a cache 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'>-</div><div class='del'>-/*</div><div class='del'>- * Notes on the cache provider:</div><div class='del'>- *</div><div class='del'>- * We require that the remote folder have persistent UIDs, and nothing</div><div class='del'>- * else. We require that the local store folder have persistent UIDs</div><div class='del'>- * and summary capability.</div><div class='del'>- *</div><div class='del'>- * If the remote folder does not have summary capability, we will need</div><div class='del'>- * to sync any new messages over to the local folder when the folder</div><div class='del'>- * is opened or when it changes. If the remote folder does have</div><div class='del'>- * summary capability, we can be more relaxed about doing this.</div><div class='del'>- *</div><div class='del'>- * If the remote folder has search capability, we will use it, at</div><div class='del'>- * least when the folder isn't synced. Otherwise if the local folder</div><div class='del'>- * has search capability, we will use that (but it will require</div><div class='del'>- * syncing the remote folder locally to use). Otherwise the cache</div><div class='del'>- * folder won't have search capability.</div><div class='del'>- *</div><div class='del'>- * CamelCacheFolder UIDs are remote UIDs, because we need to be able</div><div class='del'>- * to return a complete list of them at get_uids time, and the</div><div class='del'>- * messages might not all be present in the local folder, and we can't</div><div class='del'>- * predict what UIDs will be assigned to them when they are cached</div><div class='del'>- * there. We keep hash tables mapping remote to local UIDs and vice</div><div class='del'>- * versa, and a map file to cache this information between sessions.</div><div class='del'>- * The maps must always be 100% accurate.</div><div class='del'>- *</div><div class='del'>- * The messages in the local folder may not be in the same order as</div><div class='del'>- * the messages in the remote folder.</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Many operations on the local folder are done with a NULL</div><div class='del'>- * CamelException, because having them fail only results in efficiency</div><div class='del'>- * problems, not actual permanent failures. (Eg, get_message will</div><div class='del'>- * try to append the message to the local folder, but doesn't check</div><div class='del'>- * for failure, because it already has the message to pass back to the</div><div class='del'>- * user.)</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include "camel-cache-folder.h"</div><div class='del'>-#include "camel-cache-store.h"</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;camel/camel-medium.h&gt;</div><div class='del'>-</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-static CamelFolderClass *folder_class = NULL;</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 refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void cache_sync (CamelFolder *folder, gboolean expunge, </div><div class='del'>-			CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static gint get_message_count (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static void append_message (CamelFolder *folder, CamelMimeMessage *message, </div><div class='del'>-			    const CamelMessageInfo *info, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static guint32 get_message_flags (CamelFolder *folder, const char *uid);</div><div class='del'>-static void set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-			       guint32 flags, guint32 set);</div><div class='del'>-static gboolean get_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				       const char *name);</div><div class='del'>-static void set_message_user_flag (CamelFolder *folder, const char *uid,</div><div class='del'>-				   const char *name, gboolean value);</div><div class='del'>-static const char *get_message_user_tag (CamelFolder *folder, const char *uid,</div><div class='del'>-					 const char *name);</div><div class='del'>-static void set_message_user_tag (CamelFolder *folder, const char *uid,</div><div class='del'>-				  const char *name, const char *value);</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *get_message (CamelFolder *folder, </div><div class='del'>-				      const gchar *uid,</div><div class='del'>-				      CamelException *ex);</div><div class='del'>-</div><div class='del'>-static GPtrArray *get_uids (CamelFolder *folder);</div><div class='del'>-static GPtrArray *get_summary (CamelFolder *folder);</div><div class='del'>-static GPtrArray *get_subfolder_names (CamelFolder *folder);</div><div class='del'>-static void free_subfolder_names (CamelFolder *folder, GPtrArray *subfolders);</div><div class='del'>-</div><div class='del'>-static GPtrArray *search_by_expression (CamelFolder *folder,</div><div class='del'>-					const char *expression,</div><div class='del'>-					CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *get_message_info (CamelFolder *folder,</div><div class='del'>-						 const char *uid);</div><div class='del'>-</div><div class='del'>-static void copy_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-			     CamelFolder *destination, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void move_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-			     CamelFolder *destination, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_cache_folder_class_init (CamelCacheFolderClass *camel_cache_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class =</div><div class='del'>-		CAMEL_FOLDER_CLASS (camel_cache_folder_class);</div><div class='del'>-</div><div class='del'>-	folder_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;init = init;</div><div class='del'>-	camel_folder_class-&gt;refresh_info = refresh_info;</div><div class='del'>-	camel_folder_class-&gt;sync = cache_sync;</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_message_flags = get_message_flags;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = set_message_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_flag = get_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_flag = set_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_tag = get_message_user_tag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_tag = set_message_user_tag;</div><div class='del'>-	camel_folder_class-&gt;get_message = get_message;</div><div class='del'>-	camel_folder_class-&gt;get_uids = get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = camel_folder_free_nop;</div><div class='del'>-	camel_folder_class-&gt;get_summary = get_summary;</div><div class='del'>-	camel_folder_class-&gt;free_summary = camel_folder_free_nop;</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_subfolder_names;</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;get_message_info = get_message_info;</div><div class='del'>-	camel_folder_class-&gt;copy_message_to = copy_message_to;</div><div class='del'>-	camel_folder_class-&gt;move_message_to = move_message_to;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_cache_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_cache_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_cache_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_cache_folder_type = camel_type_register (</div><div class='del'>-			CAMEL_FOLDER_TYPE, "CamelCacheFolder",</div><div class='del'>-			sizeof (CamelCacheFolder),</div><div class='del'>-			sizeof (CamelCacheFolderClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_cache_folder_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectFinalizeFunc) finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_cache_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cache_free_summary (CamelCacheFolder *cache_folder)</div><div class='del'>-{</div><div class='del'>-	if (cache_folder-&gt;remote_summary) {</div><div class='del'>-		camel_folder_free_summary (cache_folder-&gt;remote,</div><div class='del'>-					   cache_folder-&gt;summary);</div><div class='del'>-	} else {</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; cache_folder-&gt;summary-&gt;len; i++) {</div><div class='del'>-			camel_message_info_free (</div><div class='del'>-				cache_folder-&gt;summary-&gt;pdata[i]);</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_free (cache_folder-&gt;summary, TRUE);</div><div class='del'>-		g_hash_table_destroy (cache_folder-&gt;summary_uids);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = CAMEL_CACHE_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	if (cache_folder-&gt;uids) {</div><div class='del'>-		camel_folder_free_uids (cache_folder-&gt;remote,</div><div class='del'>-					cache_folder-&gt;uids);</div><div class='del'>-	}</div><div class='del'>-	if (cache_folder-&gt;summary)</div><div class='del'>-		cache_free_summary (cache_folder);</div><div class='del'>-</div><div class='del'>-	if (cache_folder-&gt;uidmap)</div><div class='del'>-		camel_cache_map_destroy (cache_folder-&gt;uidmap);</div><div class='del'>-</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (cache_folder-&gt;local));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (cache_folder-&gt;remote));</div><div class='del'>-</div><div class='del'>-	g_free (cache_folder-&gt;mapfile);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update (CamelCacheFolder *cache_folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	if (cache_folder-&gt;uids) {</div><div class='del'>-		camel_folder_free_uids (cache_folder-&gt;remote,</div><div class='del'>-					cache_folder-&gt;uids);</div><div class='del'>-	}</div><div class='del'>-	cache_folder-&gt;uids = camel_folder_get_uids (cache_folder-&gt;remote);</div><div class='del'>-</div><div class='del'>-	if (cache_folder-&gt;summary)</div><div class='del'>-		cache_free_summary (cache_folder);</div><div class='del'>-</div><div class='del'>-	if (cache_folder-&gt;remote_summary) {</div><div class='del'>-		cache_folder-&gt;summary =</div><div class='del'>-			camel_folder_get_summary (cache_folder-&gt;remote);</div><div class='del'>-	} else {</div><div class='del'>-		CamelMessageInfo *mi;</div><div class='del'>-		GPtrArray *lsummary;</div><div class='del'>-		const char *ruid;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		if (!cache_folder-&gt;is_synced) {</div><div class='del'>-			camel_cache_folder_sync (cache_folder, ex);</div><div class='del'>-			if (camel_exception_is_set (ex))</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		cache_folder-&gt;summary = g_ptr_array_new ();</div><div class='del'>-		cache_folder-&gt;summary_uids = g_hash_table_new (g_str_hash,</div><div class='del'>-							       g_str_equal);</div><div class='del'>-</div><div class='del'>-		lsummary = camel_folder_get_summary (cache_folder-&gt;local);</div><div class='del'>-</div><div class='del'>-		/* For each local message, duplicate its info, replace</div><div class='del'>-		 * the uid with the remote one, and add it to the</div><div class='del'>-		 * uid-&gt;info cache.</div><div class='del'>-		 */</div><div class='del'>-		for (i = 0; i &lt; lsummary-&gt;len; i++) {</div><div class='del'>-			mi = lsummary-&gt;pdata[i];</div><div class='del'>-			ruid = camel_cache_map_get_remote (cache_folder-&gt;uidmap, mi-&gt;uid);</div><div class='del'>-			if (!ruid) {</div><div class='del'>-				/* Stale message. Delete it from cache. */</div><div class='del'>-				camel_folder_delete_message (</div><div class='del'>-					cache_folder-&gt;local, mi-&gt;uid);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			mi = g_new (CamelMessageInfo, 1);</div><div class='del'>-			camel_message_info_dup_to (lsummary-&gt;pdata[i], mi);</div><div class='del'>-			g_free (mi-&gt;uid);</div><div class='del'>-			mi-&gt;uid = g_strdup (ruid);</div><div class='del'>-			g_hash_table_insert (cache_folder-&gt;summary_uids,</div><div class='del'>-					     mi-&gt;uid, mi);</div><div class='del'>-		}</div><div class='del'>-		camel_folder_free_summary (cache_folder-&gt;local, lsummary);</div><div class='del'>-</div><div class='del'>-		/* Now build the summary array in remote UID order. */</div><div class='del'>-		for (i = 0; i &lt; cache_folder-&gt;uids-&gt;len; i++) {</div><div class='del'>-			mi = g_hash_table_lookup (cache_folder-&gt;summary_uids,</div><div class='del'>-						  cache_folder-&gt;uids-&gt;pdata[i]);</div><div class='del'>-			g_ptr_array_add (cache_folder-&gt;summary, mi);</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'>-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'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	CF_CLASS (folder)-&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_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	folder-&gt;permanent_flags =</div><div class='del'>-		camel_folder_get_permanent_flags (cache_folder-&gt;local);</div><div class='del'>-	folder-&gt;can_hold_folders = cache_folder-&gt;remote-&gt;can_hold_folders;</div><div class='del'>-	folder-&gt;can_hold_messages = cache_folder-&gt;remote-&gt;can_hold_messages;</div><div class='del'>-	folder-&gt;has_summary_capability = TRUE;</div><div class='del'>-	folder-&gt;has_search_capability =</div><div class='del'>-		camel_folder_has_search_capability (cache_folder-&gt;local) ||</div><div class='del'>-		camel_folder_has_search_capability (cache_folder-&gt;remote);</div><div class='del'>-</div><div class='del'>-	cache_folder-&gt;remote_summary =</div><div class='del'>-		camel_folder_has_summary_capability (cache_folder-&gt;remote);</div><div class='del'>-</div><div class='del'>-	/* Load UIDs, summary, etc. */</div><div class='del'>-	path = CAMEL_SERVICE (cache_folder-&gt;local-&gt;parent_store)-&gt;url-&gt;path;</div><div class='del'>-	cache_folder-&gt;mapfile = g_strdup_printf ("%s/%s.map", path, name);</div><div class='del'>-	cache_folder-&gt;uidmap = camel_cache_map_new ();</div><div class='del'>-	camel_cache_map_read (cache_folder-&gt;uidmap, cache_folder-&gt;mapfile, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-	update (cache_folder, ex);</div><div class='del'>-</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* If the remote folder changes, cache the new messages if necessary,</div><div class='del'>- * update the summary, and propagate the signal.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-remote_folder_changed (CamelObject *remote_folder, gpointer type,</div><div class='del'>-		       gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = user_data;</div><div class='del'>-</div><div class='del'>-	update (cache_folder, NULL);</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (cache_folder),</div><div class='del'>-				    "folder_changed", type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* If the local folder changes, it's because we just cached a message</div><div class='del'>- * or expunged messages. Look for new messages and update the UID maps.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-local_folder_changed (CamelObject *local, gpointer type, gpointer data)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *local_folder = CAMEL_FOLDER (local);</div><div class='del'>-	CamelCacheFolder *cache_folder = data;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	GPtrArray *new_luids;</div><div class='del'>-	char *luid;</div><div class='del'>-	const char *ruid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* Get the updated list of local UIDs. For any that we didn't</div><div class='del'>-	 * already know about, figure out the corresponding remote</div><div class='del'>-	 * UID.</div><div class='del'>-	 */</div><div class='del'>-	new_luids = camel_folder_get_uids (local_folder);</div><div class='del'>-	for (i = 0; i &lt; new_luids-&gt;len; i++) {</div><div class='del'>-		luid = new_luids-&gt;pdata[i];</div><div class='del'>-		if (!camel_cache_map_get_remote (cache_folder-&gt;uidmap, luid)) {</div><div class='del'>-			msg = camel_folder_get_message (local_folder,</div><div class='del'>-							luid, NULL);</div><div class='del'>-			if (!msg)</div><div class='del'>-				continue; /* Hrmph. */</div><div class='del'>-			ruid = camel_medium_get_header (CAMEL_MEDIUM (msg),</div><div class='del'>-							"X-Evolution-Remote-UID");</div><div class='del'>-			if (!ruid) {</div><div class='del'>-				/* How'd that get here? */</div><div class='del'>-				camel_folder_delete_message (local_folder,</div><div class='del'>-							     luid);</div><div class='del'>-				continue;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			camel_cache_map_update (cache_folder-&gt;uidmap,</div><div class='del'>-						luid, ruid);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	camel_folder_free_uids (local_folder, new_luids);</div><div class='del'>-</div><div class='del'>-	/* FIXME: the uidmaps contain bad data now. */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static void</div><div class='del'>-refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	camel_folder_refresh_info (cache_folder-&gt;remote, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static void</div><div class='del'>-cache_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	camel_folder_sync (cache_folder-&gt;remote, expunge, ex);</div><div class='del'>-	if (!camel_exception_is_set (ex)) {</div><div class='del'>-		camel_folder_sync (cache_folder-&gt;local, expunge, NULL);</div><div class='del'>-		camel_cache_map_write (cache_folder-&gt;uidmap,</div><div class='del'>-				       cache_folder-&gt;mapfile, ex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static void</div><div class='del'>-expunge (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	camel_folder_expunge (cache_folder-&gt;remote, ex);</div><div class='del'>-	if (!camel_exception_is_set (ex))</div><div class='del'>-		camel_folder_expunge (cache_folder-&gt;local, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static gint</div><div class='del'>-get_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	return cache_folder-&gt;summary-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static void</div><div class='del'>-append_message (CamelFolder *folder, CamelMimeMessage *message, </div><div class='del'>-		const CamelMessageInfo *info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	/* We'd like to cache this locally as well, but we have no</div><div class='del'>-	 * 100% reliable way to determine the UID assigned to the</div><div class='del'>-	 * remote message, so we can't.</div><div class='del'>-	 */</div><div class='del'>-	camel_folder_append_message (cache_folder-&gt;remote, message, info, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static guint32</div><div class='del'>-get_message_flags (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	const CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = get_message_info (folder, uid);</div><div class='del'>-	g_return_val_if_fail (mi != NULL, 0);</div><div class='del'>-	return mi-&gt;flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</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)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-	const char *luid;</div><div class='del'>-</div><div class='del'>-	luid = camel_cache_map_get_local (cache_folder-&gt;uidmap, uid);</div><div class='del'>-	if (luid) {</div><div class='del'>-		camel_folder_set_message_flags (cache_folder-&gt;local, luid,</div><div class='del'>-						flags, set);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_set_message_flags (cache_folder-&gt;remote, uid, flags, set);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static gboolean</div><div class='del'>-get_message_user_flag (CamelFolder *folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	const CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = get_message_info (folder, uid);</div><div class='del'>-	g_return_val_if_fail (mi != NULL, 0);</div><div class='del'>-	return camel_flag_get ((CamelFlag **)&amp;mi-&gt;user_flags, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</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)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-	const char *luid;</div><div class='del'>-</div><div class='del'>-	luid = camel_cache_map_get_local (cache_folder-&gt;uidmap, uid);</div><div class='del'>-	if (luid) {</div><div class='del'>-		camel_folder_set_message_user_flag (cache_folder-&gt;local, luid,</div><div class='del'>-						    name, value);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_set_message_user_flag (cache_folder-&gt;remote, uid,</div><div class='del'>-					    name, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static const char *</div><div class='del'>-get_message_user_tag (CamelFolder *folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	const CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = get_message_info (folder, uid);</div><div class='del'>-	g_return_val_if_fail (mi != NULL, NULL);</div><div class='del'>-	return camel_tag_get ((CamelTag **)&amp;mi-&gt;user_tags, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static void</div><div class='del'>-set_message_user_tag (CamelFolder *folder, const char *uid,</div><div class='del'>-		      const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-	const char *luid;</div><div class='del'>-</div><div class='del'>-	luid = camel_cache_map_get_local (cache_folder-&gt;uidmap, uid);</div><div class='del'>-	if (luid) {</div><div class='del'>-		camel_folder_set_message_user_tag (cache_folder-&gt;local, luid,</div><div class='del'>-						   name, value);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_set_message_user_tag (cache_folder-&gt;remote, uid,</div><div class='del'>-					   name, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-	const char *luid;</div><div class='del'>-</div><div class='del'>-	/* Check if we have it cached first. */</div><div class='del'>-	luid = camel_cache_map_get_local (cache_folder-&gt;uidmap, uid);</div><div class='del'>-	if (luid) {</div><div class='del'>-		msg = camel_folder_get_message (cache_folder-&gt;local,</div><div class='del'>-						luid, NULL);</div><div class='del'>-		if (msg)</div><div class='del'>-			return msg;</div><div class='del'>-</div><div class='del'>-		/* Hm... Oh well. Update the map and try for real. */</div><div class='del'>-		camel_cache_map_remove (cache_folder-&gt;uidmap, NULL, uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* OK. It's not cached. Get the remote message. */</div><div class='del'>-	msg = camel_folder_get_message (cache_folder-&gt;remote, uid, ex);</div><div class='del'>-	if (!msg)</div><div class='del'>-		return NULL;</div><div class='del'>-	info = camel_folder_get_message_info (cache_folder-&gt;remote, uid);</div><div class='del'>-</div><div class='del'>-	/* Add a header giving the remote UID and append it to the</div><div class='del'>-	 * local folder. (This should eventually invoke</div><div class='del'>-	 * local_folder_changed(), which will take care of updating</div><div class='del'>-	 * the uidmaps.)</div><div class='del'>-	 */</div><div class='del'>-	camel_medium_add_header (CAMEL_MEDIUM (msg), "X-Evolution-Remote-UID",</div><div class='del'>-				 uid);</div><div class='del'>-	camel_folder_append_message (cache_folder-&gt;local, msg, info, NULL);</div><div class='del'>-</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_uids (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	return cache_folder-&gt;uids;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_summary (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	return cache_folder-&gt;summary;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static GPtrArray *</div><div class='del'>-get_subfolder_names (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	return camel_folder_get_subfolder_names (cache_folder-&gt;remote);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static void</div><div class='del'>-free_subfolder_names (CamelFolder *folder, GPtrArray *subfolders)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	camel_folder_free_subfolder_names (cache_folder-&gt;remote, subfolders);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static GPtrArray *</div><div class='del'>-search_by_expression (CamelFolder *folder, const char *expression,</div><div class='del'>-		      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	/* Search on the remote folder if we're not synced. */</div><div class='del'>-	if (!cache_folder-&gt;is_synced &amp;&amp;</div><div class='del'>-	    camel_folder_has_search_capability (cache_folder-&gt;remote)) {</div><div class='del'>-		return camel_folder_search_by_expression (cache_folder-&gt;remote,</div><div class='del'>-							  expression, ex);</div><div class='del'>-	} else {</div><div class='del'>-		GPtrArray *matches;</div><div class='del'>-		const char *ruid;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		if (!cache_folder-&gt;is_synced)</div><div class='del'>-			camel_cache_folder_sync (cache_folder, ex);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			return NULL;</div><div class='del'>-		matches = search_by_expression (cache_folder-&gt;local,</div><div class='del'>-						expression, 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'>-		/* Convert local uids to remote. */</div><div class='del'>-		for (i = 0; i &lt; matches-&gt;len; i++) {</div><div class='del'>-			ruid = camel_cache_map_get_remote (cache_folder-&gt;uidmap,</div><div class='del'>-							   matches-&gt;pdata[i]);</div><div class='del'>-			g_free (matches-&gt;pdata[i]);</div><div class='del'>-			matches-&gt;pdata[i] = g_strdup (ruid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		return matches;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static const CamelMessageInfo *</div><div class='del'>-get_message_info (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder = (CamelCacheFolder *)folder;</div><div class='del'>-</div><div class='del'>-	if (cache_folder-&gt;remote_summary) {</div><div class='del'>-		return camel_folder_get_message_info (cache_folder-&gt;remote,</div><div class='del'>-						      uid);</div><div class='del'>-	} else</div><div class='del'>-		return g_hash_table_lookup (cache_folder-&gt;summary_uids, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static void</div><div class='del'>-copy_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-		 CamelFolder *destination, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *source_cache_folder = (CamelCacheFolder *)source;</div><div class='del'>-	CamelCacheFolder *dest_cache_folder = (CamelCacheFolder *)destination;</div><div class='del'>-</div><div class='del'>-	/* If we are here, we know that the folders have the same parent</div><div class='del'>-	 * store, which implies their remote and local folders have the</div><div class='del'>-	 * same parent store as well.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (CF_CLASS (source_cache_folder-&gt;remote)-&gt;copy_message_to !=</div><div class='del'>-	    folder_class-&gt;copy_message_to) {</div><div class='del'>-		/* The remote store has a non-default copy method, so</div><div class='del'>-		 * use it to avoid unnecessary network traffic.</div><div class='del'>-		 */</div><div class='del'>-		CF_CLASS (source_cache_folder-&gt;remote)-&gt;copy_message_to (</div><div class='del'>-			source_cache_folder-&gt;remote, uid,</div><div class='del'>-			dest_cache_folder-&gt;remote, ex);</div><div class='del'>-	} else {</div><div class='del'>-		/* The remote store uses the default copy method,</div><div class='del'>-		 * meaning if we proxy the copy_message_to over to it,</div><div class='del'>-		 * it will suck the message over the network. We may</div><div class='del'>-		 * already have a local copy, and if we don't, we want</div><div class='del'>-		 * to, and if we're going to have the message in</div><div class='del'>-		 * memory, then we should get it into the destination</div><div class='del'>-		 * cache too. So do this by hand.</div><div class='del'>-		 */</div><div class='del'>-		CamelMimeMessage *msg;</div><div class='del'>-		const CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-		msg = get_message (source, uid, ex);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			return;</div><div class='del'>-		info = camel_folder_get_message_info (source, uid);</div><div class='del'>-</div><div class='del'>-		camel_medium_remove_header (CAMEL_MEDIUM (msg),</div><div class='del'>-					    "X-Evolution-Remote-UID");</div><div class='del'>-		append_message (destination, msg, info, ex);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* DONE */</div><div class='del'>-static void</div><div class='del'>-move_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-		 CamelFolder *destination, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *source_cache_folder = (CamelCacheFolder *)source;</div><div class='del'>-	CamelCacheFolder *dest_cache_folder = (CamelCacheFolder *)destination;</div><div class='del'>-</div><div class='del'>-	/* See comments in copy_message_to. */</div><div class='del'>-</div><div class='del'>-	if (CF_CLASS (source_cache_folder)-&gt;move_message_to !=</div><div class='del'>-	    folder_class-&gt;move_message_to) {</div><div class='del'>-		CF_CLASS (source_cache_folder)-&gt;move_message_to (</div><div class='del'>-			source_cache_folder-&gt;remote, uid,</div><div class='del'>-			dest_cache_folder-&gt;remote, ex);</div><div class='del'>-	} else {</div><div class='del'>-		CamelMimeMessage *msg;</div><div class='del'>-		const CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-		msg = get_message (source, uid, ex);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			return;</div><div class='del'>-		info = camel_folder_get_message_info (source, uid);</div><div class='del'>-</div><div class='del'>-		camel_medium_remove_header (CAMEL_MEDIUM (msg),</div><div class='del'>-					    "X-Evolution-Remote-UID");</div><div class='del'>-		append_message (destination, msg, info, ex);</div><div class='del'>-		if (!camel_exception_is_set (ex))</div><div class='del'>-			camel_folder_delete_message (source, uid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_cache_folder_new (CamelStore *store, CamelFolder *parent,</div><div class='del'>-			CamelFolder *remote, CamelFolder *local,</div><div class='del'>-			CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheFolder *cache_folder;</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	cache_folder = CAMEL_CACHE_FOLDER (camel_object_new (CAMEL_CACHE_FOLDER_TYPE));</div><div class='del'>-	folder = (CamelFolder *)cache_folder;</div><div class='del'>-</div><div class='del'>-	cache_folder-&gt;local = local;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (local));</div><div class='del'>-	camel_object_hook_event (CAMEL_OBJECT (local), "folder_changed",</div><div class='del'>-				 local_folder_changed, cache_folder);</div><div class='del'>-</div><div class='del'>-	cache_folder-&gt;remote = remote;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (remote));</div><div class='del'>-	camel_object_hook_event (CAMEL_OBJECT (remote), "folder_changed",</div><div class='del'>-				 remote_folder_changed, cache_folder);</div><div class='del'>-</div><div class='del'>-	/* XXX */</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_cache_folder_sync (CamelCacheFolder *cache_folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	const char *ruid, *luid;</div><div class='del'>-	int lsize, i;</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	lsize = camel_folder_get_message_count (cache_folder-&gt;local);</div><div class='del'>-</div><div class='del'>-	camel_folder_freeze (cache_folder-&gt;local);</div><div class='del'>-	for (i = 0; i &lt; cache_folder-&gt;uids-&gt;len; i++) {</div><div class='del'>-		ruid = cache_folder-&gt;uids-&gt;pdata[i];</div><div class='del'>-		luid = camel_cache_map_get_local (cache_folder-&gt;uidmap, ruid);</div><div class='del'>-</div><div class='del'>-		/* Don't re-copy messages we already have. */</div><div class='del'>-		if (luid &amp;&amp;</div><div class='del'>-		    camel_folder_get_message_info (cache_folder-&gt;local, luid))</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		msg = camel_folder_get_message (cache_folder-&gt;remote,</div><div class='del'>-						ruid, ex);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			return;</div><div class='del'>-		info = camel_folder_get_message_info (cache_folder-&gt;remote,</div><div class='del'>-						      ruid);</div><div class='del'>-</div><div class='del'>-		camel_medium_add_header (CAMEL_MEDIUM (msg),</div><div class='del'>-					 "X-Evolution-Remote-UID", ruid);</div><div class='del'>-		camel_folder_append_message (cache_folder-&gt;local, msg,</div><div class='del'>-					     info, ex);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-	camel_folder_thaw (cache_folder-&gt;local);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-get_mappings (CamelCacheFolder *cache_folder, int first, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	const char *ruid;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	uids = camel_folder_get_uids (cache_folder-&gt;local);</div><div class='del'>-	for (i = first; i &lt; uids-&gt;len; i++) {</div><div class='del'>-		msg = camel_folder_get_message (cache_folder-&gt;local,</div><div class='del'>-						uids-&gt;pdata[i], ex);</div><div class='del'>-		if (!msg)</div><div class='del'>-			break;</div><div class='del'>-		ruid = camel_medium_get_header (CAMEL_MEDIUM (msg),</div><div class='del'>-						"X-Evolution-Remote-UID");</div><div class='del'>-</div><div class='del'>-		camel_cache_map_add (cache_folder-&gt;uidmap,</div><div class='del'>-				     uids-&gt;pdata[i], ruid);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_free_uids (cache_folder-&gt;local, uids);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/cache/camel-cache-folder.h b/camel/providers/cache/camel-cache-folder.h<br/>deleted file mode 100644<br/>index 3609de4d67..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/camel-cache-folder.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/camel-cache-folder.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-cache-folder.h: Class for a cache 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'>-#ifndef CAMEL_CACHE_FOLDER_H</div><div class='del'>-#define CAMEL_CACHE_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include "camel-cache-map.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_CACHE_FOLDER_TYPE     (camel_cache_folder_get_type ())</div><div class='del'>-#define CAMEL_CACHE_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CACHE_FOLDER_TYPE, CamelCacheFolder))</div><div class='del'>-#define CAMEL_CACHE_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CACHE_FOLDER_TYPE, CamelCacheFolderClass))</div><div class='del'>-#define IS_CAMEL_CACHE_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CACHE_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'>-	/* Remote and local folders */</div><div class='del'>-	CamelFolder *remote, *local;</div><div class='del'>-</div><div class='del'>-	/* Remote UIDs, in order, summary, and uid-&gt;info map if</div><div class='del'>-	 * summary is from local info.</div><div class='del'>-	 */</div><div class='del'>-	GPtrArray *uids, *summary;</div><div class='del'>-	GHashTable *summary_uids;</div><div class='del'>-</div><div class='del'>-	/* UID map */</div><div class='del'>-	CamelCacheMap *uidmap;</div><div class='del'>-	char *mapfile;</div><div class='del'>-</div><div class='del'>-	/* Is the summary remote? Is the folder known to be synced? */</div><div class='del'>-	gboolean remote_summary, is_synced;</div><div class='del'>-</div><div class='del'>-} CamelCacheFolder;</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'>-} CamelCacheFolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelFolder *camel_cache_folder_new (CamelStore *store, CamelFolder *parent,</div><div class='del'>-				     CamelFolder *remote, CamelFolder *local,</div><div class='del'>-				     CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_cache_folder_sync (CamelCacheFolder *cache_folder,</div><div class='del'>-			      CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_cache_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_CACHE_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/cache/camel-cache-map.c b/camel/providers/cache/camel-cache-map.c<br/>deleted file mode 100644<br/>index d3cece6f60..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/camel-cache-map.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/camel-cache-map.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,255 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-cache-map.c : functions for a local&lt;-&gt;remote uid map */</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-cache-map.h"</div><div class='del'>-#include &lt;camel/camel-exception.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;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_new:</div><div class='del'>- *</div><div class='del'>- * Return value: a new CamelCacheMap</div><div class='del'>- **/</div><div class='del'>-CamelCacheMap *</div><div class='del'>-camel_cache_map_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelCacheMap *map = g_new (CamelCacheMap, 1);</div><div class='del'>-</div><div class='del'>-	map-&gt;l2r = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	map-&gt;r2l = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	return map;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_mapping (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	g_free (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_destroy:</div><div class='del'>- * @map: a CamelCacheMap</div><div class='del'>- *</div><div class='del'>- * Frees @map and all of the data stored in it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_cache_map_destroy (CamelCacheMap *map)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_foreach (map-&gt;l2r, free_mapping, NULL);</div><div class='del'>-	g_hash_table_destroy (map-&gt;l2r);</div><div class='del'>-	g_hash_table_destroy (map-&gt;r2l);</div><div class='del'>-	g_free (map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_add:</div><div class='del'>- * @map: a CamelCacheMap</div><div class='del'>- * @luid: the local uid</div><div class='del'>- * @ruid: the remote uid</div><div class='del'>- *</div><div class='del'>- * Adds a mapping between @luid and @ruid. If either already exists</div><div class='del'>- * in the map, this may leak memory and result in incorrect map entries.</div><div class='del'>- * Use camel_cache_map_update() in that case instead.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_cache_map_add (CamelCacheMap *map, const char *luid, const char *ruid)</div><div class='del'>-{</div><div class='del'>-	char *map_luid = g_strdup (luid);</div><div class='del'>-	char *map_ruid = g_strdup (ruid);</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (map-&gt;l2r, map_luid, map_ruid);</div><div class='del'>-	g_hash_table_insert (map-&gt;r2l, map_ruid, map_luid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_remove:</div><div class='del'>- * @map: a CamelCacheMap</div><div class='del'>- * @luid: the local uid</div><div class='del'>- * @ruid: the remote uid</div><div class='del'>- *</div><div class='del'>- * Removes the mapping between @luid and @ruid. Either (but not both)</div><div class='del'>- * of the uids can be %NULL if they are not both known.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_cache_map_remove (CamelCacheMap *map, const char *luid, const char *ruid)</div><div class='del'>-{</div><div class='del'>-	gpointer map_luid, map_ruid;</div><div class='del'>-</div><div class='del'>-	if ((luid &amp;&amp; g_hash_table_lookup_extended (map-&gt;l2r, luid,</div><div class='del'>-						   &amp;map_luid, &amp;map_ruid)) ||</div><div class='del'>-	    (ruid &amp;&amp; g_hash_table_lookup_extended (map-&gt;r2l, ruid,</div><div class='del'>-						  &amp;map_luid, &amp;map_ruid))) {</div><div class='del'>-		g_hash_table_remove (map-&gt;l2r, map_luid);</div><div class='del'>-		g_hash_table_remove (map-&gt;r2l, map_ruid);</div><div class='del'>-		g_free (map_luid);</div><div class='del'>-		g_free (map_ruid);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_update:</div><div class='del'>- * @map: a CamelCacheMap</div><div class='del'>- * @luid: the local uid</div><div class='del'>- * @ruid: the remote uid</div><div class='del'>- *</div><div class='del'>- * Updates the mappings to associate @luid with @ruid, clearing any</div><div class='del'>- * previous mappings for both of them.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_cache_map_update (CamelCacheMap *map, const char *luid, const char *ruid)</div><div class='del'>-{</div><div class='del'>-	camel_cache_map_remove (map, luid, ruid);</div><div class='del'>-	camel_cache_map_add (map, luid, ruid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_get_local</div><div class='del'>- * @map: a CamelCacheMap</div><div class='del'>- * @ruid: the remote uid</div><div class='del'>- *</div><div class='del'>- * Return value: the corresponding local uid, or %NULL</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_cache_map_get_local (CamelCacheMap *map, const char *ruid)</div><div class='del'>-{</div><div class='del'>-	return g_hash_table_lookup (map-&gt;r2l, ruid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_get_remote</div><div class='del'>- * @map: a CamelCacheMap</div><div class='del'>- * @luid: the local uid</div><div class='del'>- *</div><div class='del'>- * Return value: the corresponding remote uid, or %NULL</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-camel_cache_map_get_remote (CamelCacheMap *map, const char *luid)</div><div class='del'>-{</div><div class='del'>-	return g_hash_table_lookup (map-&gt;l2r, luid);</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'>-write_mapping (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	int fd = *(int *)user_data;</div><div class='del'>-</div><div class='del'>-	/* FIXME: We assume the local UID has no ':'s in it. */</div><div class='del'>-	write (fd, key, strlen (key));</div><div class='del'>-	write (fd, ":", 1);</div><div class='del'>-	write (fd, value, strlen (value));</div><div class='del'>-	write (fd, "\n", 1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_write:</div><div class='del'>- * @map: a CamelCacheMap</div><div class='del'>- * @file: the filename to write the map to</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Writes @map out to @file, setting @ex if something goes wrong.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_cache_map_write (CamelCacheMap *map, const char *file,</div><div class='del'>-		       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	char *tmpfile;</div><div class='del'>-</div><div class='del'>-	tmpfile = g_strdup_printf ("%s~", file);</div><div class='del'>-	fd = open (tmpfile, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		g_free (tmpfile);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Could not create cache map file: %s",</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (map-&gt;l2r, write_mapping, &amp;fd);</div><div class='del'>-</div><div class='del'>-	if (close (fd) == -1 ||</div><div class='del'>-	    rename (tmpfile, file) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Could not save cache map file: %s",</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		unlink (tmpfile);</div><div class='del'>-	}</div><div class='del'>-	g_free (tmpfile);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_map_read:</div><div class='del'>- * @map: a CamelCacheMap</div><div class='del'>- * @file: the filename to read the map from</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Reads @map from @file, setting @ex if something goes wrong. @map</div><div class='del'>- * should be a freshly-created CamelCacheMap.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_cache_map_read (CamelCacheMap *map, const char *file, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	FILE *f;</div><div class='del'>-	char buf[1024], *p, *q;</div><div class='del'>-</div><div class='del'>-	/* FIXME: lazy implementation. We could make this work with</div><div class='del'>-	 * lines longer than 1024 chars. :)</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	f = fopen (file, "r");</div><div class='del'>-	if (!f) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Could not open cache map file: %s",</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (fgets (buf, sizeof (buf), f)) {</div><div class='del'>-		p = strchr (buf, ':');</div><div class='del'>-		if (p)</div><div class='del'>-			q = strchr (buf, '\n');</div><div class='del'>-		if (!p || !q) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     "Bad cache file.");</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-		*p++ = *q = '\0';</div><div class='del'>-</div><div class='del'>-		/* Local uid at buf, remote at p. */</div><div class='del'>-		camel_cache_map_add (map, buf, p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (f);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/cache/camel-cache-map.h b/camel/providers/cache/camel-cache-map.h<br/>deleted file mode 100644<br/>index a15c9afe1a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/camel-cache-map.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/camel-cache-map.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-cache-map.h: functions for dealing with UID maps */</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'>-#ifndef CAMEL_CACHE_MAP_H</div><div class='del'>-#define CAMEL_CACHE_MAP_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;camel/camel-types.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GHashTable *l2r, *r2l;</div><div class='del'>-} CamelCacheMap;</div><div class='del'>-</div><div class='del'>-CamelCacheMap *camel_cache_map_new (void);</div><div class='del'>-void camel_cache_map_destroy (CamelCacheMap *map);</div><div class='del'>-</div><div class='del'>-void camel_cache_map_add (CamelCacheMap *map, const char *luid,</div><div class='del'>-			  const char *ruid);</div><div class='del'>-void camel_cache_map_remove (CamelCacheMap *map, const char *luid,</div><div class='del'>-			     const char *ruid);</div><div class='del'>-void camel_cache_map_update (CamelCacheMap *map, const char *luid,</div><div class='del'>-			     const char *ruid);</div><div class='del'>-</div><div class='del'>-const char *camel_cache_map_get_local (CamelCacheMap *map, const char *ruid);</div><div class='del'>-const char *camel_cache_map_get_remote (CamelCacheMap *map, const char *luid);</div><div class='del'>-</div><div class='del'>-void camel_cache_map_write (CamelCacheMap *map, const char *file,</div><div class='del'>-			    CamelException *ex);</div><div class='del'>-void camel_cache_map_read (CamelCacheMap *map, const char *file,</div><div class='del'>-			   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_CACHE_MAP_H */</div><div class='head'>diff --git a/camel/providers/cache/camel-cache-provider.c b/camel/providers/cache/camel-cache-provider.c<br/>deleted file mode 100644<br/>index 217f06816a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/camel-cache-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/camel-cache-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-cache-provider.c: cache 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-cache-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 cache_provider = {</div><div class='del'>-	"cache",</div><div class='del'>-	"Cache",</div><div class='del'>-</div><div class='del'>-	"For caching remote mail into a local store.",</div><div class='del'>-</div><div class='del'>-	"cache",</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'>-</div><div class='del'>-void</div><div class='del'>-camel_provider_module_init (CamelSession *session)</div><div class='del'>-{</div><div class='del'>-	cache_provider.object_types[CAMEL_PROVIDER_STORE] =</div><div class='del'>-		camel_cache_store_get_type();</div><div class='del'>-</div><div class='del'>-	camel_session_register_provider (session, &amp;cache_provider);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/cache/camel-cache-store.c b/camel/providers/cache/camel-cache-store.c<br/>deleted file mode 100644<br/>index 544cca69a1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/camel-cache-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/camel-cache-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,297 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-cache-store.c : class for a cache 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-cache-store.h"</div><div class='del'>-#include "camel-cache-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'>-static CamelServiceClass *service_class = NULL;</div><div class='del'>-#define CS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static gboolean cache_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean cache_disconnect (CamelService *service, CamelException *ex);</div><div class='del'>-static char *get_path (CamelService *service);</div><div class='del'>-static char *get_name (CamelService *service, gboolean brief);</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 void rename_folder (CamelStore *store, const char *old_name,</div><div class='del'>-			   const char *new_name, 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'>-static char *get_default_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_cache_store_class_init (CamelCacheStoreClass *camel_cache_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_cache_store_class);</div><div class='del'>-	CamelStoreClass *camel_store_class =</div><div class='del'>-		CAMEL_STORE_CLASS (camel_cache_store_class);</div><div class='del'>-	</div><div class='del'>-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;connect = cache_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = cache_disconnect;</div><div class='del'>-	camel_service_class-&gt;get_path = get_path;</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-</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;rename_folder = rename_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'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_cache_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_cache_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_cache_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_cache_store_type = camel_type_register (</div><div class='del'>-			CAMEL_STORE_TYPE, "CamelCacheStore",</div><div class='del'>-			sizeof (CamelCacheStore),</div><div class='del'>-			sizeof (CamelCacheStoreClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_cache_store_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectFinalizeFunc) finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_cache_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (object);</div><div class='del'>-</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (cache_store-&gt;local));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (cache_store-&gt;remote));</div><div class='del'>-	g_free (cache_store-&gt;local_base);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cache_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);</div><div class='del'>-</div><div class='del'>-	return camel_service_connect (CAMEL_SERVICE (cache_store-&gt;remote), ex) &amp;&amp;</div><div class='del'>-		camel_service_connect (CAMEL_SERVICE (cache_store-&gt;local), ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-cache_disconnect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);</div><div class='del'>-</div><div class='del'>-	return camel_service_disconnect (CAMEL_SERVICE (cache_store-&gt;local), ex) &amp;&amp;</div><div class='del'>-		camel_service_disconnect (CAMEL_SERVICE (cache_store-&gt;remote), ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_path (CamelService *service)</div><div class='del'>-{</div><div class='del'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);</div><div class='del'>-	char *path, *subpath;</div><div class='del'>-</div><div class='del'>-	subpath = camel_service_get_path (CAMEL_SERVICE (cache_store-&gt;remote));</div><div class='del'>-	path = g_strdup_printf ("cache/%s", subpath);</div><div class='del'>-	g_free (subpath);</div><div class='del'>-	return path;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (service);</div><div class='del'>-</div><div class='del'>-	return camel_service_get_name (CAMEL_SERVICE (cache_store-&gt;remote),</div><div class='del'>-				       brief);</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'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);</div><div class='del'>-	CamelFolder *parent, *rf, *lf;</div><div class='del'>-</div><div class='del'>-	rf = camel_store_get_folder (cache_store-&gt;remote, folder_name,</div><div class='del'>-				     create, ex);</div><div class='del'>-	if (!rf)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	lf = camel_store_get_folder (cache_store-&gt;local, folder_name,</div><div class='del'>-				     TRUE, ex);</div><div class='del'>-	if (!lf) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (rf));</div><div class='del'>-		camel_exception_setv (ex, camel_exception_get_id (ex),</div><div class='del'>-				      "Could not create cache folder:\n%s",</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'>-	return camel_cache_folder_new (store, parent, rf, lf, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* XXX these two need to be better about failure recovery. */</div><div class='del'>-static void</div><div class='del'>-delete_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-	       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);</div><div class='del'>-</div><div class='del'>-	camel_store_delete_folder (cache_store-&gt;remote, folder_name, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-	camel_store_delete_folder (cache_store-&gt;local, folder_name, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-rename_folder (CamelStore *store, const char *old_name,</div><div class='del'>-	       const char *new_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);</div><div class='del'>-</div><div class='del'>-	camel_store_rename_folder (cache_store-&gt;remote, old_name,</div><div class='del'>-				   new_name, ex);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-	camel_store_rename_folder (cache_store-&gt;local, old_name,</div><div class='del'>-				   new_name, NULL);</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'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (cache_store-&gt;remote)-&gt;get_folder_name (</div><div class='del'>-		cache_store-&gt;remote, folder_name, ex);</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'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (cache_store-&gt;remote)-&gt;get_root_folder_name (</div><div class='del'>-		cache_store-&gt;remote, ex);</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'>-	CamelCacheStore *cache_store = CAMEL_CACHE_STORE (store);</div><div class='del'>-</div><div class='del'>-	return CS_CLASS (cache_store-&gt;remote)-&gt;get_default_folder_name (</div><div class='del'>-		cache_store-&gt;remote, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_cache_store_new:</div><div class='del'>- * @remote: a remote store</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Return value: a CamelCacheStore for the given remote store.</div><div class='del'>- **/</div><div class='del'>-CamelStore *</div><div class='del'>-camel_cache_store_new (CamelStore *remote, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelCacheStore *cache_store;</div><div class='del'>-	CamelService *remote_service = (CamelService *)remote;</div><div class='del'>-	CamelSession *session;</div><div class='del'>-	char *url_string;</div><div class='del'>-	CamelURL *url;</div><div class='del'>-</div><div class='del'>-	session = camel_service_get_session (remote_service);</div><div class='del'>-</div><div class='del'>-	url_string = camel_service_get_url (remote_service);</div><div class='del'>-	url = camel_url_new (url_string, ex);</div><div class='del'>-	g_free (url_string);</div><div class='del'>-</div><div class='del'>-	if (!url)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	cache_store = (CamelCacheStore *)</div><div class='del'>-		camel_service_new (CAMEL_CACHE_STORE_TYPE, session,</div><div class='del'>-				   camel_service_get_provider (remote_service),</div><div class='del'>-				   url, ex);</div><div class='del'>-	if (camel_exception_is_set (ex)) {</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'>-	cache_store-&gt;remote = remote;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (remote));</div><div class='del'>-</div><div class='del'>-	cache_store-&gt;local_base = camel_session_get_storage_path (</div><div class='del'>-		session, (CamelService *)cache_store, ex);</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (cache_store));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	url_string = g_strdup_printf ("mbox:%s", cache_store-&gt;local_base);</div><div class='del'>-	cache_store-&gt;local = camel_session_get_store (session, url_string, ex);</div><div class='del'>-	g_free (url_string);</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (cache_store));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return (CamelStore *)cache_store;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/cache/camel-cache-store.h b/camel/providers/cache/camel-cache-store.h<br/>deleted file mode 100644<br/>index 7339d8a9f3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/camel-cache-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/camel-cache-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-cache-store.h: class for a cache 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'>-#ifndef CAMEL_CACHE_STORE_H</div><div class='del'>-#define CAMEL_CACHE_STORE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_CACHE_STORE_TYPE     (camel_cache_store_get_type ())</div><div class='del'>-#define CAMEL_CACHE_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_CACHE_STORE_TYPE, CamelCacheStore))</div><div class='del'>-#define CAMEL_CACHE_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_CACHE_STORE_TYPE, CamelCacheStoreClass))</div><div class='del'>-#define IS_CAMEL_CACHE_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_CACHE_STORE_TYPE))</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'>-	char *local_base;</div><div class='del'>-	CamelStore *remote, *local;</div><div class='del'>-</div><div class='del'>-} CamelCacheStore;</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'>-} CamelCacheStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* support functions */</div><div class='del'>-CamelStore *camel_cache_store_new (CamelStore *remote, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_cache_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_CACHE_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/cache/libcamelcache.urls b/camel/providers/cache/libcamelcache.urls<br/>deleted file mode 100644<br/>index 06cf65390f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/cache/libcamelcache.urls?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/cache/libcamelcache.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-cache</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 19646f1960..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,48 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelimapincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-</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'>-	$(KRB4_CFLAGS)				\</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-auth.c			\</div><div class='del'>-	camel-imap-command.c			\</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-summary.c			\</div><div class='del'>-	camel-imap-utils.c</div><div class='del'>-</div><div class='del'>-libcamelimapinclude_HEADERS =			\</div><div class='del'>-	camel-imap-auth.h			\</div><div class='del'>-	camel-imap-command.h			\</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'>-	camel-imap-summary.h			\</div><div class='del'>-	camel-imap-utils.h</div><div class='del'>-</div><div class='del'>-libcamelimap_la_LDFLAGS = $(KRB4_LDFLAGS) -version-info 0:0:0</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-auth.c b/camel/providers/imap/camel-imap-auth.c<br/>deleted file mode 100644<br/>index 3bf1af6535..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-auth.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-auth.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,195 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-auth.c: IMAP AUTHENTICATE implementations */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors: Dan Winship &lt;danw@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'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-#include &lt;krb.h&gt;</div><div class='del'>-/* MIT krb4 des.h #defines _. Sigh. We don't need it. */</div><div class='del'>-#undef _</div><div class='del'>-#endif</div><div class='del'>-</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'>-#include "camel-imap-auth.h"</div><div class='del'>-#include "camel-imap-command.h"</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-base64_encode_simple (const char *data, int len)</div><div class='del'>-{</div><div class='del'>-	unsigned char *out;</div><div class='del'>-	int state = 0, outlen;</div><div class='del'>-	unsigned int save = 0;</div><div class='del'>-</div><div class='del'>-	out = g_malloc (len * 4 / 3 + 5);</div><div class='del'>-	outlen = base64_encode_close ((unsigned char *)data, len, FALSE,</div><div class='del'>-				      out, &amp;state, &amp;save);</div><div class='del'>-	out[outlen] = '\0';</div><div class='del'>-	return (char *)out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-base64_decode_simple (char *data, int len)</div><div class='del'>-{</div><div class='del'>-	int state = 0;</div><div class='del'>-	unsigned int save = 0;</div><div class='del'>-</div><div class='del'>-	return base64_decode_step ((unsigned char *)data, len,</div><div class='del'>-				   (unsigned char *)data, &amp;state, &amp;save);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-#define IMAP_KERBEROS_V4_PROTECTION_NONE      1</div><div class='del'>-#define IMAP_KERBEROS_V4_PROTECTION_INTEGRITY 2</div><div class='del'>-#define IMAP_KERBEROS_V4_PROTECTION_PRIVACY   4</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-imap_try_kerberos_v4_auth (CamelImapStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *resp, *data;</div><div class='del'>-	int status, len;</div><div class='del'>-	char *inst, *realm, *buf, *username;</div><div class='del'>-	guint32 nonce_n, nonce_h, plus1;</div><div class='del'>-	struct hostent *h;</div><div class='del'>-	KTEXT_ST authenticator;</div><div class='del'>-	CREDENTIALS credentials;</div><div class='del'>-	des_cblock session;</div><div class='del'>-	des_key_schedule schedule;</div><div class='del'>-</div><div class='del'>-	/* The kickoff. */</div><div class='del'>-	response = camel_imap_command (store, NULL, ex,</div><div class='del'>-				       "AUTHENTICATE KERBEROS_V4");</div><div class='del'>-	if (!response)</div><div class='del'>-		return FALSE;</div><div class='del'>-	resp = camel_imap_response_extract_continuation (response, ex);</div><div class='del'>-	if (!resp)</div><div class='del'>-		return FALSE;</div><div class='del'>-	data = imap_next_word (resp);</div><div class='del'>-</div><div class='del'>-	/* First server response is a base64-encoded 32-bit random number</div><div class='del'>-	 * ("nonce") in network byte order.</div><div class='del'>-	 */</div><div class='del'>-	if (strlen (data) != 8 || base64_decode_simple (data, 8) != 4) {</div><div class='del'>-		g_free (resp);</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-	memcpy (&amp;nonce_n, data, 4);</div><div class='del'>-	g_free (resp);</div><div class='del'>-	nonce_h = ntohl (nonce_n);</div><div class='del'>-</div><div class='del'>-	/* Our response is an authenticator including that number. */</div><div class='del'>-	h = camel_service_gethost (CAMEL_SERVICE (store), ex);</div><div class='del'>-	if (!h)</div><div class='del'>-		goto lose;</div><div class='del'>-	inst = g_strndup (h-&gt;h_name, strcspn (h-&gt;h_name, "."));</div><div class='del'>-	g_strdown (inst);</div><div class='del'>-	realm = g_strdup (krb_realmofhost (h-&gt;h_name));</div><div class='del'>-	status = krb_mk_req (&amp;authenticator, "imap", inst, realm, nonce_h);</div><div class='del'>-	if (status == KSUCCESS) {</div><div class='del'>-		status = krb_get_cred ("imap", inst, realm, &amp;credentials);</div><div class='del'>-		memcpy (session, credentials.session, sizeof (session));</div><div class='del'>-		memset (&amp;credentials, 0, sizeof (credentials));</div><div class='del'>-	}</div><div class='del'>-	g_free (inst);</div><div class='del'>-	g_free (realm);</div><div class='del'>-</div><div class='del'>-	if (status != KSUCCESS) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Could not get Kerberos ticket:\n%s"),</div><div class='del'>-				      krb_err_txt[status]);</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-	des_key_sched (&amp;session, schedule);</div><div class='del'>-</div><div class='del'>-	buf = base64_encode_simple (authenticator.dat, authenticator.length);</div><div class='del'>-	response = camel_imap_command_continuation (store, ex, buf);</div><div class='del'>-	g_free (buf);</div><div class='del'>-	if (!response)</div><div class='del'>-		goto lose;</div><div class='del'>-	resp = camel_imap_response_extract_continuation (response, ex);</div><div class='del'>-	if (!resp)</div><div class='del'>-		goto lose;</div><div class='del'>-	data = imap_next_word (resp);</div><div class='del'>-</div><div class='del'>-	len = strlen (data);</div><div class='del'>-	base64_decode_simple (data, strlen (data));</div><div class='del'>-</div><div class='del'>-	/* This one is encrypted. */</div><div class='del'>-	des_ecb_encrypt ((des_cblock *)data, (des_cblock *)data, schedule, 0);</div><div class='del'>-</div><div class='del'>-	/* Check that the returned value is the original nonce plus one. */</div><div class='del'>-	memcpy (&amp;plus1, data, 4);</div><div class='del'>-	if (ntohl (plus1) != nonce_h + 1) {</div><div class='del'>-		g_free (resp);</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* "the fifth octet contain[s] a bit-mask specifying the</div><div class='del'>-	 * protection mechanisms supported by the server"</div><div class='del'>-	 */</div><div class='del'>-	if (!(data[4] &amp; IMAP_KERBEROS_V4_PROTECTION_NONE)) {</div><div class='del'>-		g_warning ("Server does not support `no protection' :-(");</div><div class='del'>-		g_free (resp);</div><div class='del'>-		goto lose;</div><div class='del'>-	}</div><div class='del'>-	g_free (resp);</div><div class='del'>-</div><div class='del'>-	username = CAMEL_SERVICE (store)-&gt;url-&gt;user;</div><div class='del'>-	len = strlen (username) + 9;</div><div class='del'>-	len += 8 - len % 8;</div><div class='del'>-	data = g_malloc0 (len);</div><div class='del'>-	memcpy (data, &amp;nonce_n, 4);</div><div class='del'>-	data[4] = IMAP_KERBEROS_V4_PROTECTION_NONE;</div><div class='del'>-	data[5] = data[6] = data[7] = 0;</div><div class='del'>-	strcpy (data + 8, username);</div><div class='del'>-</div><div class='del'>-	des_pcbc_encrypt ((des_cblock *)data, (des_cblock *)data, len,</div><div class='del'>-			  schedule, &amp;session, 1);</div><div class='del'>-	memset (&amp;session, 0, sizeof (session));</div><div class='del'>-	buf = base64_encode_simple (data, len);</div><div class='del'>-	g_free (data);</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command_continuation (store, ex, buf);</div><div class='del'>-	if (!response)</div><div class='del'>-		goto lose;</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-	return TRUE;</div><div class='del'>-</div><div class='del'>- lose:</div><div class='del'>-	memset (&amp;session, 0, sizeof (session));</div><div class='del'>-</div><div class='del'>-	/* Get the server out of "waiting for continuation data" mode.</div><div class='del'>-	 */</div><div class='del'>-	response = camel_imap_command_continuation (store, NULL, "*");</div><div class='del'>-	if (response)</div><div class='del'>-		camel_imap_response_free (response);</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-#endif /* HAVE_KRB4 */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-auth.h b/camel/providers/imap/camel-imap-auth.h<br/>deleted file mode 100644<br/>index fbbc5ef709..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-auth.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-auth.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-auth.h: IMAP AUTHENTICATE implementations */</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.</div><div class='del'>- *</div><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_IMAP_AUTH_H</div><div class='del'>-#define CAMEL_IMAP_AUTH_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-</div><div class='del'>-gboolean imap_try_kerberos_v4_auth (CamelImapStore *store, CamelException *ex);</div><div class='del'>-gboolean imap_try_gssapi_auth      (CamelImapStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_AUTH_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-command.c b/camel/providers/imap/camel-imap-command.c<br/>deleted file mode 100644<br/>index e9808d5a1f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-command.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-command.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,406 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-command.c: IMAP command sending/parsing routines */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- *  Authors:</div><div class='del'>- *    Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>- *    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;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-command.h"</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-static char *imap_read_untagged (CamelImapStore *store, char *line,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-static CamelImapResponse *imap_read_response (CamelImapStore *store,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_command: Send a command to a IMAP server and get a response</div><div class='del'>- * @store: the IMAP store</div><div class='del'>- * @folder: The folder to perform the operation in (or %NULL if not</div><div class='del'>- * relevant).</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * @fmt: a printf-style format string, followed by arguments</div><div class='del'>- *</div><div class='del'>- * This function makes sure that @folder (if non-%NULL) is the</div><div class='del'>- * currently-selected folder on @store and then sends the IMAP command</div><div class='del'>- * specified by @fmt and the following arguments. It then reads the</div><div class='del'>- * server's response(s) and parses the final result.</div><div class='del'>- *</div><div class='del'>- * As a special case, if @fmt is %NULL, it will just select @folder</div><div class='del'>- * and return the response from doing so.</div><div class='del'>- * </div><div class='del'>- * Return value: %NULL if an error occurred (in which case @ex will</div><div class='del'>- * be set). Otherwise, a CamelImapResponse describing the server's</div><div class='del'>- * response, which the caller must free with camel_imap_response_free().</div><div class='del'>- **/</div><div class='del'>-CamelImapResponse *</div><div class='del'>-camel_imap_command (CamelImapStore *store, CamelFolder *folder,</div><div class='del'>-		    CamelException *ex, const char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	gchar *cmdbuf;</div><div class='del'>-	va_list ap;</div><div class='del'>-</div><div class='del'>-	/* Check for current folder */</div><div class='del'>-	if (folder &amp;&amp; (!fmt || folder != store-&gt;current_folder)) {</div><div class='del'>-		CamelImapResponse *response;</div><div class='del'>-</div><div class='del'>-		store-&gt;current_folder = NULL;</div><div class='del'>-		response = camel_imap_command (store, NULL, ex,</div><div class='del'>-					       "SELECT \"%s\"",</div><div class='del'>-					       folder-&gt;full_name);</div><div class='del'>-		if (!response)</div><div class='del'>-			return NULL;</div><div class='del'>-		store-&gt;current_folder = folder;</div><div class='del'>-</div><div class='del'>-		if (!fmt)</div><div class='del'>-			return response;</div><div class='del'>-</div><div class='del'>-		camel_imap_response_free (response);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Send the 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'>-	camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex,</div><div class='del'>-					"A%.5d %s\r\n", store-&gt;command++,</div><div class='del'>-					cmdbuf);</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Read the response. */</div><div class='del'>-	return imap_read_response (store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_command_continuation: Send more command data to the IMAP server</div><div class='del'>- * @store: the IMAP store</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- * @cmdbuf: buffer containing the response/request data</div><div class='del'>- *</div><div class='del'>- * This method is for sending continuing responses to the IMAP server</div><div class='del'>- * after camel_imap_command returns a CAMEL_IMAP_PLUS response.</div><div class='del'>- * </div><div class='del'>- * Return value: as for camel_imap_command()</div><div class='del'>- **/</div><div class='del'>-CamelImapResponse *</div><div class='del'>-camel_imap_command_continuation (CamelImapStore *store, CamelException *ex,</div><div class='del'>-				 const char *cmdbuf)</div><div class='del'>-{</div><div class='del'>-	if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex,</div><div class='del'>-					    "%s\r\n", cmdbuf) &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return imap_read_response (store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Read the response to an IMAP command. */</div><div class='del'>-static CamelImapResponse *</div><div class='del'>-imap_read_response (CamelImapStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	int number, exists = 0;</div><div class='del'>-	GArray *expunged = NULL;</div><div class='del'>-	char *respbuf, *retcode, *word, *p;</div><div class='del'>-</div><div class='del'>-	/* Read first line */</div><div class='del'>-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store),</div><div class='del'>-					  &amp;respbuf, ex) &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	response = g_new0 (CamelImapResponse, 1);</div><div class='del'>-	response-&gt;untagged = g_ptr_array_new ();</div><div class='del'>-</div><div class='del'>-	/* Check for untagged data */</div><div class='del'>-	while (!strncmp (respbuf, "* ", 2)) {</div><div class='del'>-		/* Read the rest of the response if it is multi-line. */</div><div class='del'>-		respbuf = imap_read_untagged (store, respbuf, ex);</div><div class='del'>-		if (camel_exception_is_set (ex))</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		/* If it starts with a number, we might deal with</div><div class='del'>-		 * it ourselves.</div><div class='del'>-		 */</div><div class='del'>-		word = imap_next_word (respbuf);</div><div class='del'>-		number = strtoul (word, &amp;p, 10);</div><div class='del'>-		if (p != word &amp;&amp; store-&gt;current_folder) {</div><div class='del'>-			word = imap_next_word (p);</div><div class='del'>-			if (!g_strcasecmp (word, "EXISTS")) {</div><div class='del'>-				exists = number;</div><div class='del'>-				g_free (respbuf);</div><div class='del'>-				goto next;</div><div class='del'>-			} else if (!g_strcasecmp (word, "EXPUNGE")) {</div><div class='del'>-				if (!expunged) {</div><div class='del'>-					expunged = g_array_new (FALSE, FALSE,</div><div class='del'>-								sizeof (int));</div><div class='del'>-				}</div><div class='del'>-				g_array_append_val (expunged, number);</div><div class='del'>-				g_free (respbuf);</div><div class='del'>-				goto next;</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			if (!g_strncasecmp (word, "BYE", 3)) {</div><div class='del'>-				/* connection was lost, no more data to fetch */</div><div class='del'>-				store-&gt;connected = FALSE;</div><div class='del'>-				g_free (respbuf);</div><div class='del'>-				respbuf = NULL;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_ptr_array_add (response-&gt;untagged, respbuf);</div><div class='del'>-	next:</div><div class='del'>-		if (camel_remote_store_recv_line (</div><div class='del'>-			CAMEL_REMOTE_STORE (store), &amp;respbuf, ex) &lt; 0)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Update the summary */</div><div class='del'>-	if (store-&gt;current_folder &amp;&amp; (exists &gt; 0 || expunged)) {</div><div class='del'>-		camel_imap_folder_changed (store-&gt;current_folder, exists,</div><div class='del'>-					   expunged, NULL);</div><div class='del'>-	}</div><div class='del'>-	if (expunged)</div><div class='del'>-		g_array_free (expunged, TRUE);</div><div class='del'>-</div><div class='del'>-	if (!respbuf || camel_exception_is_set (ex)) {</div><div class='del'>-		camel_imap_response_free (response);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	response-&gt;status = respbuf;</div><div class='del'>-</div><div class='del'>-	/* Check for OK or continuation response. */</div><div class='del'>-	if (!strncmp (respbuf, "+ ", 2))</div><div class='del'>-		return response;</div><div class='del'>-	retcode = imap_next_word (respbuf);</div><div class='del'>-	if (!strncmp (retcode, "OK", 2))</div><div class='del'>-		return response;</div><div class='del'>-</div><div class='del'>-	/* We should never get BAD, or anything else but +, OK, or NO</div><div class='del'>-	 * for that matter.</div><div class='del'>-	 */</div><div class='del'>-	if (strncmp (retcode, "NO", 2) != 0) {</div><div class='del'>-		g_warning ("Unexpected response from IMAP server: %s",</div><div class='del'>-			   respbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unexpected response from IMAP "</div><div class='del'>-					"server: %s"), respbuf);</div><div class='del'>-		camel_imap_response_free (response);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	retcode = imap_next_word (retcode);</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-			      _("IMAP command failed: %s"),</div><div class='del'>-			      retcode ? retcode : _("Unknown error"));</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Given a line that is the start of an untagged response, read and</div><div class='del'>- * return the complete response. (This will be a no-op if the line</div><div class='del'>- * in question doesn't end with a literal.)</div><div class='del'>- *</div><div class='del'>- * FIXME: this won't deal with multiple literals in a single response.</div><div class='del'>- */</div><div class='del'>-static char *</div><div class='del'>-imap_read_untagged (CamelImapStore *store, char *line, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int fulllen, length, left, i;</div><div class='del'>-	GPtrArray *data;</div><div class='del'>-	char *end, *p;</div><div class='del'>-</div><div class='del'>-	p = strrchr (line, '{');</div><div class='del'>-	if (!p)</div><div class='del'>-		return line;</div><div class='del'>-</div><div class='del'>-	length = strtoul (p + 1, &amp;end, 10);</div><div class='del'>-	if (*end != '}' || *(end + 1) || end == p + 1)</div><div class='del'>-		return line;</div><div class='del'>-</div><div class='del'>-	fulllen = length + strlen (line) + 1;</div><div class='del'>-</div><div class='del'>-	/* OK. We have a literal. @length is the length including CRLF</div><div class='del'>-	 * pairs, which camel_remote_store_recv_line won't return.</div><div class='del'>-	 */</div><div class='del'>-	data = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_add (data, line);</div><div class='del'>-	left = length;</div><div class='del'>-	while (1) {</div><div class='del'>-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store),</div><div class='del'>-						  &amp;line, ex) &lt; 0) {</div><div class='del'>-			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'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_add (data, line);</div><div class='del'>-</div><div class='del'>-		if (left &lt;= 0)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		left -= strlen (line) + 2;</div><div class='del'>-</div><div class='del'>-		/* The output string will have only LF, not CRLF, so</div><div class='del'>-		 * decrement the length by one.</div><div class='del'>-		 */</div><div class='del'>-		length--;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add the length of the post-literal line. */</div><div class='del'>-	fulllen += strlen (line);</div><div class='del'>-</div><div class='del'>-	/* p points to the "{" in the line that starts the literal.</div><div class='del'>-	 * The length of the CR-less response must be less than or</div><div class='del'>-	 * equal to the length of the response with CRs, therefore</div><div class='del'>-	 * overwriting the old value with the new value cannot cause</div><div class='del'>-	 * an overrun.</div><div class='del'>-	 */</div><div class='del'>-	sprintf (p, "{%d}", length);</div><div class='del'>-</div><div class='del'>-	/* Now reassemble the data. */</div><div class='del'>-	p = line = g_malloc (fulllen + 1);</div><div class='del'>-	for (i = 0; i &lt; data-&gt;len; i++) {</div><div class='del'>-		length = strlen (data-&gt;pdata[i]);</div><div class='del'>-		memcpy (p, data-&gt;pdata[i], length);</div><div class='del'>-		g_free (data-&gt;pdata[i]);</div><div class='del'>-		p += length;</div><div class='del'>-		*p++ = '\n';</div><div class='del'>-	}</div><div class='del'>-	*p = '\0';</div><div class='del'>-	g_ptr_array_free (data, TRUE);</div><div class='del'>-	return line;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_response_free:</div><div class='del'>- * response: a CamelImapResponse:</div><div class='del'>- *</div><div class='del'>- * Frees all of the data in @response.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-camel_imap_response_free (CamelImapResponse *response)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++)</div><div class='del'>-		g_free (response-&gt;untagged-&gt;pdata[i]);</div><div class='del'>-	g_ptr_array_free (response-&gt;untagged, TRUE);</div><div class='del'>-	g_free (response-&gt;status);</div><div class='del'>-	g_free (response);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_response_extract:</div><div class='del'>- * @response: the response data returned from camel_imap_command</div><div class='del'>- * @type: the response type to extract</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This checks that @response contains a single untagged response of</div><div class='del'>- * type @type and returns just that response data. If @response</div><div class='del'>- * doesn't contain the right information, the function will set @ex and</div><div class='del'>- * return %NULL. Either way, @response will be freed.</div><div class='del'>- *</div><div class='del'>- * Return value: the desired response string, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_imap_response_extract (CamelImapResponse *response, const char *type,</div><div class='del'>-			     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int len = strlen (type), i;</div><div class='del'>-	char *resp;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-		/* Skip "* ", and initial sequence number, if present */</div><div class='del'>-		strtoul (resp + 2, &amp;resp, 10);</div><div class='del'>-		if (*resp == ' ')</div><div class='del'>-			resp = imap_next_word (resp);</div><div class='del'>-</div><div class='del'>-		if (!g_strncasecmp (resp, type, len))</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		g_free (response-&gt;untagged-&gt;pdata[i]);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (i &lt; response-&gt;untagged-&gt;len) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-		for (i++; i &lt; response-&gt;untagged-&gt;len; i++)</div><div class='del'>-			g_free (response-&gt;untagged-&gt;pdata[i]);</div><div class='del'>-	} else {</div><div class='del'>-		resp = NULL;</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("IMAP server response did not contain "</div><div class='del'>-					"%s information"), type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_ptr_array_free (response-&gt;untagged, TRUE);</div><div class='del'>-	g_free (response-&gt;status);</div><div class='del'>-	g_free (response);</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_response_extract_continuation:</div><div class='del'>- * @response: the response data returned from camel_imap_command</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * This checks that @response contains a continuation response, and</div><div class='del'>- * returns just that data. If @response doesn't contain a continuation</div><div class='del'>- * response, the function will set @ex and return %NULL. Either way,</div><div class='del'>- * @response will be freed.</div><div class='del'>- *</div><div class='del'>- * Return value: the desired response string, which the caller must free.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-camel_imap_response_extract_continuation (CamelImapResponse *response,</div><div class='del'>-					  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *status;</div><div class='del'>-</div><div class='del'>-	if (response-&gt;status &amp;&amp; !strncmp (response-&gt;status, "+ ", 2)) {</div><div class='del'>-		status = response-&gt;status;</div><div class='del'>-		response-&gt;status = NULL;</div><div class='del'>-		camel_imap_response_free (response);</div><div class='del'>-		return status;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-			      _("Unexpected OK response from IMAP server: %s"),</div><div class='del'>-			      response-&gt;status);</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h<br/>deleted file mode 100644<br/>index 38e290c379..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-command.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-command.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'>-/* camel-imap-command.h: IMAP command sending/parsing routines */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors:</div><div class='del'>- *   Dan Winship &lt;danw@helixcode.com&gt;</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.</div><div class='del'>- *</div><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_COMMAND_H</div><div class='del'>-#define CAMEL_IMAP_COMMAND_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	GPtrArray *untagged;</div><div class='del'>-	char *status;</div><div class='del'>-} CamelImapResponse;</div><div class='del'>-</div><div class='del'>-CamelImapResponse *camel_imap_command              (CamelImapStore *store,</div><div class='del'>-						    CamelFolder *folder,</div><div class='del'>-						    CamelException *ex,</div><div class='del'>-						    const char *fmt, ...);</div><div class='del'>-CamelImapResponse *camel_imap_command_continuation (CamelImapStore *store,</div><div class='del'>-						    CamelException *ex,</div><div class='del'>-						    const char *cmdbuf);</div><div class='del'>-</div><div class='del'>-void  camel_imap_response_free                 (CamelImapResponse *response);</div><div class='del'>-char *camel_imap_response_extract              (CamelImapResponse *response,</div><div class='del'>-						const char *type,</div><div class='del'>-						CamelException *ex);</div><div class='del'>-char *camel_imap_response_extract_continuation (CamelImapResponse *response,</div><div class='del'>-						CamelException *ex);</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_COMMAND_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c<br/>deleted file mode 100644<br/>index a4b8b459de..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-folder.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,850 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-imap-folder.c: Abstract class for an imap 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'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include "camel-imap-command.h"</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-imap-stream.h"</div><div class='del'>-#include "camel-imap-summary.h"</div><div class='del'>-#include "camel-imap-utils.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) x</div><div class='del'>-</div><div class='del'>-#define CF_CLASS(o) (CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(o)))</div><div class='del'>-</div><div class='del'>-static CamelFolderClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void imap_finalize (CamelObject *object);</div><div class='del'>-static void imap_refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-static const char *imap_get_full_name (CamelFolder *folder);</div><div class='del'>-static void imap_expunge (CamelFolder *folder, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* message counts */</div><div class='del'>-static gint imap_get_message_count (CamelFolder *folder);</div><div class='del'>-static gint imap_get_unread_message_count (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-/* message manipulation */</div><div class='del'>-static CamelMimeMessage *imap_get_message (CamelFolder *folder, const gchar *uid,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-static void imap_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-				 const CamelMessageInfo *info, CamelException *ex);</div><div class='del'>-static void imap_copy_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-				  CamelFolder *destination, CamelException *ex);</div><div class='del'>-static void imap_move_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-				  CamelFolder *destination, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* summary info */</div><div class='del'>-static GPtrArray *imap_get_uids (CamelFolder *folder);</div><div class='del'>-static GPtrArray *imap_get_summary (CamelFolder *folder);</div><div class='del'>-static const CamelMessageInfo *imap_get_message_info (CamelFolder *folder, const char *uid);</div><div class='del'>-</div><div class='del'>-static void imap_update_summary (CamelFolder *folder, int first, int last,</div><div class='del'>-				 CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* searching */</div><div class='del'>-static GPtrArray *imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* flag methods */</div><div class='del'>-static guint32  imap_get_message_flags     (CamelFolder *folder, const char *uid);</div><div class='del'>-static void     imap_set_message_flags     (CamelFolder *folder, const char *uid, guint32 flags, guint32 set);</div><div class='del'>-static gboolean imap_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name);</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);</div><div class='del'>-</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'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;refresh_info = imap_refresh_info;</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'>-	camel_folder_class-&gt;get_full_name = imap_get_full_name;</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;free_uids = camel_folder_free_nop;</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_unread_message_count = imap_get_unread_message_count;</div><div class='del'>-	camel_folder_class-&gt;get_message = imap_get_message;</div><div class='del'>-	camel_folder_class-&gt;append_message = imap_append_message;</div><div class='del'>-	camel_folder_class-&gt;copy_message_to = imap_copy_message_to;</div><div class='del'>-	camel_folder_class-&gt;move_message_to = imap_move_message_to;</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;get_message_info = imap_get_message_info;</div><div class='del'>-	camel_folder_class-&gt;free_summary = camel_folder_free_nop;</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_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_flag = imap_get_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_flag = imap_set_message_user_flag;</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;has_summary_capability = TRUE;</div><div class='del'>-	folder-&gt;has_search_capability = TRUE;</div><div class='del'>-	</div><div class='del'>-	imap_folder-&gt;summary = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_imap_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_imap_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_imap_folder_type =</div><div class='del'>-			camel_type_register (CAMEL_FOLDER_TYPE, "CamelImapFolder",</div><div class='del'>-					     sizeof (CamelImapFolder),</div><div class='del'>-					     sizeof (CamelImapFolderClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_imap_folder_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_imap_folder_init,</div><div class='del'>-					     (CamelObjectFinalizeFunc) imap_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_imap_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_imap_folder_new (CamelStore *parent, const char *folder_name,</div><div class='del'>-		       const char *short_name, const char *summary_file,</div><div class='del'>-		       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (parent);</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (camel_object_new (camel_imap_folder_get_type ()));</div><div class='del'>-	CamelImapFolder *imap_folder = (CamelImapFolder *)folder;</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	const char *resp;</div><div class='del'>-	guint32 validity = 0;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	camel_folder_construct (folder, parent, folder_name, short_name);</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (imap_store, folder, ex, NULL);</div><div class='del'>-	if (!response) {</div><div class='del'>-		camel_object_unref ((CamelObject *)folder);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i] + 2;</div><div class='del'>-		if (!g_strncasecmp (resp, "FLAGS ", 6)) {</div><div class='del'>-			folder-&gt;permanent_flags =</div><div class='del'>-				imap_parse_flag_list (resp + 6);</div><div class='del'>-		} else if (!g_strncasecmp (resp, "OK [PERMANENTFLAGS ", 19)) {</div><div class='del'>-			folder-&gt;permanent_flags =</div><div class='del'>-				imap_parse_flag_list (resp + 19);</div><div class='del'>-		} else if (!g_strncasecmp (resp, "OK [UIDVALIDITY ", 16)) {</div><div class='del'>-			validity = strtoul (resp + 16, NULL, 10);</div><div class='del'>-		} else if (isdigit ((unsigned char)*resp)) {</div><div class='del'>-			unsigned long num = strtoul (resp, (char **)&amp;resp, 10);</div><div class='del'>-</div><div class='del'>-			if (!g_strncasecmp (resp, " EXISTS", 7))</div><div class='del'>-				imap_folder-&gt;exists = num;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-</div><div class='del'>-	imap_folder-&gt;summary = camel_imap_summary_new (summary_file, validity);</div><div class='del'>-	if (!imap_folder-&gt;summary) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not load summary for %s"),</div><div class='del'>-				      folder_name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	imap_refresh_info (folder, ex);</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-imap_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	camel_object_unref ((CamelObject *)imap_folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	struct {</div><div class='del'>-		char *uid;</div><div class='del'>-		guint32 flags;</div><div class='del'>-	} *new;</div><div class='del'>-	char *resp, *uid, *p, *flags;</div><div class='del'>-	int i, seq, summary_len;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	gboolean folder_changed = FALSE;</div><div class='del'>-</div><div class='del'>-	if (imap_folder-&gt;exists == 0) {</div><div class='del'>-		if (camel_folder_summary_count != 0) {</div><div class='del'>-			camel_folder_summary_clear (imap_folder-&gt;summary);</div><div class='del'>-			camel_object_trigger_event (CAMEL_OBJECT (folder),</div><div class='del'>-						    "folder_changed", NULL);</div><div class='del'>-		}</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Get UIDs and flags of all messages. */</div><div class='del'>-	response = camel_imap_command (store, folder, ex,</div><div class='del'>-				       "FETCH 1:%d (UID FLAGS)",</div><div class='del'>-				       imap_folder-&gt;exists);</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	new = g_malloc0 (imap_folder-&gt;exists * sizeof (*new));</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		resp = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-</div><div class='del'>-		seq = strtoul (resp + 2, &amp;resp, 10);</div><div class='del'>-		if (g_strncasecmp (resp, " FETCH ", 7) != 0)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		uid = e_strstrcase (resp, "UID ");</div><div class='del'>-		if (uid) {</div><div class='del'>-			uid += 4;</div><div class='del'>-			strtoul (uid, &amp;p, 10);</div><div class='del'>-			new[seq - 1].uid = g_strndup (uid, p - uid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		flags = e_strstrcase (resp, "FLAGS ");</div><div class='del'>-		if (flags) {</div><div class='del'>-			flags += 6;</div><div class='del'>-			new[seq - 1].flags = imap_parse_flag_list (flags);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If we find a UID in the summary that doesn't correspond to</div><div class='del'>-	 * the UID in the folder, that it means the message was</div><div class='del'>-	 * deleted on the server, so we remove it from the summary.</div><div class='del'>-	 */</div><div class='del'>-	summary_len = camel_folder_summary_count (imap_folder-&gt;summary);</div><div class='del'>-	for (i = 0; i &lt; summary_len &amp;&amp; i &lt; imap_folder-&gt;exists; i++) {</div><div class='del'>-		info = camel_folder_summary_index (imap_folder-&gt;summary, i);</div><div class='del'>-</div><div class='del'>-		/* Shouldn't happen, but... */</div><div class='del'>-		if (!new[i].uid)</div><div class='del'>-			continue;</div><div class='del'>-</div><div class='del'>-		if (strcmp (info-&gt;uid, new[i].uid) != 0) {</div><div class='del'>-			camel_folder_summary_remove (imap_folder-&gt;summary,</div><div class='del'>-						     info);</div><div class='del'>-			folder_changed = TRUE;</div><div class='del'>-			i--;</div><div class='del'>-			summary_len--;</div><div class='del'>-			continue;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Update summary flags */</div><div class='del'>-		if (info-&gt;flags != new[i].flags) {</div><div class='del'>-			info-&gt;flags = new[i].flags;</div><div class='del'>-			camel_object_trigger_event (CAMEL_OBJECT (folder),</div><div class='del'>-						    "message_changed",</div><div class='del'>-						    info-&gt;uid);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (new[i].uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Remove any leftover cached summary messages. */</div><div class='del'>-	while (summary_len &gt; i + 1) {</div><div class='del'>-		camel_folder_summary_remove_index (imap_folder-&gt;summary,</div><div class='del'>-						   --summary_len);</div><div class='del'>-		folder_changed = TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Add any new folder messages. */</div><div class='del'>-	if (i &lt; imap_folder-&gt;exists) {</div><div class='del'>-		/* Fetch full summary for the remaining messages. */</div><div class='del'>-		imap_update_summary (folder, i + 1, imap_folder-&gt;exists, ex);</div><div class='del'>-		folder_changed = TRUE;</div><div class='del'>-</div><div class='del'>-		while (i &lt; imap_folder-&gt;exists)</div><div class='del'>-			g_free (new[i++].uid);</div><div class='del'>-	}</div><div class='del'>-	g_free (new);</div><div class='del'>-</div><div class='del'>-	if (folder_changed) {</div><div class='del'>-		camel_object_trigger_event (CAMEL_OBJECT (folder),</div><div class='del'>-					    "folder_changed", NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	int i, max;</div><div class='del'>-</div><div class='del'>-	/* Set the flags on any messages that have changed this session */</div><div class='del'>-	max = camel_folder_summary_count (imap_folder-&gt;summary);</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 = camel_folder_summary_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 = imap_create_flag_list (info-&gt;flags);</div><div class='del'>-			if (flags) {</div><div class='del'>-				response = camel_imap_command (</div><div class='del'>-					store, folder, ex,</div><div class='del'>-					"UID STORE %s FLAGS.SILENT %s",</div><div class='del'>-					info-&gt;uid, flags);</div><div class='del'>-				g_free (flags);</div><div class='del'>-				if (!response)</div><div class='del'>-					return;</div><div class='del'>-				camel_imap_response_free (response);</div><div class='del'>-			}</div><div class='del'>-			info-&gt;flags &amp;= ~CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (expunge) {</div><div class='del'>-		response = camel_imap_command (store, folder, ex, "EXPUNGE");</div><div class='del'>-		camel_imap_response_free (response);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_save (imap_folder-&gt;summary);</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'>-	imap_sync (folder, TRUE, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *</div><div class='del'>-imap_get_full_name (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = ((CamelService *)folder-&gt;parent_store)-&gt;url;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if (!url-&gt;path || !*url-&gt;path || !strcmp (url-&gt;path, "/"))</div><div class='del'>-		return folder-&gt;full_name;</div><div class='del'>-	len = strlen (url-&gt;path + 1);</div><div class='del'>-	if (!strncmp (url-&gt;path + 1, folder-&gt;full_name, len) &amp;&amp;</div><div class='del'>-	    strlen (folder-&gt;full_name) &gt; len + 1)</div><div class='del'>-		return folder-&gt;full_name + len + 1;</div><div class='del'>-	return folder-&gt;full_name;</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-imap_get_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	</div><div class='del'>-	return camel_folder_summary_count (imap_folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-imap_get_unread_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	int i, max, count = 0;</div><div class='del'>-</div><div class='del'>-	max = camel_folder_summary_count (imap_folder-&gt;summary);</div><div class='del'>-	for (i = 0; i &lt; max; i++) {</div><div class='del'>-		info = camel_folder_summary_index (imap_folder-&gt;summary, i);</div><div class='del'>-		if (!(info-&gt;flags &amp; CAMEL_MESSAGE_SEEN))</div><div class='del'>-			count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_append_message (CamelFolder *folder, CamelMimeMessage *message,</div><div class='del'>-		     const CamelMessageInfo *info, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelStream *memstream;</div><div class='del'>-	CamelMimeFilter *crlf_filter;</div><div class='del'>-	CamelStreamFilter *streamfilter;</div><div class='del'>-	GByteArray *ba;</div><div class='del'>-	char *flagstr, *result;</div><div class='del'>-	</div><div class='del'>-	/* create flag string param */</div><div class='del'>-	if (info &amp;&amp; info-&gt;flags)</div><div class='del'>-		flagstr = imap_create_flag_list (info-&gt;flags);</div><div class='del'>-	else</div><div class='del'>-		flagstr = NULL;</div><div class='del'>-</div><div class='del'>-	/* FIXME: We could avoid this if we knew how big the message was. */</div><div class='del'>-	memstream = camel_stream_mem_new ();</div><div class='del'>-	ba = g_byte_array_new ();</div><div class='del'>-	camel_stream_mem_set_byte_array (CAMEL_STREAM_MEM (memstream), ba);</div><div class='del'>-</div><div class='del'>-	streamfilter = camel_stream_filter_new_with_stream (memstream);</div><div class='del'>-	crlf_filter = camel_mime_filter_crlf_new (</div><div class='del'>-		CAMEL_MIME_FILTER_CRLF_ENCODE,</div><div class='del'>-		CAMEL_MIME_FILTER_CRLF_MODE_CRLF_ONLY);</div><div class='del'>-	camel_stream_filter_add (streamfilter, crlf_filter);</div><div class='del'>-	camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (message),</div><div class='del'>-					    CAMEL_STREAM (streamfilter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (streamfilter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (crlf_filter));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (memstream));</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (store, NULL, ex, "APPEND %s%s%s {%d}",</div><div class='del'>-				       folder-&gt;full_name, flagstr ? " " : "",</div><div class='del'>-				       flagstr ? flagstr : "", ba-&gt;len);</div><div class='del'>-	g_free (flagstr);</div><div class='del'>-	</div><div class='del'>-	if (!response) {</div><div class='del'>-		g_byte_array_free (ba, TRUE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	result = camel_imap_response_extract_continuation (response, ex);</div><div class='del'>-	if (!result) {</div><div class='del'>-		g_byte_array_free (ba, TRUE);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free (result);</div><div class='del'>-</div><div class='del'>-	/* send the rest of our data - the mime message */</div><div class='del'>-	g_byte_array_append (ba, "\0", 3);</div><div class='del'>-	response = camel_imap_command_continuation (store, ex, ba-&gt;data);</div><div class='del'>-	g_byte_array_free (ba, TRUE);</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_copy_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-		      CamelFolder *destination, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (source-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (store, source, ex, "UID COPY %s \"%s\"",</div><div class='del'>-				       uid, destination-&gt;full_name);</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-</div><div class='del'>-	/* FIXME: This should go away once folder_changed is being</div><div class='del'>-	 * emitted by camel_imap_folder_changed on appends again.</div><div class='del'>-	 */</div><div class='del'>-	if (!camel_exception_is_set (ex)) {</div><div class='del'>-		camel_object_trigger_event (CAMEL_OBJECT (destination),</div><div class='del'>-					    "folder_changed", NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_move_message_to (CamelFolder *source, const char *uid,</div><div class='del'>-		      CamelFolder *destination, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (source-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (store, source, ex, "UID COPY %s \"%s\"",</div><div class='del'>-				       uid, destination-&gt;full_name);</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/* FIXME: This should go away once folder_changed is being</div><div class='del'>-	 * emitted by camel_imap_folder_changed on appends again.</div><div class='del'>-	 */</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (destination),</div><div class='del'>-				    "folder_changed", NULL);</div><div class='del'>-</div><div class='del'>-	camel_folder_delete_message (source, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-imap_get_uids (CamelFolder *folder) </div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *array;</div><div class='del'>-	int i, count;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count (imap_folder-&gt;summary);</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'>-</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		info = camel_folder_summary_index (imap_folder-&gt;summary, 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'>-	return array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-imap_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	CamelStream *msgstream;</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	char *result, *mesg, *p;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (store, folder, ex,</div><div class='del'>-				       "UID FETCH %s RFC822", uid);</div><div class='del'>-	if (!response)</div><div class='del'>-		return NULL;</div><div class='del'>-	result = camel_imap_response_extract (response, "FETCH", ex);</div><div class='del'>-	if (!result)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	p = strstr (result, "RFC822");</div><div class='del'>-	if (p) {</div><div class='del'>-		p += 7;</div><div class='del'>-		mesg = imap_parse_nstring (&amp;p, &amp;len);</div><div class='del'>-	}</div><div class='del'>-	if (!p) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Could not find message body in FETCH "</div><div class='del'>-					"response."));</div><div class='del'>-		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'>-	msgstream = camel_stream_mem_new_with_buffer (mesg, len);</div><div class='del'>-	msg = camel_mime_message_new ();</div><div class='del'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER (msg),</div><div class='del'>-						  msgstream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (msgstream));</div><div class='del'>-	g_free (mesg);</div><div class='del'>-</div><div class='del'>-	return msg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_protocol_get_summary_specifier</div><div class='del'>- *</div><div class='del'>- * Make a data item specifier for the header lines we need,</div><div class='del'>- * appropriate to the server level.</div><div class='del'>- *</div><div class='del'>- * IMAP4rev1:  UID FLAGS BODY.PEEK[HEADER.FIELDS (SUBJECT FROM .. IN-REPLY-TO)]</div><div class='del'>- * IMAP4:      UID FLAGS RFC822.HEADER.LINES (SUBJECT FROM .. IN-REPLY-TO)</div><div class='del'>- **/</div><div class='del'>-static char *</div><div class='del'>-imap_protocol_get_summary_specifier (CamelImapStore *store)</div><div class='del'>-{</div><div class='del'>-	char *sect_begin, *sect_end;</div><div class='del'>-	char *headers_wanted = "SUBJECT FROM TO CC DATE MESSAGE-ID REFERENCES IN-REPLY-TO";</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;server_level &gt;= IMAP_LEVEL_IMAP4REV1) {</div><div class='del'>-		sect_begin = "BODY.PEEK[HEADER.FIELDS";</div><div class='del'>-		sect_end = "]";</div><div class='del'>-	} else {</div><div class='del'>-		sect_begin = "RFC822.HEADER.LINES";</div><div class='del'>-		sect_end   = "";</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return g_strdup_printf ("UID FLAGS %s (%s)%s", sect_begin,</div><div class='del'>-				headers_wanted, sect_end);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_update_summary (CamelFolder *folder, int first, int last,</div><div class='del'>-		     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (folder-&gt;parent_store);</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	GPtrArray *headers = NULL;</div><div class='del'>-	char *q, *summary_specifier;</div><div class='del'>-	struct _header_raw *h = NULL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* If the range we're updating overlaps with the range we already</div><div class='del'>-	 * know about, then fetch just flags + uids first. If uids</div><div class='del'>-	 * aren't "right", reorder them. Update flags appropriately.</div><div class='del'>-	 * If that returned unknown UIDs, or we're updating unknown</div><div class='del'>-	 * sequence numbers, do the full fetch for those.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	summary_specifier = imap_protocol_get_summary_specifier (store);</div><div class='del'>-	if (first == last) {</div><div class='del'>-		response = camel_imap_command (store, folder, ex,</div><div class='del'>-					       "FETCH %d (%s)", first,</div><div class='del'>-					       summary_specifier);</div><div class='del'>-	} else {</div><div class='del'>-		response = camel_imap_command (store, folder, ex,</div><div class='del'>-					       "FETCH %d:%d (%s)", first,</div><div class='del'>-					       last, summary_specifier);</div><div class='del'>-	}</div><div class='del'>-	g_free (summary_specifier);</div><div class='del'>-</div><div class='del'>-	if (!response)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	headers = response-&gt;untagged;</div><div class='del'>-	for (i = 0; i &lt; headers-&gt;len; i++) {</div><div class='del'>-		CamelMessageInfo *info;</div><div class='del'>-		char *uid, *flags, *header;</div><div class='del'>-</div><div class='del'>-		/* Grab the UID... */</div><div class='del'>-		if (!(uid = strstr (headers-&gt;pdata[i], "UID "))) {</div><div class='del'>-			d(fprintf (stderr, "Cannot get a uid for %d\n\n%s\n\n", i+1, (char *) headers-&gt;pdata[i]));</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		for (uid += 4; *uid &amp;&amp; (*uid &lt; '0' || *uid &gt; '9'); uid++)</div><div class='del'>-			;</div><div class='del'>-		for (q = uid; *q &amp;&amp; *q &gt;= '0' &amp;&amp; *q &lt;= '9'; q++)</div><div class='del'>-			;</div><div class='del'>-</div><div class='del'>-		/* construct the header list */</div><div class='del'>-		/* fast-forward to beginning of header info... */</div><div class='del'>-		header = strchr (headers-&gt;pdata[i], '\n') + 1;</div><div class='del'>-		h = NULL;</div><div class='del'>-		do {</div><div class='del'>-			char *line;</div><div class='del'>-			int len;</div><div class='del'>-</div><div class='del'>-			len = strcspn (header, "\n");</div><div class='del'>-			while (header[len + 1] == ' ' ||</div><div class='del'>-			       header[len + 1] == '\t')</div><div class='del'>-				len += 1 + strcspn (header + len + 1, "\n");</div><div class='del'>-			line = g_strndup (header, len);</div><div class='del'>-			header_raw_append_parse (&amp;h, line, -1);</div><div class='del'>-			g_free (line);</div><div class='del'>-</div><div class='del'>-			header += len;</div><div class='del'>-		} while (*header++ == '\n' &amp;&amp; *header != '\n');</div><div class='del'>-</div><div class='del'>-		/* We can't just call camel_folder_summary_add_from_parser</div><div class='del'>-		 * because it will assign the wrong UID, and thus get the</div><div class='del'>-		 * uid hash table wrong and all that. FIXME some day.</div><div class='del'>-		 */</div><div class='del'>-		info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(imap_folder-&gt;summary)))-&gt;message_info_new(imap_folder-&gt;summary, h);</div><div class='del'>-		header_raw_clear (&amp;h);</div><div class='del'>-		info-&gt;uid = g_strndup (uid, q - uid);</div><div class='del'>-</div><div class='del'>-		/* now lets grab the FLAGS */</div><div class='del'>-		if (!(flags = strstr (headers-&gt;pdata[i], "FLAGS "))) {</div><div class='del'>-			d(fprintf (stderr, "We didn't seem to get any flags for %d...\n", i));</div><div class='del'>-		} else {		</div><div class='del'>-			for (flags += 6; *flags &amp;&amp; *flags != '('; flags++)</div><div class='del'>-				;</div><div class='del'>-			info-&gt;flags = imap_parse_flag_list (flags);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_folder_summary_add (imap_folder-&gt;summary, info);</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-imap_get_summary (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	return imap_folder-&gt;summary-&gt;messages;</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_get_message_info (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-	</div><div class='del'>-	return camel_folder_summary_uid (imap_folder-&gt;summary, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-imap_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	GPtrArray *uids = NULL;</div><div class='del'>-	char *result, *sexp, *p;</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "camel sexp: '%s'\n", expression));</div><div class='del'>-	sexp = imap_translate_sexp (expression);</div><div class='del'>-	d(fprintf (stderr, "imap sexp: '%s'\n", sexp));</div><div class='del'>-	</div><div class='del'>-	uids = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	if (!folder-&gt;has_search_capability) {</div><div class='del'>-		g_free (sexp);</div><div class='del'>-		return uids;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	response = camel_imap_command (CAMEL_IMAP_STORE (folder-&gt;parent_store),</div><div class='del'>-				       folder, NULL, "UID SEARCH %s", sexp);</div><div class='del'>-	g_free (sexp);</div><div class='del'>-	if (!response)</div><div class='del'>-		return uids;</div><div class='del'>-</div><div class='del'>-	result = camel_imap_response_extract (response, "SEARCH", NULL);</div><div class='del'>-	if (!result)</div><div class='del'>-		return uids;</div><div class='del'>-	</div><div class='del'>-	if ((p = strstr (result, "* SEARCH"))) {</div><div class='del'>-		char *word;</div><div class='del'>-		</div><div class='del'>-		word = imap_next_word (p); /* word now points to SEARCH */</div><div class='del'>-		</div><div class='del'>-		for (word = imap_next_word (word); *word &amp;&amp; *word != '*'; word = imap_next_word (word)) {</div><div class='del'>-			gboolean word_is_numeric = TRUE;</div><div class='del'>-			char *ep;</div><div class='del'>-			</div><div class='del'>-			/* find the end of this word and make sure it's a numeric uid */</div><div class='del'>-			for (ep = word; *ep &amp;&amp; *ep != ' ' &amp;&amp; *ep != '\n'; ep++)</div><div class='del'>-				if (*ep &lt; '0' || *ep &gt; '9')</div><div class='del'>-					word_is_numeric = FALSE;</div><div class='del'>-			</div><div class='del'>-			if (word_is_numeric)</div><div class='del'>-				g_ptr_array_add (uids, g_strndup (word, (gint)(ep - word)));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (result);</div><div class='del'>-	</div><div class='del'>-	return uids;</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)</div><div class='del'>-{</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-	</div><div class='del'>-	info = imap_get_message_info (folder, uid);</div><div class='del'>-	g_return_val_if_fail (info != NULL, 0);</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)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = (CamelImapFolder *)folder;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid (imap_folder-&gt;summary, uid);</div><div class='del'>-	g_return_if_fail (info != NULL);</div><div class='del'>-</div><div class='del'>-	if ((info-&gt;flags &amp; set) == flags)</div><div class='del'>-		return;</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'>-	camel_folder_summary_touch (imap_folder-&gt;summary);</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (folder), "message_changed",</div><div class='del'>-				    (gpointer)uid);</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)</div><div class='del'>-{</div><div class='del'>-	/* FIXME */</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)</div><div class='del'>-{</div><div class='del'>-	/* FIXME */</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT (folder), "message_changed",</div><div class='del'>-				    (gpointer)uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_imap_folder_changed (CamelFolder *folder, int exists,</div><div class='del'>-			   GArray *expunged, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapFolder *imap_folder = CAMEL_IMAP_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	if (expunged) {</div><div class='del'>-		int i, id;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; expunged-&gt;len; i++) {</div><div class='del'>-			id = g_array_index (expunged, int, i);</div><div class='del'>-			camel_folder_summary_remove_index (</div><div class='del'>-				imap_folder-&gt;summary, id - 1);</div><div class='del'>-		}</div><div class='del'>-		camel_object_trigger_event (CAMEL_OBJECT (folder),</div><div class='del'>-					    "folder_changed", NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (exists != 0)</div><div class='del'>-		imap_folder-&gt;exists = exists;</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 109cc76506..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-folder.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,77 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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 "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)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolder))</div><div class='del'>-#define CAMEL_IMAP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_FOLDER_TYPE, CamelImapFolderClass))</div><div class='del'>-#define IS_CAMEL_IMAP_FOLDER(o)    (CAMEL_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'>-	CamelFolderSummary *summary;</div><div class='del'>-	int exists;</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,</div><div class='del'>-				    const char *folder_name,</div><div class='del'>-				    const char *short_name,</div><div class='del'>-				    const char *summary_file,</div><div class='del'>-				    CamelException *ex);</div><div class='del'>-</div><div class='del'>-void camel_imap_folder_changed (CamelFolder *folder, int exists,</div><div class='del'>-				GArray *expunged, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_imap_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-provider.c b/camel/providers/imap/camel-imap-provider.c<br/>deleted file mode 100644<br/>index 9b962df5f4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,113 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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'>-	N_("IMAPv4"),</div><div class='del'>-</div><div class='del'>-	N_("For reading and storing mail on IMAP servers."),</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE |</div><div class='del'>-	CAMEL_PROVIDER_IS_STORAGE,</div><div class='del'>-</div><div class='del'>-	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST |</div><div class='del'>-	CAMEL_URL_ALLOW_PATH | CAMEL_URL_ALLOW_AUTH,</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 0a8618ff90..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,788 +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;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 &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-imap-store.h"</div><div class='del'>-#include "camel-imap-auth.h"</div><div class='del'>-#include "camel-imap-folder.h"</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-#include "camel-imap-command.h"</div><div class='del'>-#include "camel-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-session.h"</div><div class='del'>-#include "camel-stream.h"</div><div class='del'>-#include "camel-stream-buffer.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-/* Specified in RFC 2060 */</div><div class='del'>-#define IMAP_PORT 143</div><div class='del'>-</div><div class='del'>-static CamelRemoteStoreClass *remote_store_class = NULL;</div><div class='del'>-</div><div class='del'>-static gboolean imap_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean imap_disconnect (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static GList *query_auth_types_generic (CamelService *service, CamelException *ex);</div><div class='del'>-static GList *query_auth_types_connected (CamelService *service, CamelException *ex);</div><div class='del'>-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);</div><div class='del'>-static char *get_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 CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-					 gboolean fast, gboolean recursive,</div><div class='del'>-					 gboolean subscribed_only,</div><div class='del'>-					 CamelException *ex);</div><div class='del'>-static gboolean folder_subscribed (CamelStore *store, const char *folder_name);</div><div class='del'>-static void subscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			      CamelException *ex);</div><div class='del'>-static void unsubscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-				CamelException *ex);</div><div class='del'>-static void imap_keepalive (CamelRemoteStore *store);</div><div class='del'>-</div><div class='del'>-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'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_imap_store_class);</div><div class='del'>-	CamelStoreClass *camel_store_class =</div><div class='del'>-		CAMEL_STORE_CLASS (camel_imap_store_class);</div><div class='del'>-	CamelRemoteStoreClass *camel_remote_store_class =</div><div class='del'>-		CAMEL_REMOTE_STORE_CLASS (camel_imap_store_class);</div><div class='del'>-	</div><div class='del'>-	remote_store_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs </div><div class='del'>-						      (camel_remote_store_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;query_auth_types_generic = query_auth_types_generic;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_connected = query_auth_types_connected;</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'>-	</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'>-	camel_store_class-&gt;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;folder_subscribed = folder_subscribed;</div><div class='del'>-	camel_store_class-&gt;subscribe_folder = subscribe_folder;</div><div class='del'>-	camel_store_class-&gt;unsubscribe_folder = unsubscribe_folder;</div><div class='del'>-</div><div class='del'>-	camel_remote_store_class-&gt;keepalive = imap_keepalive;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-free_sub (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_store_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach_remove (imap_store-&gt;subscribed_folders,</div><div class='del'>-				     free_sub, NULL);</div><div class='del'>-	g_hash_table_destroy (imap_store-&gt;subscribed_folders);</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'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (object);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-	</div><div class='del'>-	remote_store-&gt;default_port = 143;</div><div class='del'>-</div><div class='del'>-	imap_store-&gt;dir_sep = '\0';</div><div class='del'>-	imap_store-&gt;current_folder = NULL;</div><div class='del'>-</div><div class='del'>-	store-&gt;flags = CAMEL_STORE_SUBSCRIPTIONS;</div><div class='del'>-	</div><div class='del'>-	imap_store-&gt;connected = FALSE;</div><div class='del'>-	imap_store-&gt;subscribed_folders = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_imap_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_imap_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_imap_store_type =</div><div class='del'>-			camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelImapStore",</div><div class='del'>-					     sizeof (CamelImapStore),</div><div class='del'>-					     sizeof (CamelImapStoreClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_imap_store_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_imap_store_init,</div><div class='del'>-					     (CamelObjectFinalizeFunc) camel_imap_store_finalize);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_imap_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct {</div><div class='del'>-	const char *name;</div><div class='del'>-	guint32 flag;</div><div class='del'>-} capabilities[] = {</div><div class='del'>-	{ "IMAP4",		IMAP_CAPABILITY_IMAP4 },</div><div class='del'>-	{ "IMAP4REV1",		IMAP_CAPABILITY_IMAP4REV1 },</div><div class='del'>-	{ "STATUS",		IMAP_CAPABILITY_STATUS },</div><div class='del'>-	{ "NAMESPACE",		IMAP_CAPABILITY_NAMESPACE },</div><div class='del'>-	{ "AUTH=KERBEROS_V4",	IMAP_CAPABILITY_AUTH_KERBEROS_V4 },</div><div class='del'>-	{ "AUTH=GSSAPI",	IMAP_CAPABILITY_AUTH_GSSAPI },</div><div class='del'>-	{ "UIDPLUS",		IMAP_CAPABILITY_UIDPLUS },</div><div class='del'>-	{ "LITERAL+",		IMAP_CAPABILITY_LITERALPLUS },</div><div class='del'>-	{ NULL, 0 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-connect_to_server (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *result, *buf, *capa, *lasts;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (!CAMEL_SERVICE_CLASS (remote_store_class)-&gt;connect (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	store-&gt;command = 0;</div><div class='del'>-</div><div class='del'>-	/* Read the greeting, if any. FIXME: deal with PREAUTH */</div><div class='del'>-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (service),</div><div class='del'>-					  &amp;buf, ex) &lt; 0) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	g_free (buf);</div><div class='del'>-	store-&gt;connected = TRUE;</div><div class='del'>-	</div><div class='del'>-	/* Find out the IMAP capabilities */</div><div class='del'>-	store-&gt;capabilities = 0;</div><div class='del'>-	response = camel_imap_command (store, NULL, ex, "CAPABILITY");</div><div class='del'>-	if (!response)</div><div class='del'>-		return FALSE;</div><div class='del'>-	result = camel_imap_response_extract (response, "CAPABILITY", ex);</div><div class='del'>-	if (!result)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Skip over "* CAPABILITY". */</div><div class='del'>-	capa = imap_next_word (result + 2);</div><div class='del'>-</div><div class='del'>-	for (capa = strtok_r (capa, " ", &amp;lasts); capa;</div><div class='del'>-	     capa = strtok_r (NULL, " ", &amp;lasts)) {</div><div class='del'>-		for (i = 0; capabilities[i].name; i++) {</div><div class='del'>-			if (g_strcasecmp (capa, capabilities[i].name) == 0) {</div><div class='del'>-				store-&gt;capabilities |= capabilities[i].flag;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_free (result);</div><div class='del'>-</div><div class='del'>-	if (store-&gt;capabilities &amp; IMAP_CAPABILITY_IMAP4REV1) {</div><div class='del'>-		store-&gt;server_level = IMAP_LEVEL_IMAP4REV1;</div><div class='del'>-		store-&gt;capabilities |= IMAP_CAPABILITY_STATUS;</div><div class='del'>-	} else if (store-&gt;capabilities &amp; IMAP_CAPABILITY_IMAP4)</div><div class='del'>-		store-&gt;server_level = IMAP_LEVEL_IMAP4;</div><div class='del'>-	else</div><div class='del'>-		store-&gt;server_level = IMAP_LEVEL_UNKNOWN;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelServiceAuthType password_authtype = {</div><div class='del'>-	N_("Password"),</div><div class='del'>-	</div><div class='del'>-	N_("This option will 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'>-#ifdef HAVE_KRB4</div><div class='del'>-static CamelServiceAuthType kerberos_v4_authtype = {</div><div class='del'>-	N_("Kerberos 4"),</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the IMAP server using "</div><div class='del'>-	   "Kerberos 4 authentication."),</div><div class='del'>-</div><div class='del'>-	"KERBEROS_V4",</div><div class='del'>-	FALSE</div><div class='del'>-};</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-query_auth_types_connected (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *types;</div><div class='del'>-</div><div class='del'>-	if (!connect_to_server (service, ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	types = CAMEL_SERVICE_CLASS (remote_store_class)-&gt;query_auth_types_connected (service, ex);</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	if (CAMEL_IMAP_STORE (service)-&gt;capabilities &amp;</div><div class='del'>-	    IMAP_CAPABILITY_AUTH_KERBEROS_V4)</div><div class='del'>-		types = g_list_prepend (types, &amp;kerberos_v4_authtype);</div><div class='del'>-#endif</div><div class='del'>-	return g_list_prepend (types, &amp;password_authtype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-query_auth_types_generic (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *types;</div><div class='del'>-	</div><div class='del'>-	types = CAMEL_SERVICE_CLASS (remote_store_class)-&gt;query_auth_types_generic (service, ex);</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	types = g_list_prepend (types, &amp;kerberos_v4_authtype);</div><div class='del'>-#endif</div><div class='del'>-	return g_list_prepend (types, &amp;password_authtype);</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'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelSession *session = camel_service_get_session (CAMEL_SERVICE (store));</div><div class='del'>-	gchar *result, *errbuf = NULL, *namespace;</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	gboolean authenticated = FALSE;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if (connect_to_server (service, ex) == 0)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	/* authenticate the user */</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	if (service-&gt;url-&gt;authmech &amp;&amp;</div><div class='del'>-	    !g_strcasecmp (service-&gt;url-&gt;authmech, "KERBEROS_V4")) {</div><div class='del'>-		if (!(store-&gt;capabilities &amp; IMAP_CAPABILITY_AUTH_KERBEROS_V4)) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-					      "IMAP server %s does not "</div><div class='del'>-					      "support requested "</div><div class='del'>-					      "authentication type %s",</div><div class='del'>-					      service-&gt;url-&gt;host,</div><div class='del'>-					      service-&gt;url-&gt;authmech);</div><div class='del'>-			camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		authenticated = imap_try_kerberos_v4_auth (store, ex);</div><div class='del'>-		if (camel_exception_is_set (ex)) {</div><div class='del'>-			camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-			return FALSE;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	while (!authenticated) {</div><div class='del'>-		if (errbuf) {</div><div class='del'>-			/* We need to un-cache the password before prompting again */</div><div class='del'>-			camel_session_query_authenticator (</div><div class='del'>-				session, CAMEL_AUTHENTICATOR_TELL, NULL,</div><div class='del'>-				TRUE, service, "password", ex);</div><div class='del'>-			g_free (service-&gt;url-&gt;passwd);</div><div class='del'>-			service-&gt;url-&gt;passwd = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!service-&gt;url-&gt;authmech &amp;&amp; !service-&gt;url-&gt;passwd) {</div><div class='del'>-			char *prompt;</div><div class='del'>-</div><div class='del'>-			prompt = g_strdup_printf (_("%sPlease enter the IMAP "</div><div class='del'>-						    "password for %s@%s"),</div><div class='del'>-						  errbuf ? errbuf : "",</div><div class='del'>-						  service-&gt;url-&gt;user,</div><div class='del'>-						  service-&gt;url-&gt;host);</div><div class='del'>-			service-&gt;url-&gt;passwd =</div><div class='del'>-				camel_session_query_authenticator (</div><div class='del'>-					session, CAMEL_AUTHENTICATOR_ASK,</div><div class='del'>-					prompt, TRUE, service, "password", ex);</div><div class='del'>-			g_free (prompt);</div><div class='del'>-			g_free (errbuf);</div><div class='del'>-			errbuf = NULL;</div><div class='del'>-</div><div class='del'>-			if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-				camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,</div><div class='del'>-						     "You didn\'t enter a password.");</div><div class='del'>-				camel_service_disconnect (service, TRUE, NULL);</div><div class='del'>-				return FALSE;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		response = camel_imap_command (store, NULL, ex,</div><div class='del'>-					       "LOGIN \"%s\" \"%s\"",</div><div class='del'>-					       service-&gt;url-&gt;user,</div><div class='del'>-					       service-&gt;url-&gt;passwd);</div><div class='del'>-		if (!response) {</div><div class='del'>-			errbuf = g_strdup_printf (_("Unable to authenticate "</div><div class='del'>-						    "to IMAP server.\n%s\n\n"),</div><div class='del'>-						  camel_exception_get_description (ex));</div><div class='del'>-			camel_exception_clear (ex);</div><div class='del'>-		} else {</div><div class='del'>-			authenticated = TRUE;</div><div class='del'>-			camel_imap_response_free (response);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find our storage path. */</div><div class='del'>-	if (!store-&gt;storage_path) {</div><div class='del'>-		store-&gt;storage_path =</div><div class='del'>-			camel_session_get_storage_path (session, service, ex);</div><div class='del'>-		if (camel_exception_is_set (ex)) </div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Find the hierarchy separator for our namespace. */</div><div class='del'>-	namespace = service-&gt;url-&gt;path;</div><div class='del'>-	if (namespace)</div><div class='del'>-		namespace++;</div><div class='del'>-	else</div><div class='del'>-		namespace = "";</div><div class='del'>-	if (store-&gt;server_level &gt;= IMAP_LEVEL_IMAP4REV1) {</div><div class='del'>-		/* This idiom means "tell me the hierarchy separator</div><div class='del'>-		 * for the given path, even if that path doesn't exist.</div><div class='del'>-		 */</div><div class='del'>-		response = camel_imap_command (store, NULL, ex,</div><div class='del'>-					       "LIST \"%s\" \"\"",</div><div class='del'>-					       namespace);</div><div class='del'>-	} else {</div><div class='del'>-		/* Plain IMAP4 doesn't have that idiom, so we fall back</div><div class='del'>-		 * to "tell me about this folder", which will fail if</div><div class='del'>-		 * the folder doesn't exist (eg, if namespace is "").</div><div class='del'>-		 */</div><div class='del'>-		response = camel_imap_command (store, NULL, ex,</div><div class='del'>-					       "LIST \"\" \"%s\"",</div><div class='del'>-					       namespace);</div><div class='del'>-	}</div><div class='del'>-        if (!response)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	result = camel_imap_response_extract (response, "LIST", NULL);</div><div class='del'>-	if (result) {</div><div class='del'>-		imap_parse_list_response (result, NULL, &amp;store-&gt;dir_sep, NULL);</div><div class='del'>-		g_free (result);</div><div class='del'>-	}</div><div class='del'>-	if (!store-&gt;dir_sep)</div><div class='del'>-		store-&gt;dir_sep = '/';	/* Guess */</div><div class='del'>-</div><div class='del'>-	/* Generate base URL */</div><div class='del'>-	store-&gt;base_url = camel_url_to_string (service-&gt;url, FALSE);</div><div class='del'>-	len = strlen (store-&gt;base_url);</div><div class='del'>-	if (service-&gt;url-&gt;path)</div><div class='del'>-		store-&gt;base_url[len - strlen (service-&gt;url-&gt;path) + 1] = '\0';</div><div class='del'>-	else {</div><div class='del'>-		store-&gt;base_url = g_realloc (store-&gt;base_url, len + 2);</div><div class='del'>-		store-&gt;base_url[len] = '/';</div><div class='del'>-		store-&gt;base_url[len + 1] = '\0';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_remote_store_refresh_folders (CAMEL_REMOTE_STORE (store), ex);</div><div class='del'>-</div><div class='del'>-	return !camel_exception_is_set (ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *store = CAMEL_IMAP_STORE (service);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	</div><div class='del'>-	if (store-&gt;connected &amp;&amp; clean) {</div><div class='del'>-		/* send the logout command */</div><div class='del'>-		response = camel_imap_command (store, NULL, ex, "LOGOUT");</div><div class='del'>-		camel_imap_response_free (response);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	store-&gt;current_folder = NULL;</div><div class='del'>-	</div><div class='del'>-	return CAMEL_SERVICE_CLASS (remote_store_class)-&gt;disconnect (service, clean, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_folder_exists (CamelImapStore *store, const char *folder_name,</div><div class='del'>-		    gboolean *selectable, char **short_name,</div><div class='del'>-		    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	char *result, sep;</div><div class='del'>-	int flags;</div><div class='del'>-</div><div class='del'>-	if (!g_strcasecmp (folder_name, "INBOX")) {</div><div class='del'>-		if (selectable)</div><div class='del'>-			*selectable = TRUE;</div><div class='del'>-		if (short_name)</div><div class='del'>-			*short_name = g_strdup ("INBOX");</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (store, NULL, ex, "LIST \"\" \"%s\"",</div><div class='del'>-				       folder_name);</div><div class='del'>-	if (!response)</div><div class='del'>-		return FALSE;</div><div class='del'>-	result = camel_imap_response_extract (response, "LIST", ex);</div><div class='del'>-	if (!result)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (!imap_parse_list_response (result, &amp;flags, &amp;sep, NULL))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (selectable)</div><div class='del'>-		*selectable = !(flags &amp; IMAP_LIST_FLAG_NOSELECT);</div><div class='del'>-	if (short_name) {</div><div class='del'>-		*short_name = strrchr (folder_name, sep);</div><div class='del'>-		if (*short_name)</div><div class='del'>-			*short_name = g_strdup (*short_name + 1);</div><div class='del'>-		else</div><div class='del'>-			*short_name = g_strdup (folder_name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-imap_create (CamelImapStore *store, const char *folder_name,</div><div class='del'>-	     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (store, NULL, ex, "CREATE \"%s\"",</div><div class='del'>-				       folder_name);</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-</div><div class='del'>-	return !camel_exception_is_set (ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-get_folder (CamelStore *store, const char *folder_name, guint32 flags,</div><div class='del'>-	    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelFolder *new_folder = NULL;</div><div class='del'>-	char *short_name, *summary_file, *p;</div><div class='del'>-	gboolean selectable;</div><div class='del'>-</div><div class='del'>-	if (!imap_folder_exists (imap_store, folder_name,</div><div class='del'>-				 &amp;selectable, &amp;short_name, ex)) {</div><div class='del'>-		if ((flags &amp; CAMEL_STORE_FOLDER_CREATE) == 0)</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		if (!imap_create (imap_store, folder_name, ex))</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		if (!imap_folder_exists (imap_store, folder_name,</div><div class='del'>-					 &amp;selectable, &amp;short_name, ex))</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!selectable) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				      "%s is not a selectable folder",</div><div class='del'>-				      folder_name);</div><div class='del'>-		g_free (short_name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	summary_file = g_strdup_printf ("%s/%s/#summary",</div><div class='del'>-					imap_store-&gt;storage_path,</div><div class='del'>-					folder_name);</div><div class='del'>-	p = strrchr (summary_file, '/');</div><div class='del'>-	*p = '\0';</div><div class='del'>-	if (e_mkdir_hier (summary_file, S_IRWXU) == 0) {</div><div class='del'>-		*p = '/';</div><div class='del'>-		new_folder = camel_imap_folder_new (store, folder_name,</div><div class='del'>-						    short_name, summary_file,</div><div class='del'>-						    ex);</div><div class='del'>-	} else {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not create directory %s: %s"),</div><div class='del'>-				      summary_file, g_strerror (errno));</div><div class='del'>-	}</div><div class='del'>-	g_free (summary_file);</div><div class='del'>-	g_free (short_name);</div><div class='del'>-</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return new_folder;</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'>-	/* INBOX is case-insensitive */</div><div class='del'>-	if (g_strcasecmp (folder_name, "INBOX") == 0)</div><div class='del'>-		return g_strdup ("INBOX");</div><div class='del'>-	else</div><div class='del'>-		return g_strdup (folder_name);</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 CamelFolderInfo *</div><div class='del'>-parse_list_response_as_folder_info (CamelImapStore *imap_store,</div><div class='del'>-				    const char *response)</div><div class='del'>-{</div><div class='del'>-	CamelFolderInfo *fi;</div><div class='del'>-	int flags;</div><div class='del'>-	char sep, *dir, *name;</div><div class='del'>-</div><div class='del'>-	if (!imap_parse_list_response (response, &amp;flags, &amp;sep, &amp;dir))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (sep) {</div><div class='del'>-		name = strrchr (dir, sep);</div><div class='del'>-		if (name &amp;&amp; !*++name) {</div><div class='del'>-			g_free (dir);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-	fi-&gt;full_name = dir;</div><div class='del'>-	if (sep &amp;&amp; name)</div><div class='del'>-		fi-&gt;name = g_strdup (name);</div><div class='del'>-	else</div><div class='del'>-		fi-&gt;name = g_strdup (dir);</div><div class='del'>-	if (!(flags &amp; IMAP_LIST_FLAG_NOSELECT))</div><div class='del'>-		fi-&gt;url = g_strdup_printf ("%s%s", imap_store-&gt;base_url, dir);</div><div class='del'>-</div><div class='del'>-	return fi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top, gboolean fast,</div><div class='del'>-		 gboolean recursive, gboolean subscribed_only,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	gboolean need_inbox = FALSE;</div><div class='del'>-	int i;</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	GPtrArray *folders;</div><div class='del'>-	const char *name;</div><div class='del'>-	char *pattern, *list;</div><div class='del'>-	char *status, *p;</div><div class='del'>-	CamelFolderInfo *topfi, *fi;</div><div class='del'>-</div><div class='del'>-	name = top;</div><div class='del'>-	if (!name) {</div><div class='del'>-		need_inbox = !subscribed_only;</div><div class='del'>-		if (url-&gt;path)</div><div class='del'>-			name = url-&gt;path + 1;</div><div class='del'>-		else</div><div class='del'>-			name = "";</div><div class='del'>-	}</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-				       "LIST \"\" \"%s\"", name);</div><div class='del'>-	if (!response)</div><div class='del'>-		return FALSE;</div><div class='del'>-	list = camel_imap_response_extract (response, "LIST", ex);</div><div class='del'>-	if (!list)</div><div class='del'>-		return FALSE;</div><div class='del'>-	topfi = parse_list_response_as_folder_info (imap_store, list);</div><div class='del'>-	g_free (list);</div><div class='del'>-	if (!topfi) {</div><div class='del'>-		topfi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-		topfi-&gt;full_name = g_strdup (name);</div><div class='del'>-		topfi-&gt;name = g_strdup (name);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!top &amp;&amp; subscribed_only)</div><div class='del'>-		pattern = g_strdup ("");</div><div class='del'>- 	else if (*name)</div><div class='del'>-		pattern = g_strdup_printf ("%s%c", name, imap_store-&gt;dir_sep);</div><div class='del'>-	else</div><div class='del'>-		pattern = g_strdup (name);</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-				       "%s \"\" \"%s%c\"",</div><div class='del'>-				       subscribed_only ? "LSUB" : "LIST",</div><div class='del'>-				       pattern, recursive ? '*' : '%');</div><div class='del'>-	g_free (pattern);</div><div class='del'>-	if (!response)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (subscribed_only) {</div><div class='del'>-		g_hash_table_foreach_remove (imap_store-&gt;subscribed_folders,</div><div class='del'>-					     free_sub, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Turn responses into CamelFolderInfo and remove any</div><div class='del'>-	 * extraneous responses.</div><div class='del'>-	 */</div><div class='del'>-	folders = g_ptr_array_new ();</div><div class='del'>-	for (i = 0; i &lt; response-&gt;untagged-&gt;len; i++) {</div><div class='del'>-		list = response-&gt;untagged-&gt;pdata[i];</div><div class='del'>-		fi = parse_list_response_as_folder_info (imap_store, list);</div><div class='del'>-		if (!fi)</div><div class='del'>-			continue;</div><div class='del'>-		g_ptr_array_add (folders, fi);</div><div class='del'>-</div><div class='del'>-		if (subscribed_only) {</div><div class='del'>-			g_hash_table_insert (imap_store-&gt;subscribed_folders,</div><div class='del'>-					     g_strdup (fi-&gt;full_name),</div><div class='del'>-					     GUINT_TO_POINTER (1));</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (!g_strcasecmp (fi-&gt;full_name, "INBOX"))</div><div class='del'>-			need_inbox = FALSE;</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-</div><div class='del'>-	/* Add INBOX, if necessary */</div><div class='del'>-	if (need_inbox) {</div><div class='del'>-		fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-		fi-&gt;full_name = g_strdup ("INBOX");</div><div class='del'>-		fi-&gt;name = g_strdup ("INBOX");</div><div class='del'>-		fi-&gt;url = g_strdup_printf ("%sINBOX", imap_store-&gt;base_url);</div><div class='del'>-</div><div class='del'>-		g_ptr_array_add (folders, fi);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!fast) {</div><div class='del'>-		/* Get read/unread counts */</div><div class='del'>-		for (i = 0; i &lt; folders-&gt;len; i++) {</div><div class='del'>-			fi = folders-&gt;pdata[i];</div><div class='del'>-			if (!fi-&gt;url)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			response = camel_imap_command (</div><div class='del'>-				imap_store, NULL, NULL,</div><div class='del'>-				"STATUS \"%s\" (MESSAGES UNSEEN)",</div><div class='del'>-				fi-&gt;full_name);</div><div class='del'>-			if (!response)</div><div class='del'>-				continue;</div><div class='del'>-			status = camel_imap_response_extract (</div><div class='del'>-				response, "STATUS", NULL);</div><div class='del'>-			if (!status)</div><div class='del'>-				continue;</div><div class='del'>-</div><div class='del'>-			p = e_strstrcase (status, "MESSAGES");</div><div class='del'>-			if (p)</div><div class='del'>-				fi-&gt;message_count = strtoul (p + 8, NULL, 10);</div><div class='del'>-			p = e_strstrcase (status, "UNSEEN");</div><div class='del'>-			if (p)</div><div class='del'>-				fi-&gt;unread_message_count = strtoul (p + 6, NULL, 10);</div><div class='del'>-			g_free (status);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* And assemble */</div><div class='del'>-	camel_folder_info_build (folders, topfi, imap_store-&gt;dir_sep, TRUE);</div><div class='del'>-	g_ptr_array_free (folders, TRUE);</div><div class='del'>-</div><div class='del'>-	/* Remove the top if it's the root of the store. */</div><div class='del'>-	if (!top &amp;&amp; !topfi-&gt;sibling &amp;&amp; !topfi-&gt;url) {</div><div class='del'>-		fi = topfi;</div><div class='del'>-		topfi = topfi-&gt;child;</div><div class='del'>-		fi-&gt;child = NULL;</div><div class='del'>-		camel_folder_info_free (fi);</div><div class='del'>-		for (fi = topfi; fi; fi = fi-&gt;sibling)</div><div class='del'>-			fi-&gt;parent = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return topfi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-folder_subscribed (CamelStore *store, const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-</div><div class='del'>-	return g_hash_table_lookup (imap_store-&gt;subscribed_folders,</div><div class='del'>-				    folder_name) != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-subscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-		  CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-				       "SUBSCRIBE \"%s\"", folder_name);</div><div class='del'>-	if (response) {</div><div class='del'>-		g_hash_table_insert (imap_store-&gt;subscribed_folders,</div><div class='del'>-				     g_strdup (folder_name),</div><div class='del'>-				     GUINT_TO_POINTER (1));</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unsubscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-		    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-	gpointer key, value;</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, ex,</div><div class='del'>-				       "UNSUBSCRIBE \"%s\"", folder_name);</div><div class='del'>-	if (response) {</div><div class='del'>-		g_hash_table_lookup_extended (imap_store-&gt;subscribed_folders,</div><div class='del'>-					      folder_name, key, value);</div><div class='del'>-		g_hash_table_remove (imap_store-&gt;subscribed_folders,</div><div class='del'>-				     folder_name);</div><div class='del'>-		g_free (key);</div><div class='del'>-	}</div><div class='del'>-	camel_imap_response_free (response);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-imap_keepalive (CamelRemoteStore *store)</div><div class='del'>-{</div><div class='del'>-	CamelImapStore *imap_store = CAMEL_IMAP_STORE (store);</div><div class='del'>-	CamelImapResponse *response;</div><div class='del'>-</div><div class='del'>-	response = camel_imap_command (imap_store, NULL, NULL, "NOOP");</div><div class='del'>-	camel_imap_response_free (response);</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 8fd996c420..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-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-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 "camel-remote-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)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_STORE_TYPE, CamelImapStore))</div><div class='del'>-#define CAMEL_IMAP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STORE_TYPE, CamelImapStoreClass))</div><div class='del'>-#define IS_CAMEL_IMAP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_IMAP_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	IMAP_LEVEL_UNKNOWN,</div><div class='del'>-	IMAP_LEVEL_IMAP4,</div><div class='del'>-	IMAP_LEVEL_IMAP4REV1</div><div class='del'>-} CamelImapServerLevel;</div><div class='del'>-</div><div class='del'>-#define IMAP_CAPABILITY_IMAP4			(1 &lt;&lt; 0)</div><div class='del'>-#define IMAP_CAPABILITY_IMAP4REV1		(1 &lt;&lt; 1)</div><div class='del'>-#define IMAP_CAPABILITY_STATUS			(1 &lt;&lt; 2)</div><div class='del'>-#define IMAP_CAPABILITY_NAMESPACE		(1 &lt;&lt; 3)</div><div class='del'>-#define IMAP_CAPABILITY_AUTH_KERBEROS_V4	(1 &lt;&lt; 4)</div><div class='del'>-#define IMAP_CAPABILITY_AUTH_GSSAPI		(1 &lt;&lt; 5)</div><div class='del'>-#define IMAP_CAPABILITY_UIDPLUS			(1 &lt;&lt; 6)</div><div class='del'>-#define IMAP_CAPABILITY_LITERALPLUS		(1 &lt;&lt; 7)</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelRemoteStore parent_object;	</div><div class='del'>-	</div><div class='del'>-	CamelFolder *current_folder;</div><div class='del'>-	</div><div class='del'>-	guint32 command;</div><div class='del'>-	</div><div class='del'>-	CamelImapServerLevel server_level;</div><div class='del'>-	guint32 capabilities;</div><div class='del'>-	</div><div class='del'>-	gchar dir_sep, *storage_path, *base_url;</div><div class='del'>-	</div><div class='del'>-	gboolean connected;</div><div class='del'>-</div><div class='del'>-	GHashTable *subscribed_folders;</div><div class='del'>-} CamelImapStore;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelRemoteStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelImapStoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_imap_store_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_IMAP_STORE_H */</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-stream.c b/camel/providers/imap/camel-imap-stream.c<br/>deleted file mode 100644<br/>index 4e9ee046d7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-stream.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-stream.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'>- *  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 "camel/camel-exception.h"</div><div class='del'>-#include &lt;sys/types.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'>-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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static ssize_t stream_read (CamelStream *stream, char *buffer, size_t n);</div><div class='del'>-static 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 (CamelObject *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'>-	</div><div class='del'>-	parent_class = CAMEL_STREAM_CLASS (camel_type_get_global_classfuncs (camel_stream_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_stream_class-&gt;read  = stream_read;</div><div class='del'>-	camel_stream_class-&gt;reset = stream_reset;</div><div class='del'>-	camel_stream_class-&gt;eos   = stream_eos;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_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'>-CamelType</div><div class='del'>-camel_imap_stream_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_imap_stream_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_imap_stream_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_imap_stream_type =</div><div class='del'>-			camel_type_register (camel_stream_get_type (), "CamelImapStream",</div><div class='del'>-					     sizeof (CamelImapStream),</div><div class='del'>-					     sizeof (CamelImapStreamClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_imap_stream_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_imap_stream_init,</div><div class='del'>-					     (CamelObjectFinalizeFunc) finalize);</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 = CAMEL_IMAP_STREAM(camel_object_new (camel_imap_stream_get_type ()));</div><div class='del'>-	</div><div class='del'>-	imap_stream-&gt;folder = folder;</div><div class='del'>-	camel_object_ref (CAMEL_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 (CamelObject *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'>-		camel_object_unref (CAMEL_OBJECT (imap_stream-&gt;folder));</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'>-		CamelException ex;</div><div class='del'>-		gchar *result, *p, *q;</div><div class='del'>-		gint status, part_len;</div><div class='del'>-		</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-		status = camel_imap_fetch_command (CAMEL_IMAP_STORE (folder-&gt;parent_store),</div><div class='del'>-						   CAMEL_FOLDER (imap_stream-&gt;folder),</div><div class='del'>-						   &amp;result, &amp;ex, "%s\r\n",</div><div class='del'>-						   imap_stream-&gt;command);</div><div class='del'>-		/* FIXME: exception is ignored */</div><div class='del'>-		camel_exception_clear (&amp;ex);</div><div class='del'>-		</div><div class='del'>-		if (!result || status != CAMEL_IMAP_OK) {</div><div class='del'>-			/* we got an error, dump this stuff */</div><div class='del'>-			g_free (result);</div><div class='del'>-			imap_stream-&gt;cache = NULL;</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (imap_stream-&gt;folder));</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'>-		camel_object_unref (CAMEL_OBJECT (imap_stream-&gt;folder));</div><div class='del'>-		</div><div class='del'>-		/* parse out the message part */</div><div class='del'>-		for (p = result; *p &amp;&amp; *p != '{' &amp;&amp; *p != '"' &amp;&amp; *p != '\n'; p++);</div><div class='del'>-		switch (*p) {</div><div class='del'>-		case '"':</div><div class='del'>-			/* a quoted string - section 4.3 */</div><div class='del'>-			p++;</div><div class='del'>-			for (q = p; *q &amp;&amp; *q != '"' &amp;&amp; *q != '\n'; q++);</div><div class='del'>-			part_len = (gint) (q - p);</div><div class='del'>-			</div><div class='del'>-			break;</div><div class='del'>-		case '{':</div><div class='del'>-			/* a literal string - section 4.3 */</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 -1;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* advance to the beginning of the actual data */</div><div class='del'>-			p++;</div><div class='del'>-			</div><div class='del'>-			/* calculate the new part-length */</div><div class='del'>-			for (q = p; *q &amp;&amp; (q - p) &lt;= part_len; q++) {</div><div class='del'>-				if (*q == '\n')</div><div class='del'>-					part_len--;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			/* FIXME: This is a hack for IMAP daemons that send us a UID at the end of each FETCH */</div><div class='del'>-			for ( ; q &gt; p &amp;&amp; *(q-1) != '\n'; q--, part_len--);</div><div class='del'>-			part_len++;</div><div class='del'>-			</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			/* Bad input */</div><div class='del'>-			g_free (result);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		imap_stream-&gt;cache = g_strndup (p, part_len);</div><div class='del'>-		g_free (result);</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='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 88881e7c1f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-stream.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_IMAP_STREAM_TYPE, CamelImapStream))</div><div class='del'>-#define CAMEL_IMAP_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_IMAP_STREAM_TYPE, CamelImapStreamClass))</div><div class='del'>-#define CAMEL_IS_IMAP_STREAM(o)    (CAMEL_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 Camel function */</div><div class='del'>-CamelType 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/camel-imap-summary.c b/camel/providers/imap/camel-imap-summary.c<br/>deleted file mode 100644<br/>index ebdf8b9842..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-summary.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-summary.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'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors:</div><div class='del'>- *    Michael Zucchi &lt;notzed@helixcode.com&gt;</div><div class='del'>- *    Dan Winship &lt;danw@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-imap-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 CAMEL_IMAP_SUMMARY_VERSION (0x1000)</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 void camel_imap_summary_class_init (CamelImapSummaryClass *klass);</div><div class='del'>-static void camel_imap_summary_init       (CamelImapSummary *obj);</div><div class='del'>-</div><div class='del'>-static CamelFolderSummaryClass *camel_imap_summary_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_imap_summary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(</div><div class='del'>-			camel_folder_summary_get_type(), "CamelImapSummary",</div><div class='del'>-			sizeof (CamelImapSummary),</div><div class='del'>-			sizeof (CamelImapSummaryClass),</div><div class='del'>-			(CamelObjectClassInitFunc) camel_imap_summary_class_init,</div><div class='del'>-			NULL,</div><div class='del'>-			(CamelObjectInitFunc) camel_imap_summary_init,</div><div class='del'>-			NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_summary_class_init (CamelImapSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *cfs_class = (CamelFolderSummaryClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_imap_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS (camel_type_get_global_classfuncs (camel_folder_summary_get_type()));</div><div class='del'>-</div><div class='del'>-	cfs_class-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	cfs_class-&gt;summary_header_save = summary_header_save;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_imap_summary_init (CamelImapSummary *obj)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	/* subclasses need to set the right instance data sizes */</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelImapMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelImapMessageContentInfo);</div><div class='del'>-</div><div class='del'>-	/* and a unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_IMAP_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_imap_summary_new:</div><div class='del'>- * @filename: the file to store the summary in.</div><div class='del'>- * @validity: the current UIDVALIDITY value of the folder</div><div class='del'>- *</div><div class='del'>- * This will create a new CamelImapSummary object and read in the</div><div class='del'>- * summary data from disk, if it exists and has the right UIDVALIDITY</div><div class='del'>- * value.</div><div class='del'>- *</div><div class='del'>- * Return value: A new CamelImapSummary object.</div><div class='del'>- **/</div><div class='del'>-CamelFolderSummary *</div><div class='del'>-camel_imap_summary_new (const char *filename, guint32 validity)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *summary = CAMEL_FOLDER_SUMMARY (</div><div class='del'>-		camel_object_new (camel_imap_summary_get_type ()));</div><div class='del'>-	CamelImapSummary *imap_summary = (CamelImapSummary *)summary;</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_set_build_content (summary, FALSE);</div><div class='del'>-	camel_folder_summary_set_filename (summary, filename);</div><div class='del'>-</div><div class='del'>-	if (camel_folder_summary_load (summary) == -1) {</div><div class='del'>-		if (errno == ENOENT) {</div><div class='del'>-			imap_summary-&gt;validity = validity;</div><div class='del'>-			return summary;</div><div class='del'>-		} else {</div><div class='del'>-			camel_object_unref ((CamelObject *)summary);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (imap_summary-&gt;validity != validity) {</div><div class='del'>-		camel_folder_summary_clear (summary);</div><div class='del'>-		imap_summary-&gt;validity = validity;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return summary;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_load (CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY (s);</div><div class='del'>-</div><div class='del'>-	if (camel_imap_summary_parent-&gt;summary_header_load (s, in) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_decode_uint32 (in, &amp;ims-&gt;validity);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_save (CamelFolderSummary *s, FILE *out)</div><div class='del'>-{</div><div class='del'>-	CamelImapSummary *ims = CAMEL_IMAP_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (camel_imap_summary_parent-&gt;summary_header_save (s, out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_encode_uint32 (out, ims-&gt;validity);</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-summary.h b/camel/providers/imap/camel-imap-summary.h<br/>deleted file mode 100644<br/>index 0b844fdd7e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-summary.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +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'>- *    Michael Zucchi &lt;notzed@helixcode.com&gt;</div><div class='del'>- *    Dan Winship &lt;danw@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_IMAP_SUMMARY_H</div><div class='del'>-#define _CAMEL_IMAP_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_IMAP_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_imap_summary_get_type (), CamelImapSummary)</div><div class='del'>-#define CAMEL_IMAP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_imap_summary_get_type (), CamelImapSummaryClass)</div><div class='del'>-#define CAMEL_IS_IMAP_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_imap_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapSummary      CamelImapSummary;</div><div class='del'>-typedef struct _CamelImapSummaryClass CamelImapSummaryClass;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapMessageContentInfo {</div><div class='del'>-	CamelMessageContentInfo info;</div><div class='del'>-</div><div class='del'>-} CamelImapMessageContentInfo;</div><div class='del'>-</div><div class='del'>-typedef struct _CamelImapMessageInfo {</div><div class='del'>-	CamelMessageInfo info;</div><div class='del'>-</div><div class='del'>-} CamelImapMessageInfo;</div><div class='del'>-</div><div class='del'>-struct _CamelImapSummary {</div><div class='del'>-	CamelFolderSummary parent;</div><div class='del'>-</div><div class='del'>-	guint32 validity;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelImapSummaryClass {</div><div class='del'>-	CamelFolderSummaryClass parent_class;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint               camel_imap_summary_get_type     (void);</div><div class='del'>-CamelFolderSummary *camel_imap_summary_new          (const char *filename,</div><div class='del'>-						     guint32 validity);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_IMAP_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-utils.c b/camel/providers/imap/camel-imap-utils.c<br/>deleted file mode 100644<br/>index b38024ecc6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,688 +0,0 @@</div><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'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include "camel-imap-utils.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include &lt;e-sexp.h&gt;</div><div class='del'>-#include "camel/camel-folder-summary.h"</div><div class='del'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-imap_next_word (const char *buf)</div><div class='del'>-{</div><div class='del'>-	char *word;</div><div class='del'>-	</div><div class='del'>-	/* skip over current word */</div><div class='del'>-	for (word = (char *)buf; *word &amp;&amp; *word != ' '; word++);</div><div class='del'>-	</div><div class='del'>-	/* skip over white space */</div><div class='del'>-	for ( ; *word &amp;&amp; *word == ' '; word++);</div><div class='del'>-	</div><div class='del'>-	return word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_parse_list_response:</div><div class='del'>- * @buf: the LIST or LSUB response</div><div class='del'>- * @flags: a pointer to a variable to store the flags in, or %NULL</div><div class='del'>- * @sep: a pointer to a variable to store the hierarchy separator in, or %NULL</div><div class='del'>- * @folder: a pointer to a variable to store the folder name in, or %NULL</div><div class='del'>- *</div><div class='del'>- * Parses a LIST or LSUB response and returns the desired parts of it.</div><div class='del'>- * If @folder is non-%NULL, its value must be freed by the caller.</div><div class='del'>- *</div><div class='del'>- * Return value: whether or not the response was successfully parsed.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-imap_parse_list_response (const char *buf, int *flags, char *sep, char **folder)</div><div class='del'>-{</div><div class='del'>-	char *word;</div><div class='del'>-	int len;</div><div class='del'>-</div><div class='del'>-	if (*buf != '*')</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	word = imap_next_word (buf);</div><div class='del'>-	if (g_strncasecmp (word, "LIST", 4) &amp;&amp; g_strncasecmp (word, "LSUB", 4))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* get the flags */</div><div class='del'>-	word = imap_next_word (word);</div><div class='del'>-	if (*word != '(')</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (flags)</div><div class='del'>-		*flags = 0;</div><div class='del'>-</div><div class='del'>-	word++;</div><div class='del'>-	while (*word != ')') {</div><div class='del'>-		len = strcspn (word, " )");</div><div class='del'>-		if (flags) {</div><div class='del'>-			if (!g_strncasecmp (word, "\\Noinferiors", len))</div><div class='del'>-				*flags |= IMAP_LIST_FLAG_NOINFERIORS;</div><div class='del'>-			else if (!g_strncasecmp (word, "\\Noselect", len))</div><div class='del'>-				*flags |= IMAP_LIST_FLAG_NOSELECT;</div><div class='del'>-			else if (!g_strncasecmp (word, "\\Marked", len))</div><div class='del'>-				*flags |= IMAP_LIST_FLAG_MARKED;</div><div class='del'>-			else if (!g_strncasecmp (word, "\\Unmarked", len))</div><div class='del'>-				*flags |= IMAP_LIST_FLAG_UNMARKED;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		word += len;</div><div class='del'>-		while (*word == ' ')</div><div class='del'>-			word++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* get the directory separator */</div><div class='del'>-	word = imap_next_word (word);</div><div class='del'>-	if (!strncmp (word, "NIL", 3)) {</div><div class='del'>-		if (sep)</div><div class='del'>-			*sep = '\0';</div><div class='del'>-	} else if (*word++ == '"') {</div><div class='del'>-		if (*word == '\\')</div><div class='del'>-			word++;</div><div class='del'>-		if (sep)</div><div class='del'>-			*sep = *word;</div><div class='del'>-		word++;</div><div class='del'>-		if (*word++ != '"')</div><div class='del'>-			return FALSE;</div><div class='del'>-	} else</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	if (folder) {</div><div class='del'>-		/* get the folder name */</div><div class='del'>-		word = imap_next_word (word);</div><div class='del'>-		*folder = imap_parse_astring (&amp;word, &amp;len);</div><div class='del'>-		return *folder != NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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'>-	</div><div class='del'>-	d(fprintf (stderr, "in AND func (argc = %d)\n", argc));</div><div class='del'>-	if (argc &gt; 0) {</div><div class='del'>-		char **strings;</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		strings = g_new (char*, argc+1);</div><div class='del'>-		strings[argc] = 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'>-			</div><div class='del'>-			d(fprintf (stderr, "\tAND func: %s\n", (*list) ? (char *) (*list)-&gt;data : "(null)"));</div><div class='del'>-			strings[argc - (i+1)] = (*list) ? (*list)-&gt;data : g_strdup ("");</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'>-		d(fprintf (stderr, "%s\n", (char *) (*list)-&gt;data));</div><div class='del'>-		</div><div class='del'>-		for (i = 0 ; i &lt; argc; 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'>-	</div><div class='del'>-	d(fprintf (stderr, "in OR func (argc = %d)\n", argc));</div><div class='del'>-	if (argc == 2 &amp;&amp; (*list)-&gt;data &amp;&amp; (*list)-&gt;next &amp;&amp; (*list)-&gt;next-&gt;data) {</div><div class='del'>-		char **strings;</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		strings = g_new (char*, argc+2);</div><div class='del'>-		strings[0] = g_strdup ("OR");</div><div class='del'>-		strings[argc+2 - 1] = NULL;</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; 2; i++) {</div><div class='del'>-			GList *list_head = *list;</div><div class='del'>-			</div><div class='del'>-			d(fprintf (stderr, "\tOR func: %s\n", (*list) ? (char *) (*list)-&gt;data : "(null)"));</div><div class='del'>-			strings[argc - i] = (*list) ? (*list)-&gt;data : g_strdup ("");</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'>-		d(fprintf (stderr, "%s\n", (char *) (*list)-&gt;data));</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'>-	d(fprintf (stderr, "in NOT func\n"));</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'>-		</div><div class='del'>-		(*list)-&gt;data = g_strdup_printf ("NOT %s", term);</div><div class='del'>-		d(fprintf (stderr, "%s\n", (char *) (*list)-&gt;data));</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 char *tz_months [] = {</div><div class='del'>-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",</div><div class='del'>-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-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'>-	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 ("%d-%s-%04d",</div><div class='del'>-				tm.tm_mday, tz_months[tm.tm_mon],</div><div class='del'>-				tm.tm_year + 1900);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-func_lt (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'>-	char *type = (*list)-&gt;data;</div><div class='del'>-	time_t date = (time_t) (argv[1])-&gt;value.number;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "in less-than func: (%d) (%s) (%d)\n", argc, type, (int) date));</div><div class='del'>-	if (argc &gt; 0) {</div><div class='del'>-		char *string, *date_str;</div><div class='del'>-		</div><div class='del'>-		date_str = format_date (date, 0);</div><div class='del'>-		</div><div class='del'>-		if (!strcmp ("SENT", type)) {</div><div class='del'>-			string = g_strdup_printf ("SENTBEFORE \"%s\"", date_str);</div><div class='del'>-		} else {</div><div class='del'>-			string = g_strdup_printf ("BEFORE \"%s\"", date_str);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		(*list)-&gt;data = string;</div><div class='del'>-		g_free (type);</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_gt (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'>-	char *type = (*list)-&gt;data;</div><div class='del'>-	time_t date = (time_t) (argv[1])-&gt;value.number;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "in greater-than func: (%d) (%s) (%d)\n", argc, type, (int) date));</div><div class='del'>-	if (argc &gt; 0) {</div><div class='del'>-		char *string, *date_str;</div><div class='del'>-		</div><div class='del'>-		date_str = format_date (date, 0);</div><div class='del'>-		</div><div class='del'>-		if (!strcmp ("SENT", type)) {</div><div class='del'>-			string = g_strdup_printf ("SENTSINCE \"%s\"", date_str);</div><div class='del'>-		} else {</div><div class='del'>-			string = g_strdup_printf ("SINCE \"%s\"", date_str);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		(*list)-&gt;data = string;</div><div class='del'>-		g_free (type);</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_eq (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'>-	char *type = (*list)-&gt;data;</div><div class='del'>-	time_t date = (time_t) (argv[1])-&gt;value.number;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "in equal-to func: (%d) (%s) (%d)\n", argc, type, (int) date));</div><div class='del'>-	if (argc &gt; 0) {</div><div class='del'>-		char *string, *date_str;</div><div class='del'>-		</div><div class='del'>-		date_str = format_date (date, 0);</div><div class='del'>-		</div><div class='del'>-		if (!strcmp ("SENT", type)) {</div><div class='del'>-			string = g_strdup_printf ("SENTON \"%s\"", date_str);</div><div class='del'>-		} else {</div><div class='del'>-			string = g_strdup_printf ("ON \"%s\"", date_str);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		(*list)-&gt;data = string;</div><div class='del'>-		g_free (type);</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_match_all (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	/* match-all doesn't have a IMAP equiv */</div><div class='del'>-	ESExpResult *r;</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_body_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'>-	char *value = (*argv)-&gt;value.string;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	if (argc &gt; 0) {</div><div class='del'>-		char *string;</div><div class='del'>-		</div><div class='del'>-		string = g_strdup_printf ("BODY \"%s\"", value);</div><div class='del'>-		</div><div class='del'>-		*list = g_list_prepend (*list, string);</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_header_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'>-	char *header = (argv[0])-&gt;value.string;</div><div class='del'>-	char *match = (argv[1])-&gt;value.string;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	if (argc == 2) {</div><div class='del'>-		char *string;</div><div class='del'>-		string = g_strdup_printf ("HEADER %s \"%s\"", header, match);</div><div class='del'>-		</div><div class='del'>-		*list = g_list_prepend (*list, string);</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_user_tag (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: what do I do here? */</div><div class='del'>-	ESExpResult *r;</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_user_flag (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: what do I do here? */</div><div class='del'>-	ESExpResult *r;</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_get_sent_date (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'>-	*list = g_list_prepend (*list, g_strdup ("SENT"));</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_get_received_date (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'>-	*list = g_list_prepend (*list, g_strdup ("RECEIVED"));</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_get_current_date (struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-	</div><div class='del'>-	r = e_sexp_result_new (ESEXP_RES_INT);</div><div class='del'>-	r-&gt;value.number = time (NULL);</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* builtin functions */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	ESExpFunc *func;</div><div class='del'>-	int type;		/* set to 1 if a function can perform shortcut evaluation, or</div><div class='del'>-				   doesn't execute everything, 0 otherwise */</div><div class='del'>-} symbols[] = {</div><div class='del'>-	{ "and",               (ESExpFunc *) func_and,               0 },</div><div class='del'>-	{ "or",                (ESExpFunc *) func_or,                0 },</div><div class='del'>-	{ "not",               (ESExpFunc *) func_not,               0 },</div><div class='del'>-	{ "&lt;",                 (ESExpFunc *) func_lt,                0 },</div><div class='del'>-	{ "&gt;",                 (ESExpFunc *) func_gt,                0 },</div><div class='del'>-	{ "=",                 (ESExpFunc *) func_eq,                0 },</div><div class='del'>-	{ "match-all",         (ESExpFunc *) func_match_all,         0 },</div><div class='del'>-	{ "body-contains",     (ESExpFunc *) func_body_contains,     0 },</div><div class='del'>-	{ "header-contains",   (ESExpFunc *) func_header_contains,   0 },</div><div class='del'>-	{ "user-tag",          (ESExpFunc *) func_user_tag,          1 },</div><div class='del'>-	{ "user-flag",         (ESExpFunc *) func_user_flag,         1 },</div><div class='del'>-	{ "get-sent-date",     (ESExpFunc *) func_get_sent_date,     1 },</div><div class='del'>-	{ "get-received-date", (ESExpFunc *) func_get_received_date, 1 },</div><div class='del'>-	{ "get-current-date",  (ESExpFunc *) func_get_current_date,  1 }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-imap_translate_sexp (const char *expression)</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, expression, strlen (expression));</div><div class='del'>-	</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 IMAP SEARCH string failed");</div><div class='del'>-		retval = NULL;</div><div class='del'>-		g_list_foreach (list, (GFunc)g_free, NULL);</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'>-	</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-imap_create_flag_list (guint32 flags)</div><div class='del'>-{</div><div class='del'>-	GString *gstr;</div><div class='del'>-	char *flag_list;</div><div class='del'>-	</div><div class='del'>-	gstr = g_string_new ("(");</div><div class='del'>-	</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_ANSWERED)</div><div class='del'>-		g_string_append (gstr, "\\Answered ");</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_DELETED)</div><div class='del'>-		g_string_append (gstr, "\\Deleted ");</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_DRAFT)</div><div class='del'>-		g_string_append (gstr, "\\Draft ");</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_FLAGGED)</div><div class='del'>-		g_string_append (gstr, "\\Flagged ");</div><div class='del'>-	if (flags &amp; CAMEL_MESSAGE_SEEN)</div><div class='del'>-		g_string_append (gstr, "\\Seen ");</div><div class='del'>-	</div><div class='del'>-	if (gstr-&gt;str[gstr-&gt;len - 1] == ' ')</div><div class='del'>-		gstr-&gt;str[gstr-&gt;len - 1] = ')';</div><div class='del'>-	else</div><div class='del'>-		g_string_append_c (gstr, ')');</div><div class='del'>-	</div><div class='del'>-	flag_list = gstr-&gt;str;</div><div class='del'>-	g_string_free (gstr, FALSE);</div><div class='del'>-	return flag_list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint32</div><div class='del'>-imap_parse_flag_list (const char *flag_list)</div><div class='del'>-{</div><div class='del'>-	guint32 flags = 0;</div><div class='del'>-	int len;</div><div class='del'>-	</div><div class='del'>-	if (*flag_list++ != '(')</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	while (*flag_list != ')') {</div><div class='del'>-		len = strcspn (flag_list, " )");</div><div class='del'>-		if (!g_strncasecmp (flag_list, "\\Answered", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_ANSWERED;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Deleted", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_DELETED;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Draft", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_DRAFT;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Flagged", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_FLAGGED;</div><div class='del'>-		else if (!g_strncasecmp (flag_list, "\\Seen", len))</div><div class='del'>-			flags |= CAMEL_MESSAGE_SEEN;</div><div class='del'>-		</div><div class='del'>-		flag_list += len;</div><div class='del'>-		if (*flag_list == ' ')</div><div class='del'>-			flag_list++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_parse_nstring:</div><div class='del'>- * @str_p: a pointer to a string</div><div class='del'>- * @len: a pointer to an int to return the length in</div><div class='del'>- *</div><div class='del'>- * This parses an "nstring" (NIL, a quoted string, or a literal)</div><div class='del'>- * starting at *@str_p. On success, *@str_p will point to the first</div><div class='del'>- * character after the end of the nstring, and *@len will contain</div><div class='del'>- * the length of the returned string. On failure, *@str_p will be</div><div class='del'>- * set to %NULL.</div><div class='del'>- *</div><div class='del'>- * This assumes that the string is in the form returned by</div><div class='del'>- * camel_imap_command(): that line breaks are indicated by LF rather</div><div class='del'>- * than CRLF.</div><div class='del'>- *</div><div class='del'>- * Return value: the parsed string, or %NULL if a NIL or no string</div><div class='del'>- * was parsed. (In the former case, *@str_p will be %NULL; in the</div><div class='del'>- * latter, it will point to the character after the NIL.)</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-imap_parse_nstring (char **str_p, int *len)</div><div class='del'>-{</div><div class='del'>-	char *str = *str_p;</div><div class='del'>-	char *out;</div><div class='del'>-</div><div class='del'>-	if (!str)</div><div class='del'>-		return NULL;</div><div class='del'>-	else if (*str == '"') {</div><div class='del'>-		char *p;</div><div class='del'>-		int size;</div><div class='del'>-</div><div class='del'>-		str++;</div><div class='del'>-		size = strcspn (str, "\"") + 1;</div><div class='del'>-		p = out = g_malloc (size);</div><div class='del'>-</div><div class='del'>-		while (*str &amp;&amp; *str != '"') {</div><div class='del'>-			if (*str == '\\')</div><div class='del'>-				str++;</div><div class='del'>-			*p++ = *str++;</div><div class='del'>-			if (p - out == size) {</div><div class='del'>-				out = g_realloc (out, size * 2);</div><div class='del'>-				p = out + size;</div><div class='del'>-				size *= 2;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (*str != '"') {</div><div class='del'>-			*str_p = NULL;</div><div class='del'>-			g_free (out);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		*p = '\0';</div><div class='del'>-		*str_p = str + 1;</div><div class='del'>-		*len = strlen (out);</div><div class='del'>-		return out;</div><div class='del'>-	} else if (*str == '{') {</div><div class='del'>-		*len = strtoul (str + 1, (char **)&amp;str, 10);</div><div class='del'>-		if (*str++ != '}' || *str++ != '\n' || strlen (str) &lt; *len) {</div><div class='del'>-			*str_p = NULL;</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		out = g_strndup (str, *len);</div><div class='del'>-		*str_p = str + *len;</div><div class='del'>-		return out;</div><div class='del'>-	} else if (!g_strncasecmp (str, "nil", 3)) {</div><div class='del'>-		*str_p += 3;</div><div class='del'>-		*len = 0;</div><div class='del'>-		return NULL;</div><div class='del'>-	} else {</div><div class='del'>-		*str_p = NULL;</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * imap_parse_astring:</div><div class='del'>- * @str_p: a pointer to a string</div><div class='del'>- * @len: a pointer to an int to return the length in</div><div class='del'>- *</div><div class='del'>- * This parses an "astring" (an atom, a quoted string, or a literal)</div><div class='del'>- * starting at *@str_p. On success, *@str_p will point to the first</div><div class='del'>- * character after the end of the astring, and *@len will contain</div><div class='del'>- * the length of the returned string. On failure, *@str_p will be</div><div class='del'>- * set to %NULL.</div><div class='del'>- *</div><div class='del'>- * This assumes that the string is in the form returned by</div><div class='del'>- * camel_imap_command(): that line breaks are indicated by LF rather</div><div class='del'>- * than CRLF.</div><div class='del'>- *</div><div class='del'>- * Return value: the parsed string, or %NULL if no string</div><div class='del'>- * was parsed. (In this case, *@str_p will also be %NULL.)</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-imap_parse_astring (char **str_p, int *len)</div><div class='del'>-{</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	if (**str_p == '{' || **str_p == '"')</div><div class='del'>-		return imap_parse_nstring (str_p, len);</div><div class='del'>-</div><div class='del'>-	p = *str_p;</div><div class='del'>-	while (isascii ((unsigned char)*p) &amp;&amp;</div><div class='del'>-	       !strchr ("(){ \"\\%*", *p))</div><div class='del'>-		p++;</div><div class='del'>-</div><div class='del'>-	*len = p - *str_p;</div><div class='del'>-	p = g_strndup (*str_p, *len);</div><div class='del'>-	*str_p += *len;</div><div class='del'>-	return p;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/imap/camel-imap-utils.h b/camel/providers/imap/camel-imap-utils.h<br/>deleted file mode 100644<br/>index d0cc05832d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/imap/camel-imap-utils.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/imap/camel-imap-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- *  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'>-#ifndef CAMEL_IMAP_UTILS_H</div><div class='del'>-#define CAMEL_IMAP_UTILS_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-char *imap_next_word (const char *buf);</div><div class='del'>-</div><div class='del'>-#define IMAP_LIST_FLAG_NOINFERIORS	(1 &lt;&lt; 0)</div><div class='del'>-#define IMAP_LIST_FLAG_NOSELECT		(1 &lt;&lt; 1)</div><div class='del'>-#define IMAP_LIST_FLAG_MARKED		(1 &lt;&lt; 2)</div><div class='del'>-#define IMAP_LIST_FLAG_UNMARKED		(1 &lt;&lt; 3)</div><div class='del'>-gboolean imap_parse_list_response (const char *buf, int *flags, char *sep, char **folder);</div><div class='del'>-</div><div class='del'>-char *imap_translate_sexp (const char *expression);</div><div class='del'>-</div><div class='del'>-char *imap_create_flag_list (guint32 flags);</div><div class='del'>-guint32 imap_parse_flag_list (const char *flag_list);</div><div class='del'>-</div><div class='del'>-char *imap_parse_nstring (char **str_p, int *len);</div><div class='del'>-char *imap_parse_astring (char **str_p, int *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_IMAP_UTILS_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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 80b41a2d45..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/maildir/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/maildir/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,22 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 073d9830de..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mbox/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'>-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 44dfc7c6a4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-folder.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mbox/camel-mbox-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,620 +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'>- *          Jeffrey Stedfast &lt;fejj@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'>-#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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMBOXS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-</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);</div><div class='del'>-static gint mbox_get_unread_message_count(CamelFolder *folder);</div><div class='del'>-static void mbox_append_message(CamelFolder *folder, CamelMimeMessage * message, const CamelMessageInfo * info,</div><div class='del'>-</div><div class='del'>-				CamelException *ex);</div><div class='del'>-static GPtrArray *mbox_get_uids(CamelFolder *folder);</div><div class='del'>-static GPtrArray *mbox_get_summary(CamelFolder *folder);</div><div class='del'>-static CamelMimeMessage *mbox_get_message(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'>-</div><div class='del'>-static const CamelMessageInfo *mbox_get_message_info(CamelFolder *folder, const char *uid);</div><div class='del'>-</div><div class='del'>-static GPtrArray *mbox_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex);</div><div class='del'>-static void mbox_search_free(CamelFolder *folder, GPtrArray * result);</div><div class='del'>-</div><div class='del'>-static guint32 mbox_get_message_flags(CamelFolder *folder, const char *uid);</div><div class='del'>-static void mbox_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set);</div><div class='del'>-static gboolean mbox_get_message_user_flag(CamelFolder *folder, const char *uid, const char *name);</div><div class='del'>-static void mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value);</div><div class='del'>-static const char *mbox_get_message_user_tag(CamelFolder *folder, const char *uid, const char *name);</div><div class='del'>-static void mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void mbox_finalize(CamelObject * object);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_folder_class_init(CamelMboxFolderClass * camel_mbox_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_mbox_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs(camel_folder_get_type()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;sync = 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;get_unread_message_count = mbox_get_unread_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;free_uids = camel_folder_free_deep;</div><div class='del'>-	camel_folder_class-&gt;get_summary = mbox_get_summary;</div><div class='del'>-	camel_folder_class-&gt;free_summary = camel_folder_free_nop;</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 = mbox_get_message;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = mbox_search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;search_free = mbox_search_free;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message_info = mbox_get_message_info;</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'>-	camel_folder_class-&gt;get_message_user_tag = mbox_get_message_user_tag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_tag = mbox_set_message_user_tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_init(gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = object;</div><div class='del'>-	CamelMboxFolder *mbox_folder = object;</div><div class='del'>-</div><div class='del'>-	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 | CAMEL_MESSAGE_DRAFT |</div><div class='del'>-	    CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN | 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'>-</div><div class='del'>-static void</div><div class='del'>-mbox_finalize(CamelObject * object)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(object);</div><div class='del'>-</div><div class='del'>-	if (mbox_folder-&gt;index)</div><div class='del'>-		ibex_close(mbox_folder-&gt;index);</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'>-	camel_folder_change_info_free(mbox_folder-&gt;changes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_mbox_folder_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mbox_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_mbox_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_mbox_folder_type = camel_type_register(CAMEL_FOLDER_TYPE, "CamelMboxFolder",</div><div class='del'>-							     sizeof(CamelMboxFolder),</div><div class='del'>-							     sizeof(CamelMboxFolderClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_mbox_folder_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) mbox_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) mbox_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_mbox_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_mbox_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelMboxFolder *mbox_folder;</div><div class='del'>-	const char *root_dir_path, *name;</div><div class='del'>-	struct stat st;</div><div class='del'>-	int forceindex;</div><div class='del'>-</div><div class='del'>-	folder = CAMEL_FOLDER (camel_object_new (CAMEL_MBOX_FOLDER_TYPE));</div><div class='del'>-	mbox_folder = (CamelMboxFolder *)folder;</div><div class='del'>-</div><div class='del'>-	name = strrchr(full_name, '/');</div><div class='del'>-	if (name)</div><div class='del'>-		name++;</div><div class='del'>-	else</div><div class='del'>-		name = full_name;</div><div class='del'>-</div><div class='del'>-	camel_folder_construct(folder, parent_store, full_name, name);</div><div class='del'>-</div><div class='del'>-	root_dir_path = camel_mbox_store_get_toplevel_dir(CAMEL_MBOX_STORE(folder-&gt;parent_store));</div><div class='del'>-</div><div class='del'>-	mbox_folder-&gt;folder_file_path = g_strdup_printf("%s/%s", root_dir_path, full_name);</div><div class='del'>-	mbox_folder-&gt;summary_file_path = g_strdup_printf("%s/%s-ev-summary", root_dir_path, full_name);</div><div class='del'>-	mbox_folder-&gt;folder_dir_path = g_strdup_printf("%s/%s.sdb", root_dir_path, full_name);</div><div class='del'>-	mbox_folder-&gt;index_file_path = g_strdup_printf("%s/%s.ibex", root_dir_path, full_name);</div><div class='del'>-</div><div class='del'>-	mbox_folder-&gt;changes = camel_folder_change_info_new();</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'>-	if (flags &amp; CAMEL_STORE_FOLDER_BODY_INDEX) {</div><div class='del'>-</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'>-		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", strerror(errno));</div><div class='del'>-			forceindex = FALSE;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* if we do have an index file, remove it */</div><div class='del'>-		if (forceindex == FALSE) {</div><div class='del'>-			unlink(mbox_folder-&gt;index_file_path);</div><div class='del'>-		}</div><div class='del'>-		forceindex = FALSE;</div><div class='del'>-	}</div><div class='del'>-	/* no summary (disk or memory), and we're proverbially screwed */</div><div class='del'>-	mbox_folder-&gt;summary = camel_mbox_summary_new(mbox_folder-&gt;summary_file_path,</div><div class='del'>-						      mbox_folder-&gt;folder_file_path, mbox_folder-&gt;index);</div><div class='del'>-	if (mbox_folder-&gt;summary == NULL || camel_mbox_summary_load(mbox_folder-&gt;summary, forceindex) == -1) {</div><div class='del'>-		camel_exception_set(ex, CAMEL_EXCEPTION_FOLDER_INVALID,	/* FIXME: right error code */</div><div class='del'>-				    _("Could not create summary"));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return folder;</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, mbox_folder-&gt;changes, ex);</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mbox_folder-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(mbox_folder-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* save index */</div><div class='del'>-	if (mbox_folder-&gt;index)</div><div class='del'>-		ibex_save(mbox_folder-&gt;index);</div><div class='del'>-	if (mbox_folder-&gt;summary)</div><div class='del'>-		camel_folder_summary_save(CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary));</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_folder = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	camel_mbox_summary_sync(mbox_folder-&gt;summary, TRUE, mbox_folder-&gt;changes, ex);</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mbox_folder-&gt;changes);</div><div class='del'>-	camel_folder_change_info_clear(mbox_folder-&gt;changes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-mbox_get_message_count(CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(mbox_folder-&gt;summary != NULL, -1);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-mbox_get_unread_message_count(CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *infolist;</div><div class='del'>-	gint i, max, count = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(mbox_folder-&gt;summary != NULL, -1);</div><div class='del'>-</div><div class='del'>-	max = camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary));</div><div class='del'>-	if (max == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	infolist = mbox_get_summary(folder);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; infolist-&gt;len; i++) {</div><div class='del'>-		info = (CamelMessageInfo *) g_ptr_array_index(infolist, i);</div><div class='del'>-		if (!(info-&gt;flags &amp; CAMEL_MESSAGE_SEEN))</div><div class='del'>-			count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 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, const CamelMessageInfo * info, 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'>-	CamelMessageInfo *newinfo;</div><div class='del'>-	struct stat st;</div><div class='del'>-	off_t seek = -1;</div><div class='del'>-	char *xev;</div><div class='del'>-	guint32 uid;</div><div class='del'>-	char *fromline = NULL;</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_WRONLY|O_APPEND, 0600);</div><div class='del'>-	if (output_stream == NULL)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	seek = st.st_size;</div><div class='del'>-</div><div class='del'>-	/* assign a new x-evolution header/uid */</div><div class='del'>-	camel_medium_remove_header(CAMEL_MEDIUM(message), "X-Evolution");</div><div class='del'>-	uid = camel_folder_summary_next_uid(CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary));</div><div class='del'>-	/* important that the header matches exactly 00000000-0000 */</div><div class='del'>-	xev = g_strdup_printf("%08x-%04x", uid, info ? info-&gt;flags &amp; 0xFFFF : 0);</div><div class='del'>-	camel_medium_add_header(CAMEL_MEDIUM(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'>-	fromline = camel_mbox_summary_build_from(CAMEL_MIME_PART(message)-&gt;headers);</div><div class='del'>-	if (camel_stream_printf(output_stream, seek==0?"%s":"\n%s", fromline) == -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'>-	camel_object_unref(CAMEL_OBJECT(filter_from));</div><div class='del'>-	camel_object_unref(CAMEL_OBJECT(filter_stream));</div><div class='del'>-	camel_object_unref(CAMEL_OBJECT(output_stream));</div><div class='del'>-	g_free(fromline);</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'>-	if (camel_mbox_summary_update(mbox_folder-&gt;summary, seek==0?seek:seek+1, mbox_folder-&gt;changes) == 0) {</div><div class='del'>-		char uidstr[16];</div><div class='del'>-</div><div class='del'>-		sprintf(uidstr, "%u", uid);</div><div class='del'>-		newinfo = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary), uidstr);</div><div class='del'>-</div><div class='del'>-		if (info &amp;&amp; newinfo) {</div><div class='del'>-			CamelFlag *flag = info-&gt;user_flags;</div><div class='del'>-			CamelTag *tag = info-&gt;user_tags;</div><div class='del'>-</div><div class='del'>-			while (flag) {</div><div class='del'>-				camel_flag_set(&amp;(newinfo-&gt;user_flags), flag-&gt;name, TRUE);</div><div class='del'>-				flag = flag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			while (tag) {</div><div class='del'>-				camel_tag_set(&amp;(newinfo-&gt;user_tags), tag-&gt;name, tag-&gt;value);</div><div class='del'>-				tag = tag-&gt;next;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mbox_folder-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(mbox_folder-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-</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"), 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"), 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'>-		camel_object_unref(CAMEL_OBJECT(filter_stream));</div><div class='del'>-	}</div><div class='del'>-	if (output_stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(output_stream));</div><div class='del'>-</div><div class='del'>-	if (filter_from)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(filter_from));</div><div class='del'>-</div><div class='del'>-	g_free(fromline);</div><div class='del'>-</div><div class='del'>-	/* 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'>-</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)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *array;</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-	int i, count;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(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 =</div><div class='del'>-		    (CamelMboxMessageInfo *) camel_folder_summary_index(CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary), i);</div><div class='del'>-</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 CamelMimeMessage *</div><div class='del'>-mbox_get_message(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(CAMEL_FOLDER_SUMMARY(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'>-	camel_object_unref(CAMEL_OBJECT(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'>-		/* TODO: This should probably perform a re-sync/etc, and try again? */</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(CAMEL_MIME_PART(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'>-	camel_object_unref(CAMEL_OBJECT(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, _("Cannot get message: %s"), g_strerror(errno));</div><div class='del'>-</div><div class='del'>-	if (parser)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(parser));</div><div class='del'>-	if (message)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(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)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	return CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary)-&gt;messages;</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_get_message_info(CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary), uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</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 = CAMEL_MBOX_FOLDER(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,</div><div class='del'>-						CAMEL_FOLDER_SUMMARY(mbox_folder-&gt;summary)-&gt;messages);</div><div class='del'>-	}</div><div class='del'>-</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 void</div><div class='del'>-mbox_search_free(CamelFolder *folder, GPtrArray * result)</div><div class='del'>-{</div><div class='del'>-	CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_free_result(mbox_folder-&gt;search, result);</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'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, 0);</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'>-mbox_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</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'>-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf-&gt;summary));</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-mbox_get_message_user_flag(CamelFolder *folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return camel_flag_get(&amp;info-&gt;user_flags, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mbox_set_message_user_flag(CamelFolder *folder, const char *uid, const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</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(CAMEL_FOLDER_SUMMARY(mf-&gt;summary));</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *mbox_get_message_user_tag(CamelFolder *folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return camel_tag_get(&amp;info-&gt;user_tags, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mbox_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMboxFolder *mf = CAMEL_MBOX_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	camel_tag_set(&amp;info-&gt;user_tags, name, value);</div><div class='del'>-	info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf-&gt;summary));</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-}</div><div class='del'>-</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 73f51a6d85..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-folder.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mbox/camel-mbox-folder.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'>-/* 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;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)     (CAMEL_CHECK_CAST((obj), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolder))</div><div class='del'>-#define CAMEL_MBOX_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_FOLDER_TYPE, CamelMboxFolderClass))</div><div class='del'>-#define IS_CAMEL_MBOX_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MBOX_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	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'>-	CamelFolderChangeInfo *changes;	/* used to store changes to the folder during processing */</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'>-/* flags are taken from CAMEL_STORE_FOLDER_* flags */</div><div class='del'>-CamelFolder *camel_mbox_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_mbox_folder_get_type(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_MBOX_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/mbox/camel-mbox-provider.c b/camel/providers/mbox/camel-mbox-provider.c<br/>deleted file mode 100644<br/>index bfce8b5ada..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mbox/camel-mbox-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-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'>-	N_("UNIX mbox-format mail files"),</div><div class='del'>-</div><div class='del'>-	N_("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'>-	CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE,</div><div class='del'>-</div><div class='del'>-	CAMEL_URL_NEED_PATH,</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 e3110ef3d3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mbox/camel-mbox-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,287 +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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMBOXF_CLASS(so) CAMEL_MBOX_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static char *get_name(CamelService *service, gboolean brief);</div><div class='del'>-static CamelFolder *get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex);</div><div class='del'>-static void delete_folder(CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);</div><div class='del'>-static char *get_folder_name(CamelStore *store, const char *folder_name, CamelException *ex);</div><div class='del'>-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-					 gboolean fast, gboolean recursive,</div><div class='del'>-					 gboolean subscribed_only,</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'>-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_mbox_store_class);</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-</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;rename_folder = rename_folder;</div><div class='del'>-	camel_store_class-&gt;get_folder_name = get_folder_name;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_store_init (gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</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'>-CamelType</div><div class='del'>-camel_mbox_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mbox_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_mbox_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_mbox_store_type = camel_type_register (CAMEL_STORE_TYPE, "CamelMboxStore",</div><div class='del'>-							     sizeof (CamelMboxStore),</div><div class='del'>-							     sizeof (CamelMboxStoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_mbox_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) camel_mbox_store_init,</div><div class='del'>-							     NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_mbox_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)-&gt;url-&gt;path, folder_name);</div><div class='del'>-</div><div class='del'>-	if (stat(name, &amp;st) == -1) {</div><div class='del'>-		int fd;</div><div class='del'>-</div><div class='del'>-		if (errno != ENOENT) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not open file `%s':\n%s"),</div><div class='del'>-					     name, g_strerror(errno));</div><div class='del'>-			g_free(name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		if ((flags &amp; CAMEL_STORE_FOLDER_CREATE) == 0) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-					     _("Folder `%s' does not exist."),</div><div class='del'>-					     folder_name);</div><div class='del'>-			g_free(name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		fd = open(name, O_WRONLY | O_CREAT | O_APPEND, 0600);</div><div class='del'>-		if (fd == -1) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not create file `%s':\n%s"),</div><div class='del'>-					     name, g_strerror(errno));</div><div class='del'>-			g_free(name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		g_free(name);</div><div class='del'>-		close(fd);</div><div class='del'>-	} else if (!S_ISREG(st.st_mode)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("`%s' is not a regular file."),</div><div class='del'>-				     name);</div><div class='del'>-		g_free(name);</div><div class='del'>-		return NULL;</div><div class='del'>-	} else</div><div class='del'>-		g_free(name);</div><div class='del'>-</div><div class='del'>-	return camel_mbox_folder_new(store, folder_name, flags, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *name, *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, folder_name);</div><div class='del'>-	if (stat (name, &amp;st) == -1) {</div><div class='del'>-		if (errno == ENOENT) {</div><div class='del'>-			/* file doesn't exist - it's kinda like deleting it ;-) */</div><div class='del'>-			g_free (name);</div><div class='del'>-			return;</div><div class='del'>-		}</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'>-	</div><div class='del'>-	if (!S_ISREG (st.st_mode)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				      _("`%s' is not a regular file."), name);</div><div class='del'>-		g_free (name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (st.st_size != 0) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_NON_EMPTY,</div><div class='del'>-				      _("Folder `%s' is not empty. Not deleted."),</div><div class='del'>-				      folder_name);</div><div class='del'>-		g_free (name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* 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 int xrename(const char *oldp, const char *newp, const char *prefix, const char *suffix, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	struct stat st;</div><div class='del'>-	char *old = g_strconcat(prefix, oldp, suffix, 0);</div><div class='del'>-	char *new = g_strconcat(prefix, newp, suffix, 0);</div><div class='del'>-	int ret = -1;</div><div class='del'>-</div><div class='del'>-	printf("renaming %s%s to %s%s\n", oldp, suffix, newp, suffix);</div><div class='del'>-</div><div class='del'>-	/* FIXME: this has races ... */</div><div class='del'>-	if (!(stat(new, &amp;st) == -1 &amp;&amp; errno==ENOENT)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not rename folder %s to %s: destination exists"),</div><div class='del'>-				     old, new);</div><div class='del'>-	} else if (rename(old, new) == 0 || errno==ENOENT) {</div><div class='del'>-		ret = 0;</div><div class='del'>-	} else if (stat(old, &amp;st) == -1 &amp;&amp; errno==ENOENT &amp;&amp; stat(new, &amp;st) == 0) {</div><div class='del'>-		/* for nfs, check if the rename worked anyway ... */</div><div class='del'>-		ret = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free(old);</div><div class='del'>-	g_free(new);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old, const char *new, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *path = CAMEL_SERVICE (store)-&gt;url-&gt;path;</div><div class='del'>-</div><div class='del'>-	/* try to rollback failures, has obvious races */</div><div class='del'>-	if (xrename(old, new, path, ".ibex", ex)) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (xrename(old, new, path, "-ev-summary", ex)) {</div><div class='del'>-		xrename(new, old, path, ".ibex", ex);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	if (xrename(old, new, path, "", ex)) {</div><div class='del'>-		xrename(new, old, path, "-ev-summary", ex);</div><div class='del'>-		xrename(new, old, path, ".ibex", ex);</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, 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='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup (service-&gt;url-&gt;path);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf (_("Local mail file %s"), service-&gt;url-&gt;path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-		 gboolean fast, gboolean recursive,</div><div class='del'>-		 gboolean subscribed_only,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: This is broken, but it corresponds to what was</div><div class='del'>-	 * there before.</div><div class='del'>-	 */</div><div class='del'>-	return NULL;</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 7b298b67f6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mbox/camel-mbox-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-mbox-store.h : class for an mbox store */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 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 "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)     (CAMEL_CHECK_CAST((obj), CAMEL_MBOX_STORE_TYPE, CamelMboxStore))</div><div class='del'>-#define CAMEL_MBOX_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MBOX_STORE_TYPE, CamelMboxStoreClass))</div><div class='del'>-#define IS_CAMEL_MBOX_STORE(o)    (CAMEL_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 Camel function */</div><div class='del'>-CamelType 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 8856d37ee8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-summary.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mbox/camel-mbox-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,894 +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 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   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static CamelFolderSummaryClass *camel_mbox_summary_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mbox_summary_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_folder_summary_get_type(), "CamelMboxSummary",</div><div class='del'>-					   sizeof (CamelMboxSummary),</div><div class='del'>-					   sizeof (CamelMboxSummaryClass),</div><div class='del'>-					   (CamelObjectClassInitFunc) camel_mbox_summary_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc) camel_mbox_summary_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc) camel_mbox_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_summary_class_init(CamelMboxSummaryClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_mbox_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS(camel_type_get_global_classfuncs(camel_folder_summary_get_type()));</div><div class='del'>-</div><div class='del'>-	sklass-&gt;summary_header_load = summary_header_load;</div><div class='del'>-	sklass-&gt;summary_header_save = summary_header_save;</div><div class='del'>-</div><div class='del'>-	sklass-&gt;message_info_new  = message_info_new;</div><div class='del'>-	sklass-&gt;message_info_new_from_parser = message_info_new_from_parser;</div><div class='del'>-	sklass-&gt;message_info_load = message_info_load;</div><div class='del'>-	sklass-&gt;message_info_save = message_info_save;</div><div class='del'>-	/*sklass-&gt;message_info_free = message_info_free;*/</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_summary_init(CamelMboxSummary *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelMboxSummaryPrivate *p;</div><div class='del'>-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	/* subclasses need to set the right instance data sizes */</div><div class='del'>-	s-&gt;message_info_size = sizeof(CamelMboxMessageInfo);</div><div class='del'>-	s-&gt;content_info_size = sizeof(CamelMboxMessageContentInfo);</div><div class='del'>-</div><div class='del'>-	/* and a unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_MBOX_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mbox_summary_finalise(CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(obj);</div><div class='del'>-</div><div class='del'>-	g_free(mbs-&gt;folder_path);</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(camel_object_new(camel_mbox_summary_get_type()));</div><div class='del'>-	</div><div class='del'>-	if (new) {</div><div class='del'>-		/* ?? */</div><div class='del'>-		camel_folder_summary_set_build_content(CAMEL_FOLDER_SUMMARY(new), TRUE);</div><div class='del'>-		camel_folder_summary_set_filename(CAMEL_FOLDER_SUMMARY(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'>-static int</div><div class='del'>-summary_header_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;summary_header_load(s, in) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_decode_uint32(in, &amp;mbs-&gt;folder_size);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-summary_header_save(CamelFolderSummary *s, FILE *out)</div><div class='del'>-{</div><div class='del'>-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(s);</div><div class='del'>-</div><div class='del'>-	if (((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;summary_header_save(s, out) == -1)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	return camel_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'>-	</div><div class='del'>-        if (in &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 *</div><div class='del'>-message_info_new(CamelFolderSummary *s, struct _header_raw *h)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;message_info_new(s, h);</div><div class='del'>-	if (mi) {</div><div class='del'>-		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 &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'>-			if (camel_folder_summary_uid(s, mi-&gt;uid)) {</div><div class='del'>-				g_free(mi-&gt;uid);</div><div class='del'>-				mi-&gt;uid = camel_folder_summary_next_uid_string(s);</div><div class='del'>-			} else {</div><div class='del'>-				/* so we dont get clashes later on */</div><div class='del'>-				camel_folder_summary_set_uid(s, uid+1);</div><div class='del'>-			}</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'>-	</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_new_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-	CamelMboxSummary *mbs = CAMEL_MBOX_SUMMARY(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</div><div class='del'>-		    &amp;&amp; (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'>-	</div><div class='del'>-	return mi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *</div><div class='del'>-message_info_load(CamelFolderSummary *s, FILE *in)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	io(printf("loading mbox message info\n"));</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *)camel_mbox_summary_parent)-&gt;message_info_load(s, in);</div><div class='del'>-	if (mi) {</div><div class='del'>-		guint32 position;</div><div class='del'>-		CamelMboxMessageInfo *mbi = (CamelMboxMessageInfo *)mi;</div><div class='del'>-</div><div class='del'>-		camel_folder_summary_decode_uint32(in, &amp;position);</div><div class='del'>-		mbi-&gt;frompos = position;</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'>-	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 = CAMEL_FOLDER_SUMMARY(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'>-	fd = open(mbs-&gt;folder_path, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		printf("%s failed to open: %s", mbs-&gt;folder_path, strerror(errno));</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_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(CAMEL_FOLDER_SUMMARY(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'>-			camel_object_unref(CAMEL_OBJECT(mp));</div><div class='del'>-			/* end of file - no content? */</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(CAMEL_FOLDER_SUMMARY(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'>-	camel_object_unref(CAMEL_OBJECT (mp));</div><div class='del'>-	</div><div class='del'>-	/* update the file size/mtime in the summary */</div><div class='del'>-	if (ok != -1) {</div><div class='del'>-		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, CamelFolderChangeInfo *changeinfo)</div><div class='del'>-{</div><div class='del'>-	int ret, i, count;</div><div class='del'>-	CamelFolderSummary *s = (CamelFolderSummary *)mbs;</div><div class='del'>-</div><div class='del'>-	/* we use the diff function of the change_info to build the update list. */</div><div class='del'>-	for (i = 0; i &lt; camel_folder_summary_count(s); i++) {</div><div class='del'>-		CamelMessageInfo *mi = camel_folder_summary_index(s, i);</div><div class='del'>-</div><div class='del'>-		camel_folder_change_info_add_source(changeinfo, mi-&gt;uid);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* do the actual work */</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'>-	count = camel_folder_summary_count(s);</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		CamelMessageInfo *mi = camel_folder_summary_index(s, i);</div><div class='del'>-		camel_folder_change_info_add_update(changeinfo, mi-&gt;uid);</div><div class='del'>-	}</div><div class='del'>-	camel_folder_change_info_build_diff(changeinfo);</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'>-		if (mbs-&gt;index)</div><div class='del'>-			ibex_save(mbs-&gt;index);</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 = CAMEL_FOLDER_SUMMARY(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'>-		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'>-</div><div class='del'>-			if (mbs-&gt;index &amp;&amp; !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'>-			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'>-				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'>-				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'>-					/* If that fails, it might be because a message was changed</div><div class='del'>-					 * rather than appended... so try again from the beginning.</div><div class='del'>-					 */</div><div class='del'>-					if (ret == -1) {</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'>-			} else {</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'>-		if (camel_folder_summary_save(s) == -1)</div><div class='del'>-			g_warning("Could not save summary: %s", strerror(errno));</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'>-	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'>-static char *tz_months[] = {</div><div class='del'>-	"Jan", "Feb", "Mar", "Apr", "May", "Jun",</div><div class='del'>-	"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static char *tz_days[] = {</div><div class='del'>-	"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* tries to build a From line, based on message headers */</div><div class='del'>-char *</div><div class='del'>-camel_mbox_summary_build_from(struct _header_raw *header)</div><div class='del'>-{</div><div class='del'>-	GString *out = g_string_new("From ");</div><div class='del'>-	char *ret;</div><div class='del'>-	const char *tmp;</div><div class='del'>-	time_t thetime;</div><div class='del'>-	int offset;</div><div class='del'>-	struct tm tm;</div><div class='del'>-</div><div class='del'>-	tmp = header_raw_find(&amp;header, "Sender", NULL);</div><div class='del'>-	if (tmp == NULL)</div><div class='del'>-		tmp = header_raw_find(&amp;header, "From", NULL);</div><div class='del'>-	if (tmp != NULL) {</div><div class='del'>-		struct _header_address *addr = header_address_decode(tmp);</div><div class='del'>-</div><div class='del'>-		tmp = NULL;</div><div class='del'>-		if (addr) {</div><div class='del'>-			if (addr-&gt;type == HEADER_ADDRESS_NAME) {</div><div class='del'>-				g_string_append(out, addr-&gt;v.addr);</div><div class='del'>-				tmp = "";</div><div class='del'>-			}</div><div class='del'>-			header_address_unref(addr);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (tmp == NULL) {</div><div class='del'>-		g_string_append(out, "unknown@nodomain.now.au");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* try use the received header to get the date */</div><div class='del'>-	tmp = header_raw_find(&amp;header, "Received", NULL);</div><div class='del'>-	if (tmp) {</div><div class='del'>-		tmp = strrchr(tmp, ';');</div><div class='del'>-		if (tmp)</div><div class='del'>-			tmp++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* if there isn't one, try the Date field */</div><div class='del'>-	if (tmp == NULL)</div><div class='del'>-		tmp = header_raw_find(&amp;header, "Date", NULL);</div><div class='del'>-</div><div class='del'>-	thetime = header_decode_date(tmp, &amp;offset);</div><div class='del'>-</div><div class='del'>-	thetime += ((offset / 100) * (60 * 60)) + (offset % 100) * 60;</div><div class='del'>-</div><div class='del'>-	/* a pseudo, but still bogus attempt at thread safing the function */</div><div class='del'>-	/*memcpy(&amp;tm, gmtime(&amp;thetime), sizeof(tm));*/</div><div class='del'>-	gmtime_r(&amp;thetime, &amp;tm);</div><div class='del'>-</div><div class='del'>-	g_string_sprintfa(out, " %s %s %d %02d:%02d:%02d %4d\n",</div><div class='del'>-			  tz_days[tm.tm_wday],</div><div class='del'>-			  tz_months[tm.tm_mon], tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_year + 1900);</div><div class='del'>-</div><div class='del'>-	ret = out-&gt;str;</div><div class='del'>-	g_string_free(out, FALSE);</div><div class='del'>-	return ret;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_mbox_summary_sync(CamelMboxSummary *mbs, gboolean expunge, CamelFolderChangeInfo *changeinfo, CamelException *ex)</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 = CAMEL_FOLDER_SUMMARY(mbs);</div><div class='del'>-	int fd = -1, fdout = -1;</div><div class='del'>-	off_t offset = 0;</div><div class='del'>-	char *tmpname = NULL;</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'>-	char *fromline;</div><div class='del'>-</div><div class='del'>-	/* make sure we're in sync, after this point we at least have a complete list of id's */</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, changeinfo);</div><div class='del'>-	} else {</div><div class='del'>-		camel_mbox_summary_update(mbs, 0, changeinfo);</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'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not open summary %s"), mbs-&gt;folder_path);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, TRUE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, 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'>-			</div><div class='del'>-			tmpname = NULL;</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Cannot open temporary mailbox: %s"), strerror(errno));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</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'>-			/* remove it from teh change list */</div><div class='del'>-			camel_folder_change_info_remove_uid(changeinfo, 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'>-				g_warning("camel_mime_parser_step failed (1)");</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (camel_mime_parser_tell_start_from (mp) != info-&gt;frompos) {</div><div class='del'>-				g_warning("Summary/mbox mismatch, aborting sync");</div><div class='del'>-				camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						      _("Summary 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'>-				g_warning("camel_mime_parser_step failed (2)");</div><div class='del'>-				goto error;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Check if the X-Evolution header is valid.  */</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'>-				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'>-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-							     _("Summary mismatch, X-Evolution header missing"));</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'>-				fromline = camel_mbox_summary_build_from(camel_mime_parser_headers_raw (mp));</div><div class='del'>-				write(fdout, fromline, strlen(fromline));</div><div class='del'>-				g_free(fromline);</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'>-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-							     _("Error writing to temp mailbox: %s"),</div><div class='del'>-							     strerror(errno));</div><div class='del'>-					goto error;</div><div class='del'>-				}</div><div class='del'>-				bodypos = lseek(fdout, 0, SEEK_CUR);</div><div class='del'>-				d(printf("pos = %d, endpos = %d, bodypos = %d\n",</div><div class='del'>-					 (int) info-&gt;info.content-&gt;pos,</div><div class='del'>-					 (int) info-&gt;info.content-&gt;endpos,</div><div class='del'>-					 (int) 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'>-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-							     _("Cannot copy data to output file: %s"),</div><div class='del'>-							     strerror (errno));</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);</div><div class='del'>-			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'>-					camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-							     _("Cannot copy data to output file: %s"),</div><div class='del'>-							     strerror(errno));</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", (int)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'>-				 (int) info-&gt;info.content-&gt;pos,</div><div class='del'>-				 (int) info-&gt;info.content-&gt;endpos,</div><div class='del'>-				 (int) 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'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not close source folder %s: %s"),</div><div class='del'>-				     mbs-&gt;folder_path, 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'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not close temp folder: %s"),</div><div class='del'>-					     strerror(errno));</div><div class='del'>-			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'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not rename folder: %s"),</div><div class='del'>-					     strerror(errno));</div><div class='del'>-			goto error;</div><div class='del'>-		}</div><div class='del'>-		tmpname = NULL;</div><div class='del'>-</div><div class='del'>-		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'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Unknown error: %s"),</div><div class='del'>-				     strerror(errno));</div><div class='del'>-		goto error;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	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'>-	camel_object_unref(CAMEL_OBJECT(mp));</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>- error:</div><div class='del'>-	if (fd != -1)</div><div class='del'>-		close(fd);</div><div class='del'>-	</div><div class='del'>-	if (fdout != -1)</div><div class='del'>-		close(fdout);</div><div class='del'>-	</div><div class='del'>-	g_free(xevnew);</div><div class='del'>-	</div><div class='del'>-	if (tmpname)</div><div class='del'>-		unlink(tmpname);</div><div class='del'>-	if (mp)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(mp));</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	</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 f90acc4f35..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mbox/camel-mbox-summary.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mbox/camel-mbox-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,81 +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;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;libibex/ibex.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MBOX_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_mbox_summary_get_type (), CamelMboxSummary)</div><div class='del'>-#define CAMEL_MBOX_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_mbox_summary_get_type (), CamelMboxSummaryClass)</div><div class='del'>-#define IS_CAMEL_MBOX_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_mbox_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMboxSummary      CamelMboxSummary;</div><div class='del'>-typedef struct _CamelMboxSummaryClass CamelMboxSummaryClass;</div><div class='del'>-</div><div class='del'>-/* 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, CamelFolderChangeInfo *changeinfo);</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, CamelFolderChangeInfo *changeinfo, CamelException *ex);</div><div class='del'>-/* generate a From line from headers */</div><div class='del'>-char *camel_mbox_summary_build_from(struct _header_raw *header);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MBOX_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/mh/.cvsignore b/camel/providers/mh/.cvsignore<br/>deleted file mode 100644<br/>index fd6b811c68..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/.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/mh/Makefile.am b/camel/providers/mh/Makefile.am<br/>deleted file mode 100644<br/>index 62f447171b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/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'>-libcamelmhincludedir = $(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 = libcamelmh.la</div><div class='del'>-provider_DATA = libcamelmh.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-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'>-	camel-mh-summary.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'>-	camel-mh-summary.h</div><div class='del'>-</div><div class='del'>-libcamelmh_la_LDFLAGS = -version-info 0:0:0</div><div class='del'>-</div><div class='del'>-libcamelmh_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)</div><div class='del'>-#libcamelmh_la_LIBADD = $(top_builddir)/libibex/libibex.la $(UNICODE_LIBS)</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = libcamelmh.urls</div><div class='del'>-</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 a56de4a9c1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/camel-mh-folder.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/camel-mh-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,534 +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-mh-folder.c : Abstract class for an email folder */</div><div class='del'>-</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 (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'>-#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-mh-folder.h"</div><div class='del'>-#include "camel-mh-store.h"</div><div class='del'>-#include "string-utils.h"</div><div class='del'>-#include "camel-stream-fs.h"</div><div class='del'>-#include "camel-mh-summary.h"</div><div class='del'>-#include "camel-data-wrapper.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-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 CamelMhFolder */</div><div class='del'>-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMHS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static void mh_sync(CamelFolder * folder, gboolean expunge, CamelException * ex);</div><div class='del'>-static gint mh_get_message_count(CamelFolder * folder);</div><div class='del'>-static gint mh_get_unread_message_count(CamelFolder * folder);</div><div class='del'>-static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex);</div><div class='del'>-static GPtrArray *mh_get_uids(CamelFolder * folder);</div><div class='del'>-static GPtrArray *mh_get_summary(CamelFolder * folder);</div><div class='del'>-static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex);</div><div class='del'>-</div><div class='del'>-static void mh_expunge(CamelFolder * folder, CamelException * ex);</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *mh_get_message_info(CamelFolder * folder, const char *uid);</div><div class='del'>-</div><div class='del'>-static GPtrArray *mh_search_by_expression(CamelFolder * folder, const char *expression, CamelException * ex);</div><div class='del'>-static void mh_search_free(CamelFolder *folder, GPtrArray *result);</div><div class='del'>-</div><div class='del'>-static guint32 mh_get_message_flags(CamelFolder * folder, const char *uid);</div><div class='del'>-static void mh_set_message_flags(CamelFolder * folder, const char *uid, guint32 flags, guint32 set);</div><div class='del'>-static gboolean mh_get_message_user_flag(CamelFolder * folder, const char *uid, const char *name);</div><div class='del'>-static void mh_set_message_user_flag(CamelFolder * folder, const char *uid, const char *name, gboolean value);</div><div class='del'>-static const char *mh_get_message_user_tag(CamelFolder *folder, const char *uid, const char *name);</div><div class='del'>-static void mh_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value);</div><div class='del'>-</div><div class='del'>-static void mh_finalize(CamelObject * object);</div><div class='del'>-</div><div class='del'>-static void camel_mh_folder_class_init(CamelObjectClass * camel_mh_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS(camel_mh_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs(camel_folder_get_type()));</div><div class='del'>-</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;sync = mh_sync;</div><div class='del'>-	camel_folder_class-&gt;get_message_count = mh_get_message_count;</div><div class='del'>-	camel_folder_class-&gt;get_unread_message_count = mh_get_unread_message_count;</div><div class='del'>-	camel_folder_class-&gt;append_message = mh_append_message;</div><div class='del'>-	camel_folder_class-&gt;get_uids = mh_get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = camel_folder_free_deep;</div><div class='del'>-	camel_folder_class-&gt;get_summary = mh_get_summary;</div><div class='del'>-	camel_folder_class-&gt;free_summary = camel_folder_free_nop;</div><div class='del'>-	camel_folder_class-&gt;expunge = mh_expunge;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message = mh_get_message;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = mh_search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;search_free = mh_search_free;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message_info = mh_get_message_info;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message_flags = mh_get_message_flags;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = mh_set_message_flags;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_flag = mh_get_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_flag = mh_set_message_user_flag;</div><div class='del'>-	camel_folder_class-&gt;get_message_user_tag = mh_get_message_user_tag;</div><div class='del'>-	camel_folder_class-&gt;set_message_user_tag = mh_set_message_user_tag;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_init(gpointer object, gpointer klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = object;</div><div class='del'>-	CamelMhFolder *mh_folder = object;</div><div class='del'>-</div><div class='del'>-	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 | CAMEL_MESSAGE_DRAFT |</div><div class='del'>-	    CAMEL_MESSAGE_FLAGGED | CAMEL_MESSAGE_SEEN | CAMEL_MESSAGE_USER;</div><div class='del'>-</div><div class='del'>-	mh_folder-&gt;summary = NULL;</div><div class='del'>-	mh_folder-&gt;search = NULL;</div><div class='del'>-	mh_folder-&gt;changes = camel_folder_change_info_new();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_finalize(CamelObject * object)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(object);</div><div class='del'>-</div><div class='del'>-	if (mh_folder-&gt;index)</div><div class='del'>-		ibex_close(mh_folder-&gt;index);</div><div class='del'>-</div><div class='del'>-	g_free(mh_folder-&gt;folder_file_path);</div><div class='del'>-	g_free(mh_folder-&gt;summary_file_path);</div><div class='del'>-	g_free(mh_folder-&gt;folder_dir_path);</div><div class='del'>-	g_free(mh_folder-&gt;index_file_path);</div><div class='del'>-	camel_folder_change_info_free(mh_folder-&gt;changes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType camel_mh_folder_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mh_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_mh_folder_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_mh_folder_type = camel_type_register(CAMEL_FOLDER_TYPE, "CamelMhFolder",</div><div class='del'>-							   sizeof(CamelMhFolder),</div><div class='del'>-							   sizeof(CamelMhFolderClass),</div><div class='del'>-							   (CamelObjectClassInitFunc) camel_mh_folder_class_init,</div><div class='del'>-							   NULL,</div><div class='del'>-							   (CamelObjectInitFunc) mh_init,</div><div class='del'>-							   (CamelObjectFinalizeFunc) mh_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_mh_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_mh_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelMhFolder *mh_folder;</div><div class='del'>-	const char *root_dir_path, *name;</div><div class='del'>-	int forceindex;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	folder = CAMEL_FOLDER (camel_object_new(CAMEL_MH_FOLDER_TYPE));</div><div class='del'>-	mh_folder = (CamelMhFolder *)folder;</div><div class='del'>-</div><div class='del'>-	name = strrchr(full_name, '/');</div><div class='del'>-	if (name)</div><div class='del'>-		name++;</div><div class='del'>-	else</div><div class='del'>-		name = full_name;</div><div class='del'>-	camel_folder_construct (folder, parent_store, full_name, name);</div><div class='del'>-</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'>-	mh_folder-&gt;folder_file_path = g_strdup_printf("%s/%s", root_dir_path, full_name);</div><div class='del'>-	mh_folder-&gt;summary_file_path = g_strdup_printf("%s/%s/ev-summary", root_dir_path, full_name);</div><div class='del'>-	mh_folder-&gt;folder_dir_path = g_strdup_printf("%s/%s", root_dir_path, full_name);</div><div class='del'>-	mh_folder-&gt;index_file_path = g_strdup_printf("%s/%s/ev-index.ibex", root_dir_path, full_name);</div><div class='del'>-</div><div class='del'>-	/* if we have no index file, force it */</div><div class='del'>-	forceindex = stat(mh_folder-&gt;index_file_path, &amp;st) == -1;</div><div class='del'>-	/* check if we need to setup an index */</div><div class='del'>-	if (flags &amp; CAMEL_STORE_FOLDER_BODY_INDEX) {</div><div class='del'>-		mh_folder-&gt;index = ibex_open(mh_folder-&gt;index_file_path, O_CREAT | O_RDWR, 0600);</div><div class='del'>-		if (mh_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", strerror(errno));</div><div class='del'>-			forceindex = FALSE;</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		/* if we do have an index file, remove it */</div><div class='del'>-		if (forceindex == FALSE) {</div><div class='del'>-			unlink(mh_folder-&gt;index_file_path);</div><div class='del'>-		}</div><div class='del'>-		forceindex = FALSE;</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'>-	mh_folder-&gt;summary = camel_mh_summary_new(mh_folder-&gt;summary_file_path,</div><div class='del'>-						  mh_folder-&gt;folder_file_path,</div><div class='del'>-						  mh_folder-&gt;index);</div><div class='del'>-</div><div class='del'>-	if (camel_mh_summary_load(mh_folder-&gt;summary, forceindex) == -1) {</div><div class='del'>-		camel_exception_set(ex, CAMEL_EXCEPTION_FOLDER_INVALID,	/* FIXME: right error code */</div><div class='del'>-				    _("Could not load or create summary"));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_sync(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'>-	if (expunge)</div><div class='del'>-		mh_expunge(folder, ex);</div><div class='del'>-	else {</div><div class='del'>-		camel_mh_summary_sync(mh_folder-&gt;summary, FALSE, mh_folder-&gt;changes, ex);</div><div class='del'>-		camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mh_folder-&gt;changes);</div><div class='del'>-		camel_folder_change_info_clear(mh_folder-&gt;changes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* save index */</div><div class='del'>-	if (mh_folder-&gt;index)</div><div class='del'>-		ibex_save(mh_folder-&gt;index);</div><div class='del'>-	if (mh_folder-&gt;summary)</div><div class='del'>-		camel_folder_summary_save(CAMEL_FOLDER_SUMMARY(mh_folder-&gt;summary));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_expunge(CamelFolder * folder, 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'>-	camel_mh_summary_sync(mh_folder-&gt;summary, TRUE, mh_folder-&gt;changes, ex);</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mh_folder-&gt;changes);</div><div class='del'>-	camel_folder_change_info_clear(mh_folder-&gt;changes);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint mh_get_message_count(CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(mh_folder-&gt;summary != NULL, -1);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mh_folder-&gt;summary));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint mh_get_unread_message_count(CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *infolist;</div><div class='del'>-	gint i, count = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(mh_folder-&gt;summary != NULL, -1);</div><div class='del'>-</div><div class='del'>-	infolist = mh_get_summary(folder);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; infolist-&gt;len; i++) {</div><div class='del'>-		info = (CamelMessageInfo *) g_ptr_array_index(infolist, i);</div><div class='del'>-		if (!(info-&gt;flags &amp; CAMEL_MESSAGE_SEEN))</div><div class='del'>-			count++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_append_message(CamelFolder * folder, CamelMimeMessage * message, const CamelMessageInfo *info, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	CamelStream *output_stream = NULL;</div><div class='del'>-	char *name = NULL;</div><div class='del'>-	char *uid = NULL;</div><div class='del'>-	CamelMessageInfo *newinfo;</div><div class='del'>-</div><div class='del'>-	/* FIXME: probably needs additional locking */</div><div class='del'>-</div><div class='del'>-	/* keep trying uid's until we find one thats ok */</div><div class='del'>-	do {</div><div class='del'>-		g_free(uid);</div><div class='del'>-		g_free(name);</div><div class='del'>-		uid = camel_folder_summary_next_uid_string((CamelFolderSummary *)mh_folder-&gt;summary);</div><div class='del'>-		name = g_strdup_printf("%s/%s", mh_folder-&gt;folder_file_path, uid);</div><div class='del'>-		output_stream = camel_stream_fs_new_with_name(name, O_WRONLY|O_CREAT|O_EXCL, 0600);</div><div class='del'>-	} while (output_stream == NULL &amp;&amp; errno == EEXIST);</div><div class='del'>-</div><div class='del'>-	if (output_stream == NULL)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/* write the message */</div><div class='del'>-	if (camel_data_wrapper_write_to_stream(CAMEL_DATA_WRAPPER(message), output_stream) == -1)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	if (camel_stream_close(output_stream) == -1)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	/* index/summarise the message.  Yes this re-reads it, its just simpler */</div><div class='del'>-	camel_mh_summary_add(mh_folder-&gt;summary, uid, TRUE);</div><div class='del'>-</div><div class='del'>-	if (info</div><div class='del'>-	    &amp;&amp; (newinfo = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mh_folder-&gt;summary), uid))) {</div><div class='del'>-		CamelFlag *flag = info-&gt;user_flags;</div><div class='del'>-		CamelTag *tag = info-&gt;user_tags;</div><div class='del'>-</div><div class='del'>-		newinfo-&gt;flags = info-&gt;flags;</div><div class='del'>-		while (flag) {</div><div class='del'>-			camel_flag_set(&amp;newinfo-&gt;user_flags, flag-&gt;name, TRUE);</div><div class='del'>-			flag = flag-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		while (tag) {</div><div class='del'>-			camel_tag_set(&amp;newinfo-&gt;user_tags, tag-&gt;name, tag-&gt;value);</div><div class='del'>-			tag = tag-&gt;next;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_change_info_add_uid(mh_folder-&gt;changes, uid);</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(folder), "folder_changed", mh_folder-&gt;changes);</div><div class='del'>-	camel_folder_change_info_clear(mh_folder-&gt;changes);</div><div class='del'>-	g_free(name);</div><div class='del'>-	g_free(uid);</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 mh folder: %s"), 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 mh folder: %s"), g_strerror(errno));</div><div class='del'>-	}</div><div class='del'>-	if (output_stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(output_stream));</div><div class='del'>-	if (name) {</div><div class='del'>-		unlink(name);</div><div class='del'>-		g_free(name);</div><div class='del'>-	}</div><div class='del'>-	g_free(uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *mh_get_uids(CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *array;</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	int i, count;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count(CAMEL_FOLDER_SUMMARY(mh_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'>-		CamelMessageInfo *info =</div><div class='del'>-			camel_folder_summary_index(CAMEL_FOLDER_SUMMARY(mh_folder-&gt;summary), i);</div><div class='del'>-</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'>-	return array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *mh_get_message(CamelFolder * folder, const gchar * uid, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-	CamelStream *message_stream = NULL;</div><div class='del'>-	CamelMimeMessage *message = NULL;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s/%s", mh_folder-&gt;folder_file_path, uid);</div><div class='del'>-</div><div class='del'>-	/* get the message summary info */</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mh_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'>-	message_stream = camel_stream_fs_new_with_name(name, O_RDONLY, 0);</div><div class='del'>-</div><div class='del'>-	/* where we read from */</div><div class='del'>-	if (message_stream == NULL)</div><div class='del'>-		goto fail;</div><div class='del'>-</div><div class='del'>-	message = camel_mime_message_new();</div><div class='del'>-	if (camel_data_wrapper_construct_from_stream(CAMEL_DATA_WRAPPER(message), message_stream) == -1) {</div><div class='del'>-		g_warning("Construction failed");</div><div class='del'>-		errno = EINVAL;</div><div class='del'>-		goto fail;</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref(CAMEL_OBJECT(message_stream));</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	return message;</div><div class='del'>-</div><div class='del'>-fail:</div><div class='del'>-	camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message: %s\n  %s"),</div><div class='del'>-			     name, g_strerror(errno));</div><div class='del'>-</div><div class='del'>-	if (message_stream)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(message_stream));</div><div class='del'>-</div><div class='del'>-	if (message)</div><div class='del'>-		camel_object_unref(CAMEL_OBJECT(message));</div><div class='del'>-</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GPtrArray *mh_get_summary(CamelFolder * folder)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	return CAMEL_FOLDER_SUMMARY(mh_folder-&gt;summary)-&gt;messages;</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 *mh_get_message_info(CamelFolder * folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mh_folder-&gt;summary), uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *mh_search_by_expression(CamelFolder * folder, const char *expression, 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'>-	if (mh_folder-&gt;search == NULL) {</div><div class='del'>-		mh_folder-&gt;search = camel_folder_search_new();</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_folder(mh_folder-&gt;search, folder);</div><div class='del'>-	if (mh_folder-&gt;summary) {</div><div class='del'>-		/* FIXME: dont access summary array directly? */</div><div class='del'>-		camel_folder_search_set_summary(mh_folder-&gt;search,</div><div class='del'>-						CAMEL_FOLDER_SUMMARY(mh_folder-&gt;summary)-&gt;messages);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_search_set_body_index(mh_folder-&gt;search, mh_folder-&gt;index);</div><div class='del'>-</div><div class='del'>-	return camel_folder_search_execute_expression(mh_folder-&gt;search, expression, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_search_free(CamelFolder *folder, GPtrArray *result)</div><div class='del'>-{</div><div class='del'>-	CamelMhFolder *mh_folder = CAMEL_MH_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	camel_folder_search_free_result(mh_folder-&gt;search, result);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint32 mh_get_message_flags(CamelFolder * folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, 0);</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 mh_set_message_flags(CamelFolder * folder, const char *uid, guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</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'>-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf-&gt;summary));</div><div class='del'>-</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean mh_get_message_user_flag(CamelFolder * folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return camel_flag_get(&amp;info-&gt;user_flags, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_set_message_user_flag(CamelFolder * folder, const char *uid, const char *name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</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(CAMEL_FOLDER_SUMMARY(mf-&gt;summary));</div><div class='del'>-	camel_object_trigger_event (CAMEL_OBJECT(folder), "message_changed", (char *) uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const char *mh_get_message_user_tag(CamelFolder *folder, const char *uid, const char *name)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_val_if_fail(info != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	return camel_tag_get(&amp;info-&gt;user_tags, name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void mh_set_message_user_tag(CamelFolder *folder, const char *uid, const char *name, const char *value)</div><div class='del'>-{</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	CamelMhFolder *mf = CAMEL_MH_FOLDER(folder);</div><div class='del'>-</div><div class='del'>-	info = camel_folder_summary_uid(CAMEL_FOLDER_SUMMARY(mf-&gt;summary), uid);</div><div class='del'>-	g_return_if_fail(info != NULL);</div><div class='del'>-</div><div class='del'>-	camel_tag_set(&amp;info-&gt;user_tags, name, value);</div><div class='del'>-	info-&gt;flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;</div><div class='del'>-	camel_folder_summary_touch(CAMEL_FOLDER_SUMMARY(mf-&gt;summary));</div><div class='del'>-	camel_object_trigger_event(CAMEL_OBJECT(folder), "message_changed", (char *) uid);</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 ddfdf2b4aa..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/camel-mh-folder.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/camel-mh-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-mh-folder.h : MH folder. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- * 	Michael Zucchi &lt;notzed@helixcode.com&gt;</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</div><div class='del'>- * GNU General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public License</div><div class='del'>- * along with this program; if not, write to the Free Software</div><div class='del'>- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307</div><div class='del'>- * USA</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef CAMEL_MH_FOLDER_H</div><div class='del'>-#define CAMEL_MH_FOLDER_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif				/* __cplusplus } */</div><div class='del'>-#include &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-mh-summary.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_MH_FOLDER_TYPE     (camel_mh_folder_get_type ())</div><div class='del'>-#define CAMEL_MH_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MH_FOLDER_TYPE, CamelMhFolder))</div><div class='del'>-#define CAMEL_MH_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_FOLDER_TYPE, CamelMhFolderClass))</div><div class='del'>-#define IS_CAMEL_MH_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MH_FOLDER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	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'>-	CamelMhSummary *summary;</div><div class='del'>-	CamelFolderSearch *search;	/* used to run searches, we just use the real thing (tm) */</div><div class='del'>-	CamelFolderChangeInfo *changes;	/* mass changes to the folder */</div><div class='del'>-} CamelMhFolder;</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'>-/* public methods */</div><div class='del'>-CamelFolder *camel_mh_folder_new(CamelStore *parent_store, const char *full_name, guint32 flags, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_mh_folder_get_type(void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif				/* __cplusplus */</div><div class='del'>-#endif				/* CAMEL_MH_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/mh/camel-mh-provider.c b/camel/providers/mh/camel-mh-provider.c<br/>deleted file mode 100644<br/>index 74329a3203..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/camel-mh-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/camel-mh-provider.c</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'>-/* 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-mh-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 mh_provider = {</div><div class='del'>-	"mh",</div><div class='del'>-	N_("UNIX MH-format mail directories"),</div><div class='del'>-</div><div class='del'>-	N_("For storing local mail in MH-like mail directories"),</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_STORAGE,</div><div class='del'>-</div><div class='del'>-	CAMEL_URL_NEED_PATH,</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 camel_provider_module_init(CamelSession * session)</div><div class='del'>-{</div><div class='del'>-	mh_provider.object_types[CAMEL_PROVIDER_STORE] = camel_mh_store_get_type();</div><div class='del'>-</div><div class='del'>-	mh_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;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 0a6da11162..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/camel-mh-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/camel-mh-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.</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;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-mh-store.h"</div><div class='del'>-#include "camel-mh-folder.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-url.h"</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelMhStore */</div><div class='del'>-#define CMHS_CLASS(so) CAMEL_MH_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CMHF_CLASS(so) CAMEL_MH_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static char *get_name(CamelService * service, gboolean brief);</div><div class='del'>-static CamelFolder *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex);</div><div class='del'>-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex);</div><div class='del'>-static void rename_folder(CamelStore *store, const char *old_name, const char *new_name, CamelException *ex);</div><div class='del'>-static char *get_folder_name(CamelStore * store, const char *folder_name, CamelException * ex);</div><div class='del'>-static CamelFolderInfo *get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-					 gboolean fast, gboolean recursive,</div><div class='del'>-					 gboolean subscribed_only,</div><div class='del'>-					 CamelException *ex);</div><div class='del'>-</div><div class='del'>-static void camel_mh_store_class_init(CamelObjectClass * camel_mh_store_class)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS(camel_mh_store_class);</div><div class='del'>-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS(camel_mh_store_class);</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-</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;rename_folder = rename_folder;</div><div class='del'>-	camel_store_class-&gt;get_folder_name = get_folder_name;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void camel_mh_store_init(CamelObject * object)</div><div class='del'>-{</div><div class='del'>-	CamelStore *store = CAMEL_STORE(object);</div><div class='del'>-</div><div class='del'>-	/* mh 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'>-CamelType camel_mh_store_get_type(void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_mh_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (camel_mh_store_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_mh_store_type = camel_type_register(CAMEL_STORE_TYPE, "CamelMhStore",</div><div class='del'>-							  sizeof(CamelMhStore),</div><div class='del'>-							  sizeof(CamelMhStoreClass),</div><div class='del'>-							  (CamelObjectClassInitFunc) camel_mh_store_class_init,</div><div class='del'>-							  NULL,</div><div class='del'>-							  (CamelObjectInitFunc) camel_mh_store_init,</div><div class='del'>-							  NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_mh_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const gchar *camel_mh_store_get_toplevel_dir(CamelMhStore * 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 *get_folder(CamelStore * store, const char *folder_name, guint32 flags, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)-&gt;url-&gt;path, folder_name);</div><div class='del'>-</div><div class='del'>-	if (stat(name, &amp;st) == -1) {</div><div class='del'>-		if (errno != ENOENT) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not open folder `%s':\n%s"),</div><div class='del'>-					     folder_name, g_strerror(errno));</div><div class='del'>-			g_free (name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		if ((flags &amp; CAMEL_STORE_FOLDER_CREATE) == 0) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-					     _("Folder `%s' does not exist."), folder_name);</div><div class='del'>-			g_free (name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		printf("creating ...\n");</div><div class='del'>-</div><div class='del'>-		if (mkdir(name, 0700) != 0) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not create folder `%s':\n%s"),</div><div class='del'>-					     folder_name, g_strerror(errno));</div><div class='del'>-			g_free (name);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-		printf("created ok?\n");</div><div class='del'>-</div><div class='del'>-	} else if (!S_ISDIR(st.st_mode)) {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_STORE_NO_FOLDER,</div><div class='del'>-				     _("`%s' is not a directory."), name);</div><div class='del'>-		g_free (name);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	g_free(name);</div><div class='del'>-</div><div class='del'>-	return camel_mh_folder_new(store, folder_name, flags, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void delete_folder(CamelStore * store, const char *folder_name, CamelException * ex)</div><div class='del'>-{</div><div class='del'>-	char *name;</div><div class='del'>-	struct stat st;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	name = g_strdup_printf("%s%s", CAMEL_SERVICE(store)-&gt;url-&gt;path, folder_name);</div><div class='del'>-	if (stat(name, &amp;st) == -1) {</div><div class='del'>-		if (errno != ENOENT)</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not delete folder `%s': %s"),</div><div class='del'>-					     folder_name, strerror(errno));</div><div class='del'>-	} else {</div><div class='del'>-		/* this will 'fail' if there are still messages in the directory -</div><div class='del'>-		   but only the metadata is lost */</div><div class='del'>-		str = g_strdup_printf("%s/ev-summary", name);</div><div class='del'>-		unlink(str);</div><div class='del'>-		g_free(str);</div><div class='del'>-		str = g_strdup_printf("%s/ev-index.ibex", name);</div><div class='del'>-		unlink(str);</div><div class='del'>-		g_free(str);</div><div class='del'>-		if (rmdir(name) == -1) {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not delete folder `%s': %s"),</div><div class='del'>-					     folder_name, strerror(errno));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	g_free(name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void rename_folder (CamelStore *store, const char *old_name, const char *new_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *old, *new;</div><div class='del'>-	struct stat st;</div><div class='del'>-</div><div class='del'>-	old = g_strdup_printf("%s%s", CAMEL_SERVICE(store)-&gt;url-&gt;path, old_name);</div><div class='del'>-	new = g_strdup_printf("%s%s", CAMEL_SERVICE(store)-&gt;url-&gt;path, new_name);</div><div class='del'>-	if (stat(new, &amp;st) == -1 &amp;&amp; errno == ENOENT) {</div><div class='del'>-		if (stat(old, &amp;st) == 0 &amp;&amp; S_ISDIR(st.st_mode)) {</div><div class='del'>-			if (rename(old, new) != 0) {</div><div class='del'>-				camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-						     _("Could not rename folder `%s': %s"), old_name, strerror(errno));</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					     _("Could not rename folder `%s': %s"), old_name, strerror(errno));</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				     _("Could not rename folder `%s': %s exists"), old_name, new_name);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *get_folder_name(CamelStore * store, const char *folder_name, 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, _("MH 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) : g_strdup_printf("/%s", folder_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *get_name(CamelService * service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup(service-&gt;url-&gt;path);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf(_("Local mail directory %s"), service-&gt;url-&gt;path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-		 gboolean fast, gboolean recursive,</div><div class='del'>-		 gboolean subscribed_only,</div><div class='del'>-		 CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* FIXME: This is broken, but it corresponds to what was</div><div class='del'>-	 * there before.</div><div class='del'>-	 */</div><div class='del'>-	return NULL;</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 e2e2bbb656..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/camel-mh-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/camel-mh-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-mh-store.h : class for an mh store */</div><div class='del'>-</div><div class='del'>-/* </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_MH_STORE_H</div><div class='del'>-#define CAMEL_MH_STORE_H 1</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif				/* __cplusplus } */</div><div class='del'>-#include "camel-store.h"</div><div class='del'>-#define CAMEL_MH_STORE_TYPE     (camel_mh_store_get_type ())</div><div class='del'>-#define CAMEL_MH_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_MH_STORE_TYPE, CamelMhStore))</div><div class='del'>-#define CAMEL_MH_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_MH_STORE_TYPE, CamelMhStoreClass))</div><div class='del'>-#define IS_CAMEL_MH_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_MH_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStore parent_object;</div><div class='del'>-	</div><div class='del'>-} CamelMhStore;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelStoreClass parent_class;</div><div class='del'>-	</div><div class='del'>-} CamelMhStoreClass;</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_mh_store_get_type(void);</div><div class='del'>-</div><div class='del'>-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'>-#endif				/* CAMEL_MH_STORE_H */</div><div class='head'>diff --git a/camel/providers/mh/camel-mh-summary.c b/camel/providers/mh/camel-mh-summary.c<br/>deleted file mode 100644<br/>index c757a9a0a9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/camel-mh-summary.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/camel-mh-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +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: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of 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-mh-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'>-#include &lt;sys/types.h&gt;</div><div class='del'>-#include &lt;dirent.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-</div><div class='del'>-#define d(x)</div><div class='del'>-</div><div class='del'>-#define CAMEL_MH_SUMMARY_VERSION (0x2000)</div><div class='del'>-</div><div class='del'>-static CamelMessageInfo *message_info_new(CamelFolderSummary *, struct _header_raw *);</div><div class='del'>-</div><div class='del'>-static void camel_mh_summary_class_init	(CamelMhSummaryClass *class);</div><div class='del'>-static void camel_mh_summary_init	(CamelMhSummary *gspaper);</div><div class='del'>-static void camel_mh_summary_finalise	(CamelObject *obj);</div><div class='del'>-</div><div class='del'>-#define _PRIVATE(x) (((CamelMhSummary *)(x))-&gt;priv)</div><div class='del'>-</div><div class='del'>-struct _CamelMhSummaryPrivate {</div><div class='del'>-	char *current_uid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelFolderSummaryClass *parent_class;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_mh_summary_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register(camel_folder_summary_get_type (), "CamelMhSummary",</div><div class='del'>-					   sizeof(CamelMhSummary),</div><div class='del'>-					   sizeof(CamelMhSummaryClass),</div><div class='del'>-					   (CamelObjectClassInitFunc)camel_mh_summary_class_init,</div><div class='del'>-					   NULL,</div><div class='del'>-					   (CamelObjectInitFunc)camel_mh_summary_init,</div><div class='del'>-					   (CamelObjectFinalizeFunc)camel_mh_summary_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mh_summary_class_init (CamelMhSummaryClass *class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) class;</div><div class='del'>-	</div><div class='del'>-	parent_class = CAMEL_FOLDER_SUMMARY_CLASS (camel_type_get_global_classfuncs(camel_folder_summary_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* override methods */</div><div class='del'>-	sklass-&gt;message_info_new = message_info_new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mh_summary_init (CamelMhSummary *o)</div><div class='del'>-{</div><div class='del'>-	struct _CamelFolderSummary *s = (CamelFolderSummary *) o;</div><div class='del'>-</div><div class='del'>-	o-&gt;priv = g_malloc0(sizeof(*o-&gt;priv));</div><div class='del'>-</div><div class='del'>-	/* set unique file version */</div><div class='del'>-	s-&gt;version += CAMEL_MH_SUMMARY_VERSION;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_mh_summary_finalise(CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelMhSummary *o = (CamelMhSummary *)obj;</div><div class='del'>-</div><div class='del'>-	g_free(o-&gt;mh_path);</div><div class='del'>-	g_free(o-&gt;priv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_mh_summary_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelMhSummary object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new #CamelMhSummary object.</div><div class='del'>- **/</div><div class='del'>-CamelMhSummary	*camel_mh_summary_new	(const char *filename, const char *mhdir, ibex *index)</div><div class='del'>-{</div><div class='del'>-	CamelMhSummary *o = (CamelMhSummary *)camel_object_new(camel_mh_summary_get_type ());</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_set_build_content((CamelFolderSummary *)o, TRUE);</div><div class='del'>-	camel_folder_summary_set_filename((CamelFolderSummary *)o, filename);</div><div class='del'>-	o-&gt;mh_path = g_strdup(mhdir);</div><div class='del'>-	o-&gt;index = index;</div><div class='del'>-	return o;</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'>-	CamelMhSummary *mhs = (CamelMhSummary *)s;</div><div class='del'>-</div><div class='del'>-	mi = ((CamelFolderSummaryClass *) parent_class)-&gt;message_info_new(s, h);</div><div class='del'>-	if (mi) {</div><div class='del'>-		/* it only ever indexes 1 message at a time */</div><div class='del'>-		mi-&gt;uid = g_strdup(mhs-&gt;priv-&gt;current_uid);</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'>-int		camel_mh_summary_load(CamelMhSummary * mhs, int forceindex)</div><div class='del'>-{</div><div class='del'>-	CamelFolderSummary *s = CAMEL_FOLDER_SUMMARY(mhs);</div><div class='del'>-</div><div class='del'>-	d(printf("loading summary ...\n"));</div><div class='del'>-</div><div class='del'>-	if (forceindex || camel_folder_summary_load(s) == -1) {</div><div class='del'>-		camel_folder_summary_clear(s);</div><div class='del'>-	}</div><div class='del'>-	return camel_mh_summary_check(mhs, forceindex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int		camel_mh_summary_add(CamelMhSummary * mhs, const char *name, int forceindex)</div><div class='del'>-{</div><div class='del'>-	char *filename = g_strdup_printf("%s/%s", mhs-&gt;mh_path, name);</div><div class='del'>-	int fd;</div><div class='del'>-	CamelMimeParser *mp;</div><div class='del'>-</div><div class='del'>-	d(printf("summarising: %s\n", name));</div><div class='del'>-</div><div class='del'>-	fd = open(filename, O_RDONLY);</div><div class='del'>-	if (fd == -1) {</div><div class='del'>-		g_warning("Cannot summarise/index: %s: %s", filename, strerror(errno));</div><div class='del'>-		g_free(filename);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	mp = camel_mime_parser_new();</div><div class='del'>-	camel_mime_parser_scan_from(mp, FALSE);</div><div class='del'>-	camel_mime_parser_init_with_fd(mp, fd);</div><div class='del'>-	if (mhs-&gt;index &amp;&amp; (forceindex || !ibex_contains_name(mhs-&gt;index, (char *)name))) {</div><div class='del'>-		d(printf("forcing indexing of message content\n"));</div><div class='del'>-		camel_folder_summary_set_index((CamelFolderSummary *)mhs, mhs-&gt;index);</div><div class='del'>-	} else {</div><div class='del'>-		camel_folder_summary_set_index((CamelFolderSummary *)mhs, NULL);</div><div class='del'>-	}</div><div class='del'>-	mhs-&gt;priv-&gt;current_uid = (char *)name;</div><div class='del'>-	camel_folder_summary_add_from_parser((CamelFolderSummary *)mhs, mp);</div><div class='del'>-	camel_object_unref((CamelObject *)mp);</div><div class='del'>-	mhs-&gt;priv-&gt;current_uid = NULL;</div><div class='del'>-	camel_folder_summary_set_index((CamelFolderSummary *)mhs, NULL);</div><div class='del'>-	g_free(filename);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_summary(char *key, CamelMessageInfo *info, CamelMhSummary *mhs)</div><div class='del'>-{</div><div class='del'>-	d(printf("removing message %s from summary\n", key));</div><div class='del'>-	if (mhs-&gt;index)</div><div class='del'>-		ibex_unindex(mhs-&gt;index, info-&gt;uid);</div><div class='del'>-	camel_folder_summary_remove((CamelFolderSummary *)mhs, info);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int		camel_mh_summary_check(CamelMhSummary * mhs, int forceindex)</div><div class='del'>-{</div><div class='del'>-	DIR *dir;</div><div class='del'>-	struct dirent *d;</div><div class='del'>-	char *p, c;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GHashTable *left;</div><div class='del'>-	int i, count;</div><div class='del'>-</div><div class='del'>-	d(printf("checking summary ...\n"));</div><div class='del'>-</div><div class='del'>-	/* scan the directory, check for mail files not in the index, or index entries that</div><div class='del'>-	   no longer exist */</div><div class='del'>-	dir = opendir(mhs-&gt;mh_path);</div><div class='del'>-	if (dir == NULL)</div><div class='del'>-		return -1;</div><div class='del'>-</div><div class='del'>-	/* keeps track of all uid's that have not been processed */</div><div class='del'>-	left = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	count = camel_folder_summary_count((CamelFolderSummary *)mhs);</div><div class='del'>-	for (i=0;i&lt;count;i++) {</div><div class='del'>-		info = camel_folder_summary_index((CamelFolderSummary *)mhs, i);</div><div class='del'>-		if (info) {</div><div class='del'>-			g_hash_table_insert(left, info-&gt;uid, info);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	while ( (d = readdir(dir)) ) {</div><div class='del'>-		/* FIXME: also run stat to check for regular file */</div><div class='del'>-		p = d-&gt;d_name;</div><div class='del'>-		while ( (c = *p++) ) {</div><div class='del'>-			if (!isdigit(c))</div><div class='del'>-				break;</div><div class='del'>-		}</div><div class='del'>-		if (c==0) {</div><div class='del'>-			info = camel_folder_summary_uid((CamelFolderSummary *)mhs, d-&gt;d_name);</div><div class='del'>-			if (info == NULL || (mhs-&gt;index &amp;&amp; (!ibex_contains_name(mhs-&gt;index, d-&gt;d_name)))) {</div><div class='del'>-				/* need to add this file to the summary */</div><div class='del'>-				if (info != NULL) {</div><div class='del'>-					g_hash_table_remove(left, info-&gt;uid);</div><div class='del'>-					camel_folder_summary_remove((CamelFolderSummary *)mhs, info);</div><div class='del'>-				}</div><div class='del'>-				camel_mh_summary_add(mhs, d-&gt;d_name, forceindex);</div><div class='del'>-			} else {</div><div class='del'>-				g_hash_table_remove(left, info-&gt;uid);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	closedir(dir);</div><div class='del'>-	g_hash_table_foreach(left, (GHFunc)remove_summary, mhs);</div><div class='del'>-	g_hash_table_destroy(left);</div><div class='del'>-</div><div class='del'>-	/* force a save of the index, just to make sure */</div><div class='del'>-	/* note this could be expensive so possibly shouldn't be here</div><div class='del'>-	   as such */</div><div class='del'>-	if (mhs-&gt;index) {</div><div class='del'>-		ibex_save(mhs-&gt;index);</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'>-/* sync the summary with the ondisk files.</div><div class='del'>-   It doesnt store the state in the file, the summary only, == MUCH faster */</div><div class='del'>-int		camel_mh_summary_sync(CamelMhSummary * mhs, int expunge, CamelFolderChangeInfo *changes, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int count, i;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	char *name;</div><div class='del'>-</div><div class='del'>-	printf("summary_sync(expunge=%s)\n", expunge?"true":"false");</div><div class='del'>-</div><div class='del'>-	if (mhs-&gt;index) {</div><div class='del'>-		ibex_save(mhs-&gt;index);</div><div class='del'>-	}</div><div class='del'>-	if (!expunge)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	count = camel_folder_summary_count((CamelFolderSummary *)mhs);</div><div class='del'>-	for (i=count-1;i&gt;=0;i--) {</div><div class='del'>-		info = camel_folder_summary_index((CamelFolderSummary *)mhs, i);</div><div class='del'>-		if (info &amp;&amp; info-&gt;flags &amp; CAMEL_MESSAGE_DELETED) {</div><div class='del'>-			name = g_strdup_printf("%s/%s", mhs-&gt;mh_path, info-&gt;uid);</div><div class='del'>-			d(printf("deleting %s\n", name));</div><div class='del'>-			if (unlink(name) == 0 || errno==ENOENT) {</div><div class='del'>-				camel_folder_change_info_remove_uid(changes, info-&gt;uid);</div><div class='del'>-				camel_folder_summary_remove((CamelFolderSummary *)mhs, info);</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/mh/camel-mh-summary.h b/camel/providers/mh/camel-mh-summary.h<br/>deleted file mode 100644<br/>index 81aa91b418..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/camel-mh-summary.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/camel-mh-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- *  Copyright (C) 2000 Helix Code Inc.</div><div class='del'>- *</div><div class='del'>- *  Authors: Not Zed &lt;notzed@lostzed.mmc.com.au&gt;</div><div class='del'>- *</div><div class='del'>- *  This program is free software; you can redistribute it and/or</div><div class='del'>- *  modify it under the terms of 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_MH_SUMMARY_H</div><div class='del'>-#define _CAMEL_MH_SUMMARY_H</div><div class='del'>-</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-#include &lt;camel/camel-folder.h&gt;</div><div class='del'>-#include &lt;camel/camel-exception.h&gt;</div><div class='del'>-#include &lt;libibex/ibex.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_MH_SUMMARY(obj)	CAMEL_CHECK_CAST (obj, camel_mh_summary_get_type (), CamelMhSummary)</div><div class='del'>-#define CAMEL_MH_SUMMARY_CLASS(klass)	CAMEL_CHECK_CLASS_CAST (klass, camel_mh_summary_get_type (), CamelMhSummaryClass)</div><div class='del'>-#define IS_CAMEL_MH_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_mh_summary_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelMhSummary	CamelMhSummary;</div><div class='del'>-typedef struct _CamelMhSummaryClass	CamelMhSummaryClass;</div><div class='del'>-</div><div class='del'>-struct _CamelMhSummary {</div><div class='del'>-	CamelFolderSummary parent;</div><div class='del'>-	struct _CamelMhSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	char *mh_path;</div><div class='del'>-	ibex *index;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _CamelMhSummaryClass {</div><div class='del'>-	CamelFolderSummaryClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* virtual methods */</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelType	 camel_mh_summary_get_type	(void);</div><div class='del'>-CamelMhSummary	*camel_mh_summary_new	(const char *filename, const char *mhdir, ibex *index);</div><div class='del'>-</div><div class='del'>-/* methods */</div><div class='del'>-int		camel_mh_summary_load(CamelMhSummary * mhs, int forceindex);</div><div class='del'>-int		camel_mh_summary_check(CamelMhSummary * mhs, int forceindex);</div><div class='del'>-int		camel_mh_summary_add(CamelMhSummary * mhs, const char *name, int forceindex);</div><div class='del'>-int		camel_mh_summary_sync(CamelMhSummary * mhs, int expunge, CamelFolderChangeInfo *changes, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#endif /* ! _CAMEL_MH_SUMMARY_H */</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/mh/libcamelmh.urls b/camel/providers/mh/libcamelmh.urls<br/>deleted file mode 100644<br/>index 372daaa98f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/mh/libcamelmh.urls?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/mh/libcamelmh.urls</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-mh</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 4b686735e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelnntpincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-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../..				\</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-nntp-provider\"</div><div class='del'>-</div><div class='del'>-libcamelnntp_la_SOURCES = 			\</div><div class='del'>-	camel-nntp-auth.c			\</div><div class='del'>-	camel-nntp-folder.c			\</div><div class='del'>-	camel-nntp-grouplist.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-auth.h			\</div><div class='del'>-	camel-nntp-folder.h			\</div><div class='del'>-	camel-nntp-grouplist.h			\</div><div class='del'>-	camel-nntp-newsrc.h			\</div><div class='del'>-	camel-nntp-resp-codes.h			\</div><div class='del'>-	camel-nntp-store.h			\</div><div class='del'>-	camel-nntp-types.h			\</div><div class='del'>-	camel-nntp-utils.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-auth.c b/camel/providers/nntp/camel-nntp-auth.c<br/>deleted file mode 100644<br/>index 1f1e6ab2d8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-auth.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-auth.c</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-nntp-auth.c : authentication for nntp */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 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;camel-nntp-auth.h&gt;</div><div class='del'>-#include &lt;camel-nntp-store.h&gt;</div><div class='del'>-#include &lt;camel-nntp-resp-codes.h&gt;</div><div class='del'>-#include &lt;camel-exception.h&gt;</div><div class='del'>-#include &lt;camel-session.h&gt;</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelService *service = CAMEL_SERVICE (store);</div><div class='del'>-	CamelSession *session = camel_service_get_session (service);</div><div class='del'>-	int resp;</div><div class='del'>-</div><div class='del'>-	if (!service-&gt;url-&gt;authmech &amp;&amp; !service-&gt;url-&gt;passwd) {</div><div class='del'>-		gchar *prompt;</div><div class='del'>-			</div><div class='del'>-		prompt = g_strdup_printf (_("Please enter the NNTP password for %s@%s"),</div><div class='del'>-					  service-&gt;url-&gt;user, service-&gt;url-&gt;host);</div><div class='del'>-		service-&gt;url-&gt;passwd =</div><div class='del'>-			camel_session_query_authenticator (session,</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'>-			</div><div class='del'>-		if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, </div><div class='del'>-					     "You didn\'t enter a password.");</div><div class='del'>-			resp = 666;</div><div class='del'>-			goto done;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* first send username */</div><div class='del'>-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO USER %s", service-&gt;url-&gt;user);</div><div class='del'>-</div><div class='del'>-	if (resp == NNTP_AUTH_REJECTED) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Server rejected username"));</div><div class='del'>-		goto done;</div><div class='del'>-</div><div class='del'>-	}</div><div class='del'>-	else if (resp != NNTP_AUTH_CONTINUE) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Failed to send username to server"));</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* then send the username if the server asks for it */</div><div class='del'>-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO PASS %s", service-&gt;url-&gt;passwd);</div><div class='del'>-</div><div class='del'>-	if (resp == NNTP_AUTH_REJECTED) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Server rejected username/password"));</div><div class='del'>-		goto done;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- done:</div><div class='del'>-</div><div class='del'>-	if (service-&gt;url-&gt;passwd) {</div><div class='del'>-		/* let's be paranoid */</div><div class='del'>-		memset (service-&gt;url-&gt;passwd, 0, strlen (service-&gt;url-&gt;passwd));</div><div class='del'>-		g_free (service-&gt;url-&gt;passwd);</div><div class='del'>-		service-&gt;url-&gt;passwd = NULL;</div><div class='del'>-	}</div><div class='del'>-	return resp;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h<br/>deleted file mode 100644<br/>index 2708d9d335..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-auth.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-auth.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-auth.h : authentication for nntp */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Author : Chris Toshok &lt;toshok@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_AUTH_H</div><div class='del'>-#define CAMEL_NNTP_AUTH_H 1</div><div class='del'>-</div><div class='del'>-#include &lt;camel-nntp-store.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus }*/</div><div class='del'>-</div><div class='del'>-int camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_AUTH_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c<br/>deleted file mode 100644<br/>index e4d53d779f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-folder.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,330 +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-resp-codes.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-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 (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CNNTPS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-</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'>-	CamelNNTPStore *store;</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'>-	store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));</div><div class='del'>-</div><div class='del'>-	if (store-&gt;newsrc)</div><div class='del'>-		camel_nntp_newsrc_write (store-&gt;newsrc);</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)</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)</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)</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'>-	if (set &amp; CAMEL_MESSAGE_SEEN) {</div><div class='del'>-		int article_num;</div><div class='del'>-		CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));</div><div class='del'>-</div><div class='del'>-		sscanf (uid, "%d", &amp;article_num);</div><div class='del'>-</div><div class='del'>-		camel_nntp_newsrc_mark_article_read (nntp_store-&gt;newsrc,</div><div class='del'>-						     folder-&gt;name,</div><div class='del'>-						     article_num);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_folder_summary_touch (nntp_folder-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelMimeMessage *</div><div class='del'>-nntp_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelStream *message_stream = NULL;</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'>-	char *message_id;</div><div class='del'>-</div><div class='del'>-	/* get the parent store */</div><div class='del'>-	parent_store = camel_folder_get_parent_store (folder);</div><div class='del'>-</div><div class='del'>-	message_id = strchr (uid, ',') + 1;</div><div class='del'>-	status = camel_nntp_command (CAMEL_NNTP_STORE( parent_store ), ex, NULL, "ARTICLE %s", message_id);</div><div class='del'>-</div><div class='del'>-	/* if the message_id was not found, raise an exception and return */</div><div class='del'>-	if (status == NNTP_NO_SUCH_ARTICLE) {</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'>-				      message_id);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	else if (status != NNTP_ARTICLE_FOLLOWS) {</div><div class='del'>-		/* XXX */</div><div class='del'>-		g_warning ("weird nntp error %d\n", status);</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 = g_malloc(buf_alloc);</div><div class='del'>-	done = FALSE;</div><div class='del'>-</div><div class='del'>-	buf[0] = 0;</div><div class='del'>-</div><div class='del'>-	while (!done) {</div><div class='del'>-		int line_length;</div><div class='del'>-		char *line;</div><div class='del'>-</div><div class='del'>-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (parent_store), &amp;line, ex) &lt; 0) {</div><div class='del'>-			g_warning ("recv_line failed while building message\n");</div><div class='del'>-			break;</div><div class='del'>-		}</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 = g_realloc (buf, buf_alloc);</div><div class='del'>-			}</div><div class='del'>-			strcat(buf, line);</div><div class='del'>-			strcat(buf, "\n");</div><div class='del'>-			buf_len += strlen(line) + 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'>-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER(message), message_stream);</div><div class='del'>-</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (message_stream));</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-	gtk_signal_connect (CAMEL_OBJECT (message), "message_changed", message_changed, folder);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	g_free (buf);</div><div class='del'>-</div><div class='del'>-	return message;</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'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-	GPtrArray *out;</div><div class='del'>-	CamelMessageInfo *message_info;</div><div class='del'>-	int i;</div><div class='del'>-	int count = camel_folder_summary_count (nntp_folder-&gt;summary);</div><div class='del'>-</div><div class='del'>-	out = g_ptr_array_new ();</div><div class='del'>-	g_ptr_array_set_size (out, count);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; count; i++) {</div><div class='del'>-		message_info = camel_folder_summary_index (nntp_folder-&gt;summary, 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 GPtrArray *</div><div class='del'>-nntp_folder_get_summary (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</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 GPtrArray*</div><div class='del'>-nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	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_get_message_info (CamelFolder *folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	return camel_folder_summary_uid (nntp_folder-&gt;summary, uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void           </div><div class='del'>-nntp_folder_finalize (CamelObject *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'>-</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'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-		</div><div class='del'>-	/* virtual method definition */</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;sync = nntp_folder_sync;</div><div class='del'>-	camel_folder_class-&gt;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 = nntp_folder_get_message;</div><div class='del'>-	camel_folder_class-&gt;get_uids = nntp_folder_get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = camel_folder_free_deep;</div><div class='del'>-	camel_folder_class-&gt;get_summary = nntp_folder_get_summary;</div><div class='del'>-	camel_folder_class-&gt;free_summary = camel_folder_free_nop;</div><div class='del'>-	camel_folder_class-&gt;search_by_expression = nntp_folder_search_by_expression;</div><div class='del'>-	camel_folder_class-&gt;get_message_info = nntp_folder_get_message_info;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_nntp_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_nntp_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_nntp_folder_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_nntp_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelNNTPFolder",</div><div class='del'>-							      sizeof (CamelNNTPFolder),</div><div class='del'>-							      sizeof (CamelNNTPFolderClass),</div><div class='del'>-							      (CamelObjectClassInitFunc) camel_nntp_folder_class_init,</div><div class='del'>-							      NULL,</div><div class='del'>-							      (CamelObjectInitFunc) NULL,</div><div class='del'>-							      (CamelObjectFinalizeFunc) nntp_folder_finalize);</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'>-CamelFolder *</div><div class='del'>-camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (camel_object_new (CAMEL_NNTP_FOLDER_TYPE));</div><div class='del'>-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);</div><div class='del'>-	const gchar *root_dir_path;</div><div class='del'>-</div><div class='del'>-	camel_folder_construct (folder, parent, folder_name, folder_name);</div><div class='del'>-	folder-&gt;has_summary_capability = TRUE;</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'>-	nntp_folder-&gt;summary_file_path = g_strdup_printf ("%s/%s-ev-summary",</div><div class='del'>-							  root_dir_path,</div><div class='del'>-							  folder-&gt;name);</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,</div><div class='del'>-					   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,</div><div class='del'>-					nntp_folder, ex);</div><div class='del'>-		if (camel_exception_get_id (ex)) {</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* 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='del'>-	return folder;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h<br/>deleted file mode 100644<br/>index eed946fb5c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-folder.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 "camel-folder.h"</div><div class='del'>-</div><div class='del'>-/*  #include "camel-store.h" */</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_FOLDER_TYPE     (camel_nntp_folder_get_type ())</div><div class='del'>-#define CAMEL_NNTP_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolder))</div><div class='del'>-#define CAMEL_NNTP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolderClass))</div><div class='del'>-#define IS_CAMEL_NNTP_FOLDER(o)    (CAMEL_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 *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 Camel function */</div><div class='del'>-CamelType camel_nntp_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-CamelFolder *camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c<br/>deleted file mode 100644<br/>index d7ee85d182..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-grouplist.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-grouplist.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'>-/* camel-nntp-grouplist.c : getting/updating the list of newsgroups on the server. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : Chris Toshok &lt;toshok@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 &lt;config.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-#include "camel-nntp-grouplist.h"</div><div class='del'>-#include "camel-nntp-resp-codes.h"</div><div class='del'>-</div><div class='del'>-static CamelNNTPGroupList *</div><div class='del'>-camel_nntp_get_grouplist_from_server (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	gboolean done = FALSE;</div><div class='del'>-	CamelNNTPGroupList *list;</div><div class='del'>-</div><div class='del'>-	status = camel_nntp_command (store, ex, NULL,</div><div class='del'>-				     "LIST");</div><div class='del'>-</div><div class='del'>-	if (status != NNTP_LIST_FOLLOWS) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not get group list from server."));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	list = g_new0 (CamelNNTPGroupList, 1);</div><div class='del'>-	list-&gt;time = time (NULL);</div><div class='del'>-</div><div class='del'>-	while (!done) {</div><div class='del'>-		char *line;</div><div class='del'>-</div><div class='del'>-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &amp;line, ex) &lt; 0)</div><div class='del'>-			return list;</div><div class='del'>-</div><div class='del'>-		if (*line == '.') {</div><div class='del'>-			done = TRUE;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);</div><div class='del'>-			char **split_line = g_strsplit (line, " ", 4);</div><div class='del'>-</div><div class='del'>-			entry-&gt;group_name = g_strdup (split_line[0]);</div><div class='del'>-			entry-&gt;high = atoi (split_line[1]);</div><div class='del'>-			entry-&gt;low = atoi (split_line[2]);</div><div class='del'>-</div><div class='del'>-			g_strfreev (split_line);</div><div class='del'>-			</div><div class='del'>-			list-&gt;group_list = g_list_append (list-&gt;group_list, entry);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelNNTPGroupList*</div><div class='del'>-camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));</div><div class='del'>-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);</div><div class='del'>-	CamelNNTPGroupList *list;</div><div class='del'>-	FILE *fp;</div><div class='del'>-	char buf[300];</div><div class='del'>-	unsigned long time;</div><div class='del'>-</div><div class='del'>-	g_free (root_dir);</div><div class='del'>-	fp = fopen (grouplist_file, "r");</div><div class='del'>-	g_free (grouplist_file);</div><div class='del'>-</div><div class='del'>-	if (fp == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unable to load grouplist file for %s: %s"),</div><div class='del'>-				      CAMEL_SERVICE(store)-&gt;url-&gt;host,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* read the time */</div><div class='del'>-	if (!fgets (buf, 300, fp)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unable to load grouplist file for %s: %s"),</div><div class='del'>-				      CAMEL_SERVICE(store)-&gt;url-&gt;host,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		fclose (fp);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	list = g_new0 (CamelNNTPGroupList, 1);</div><div class='del'>-	list-&gt;store = store;</div><div class='del'>-	sscanf (buf, "%lu", &amp;time);</div><div class='del'>-	list-&gt;time = time;</div><div class='del'>-</div><div class='del'>-	while (fgets (buf, 300, fp)) {</div><div class='del'>-		CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);</div><div class='del'>-		char **split_line = g_strsplit (buf, " ", 4);</div><div class='del'>-</div><div class='del'>-		entry-&gt;group_name = g_strdup (split_line[0]);</div><div class='del'>-		entry-&gt;high = atoi (split_line[1]);</div><div class='del'>-		entry-&gt;low = atoi (split_line[2]);</div><div class='del'>-</div><div class='del'>-		g_strfreev (split_line);</div><div class='del'>-</div><div class='del'>-		list-&gt;group_list = g_list_append (list-&gt;group_list, entry);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fclose (fp);</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-save_entry (CamelNNTPGroupListEntry *entry, FILE *fp)</div><div class='del'>-{</div><div class='del'>-	fprintf (fp, "%s %d %d\n", entry-&gt;group_name, entry-&gt;low, entry-&gt;high);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_grouplist_save (CamelNNTPGroupList *group_list, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	FILE *fp;</div><div class='del'>-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(group_list-&gt;store));</div><div class='del'>-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);</div><div class='del'>-</div><div class='del'>-	g_free (root_dir);</div><div class='del'>-	fp = fopen (grouplist_file, "w");</div><div class='del'>-	g_free (grouplist_file);</div><div class='del'>-</div><div class='del'>-	if (fp == NULL) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unable to save grouplist file for %s: %s"),</div><div class='del'>-				      CAMEL_SERVICE(group_list-&gt;store)-&gt;url-&gt;host,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fprintf (fp, "%lu\n", (long)group_list-&gt;time);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (group_list-&gt;group_list, (GFunc)save_entry, fp);</div><div class='del'>-</div><div class='del'>-	fclose (fp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_entry (CamelNNTPGroupListEntry *entry, void *data)</div><div class='del'>-{</div><div class='del'>-	g_free (entry-&gt;group_name);</div><div class='del'>-	g_free (entry);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_grouplist_free (CamelNNTPGroupList *group_list)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (group_list);</div><div class='del'>-</div><div class='del'>-	g_list_foreach (group_list-&gt;group_list, (GFunc)free_entry, NULL);</div><div class='del'>-</div><div class='del'>-	g_free (group_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelNNTPGroupList*</div><div class='del'>-camel_nntp_grouplist_fetch (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPGroupList *list;</div><div class='del'>-</div><div class='del'>-	list = camel_nntp_get_grouplist_from_file (store, ex);</div><div class='del'>-</div><div class='del'>-	printf ("camel_nntp_get_grouplist_from_file returned %p\n", list);</div><div class='del'>-</div><div class='del'>-	if (!list) {</div><div class='del'>-		camel_exception_clear (ex);</div><div class='del'>-</div><div class='del'>-		list = camel_nntp_get_grouplist_from_server (store, ex);</div><div class='del'>-</div><div class='del'>-		if (!list) {</div><div class='del'>-			camel_nntp_grouplist_free (list);</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			list-&gt;store = store;</div><div class='del'>-			camel_nntp_grouplist_save (list, ex);</div><div class='del'>-			return list;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h<br/>deleted file mode 100644<br/>index 67c74d5dc2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-grouplist.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-grouplist.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : Chris Toshok &lt;toshok@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'>-#ifndef CAMEL_NNTP_GROUPLIST_H</div><div class='del'>-#define CAMEL_NNTP_GROUPLIST_H 1</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-</div><div class='del'>-struct CamelNNTPGroupListEntry {</div><div class='del'>-	char *group_name;</div><div class='del'>-	guint32 low;</div><div class='del'>-	guint32 high;</div><div class='del'>-	guint32 flags;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct CamelNNTPGroupList {</div><div class='del'>-	CamelNNTPStore *store;</div><div class='del'>-	time_t time;</div><div class='del'>-	GList *group_list;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-CamelNNTPGroupList* camel_nntp_grouplist_fetch  (CamelNNTPStore *store, CamelException *ex);</div><div class='del'>-gint                camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex);</div><div class='del'>-void                camel_nntp_grouplist_save   (CamelNNTPGroupList *group_list, CamelException *ex);</div><div class='del'>-void                camel_nntp_grouplist_free   (CamelNNTPGroupList *group_list);</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_GROUPLIST_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c<br/>deleted file mode 100644<br/>index b474dd3a40..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-newsrc.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-newsrc.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,573 +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 &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include "camel-nntp-newsrc.h"</div><div class='del'>-#include &lt;camel/camel-folder-summary.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	guint low;</div><div class='del'>-	guint high;</div><div class='del'>-} ArticleRange;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	char *name;</div><div class='del'>-	GArray *ranges;</div><div class='del'>-	gboolean subscribed;</div><div class='del'>-} NewsrcGroup;</div><div class='del'>-</div><div class='del'>-struct CamelNNTPNewsrc {</div><div class='del'>-	gchar *filename;</div><div class='del'>-	GHashTable *groups;</div><div class='del'>-	gboolean dirty;</div><div class='del'>-} ;</div><div class='del'>-</div><div class='del'>-static NewsrcGroup *</div><div class='del'>-camel_nntp_newsrc_group_add (CamelNNTPNewsrc *newsrc, const char *group_name, gboolean subscribed)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *new_group = g_malloc(sizeof(NewsrcGroup));</div><div class='del'>-</div><div class='del'>-	new_group-&gt;name = g_strdup(group_name);</div><div class='del'>-	new_group-&gt;subscribed = subscribed;</div><div class='del'>-	new_group-&gt;ranges = g_array_new (FALSE, FALSE, sizeof (ArticleRange));</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (newsrc-&gt;groups, new_group-&gt;name, new_group);</div><div class='del'>-</div><div class='del'>-	newsrc-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	return new_group;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-camel_nntp_newsrc_group_get_highest_article_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)</div><div class='del'>-{</div><div class='del'>-	if (!group || group-&gt;ranges-&gt;len == 0)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return g_array_index(group-&gt;ranges, ArticleRange, group-&gt;ranges-&gt;len - 1).high;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-camel_nntp_newsrc_group_get_num_articles_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int count = 0;</div><div class='del'>-</div><div class='del'>-	if (group == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; group-&gt;ranges-&gt;len; i ++)</div><div class='del'>-		count += (g_array_index(group-&gt;ranges, ArticleRange, i).high -</div><div class='del'>-			  g_array_index(group-&gt;ranges, ArticleRange, i).low) + 1;</div><div class='del'>-</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_newsrc_group_mark_range_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group, long low, long high)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (group-&gt;ranges-&gt;len == 1</div><div class='del'>-	    &amp;&amp; g_array_index (group-&gt;ranges, ArticleRange, 0).low == 0</div><div class='del'>-	    &amp;&amp; g_array_index (group-&gt;ranges, ArticleRange, 0).high == 0) {</div><div class='del'>-		g_array_index (group-&gt;ranges, ArticleRange, 0).low = low;</div><div class='del'>-		g_array_index (group-&gt;ranges, ArticleRange, 0).high = high;</div><div class='del'>-</div><div class='del'>-		newsrc-&gt;dirty = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else  {</div><div class='del'>-		ArticleRange tmp_range;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; group-&gt;ranges-&gt;len; i ++) {</div><div class='del'>-			guint range_low = g_array_index (group-&gt;ranges, ArticleRange, i).low;</div><div class='del'>-			guint range_high = g_array_index (group-&gt;ranges, ArticleRange, i).high;</div><div class='del'>-			</div><div class='del'>-			/* if it's already part of a range, return immediately. */</div><div class='del'>-			if (low &gt;= range_low &amp;&amp;</div><div class='del'>-			    low &lt;= range_high &amp;&amp;</div><div class='del'>-			    high &gt;= range_low &amp;&amp;</div><div class='del'>-			    high &lt;= range_high) {</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if we have a new lower bound for this range, set it. */</div><div class='del'>-			else if (low &lt;= range_low</div><div class='del'>-				 &amp;&amp; high &gt;= range_low</div><div class='del'>-				 &amp;&amp; high &lt;= range_high) {</div><div class='del'>-				g_array_index (group-&gt;ranges, ArticleRange, i).low = low;</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if we have a new upper bound for this range, set it. */</div><div class='del'>-			else if (high &gt;= range_high</div><div class='del'>-				 &amp;&amp; low &gt;= range_low</div><div class='del'>-				 &amp;&amp; low &lt;= range_high) {</div><div class='del'>-				g_array_index (group-&gt;ranges, ArticleRange, i).high = high;</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if we would be inserting another range that</div><div class='del'>-                           starts one index higher than an existing</div><div class='del'>-                           one, make the upper value of the existing</div><div class='del'>-                           range the upper value of the new one. */</div><div class='del'>-			else if (low == range_high + 1) {</div><div class='del'>-				g_array_index (group-&gt;ranges, ArticleRange, i).high = high;</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if we would be inserting another range that</div><div class='del'>-                           ends one index lower than an existing one,</div><div class='del'>-                           group the existing range by setting its low</div><div class='del'>-                           to the new low */</div><div class='del'>-			else if (high == range_low - 1) {</div><div class='del'>-				g_array_index (group-&gt;ranges, ArticleRange, i).low = low;</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-			/* if the range lies entirely outside another</div><div class='del'>-                           range, doesn't coincide with it's</div><div class='del'>-                           endpoints, and has lower values, insert it</div><div class='del'>-                           into the middle of the list. */</div><div class='del'>-			else if (low &lt; range_low</div><div class='del'>-				 &amp;&amp; high &lt; range_low) {</div><div class='del'>-				tmp_range.low = low;</div><div class='del'>-				tmp_range.high = high;</div><div class='del'>-</div><div class='del'>-				group-&gt;ranges = g_array_insert_val (group-&gt;ranges, i, tmp_range);</div><div class='del'>-				newsrc-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-				return;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* if we made it here, the range needs to go at the end */</div><div class='del'>-		tmp_range.low = low;</div><div class='del'>-		tmp_range.high = high;</div><div class='del'>-		group-&gt;ranges = g_array_append_val (group-&gt;ranges, tmp_range);</div><div class='del'>-		newsrc-&gt;dirty = TRUE;</div><div class='del'>-	} </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_nntp_newsrc_get_highest_article_read (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</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'>-int</div><div class='del'>-camel_nntp_newsrc_get_num_articles_read (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</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_num_articles_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, const char *group_name, int num)</div><div class='del'>-{</div><div class='del'>-	camel_nntp_newsrc_mark_range_read (newsrc, group_name, num, num);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_mark_range_read(CamelNNTPNewsrc *newsrc, const char *group_name, long low, long high)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</div><div class='del'>-	/* swap them if they're in the wrong order. */</div><div class='del'>-	if (low &gt; high) {</div><div class='del'>-		long tmp;</div><div class='del'>-</div><div class='del'>-		tmp = high;</div><div class='del'>-		high = low;</div><div class='del'>-		low = tmp;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	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, const char *group_name, long num)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</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'>-gboolean  </div><div class='del'>-camel_nntp_newsrc_group_is_subscribed (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group) {</div><div class='del'>-		return group-&gt;subscribed;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_subscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group) {</div><div class='del'>-		if (!group-&gt;subscribed)</div><div class='del'>-			newsrc-&gt;dirty = TRUE;</div><div class='del'>-		group-&gt;subscribed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		camel_nntp_newsrc_group_add (newsrc, group_name, TRUE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-camel_nntp_newsrc_unsubscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)</div><div class='del'>-{</div><div class='del'>-	NewsrcGroup *group = g_hash_table_lookup (newsrc-&gt;groups, group_name);</div><div class='del'>-</div><div class='del'>-	if (group) {</div><div class='del'>-		if (group-&gt;subscribed)</div><div class='del'>-			newsrc-&gt;dirty = TRUE;</div><div class='del'>-		group-&gt;subscribed = FALSE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		camel_nntp_newsrc_group_add (newsrc, group_name, FALSE);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</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'>-	g_return_val_if_fail (newsrc, NULL);</div><div class='del'>-</div><div class='del'>-	npa.ptr_array = g_ptr_array_new();</div><div class='del'>-	npa.subscribed_only = TRUE;</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (newsrc-&gt;groups,</div><div class='del'>-			      (GHFunc)get_group_foreach, &amp;npa);</div><div class='del'>-</div><div class='del'>-	return npa.ptr_array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GPtrArray *</div><div class='del'>-camel_nntp_newsrc_get_all_group_names (CamelNNTPNewsrc *newsrc)</div><div class='del'>-{</div><div class='del'>-	struct newsrc_ptr_array npa;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (newsrc, NULL);</div><div class='del'>-</div><div class='del'>-	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'>-</div><div class='del'>-	fp = newsrc_fp-&gt;fp;</div><div class='del'>-	newsrc = newsrc_fp-&gt;newsrc;</div><div class='del'>-</div><div class='del'>-	fprintf (fp, "%s%c", group-&gt;name, group-&gt;subscribed ? ':' : '!');</div><div class='del'>-</div><div class='del'>-	if (group-&gt;ranges-&gt;len == 1</div><div class='del'>-	    &amp;&amp; g_array_index (group-&gt;ranges, ArticleRange, 0).low == 0</div><div class='del'>-	    &amp;&amp; g_array_index (group-&gt;ranges, ArticleRange, 0).high == 0) {</div><div class='del'>-		fprintf (fp, "\n");</div><div class='del'>-</div><div class='del'>-		return; /* special case since our parsing code will insert this</div><div class='del'>-			   bogus range if there were no read articles.  The code</div><div class='del'>-			   to add a range is smart enough to remove this one if we</div><div class='del'>-			   ever mark an article read, but we still need to deal with</div><div class='del'>-			   it if that code doesn't get hit. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fprintf (fp, " ");</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; group-&gt;ranges-&gt;len; i ++) {</div><div class='del'>-		char range_buffer[100];</div><div class='del'>-		guint low = g_array_index (group-&gt;ranges, ArticleRange, i).low;</div><div class='del'>-		guint high = g_array_index (group-&gt;ranges, ArticleRange, i).high;</div><div class='del'>-</div><div class='del'>-		if (low == high)</div><div class='del'>-			sprintf(range_buffer, "%d", low);</div><div class='del'>-		else if (low == high - 1)</div><div class='del'>-			sprintf(range_buffer, "%d,%d", low, high);</div><div class='del'>-		else</div><div class='del'>-			sprintf(range_buffer, "%d-%d", low, high);</div><div class='del'>-</div><div class='del'>-		if (i != group-&gt;ranges-&gt;len - 1)</div><div class='del'>-			strcat(range_buffer, ",");</div><div class='del'>-</div><div class='del'>-		fprintf (fp, range_buffer);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	fprintf (fp, "\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-camel_nntp_newsrc_write_to_file(CamelNNTPNewsrc *newsrc, FILE *fp)</div><div class='del'>-{</div><div class='del'>-	struct newsrc_fp newsrc_fp;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (newsrc);</div><div class='del'>-</div><div class='del'>-	newsrc_fp.newsrc = newsrc;</div><div class='del'>-	newsrc_fp.fp = fp;</div><div class='del'>-</div><div class='del'>-	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'>-	g_return_if_fail (newsrc);</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'>-	newsrc-&gt;dirty = FALSE;</div><div class='del'>-</div><div class='del'>-	fclose(fp);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_newsrc_parse_line(CamelNNTPNewsrc *newsrc, char *line)</div><div class='del'>-{</div><div class='del'>-	char *p, *comma, *dash;</div><div class='del'>-	gboolean is_subscribed;</div><div class='del'>-	NewsrcGroup *group;</div><div class='del'>-</div><div class='del'>-	p = strchr(line, ':');</div><div class='del'>-</div><div class='del'>-	if (p) {</div><div class='del'>-		is_subscribed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		p = strchr(line, '!');</div><div class='del'>-		if (p)</div><div class='del'>-			is_subscribed = FALSE;</div><div class='del'>-		else</div><div class='del'>-			return; /* bogus line. */</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*p++ = '\0';</div><div class='del'>-</div><div class='del'>-	group = camel_nntp_newsrc_group_add (newsrc, line, is_subscribed);</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		guint high, low;</div><div class='del'>-</div><div class='del'>-		comma = strchr(p, ',');</div><div class='del'>-</div><div class='del'>-		if (comma)</div><div class='del'>-			*comma = '\0';</div><div class='del'>-</div><div class='del'>-		dash = strchr(p, '-');</div><div class='del'>-</div><div class='del'>-		if (!dash) { /* there wasn't a dash.  must be just one number */</div><div class='del'>-			high = low = atol(p);</div><div class='del'>-		}</div><div class='del'>-		else { /* there was a dash. */</div><div class='del'>-			*dash = '\0';</div><div class='del'>-			low = atol(p);</div><div class='del'>-			*dash = '-';</div><div class='del'>-			p = dash + 1;</div><div class='del'>-			high = atol(p);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);</div><div class='del'>-</div><div class='del'>-		if (comma) {</div><div class='del'>-			*comma = ',';</div><div class='del'>-			p = comma + 1;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	} while(comma);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char*</div><div class='del'>-get_line (char *buf, char **p)</div><div class='del'>-{</div><div class='del'>-	char *l;</div><div class='del'>-	char *line;</div><div class='del'>-</div><div class='del'>-	g_assert (*p == NULL || **p == '\n' || **p == '\0');</div><div class='del'>-</div><div class='del'>-	if (*p == NULL) {</div><div class='del'>-		*p = buf;</div><div class='del'>-</div><div class='del'>-		if (**p == '\0')</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (**p == '\0')</div><div class='del'>-			return NULL;</div><div class='del'>-</div><div class='del'>-		(*p) ++;</div><div class='del'>-	</div><div class='del'>-		/* if we just incremented to the end of the buffer, return NULL */</div><div class='del'>-		if (**p == '\0')</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	l = strchr (*p, '\n');</div><div class='del'>-	if (l) {</div><div class='del'>-		*l = '\0';</div><div class='del'>-		line = g_strdup (*p);</div><div class='del'>-		*l = '\n';</div><div class='del'>-		*p = l;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* we're at the last line (which isn't terminated by a \n, btw) */</div><div class='del'>-		line = g_strdup (*p);</div><div class='del'>-		(*p) += strlen (*p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return line;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelNNTPNewsrc *</div><div class='del'>-camel_nntp_newsrc_read_for_server (const char *server)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	char buf[1024];</div><div class='del'>-	char *file_contents, *line, *p;</div><div class='del'>-	char *filename;</div><div class='del'>-	CamelNNTPNewsrc *newsrc;</div><div class='del'>-	int newsrc_len;</div><div class='del'>-	int len_read = 0;</div><div class='del'>-	struct stat sb;</div><div class='del'>-</div><div class='del'>-	filename = g_strdup_printf ("%s/.newsrc-%s", g_get_home_dir(), server);</div><div class='del'>-</div><div class='del'>-	newsrc = g_new0(CamelNNTPNewsrc, 1);</div><div class='del'>-	newsrc-&gt;filename = filename;</div><div class='del'>-	newsrc-&gt;groups = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if ((fd = open(filename, O_RDONLY)) == -1) {</div><div class='del'>-		g_warning ("~/.newsrc-%s not present.\n", server);</div><div class='del'>-		return newsrc;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (fstat (fd, &amp;sb) == -1) {</div><div class='del'>-		g_warning ("failed fstat on ~/.newsrc-%s: %s\n", server, strerror(errno));</div><div class='del'>-		return newsrc;</div><div class='del'>-	}</div><div class='del'>-	newsrc_len = sb.st_size;</div><div class='del'>-</div><div class='del'>-	file_contents = g_malloc (newsrc_len + 1);</div><div class='del'>-</div><div class='del'>-	while (len_read &lt; newsrc_len) {</div><div class='del'>-		int c = read (fd, buf, sizeof (buf));</div><div class='del'>-</div><div class='del'>-		if (c == -1)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		memcpy (&amp;file_contents[len_read], buf, c);</div><div class='del'>-		len_read += c;</div><div class='del'>-	}</div><div class='del'>-	file_contents [len_read] = 0;</div><div class='del'>-</div><div class='del'>-	p = NULL;</div><div class='del'>-	while ((line = get_line (file_contents, &amp;p))) {</div><div class='del'>-		camel_nntp_newsrc_parse_line(newsrc, line);</div><div class='del'>-		g_free (line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	close (fd);</div><div class='del'>-	g_free (file_contents);</div><div class='del'>-</div><div class='del'>-	return newsrc;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h<br/>deleted file mode 100644<br/>index 652e3edbce..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-newsrc.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-newsrc.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-</div><div class='del'>-#ifndef _CAMEL_NNTP_NEWSRC_H_</div><div class='del'>-#define _CAMEL_NNTP_NEWSRC_H_</div><div class='del'>-</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include "glib.h"</div><div class='del'>-</div><div class='del'>-typedef struct CamelNNTPNewsrc CamelNNTPNewsrc;</div><div class='del'>-</div><div class='del'>-int              camel_nntp_newsrc_get_highest_article_read   (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-int              camel_nntp_newsrc_get_num_articles_read      (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-void             camel_nntp_newsrc_mark_article_read          (CamelNNTPNewsrc *newsrc,</div><div class='del'>-							       const char *group_name, int num);</div><div class='del'>-void             camel_nntp_newsrc_mark_range_read            (CamelNNTPNewsrc *newsrc,</div><div class='del'>-							       const char *group_name, long low, long high);</div><div class='del'>-</div><div class='del'>-gboolean         camel_nntp_newsrc_article_is_read            (CamelNNTPNewsrc *newsrc,</div><div class='del'>-							       const char *group_name, long num);</div><div class='del'>-</div><div class='del'>-gboolean         camel_nntp_newsrc_group_is_subscribed        (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-void             camel_nntp_newsrc_subscribe_group            (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-void             camel_nntp_newsrc_unsubscribe_group          (CamelNNTPNewsrc *newsrc, const char *group_name);</div><div class='del'>-</div><div class='del'>-GPtrArray*       camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc);</div><div class='del'>-GPtrArray*       camel_nntp_newsrc_get_all_group_names        (CamelNNTPNewsrc *newsrc);</div><div class='del'>-void             camel_nntp_newsrc_free_group_names           (CamelNNTPNewsrc *newsrc, GPtrArray *group_names);</div><div class='del'>-</div><div class='del'>-void             camel_nntp_newsrc_write_to_file              (CamelNNTPNewsrc *newsrc, FILE *fp);</div><div class='del'>-void             camel_nntp_newsrc_write                      (CamelNNTPNewsrc *newsrc);</div><div class='del'>-CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server            (const char *server);</div><div class='del'>-</div><div class='del'>-#endif /* _CAMEL_NNTP_NEWSRC_H_ */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c<br/>deleted file mode 100644<br/>index 76ac521ec6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-provider.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-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 void add_hash (guint *hash, char *s);</div><div class='del'>-static guint nntp_url_hash (gconstpointer key);</div><div class='del'>-static gint check_equal (char *s1, char *s2);</div><div class='del'>-static gint nntp_url_equal (gconstpointer a, gconstpointer b);</div><div class='del'>-</div><div class='del'>-static CamelProvider news_provider = {</div><div class='del'>-	"nntp",</div><div class='del'>-	N_("USENET news"),</div><div class='del'>-</div><div class='del'>-	N_("This is a provider for reading from and posting to"</div><div class='del'>-	   "USENET newsgroups."),</div><div class='del'>-</div><div class='del'>-	"news",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_STORAGE,</div><div class='del'>-</div><div class='del'>-	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_USER |</div><div class='del'>-	CAMEL_URL_ALLOW_PASSWORD | CAMEL_URL_ALLOW_AUTH,</div><div class='del'>-</div><div class='del'>-	{ 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'>-	news_provider.object_types[CAMEL_PROVIDER_STORE] =</div><div class='del'>-		camel_nntp_store_get_type();</div><div class='del'>-</div><div class='del'>-	news_provider.service_cache = g_hash_table_new (nntp_url_hash, nntp_url_equal);</div><div class='del'>-</div><div class='del'>-	camel_session_register_provider (session, &amp;news_provider);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_hash (guint *hash, char *s)</div><div class='del'>-{</div><div class='del'>-	if (s)</div><div class='del'>-		*hash ^= g_str_hash(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static guint</div><div class='del'>-nntp_url_hash (gconstpointer key)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u = (CamelURL *)key;</div><div class='del'>-	guint hash = 0;</div><div class='del'>-</div><div class='del'>-	add_hash (&amp;hash, u-&gt;user);</div><div class='del'>-	add_hash (&amp;hash, u-&gt;host);</div><div class='del'>-	hash ^= u-&gt;port;</div><div class='del'>-	</div><div class='del'>-	return hash;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-check_equal (char *s1, char *s2)</div><div class='del'>-{</div><div class='del'>-	if (s1 == NULL) {</div><div class='del'>-		if (s2 == NULL)</div><div class='del'>-			return TRUE;</div><div class='del'>-		else</div><div class='del'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (s2 == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return strcmp (s1, s2) == 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-nntp_url_equal (gconstpointer a, gconstpointer b)</div><div class='del'>-{</div><div class='del'>-	const CamelURL *u1 = a, *u2 = b;</div><div class='del'>-	</div><div class='del'>-	return check_equal (u1-&gt;user, u2-&gt;user)</div><div class='del'>-		&amp;&amp; check_equal (u1-&gt;host, u2-&gt;host)</div><div class='del'>-		&amp;&amp; u1-&gt;port == u2-&gt;port;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h<br/>deleted file mode 100644<br/>index 8b9dc8ff6c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-resp-codes.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-resp-codes.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-resp-codes.h : #defines for all the response codes we care about */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 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'>-#ifndef CAMEL_NNTP_RESP_CODES_H</div><div class='del'>-#define CAMEL_NNTP_RESP_CODES_H 1</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_OK(x) ((x) &lt; 400)</div><div class='del'>-#define CAMEL_NNTP_ERR(x) (!CAMEL_NNTP_OK(x) &amp;&amp; (x) &lt; 500)</div><div class='del'>-#define CAMEL_NNTP_FAIL(x) (!CAMEL_NNTP_OK(x) &amp;&amp; !CAMEL_NNTP_ERR(x))</div><div class='del'>-</div><div class='del'>-#define NNTP_GREETING_POSTING_OK    200</div><div class='del'>-#define NNTP_GREETING_NO_POSTING    201</div><div class='del'>-</div><div class='del'>-#define NNTP_GROUP_SELECTED           211</div><div class='del'>-#define NNTP_LIST_FOLLOWS             215</div><div class='del'>-#define NNTP_ARTICLE_FOLLOWS          220</div><div class='del'>-#define NNTP_HEAD_FOLLOWS             221</div><div class='del'>-#define NNTP_DATA_FOLLOWS             224</div><div class='del'>-#define NNTP_NEW_ARTICLE_LIST_FOLLOWS 230</div><div class='del'>-#define NNTP_NEW_GROUP_LIST_FOLLOWS   231</div><div class='del'>-</div><div class='del'>-#define NNTP_NO_SUCH_GROUP          411</div><div class='del'>-#define NNTP_NO_SUCH_ARTICLE        430</div><div class='del'>-</div><div class='del'>-/* authentication */</div><div class='del'>-#define NNTP_AUTH_ACCEPTED          281</div><div class='del'>-#define NNTP_AUTH_CONTINUE          381</div><div class='del'>-#define NNTP_AUTH_REQUIRED          480</div><div class='del'>-#define NNTP_AUTH_REJECTED          482</div><div class='del'>-</div><div class='del'>-#define NNTP_PROTOCOL_ERROR         666</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_RESP_CODES_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c<br/>deleted file mode 100644<br/>index ff9e7a989a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,870 +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'>-#include &lt;config.h&gt;</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;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-nntp-resp-codes.h"</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-grouplist.h"</div><div class='del'>-#include "camel-nntp-folder.h"</div><div class='del'>-#include "camel-nntp-auth.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'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#define NNTP_PORT 119</div><div class='del'>-</div><div class='del'>-#define DUMP_EXTENSIONS</div><div class='del'>-</div><div class='del'>-/* define if you want the subscribe ui to show folders in tree form */</div><div class='del'>-/* #define INFO_AS_TREE */</div><div class='del'>-</div><div class='del'>-static CamelRemoteStoreClass *remote_store_class = NULL;</div><div class='del'>-</div><div class='del'>-static CamelServiceClass *service_class = NULL;</div><div class='del'>-</div><div class='del'>-/* Returns the class for a CamelNNTPStore */</div><div class='del'>-#define CNNTPS_CLASS(so) CAMEL_NNTP_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))</div><div class='del'>-</div><div class='del'>-static gboolean ensure_news_dir_exists (CamelNNTPStore *store);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_store_get_extensions (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	store-&gt;extensions = 0;</div><div class='del'>-</div><div class='del'>-	if (camel_nntp_command (store, ex, NULL, "LIST EXTENSIONS") == NNTP_LIST_FOLLOWS) {</div><div class='del'>-		gboolean done = FALSE;</div><div class='del'>-		CamelException ex;</div><div class='del'>-</div><div class='del'>-		camel_exception_init (&amp;ex);</div><div class='del'>-</div><div class='del'>-		while (!done) {</div><div class='del'>-			char *line;</div><div class='del'>-</div><div class='del'>-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &amp;line, &amp;ex) &lt; 0)</div><div class='del'>-				break; /* XXX */</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'>-#define CHECK_EXT(name,val) if (!strcasecmp (line, (name))) store-&gt;extensions |= (val)</div><div class='del'>-</div><div class='del'>-				CHECK_EXT ("SEARCH",     CAMEL_NNTP_EXT_SEARCH);</div><div class='del'>-				CHECK_EXT ("SETGET",     CAMEL_NNTP_EXT_SETGET);</div><div class='del'>-				CHECK_EXT ("OVER",       CAMEL_NNTP_EXT_OVER);</div><div class='del'>-				CHECK_EXT ("XPATTEXT",   CAMEL_NNTP_EXT_XPATTEXT);</div><div class='del'>-				CHECK_EXT ("XACTIVE",    CAMEL_NNTP_EXT_XACTIVE);</div><div class='del'>-				CHECK_EXT ("LISTMOTD",   CAMEL_NNTP_EXT_LISTMOTD);</div><div class='del'>-				CHECK_EXT ("LISTSUBSCR", CAMEL_NNTP_EXT_LISTSUBSCR);</div><div class='del'>-				CHECK_EXT ("LISTPNAMES", CAMEL_NNTP_EXT_LISTPNAMES);</div><div class='del'>-</div><div class='del'>-#undef CHECK_EXT</div><div class='del'>-			}</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'>-#ifdef DUMP_EXTENSIONS</div><div class='del'>-	g_print ("NNTP Extensions:");</div><div class='del'>-#define DUMP_EXT(name,val) if (store-&gt;extensions &amp; (val)) g_print (" %s", name);</div><div class='del'>-	DUMP_EXT ("SEARCH",     CAMEL_NNTP_EXT_SEARCH);</div><div class='del'>-	DUMP_EXT ("SETGET",     CAMEL_NNTP_EXT_SETGET);</div><div class='del'>-	DUMP_EXT ("OVER",       CAMEL_NNTP_EXT_OVER);</div><div class='del'>-	DUMP_EXT ("XPATTEXT",   CAMEL_NNTP_EXT_XPATTEXT);</div><div class='del'>-	DUMP_EXT ("XACTIVE",    CAMEL_NNTP_EXT_XACTIVE);</div><div class='del'>-	DUMP_EXT ("LISTMOTD",   CAMEL_NNTP_EXT_LISTMOTD);</div><div class='del'>-	DUMP_EXT ("LISTSUBSCR", CAMEL_NNTP_EXT_LISTSUBSCR);</div><div class='del'>-	DUMP_EXT ("LISTPNAMES", CAMEL_NNTP_EXT_LISTPNAMES);</div><div class='del'>-	g_print ("\n");</div><div class='del'>-#undef DUMP_EXT</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_nntp_store_get_overview_fmt (CamelNNTPStore *store, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int status;</div><div class='del'>-	int i;</div><div class='del'>-	gboolean done = FALSE;</div><div class='del'>-	</div><div class='del'>-	status = camel_nntp_command (store, ex, NULL,</div><div class='del'>-				     "LIST OVERVIEW.FMT");</div><div class='del'>-</div><div class='del'>-	if (status != NNTP_LIST_FOLLOWS) {</div><div class='del'>-		if (store-&gt;extensions &amp; CAMEL_NNTP_EXT_OVER) {</div><div class='del'>-			/* if we can't get the overview format, we should</div><div class='del'>-			   disable OVER support */</div><div class='del'>-			g_warning ("server reported support of OVER but LIST OVERVIEW.FMT failed."</div><div class='del'>-				   "  disabling OVER.\n");</div><div class='del'>-			store-&gt;extensions &amp;= ~CAMEL_NNTP_EXT_OVER;</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		if (!(store-&gt;extensions &amp; CAMEL_NNTP_EXT_OVER)) {</div><div class='del'>-			g_warning ("server didn't report support of OVER but LIST OVERVIEW.FMT worked."</div><div class='del'>-				   "  enabling OVER.\n");</div><div class='del'>-			store-&gt;extensions |= CAMEL_NNTP_EXT_OVER;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* start at 1 because the article number is always first */</div><div class='del'>-	store-&gt;num_overview_fields = 1;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; CAMEL_NNTP_OVER_LAST; i ++) {</div><div class='del'>-		store-&gt;overview_field [i].index = -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	while (!done) {</div><div class='del'>-		char *line;</div><div class='del'>-</div><div class='del'>-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &amp;line, ex) &lt; 0)</div><div class='del'>-			break; /* XXX */</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'>-			CamelNNTPOverField *over_field = NULL;</div><div class='del'>-			char *colon = NULL;;</div><div class='del'>-</div><div class='del'>-			if (!strncasecmp (line, "From:", 5)) {</div><div class='del'>-				over_field = &amp;store-&gt;overview_field [ CAMEL_NNTP_OVER_FROM ];</div><div class='del'>-				over_field-&gt;index = store-&gt;num_overview_fields;</div><div class='del'>-				colon = line + 5;</div><div class='del'>-			}</div><div class='del'>-			else if (!strncasecmp (line, "Subject:", 7)) {</div><div class='del'>-				over_field = &amp;store-&gt;overview_field [ CAMEL_NNTP_OVER_SUBJECT ];</div><div class='del'>-				over_field-&gt;index = store-&gt;num_overview_fields;</div><div class='del'>-				colon = line + 7;</div><div class='del'>-			}</div><div class='del'>-			else if (!strncasecmp (line, "Date:", 5)) {</div><div class='del'>-				over_field = &amp;store-&gt;overview_field [ CAMEL_NNTP_OVER_DATE ];</div><div class='del'>-				over_field-&gt;index = store-&gt;num_overview_fields;</div><div class='del'>-				colon = line + 5;</div><div class='del'>-			}</div><div class='del'>-			else if (!strncasecmp (line, "Message-ID:", 11)) {</div><div class='del'>-				over_field = &amp;store-&gt;overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ];</div><div class='del'>-				over_field-&gt;index = store-&gt;num_overview_fields;</div><div class='del'>-				colon = line + 11;</div><div class='del'>-			}</div><div class='del'>-			else if (!strncasecmp (line, "References:", 11)) {</div><div class='del'>-				over_field = &amp;store-&gt;overview_field [ CAMEL_NNTP_OVER_REFERENCES ];</div><div class='del'>-				over_field-&gt;index = store-&gt;num_overview_fields;</div><div class='del'>-				colon = line + 11;</div><div class='del'>-			}</div><div class='del'>-			else if (!strncasecmp (line, "Bytes:", 6)) {</div><div class='del'>-				over_field = &amp;store-&gt;overview_field [ CAMEL_NNTP_OVER_BYTES ];</div><div class='del'>-				over_field-&gt;index = store-&gt;num_overview_fields;</div><div class='del'>-				colon = line + 11;</div><div class='del'>-			}</div><div class='del'>-		</div><div class='del'>-			if (colon &amp;&amp; !strncmp (colon + 1, "full", 4))</div><div class='del'>-				over_field-&gt;full = TRUE;</div><div class='del'>-</div><div class='del'>-			store-&gt;num_overview_fields ++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (line);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; CAMEL_NNTP_OVER_LAST; i ++) {</div><div class='del'>-		if (store-&gt;overview_field [i].index == -1) {</div><div class='del'>-			g_warning ("server's OVERVIEW.FMT doesn't support minimum set we require,"</div><div class='del'>-				   " disabling OVER support.\n");</div><div class='del'>-			store-&gt;extensions &amp;= ~CAMEL_NNTP_EXT_OVER;</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'>-nntp_store_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *buf;</div><div class='del'>-	int resp_code;</div><div class='del'>-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);</div><div class='del'>-</div><div class='del'>-	if (!ensure_news_dir_exists(store)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not open directory for news server: %s"),</div><div class='del'>-				      strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (CAMEL_SERVICE_CLASS (remote_store_class)-&gt;connect (service, ex) == FALSE)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/* Read the greeting */</div><div class='del'>-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (service), &amp;buf, ex) &lt; 0) {</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* check if posting is allowed. */</div><div class='del'>-	resp_code = atoi (buf);</div><div class='del'>-	if (resp_code == NNTP_GREETING_POSTING_OK) {</div><div class='del'>-		g_print ("posting allowed\n");</div><div class='del'>-		store-&gt;posting_allowed = TRUE;</div><div class='del'>-	}</div><div class='del'>-	else if (resp_code == NNTP_GREETING_NO_POSTING) {</div><div class='del'>-		g_print ("no posting allowed\n");</div><div class='del'>-		store-&gt;posting_allowed = FALSE;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("unexpected server greeting code %d, no posting allowed\n", resp_code);</div><div class='del'>-		store-&gt;posting_allowed = FALSE;</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'>-	camel_nntp_store_get_extensions (store, ex);</div><div class='del'>-</div><div class='del'>-	/* try to get the overview.fmt */</div><div class='del'>-	camel_nntp_store_get_overview_fmt (store, 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'>-nntp_store_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);</div><div class='del'>-</div><div class='del'>-	if (clean)</div><div class='del'>-		camel_nntp_command (store, ex, NULL, "QUIT");</div><div class='del'>-</div><div class='del'>-	if (store-&gt;newsrc)</div><div class='del'>-		camel_nntp_newsrc_write (store-&gt;newsrc);</div><div class='del'>-</div><div class='del'>-	if (!service_class-&gt;disconnect (service, clean, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-nntp_store_get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup_printf ("%s", service-&gt;url-&gt;host);</div><div class='del'>-	else</div><div class='del'>-		return g_strdup_printf (_("USENET News via %s"), service-&gt;url-&gt;host);</div><div class='del'>-	</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelServiceAuthType password_authtype = {</div><div class='del'>-	N_("Password"),</div><div class='del'>-	</div><div class='del'>-	N_("This option will authenticate with the NNTP server using a "</div><div class='del'>-	   "plaintext password."),</div><div class='del'>-	</div><div class='del'>-	"",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-nntp_store_query_auth_types_generic (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *prev;</div><div class='del'>-	</div><div class='del'>-	prev = CAMEL_SERVICE_CLASS (remote_store_class)-&gt;query_auth_types_generic (service, ex);</div><div class='del'>-	return g_list_prepend (prev, &amp;password_authtype);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-nntp_store_query_auth_types_connected (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	g_warning ("nntp::query_auth_types_connected: not implemented. Defaulting.");</div><div class='del'>-	/* FIXME: use the classfunc instead of the local? */</div><div class='del'>-	return nntp_store_query_auth_types_generic (service, 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'>-		       guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-</div><div class='del'>-	printf ("get_folder called on folder_name=%s\n", folder_name);</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 = </div><div class='del'>-		camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)-&gt;url-&gt;host);</div><div class='del'>-</div><div class='del'>-	if (!nntp_store-&gt;newsrc) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unable to open or create .newsrc file for %s: %s"),</div><div class='del'>-				      CAMEL_SERVICE(store)-&gt;url-&gt;host,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_nntp_folder_new (store, folder_name, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef INFO_AS_TREE</div><div class='del'>-static void</div><div class='del'>-build_folder_info (CamelNNTPStore *nntp_store, CamelFolderInfo **root,</div><div class='del'>-		   CamelFolderInfo *parent, CamelNNTPGroupListEntry *entry,</div><div class='del'>-		   char *prefix, char *suffix,</div><div class='del'>-		   GHashTable *name_to_info)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (nntp_store)-&gt;url;</div><div class='del'>-	char *dot;</div><div class='del'>-	if ((dot = strchr (suffix, '.'))) {</div><div class='del'>-		/* it's an internal node, figure out the next node in</div><div class='del'>-                   the chain */</div><div class='del'>-		CamelFolderInfo *node;</div><div class='del'>-		char *node_name, *node_full_name;</div><div class='del'>-</div><div class='del'>-		node_name = g_malloc0 (dot - suffix + 1);</div><div class='del'>-		strncpy (node_name, suffix, dot - suffix);</div><div class='del'>-		node_full_name = g_strdup_printf ("%s.%s", prefix, node_name);</div><div class='del'>-</div><div class='del'>-		node = g_hash_table_lookup (name_to_info, node_full_name);</div><div class='del'>-		if (!node) {</div><div class='del'>-			/* we need to add one */</div><div class='del'>-			node = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-			node-&gt;name = g_strdup (node_name);</div><div class='del'>-			node-&gt;full_name = g_strdup (node_full_name);</div><div class='del'>-			node-&gt;url = NULL;</div><div class='del'>-			node-&gt;message_count = -1;</div><div class='del'>-			node-&gt;unread_message_count = -1;</div><div class='del'>-</div><div class='del'>-			if (parent) {</div><div class='del'>-				if (parent-&gt;child) {</div><div class='del'>-					node-&gt;sibling = parent-&gt;child;</div><div class='del'>-					parent-&gt;child = node;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					parent-&gt;child = node;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				if (*root) {</div><div class='del'>-					*root = node;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					node-&gt;sibling = *root;</div><div class='del'>-					*root = node;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			g_hash_table_insert (name_to_info, node_full_name, node);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		build_folder_info (nntp_store, root, node, entry, node_full_name, dot + 1, name_to_info);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* it's a leaf node, make the CamelFolderInfo and</div><div class='del'>-                   append it to @parent's list of children. */</div><div class='del'>-		CamelFolderInfo *new_group;</div><div class='del'>-</div><div class='del'>-		new_group = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-		new_group-&gt;name = g_strdup (entry-&gt;group_name);</div><div class='del'>-		new_group-&gt;full_name = g_strdup (entry-&gt;group_name);</div><div class='del'>-		new_group-&gt;url = g_strdup_printf ("nntp://%s%s%s/%s",</div><div class='del'>-						  url-&gt;user ? url-&gt;user : "",</div><div class='del'>-						  url-&gt;user ? "@" : "",</div><div class='del'>-						  url-&gt;host, (char *)entry-&gt;group_name);</div><div class='del'>-</div><div class='del'>-		new_group-&gt;message_count = entry-&gt;high - entry-&gt;low;</div><div class='del'>-		new_group-&gt;unread_message_count = (new_group-&gt;message_count - </div><div class='del'>-						   camel_nntp_newsrc_get_num_articles_read (nntp_store-&gt;newsrc, entry-&gt;group_name));</div><div class='del'>-</div><div class='del'>-		if (parent) {</div><div class='del'>-			if (parent-&gt;child) {</div><div class='del'>-				new_group-&gt;sibling = parent-&gt;child;</div><div class='del'>-				parent-&gt;child = new_group;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				parent-&gt;child = new_group;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			if (*root) {</div><div class='del'>-				*root = new_group;</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				new_group-&gt;sibling = *root;</div><div class='del'>-				*root = new_group;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-build_folder_info_from_grouplist (CamelNNTPStore *nntp_store, const char *top)</div><div class='del'>-{</div><div class='del'>-	GList *g;</div><div class='del'>-	CamelFolderInfo *groups = NULL;</div><div class='del'>-#ifdef INFO_AS_TREE</div><div class='del'>-	GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-#else</div><div class='del'>-	CamelFolderInfo *last = NULL, *fi;</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (nntp_store)-&gt;url;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	for (g = nntp_store-&gt;group_list-&gt;group_list; g; g = g_list_next (g)) {</div><div class='del'>-		CamelNNTPGroupListEntry *entry = g-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (!top || !strncmp (top, entry-&gt;group_name, strlen (top))) {</div><div class='del'>-#ifdef INFO_AS_TREE</div><div class='del'>-			build_folder_info (nntp_store, &amp;groups, NULL, entry,</div><div class='del'>-					   "", entry-&gt;group_name, hash);</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-			fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-			fi-&gt;name = g_strdup (entry-&gt;group_name);</div><div class='del'>-			fi-&gt;full_name = g_strdup (entry-&gt;group_name);</div><div class='del'>-			fi-&gt;url = g_strdup_printf ("nntp://%s%s%s/%s",</div><div class='del'>-						   url-&gt;user ? url-&gt;user : "",</div><div class='del'>-						   url-&gt;user ? "@" : "",</div><div class='del'>-						   url-&gt;host, (char *)entry-&gt;group_name);</div><div class='del'>-</div><div class='del'>-			fi-&gt;message_count = entry-&gt;high - entry-&gt;low;</div><div class='del'>-			fi-&gt;unread_message_count = (fi-&gt;message_count - </div><div class='del'>-						    camel_nntp_newsrc_get_num_articles_read (</div><div class='del'>-							     nntp_store-&gt;newsrc, entry-&gt;group_name));</div><div class='del'>-</div><div class='del'>-			if (last)</div><div class='del'>-				last-&gt;sibling = fi;</div><div class='del'>-			else</div><div class='del'>-				groups = fi;</div><div class='del'>-			last = fi;</div><div class='del'>-#endif</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return groups;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolderInfo *</div><div class='del'>-nntp_store_get_folder_info (CamelStore *store, const char *top,</div><div class='del'>-			    gboolean fast, gboolean recursive,</div><div class='del'>-			    gboolean subscribed_only,</div><div class='del'>-			    CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelURL *url = CAMEL_SERVICE (store)-&gt;url;</div><div class='del'>-	CamelNNTPStore *nntp_store = (CamelNNTPStore *)store;</div><div class='del'>-	GPtrArray *names;</div><div class='del'>-	CamelFolderInfo *groups = NULL, *last = NULL, *fi;</div><div class='del'>-	int i;</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 = </div><div class='del'>-		camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)-&gt;url-&gt;host);</div><div class='del'>-</div><div class='del'>-	if (!nntp_store-&gt;newsrc) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-				      _("Unable to open or create .newsrc file for %s: %s"),</div><div class='del'>-				      CAMEL_SERVICE(store)-&gt;url-&gt;host,</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!subscribed_only) {</div><div class='del'>-		if (!nntp_store-&gt;group_list)</div><div class='del'>-			nntp_store-&gt;group_list = camel_nntp_grouplist_fetch (nntp_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'>-		else {</div><div class='del'>-			fi = build_folder_info_from_grouplist (nntp_store, top);</div><div class='del'>-			return fi;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (top == NULL) {</div><div class='del'>-		/* return the list of groups */</div><div class='del'>-		names = camel_nntp_newsrc_get_subscribed_group_names (nntp_store-&gt;newsrc);</div><div class='del'>-		for (i = 0; i &lt; names-&gt;len; i++) {</div><div class='del'>-			fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-			fi-&gt;name = g_strdup (names-&gt;pdata[i]);</div><div class='del'>-			fi-&gt;full_name = g_strdup (names-&gt;pdata[i]);</div><div class='del'>-			fi-&gt;url = g_strdup_printf ("nntp://%s%s%s/%s",</div><div class='del'>-						   url-&gt;user ? url-&gt;user : "",</div><div class='del'>-						   url-&gt;user ? "@" : "",</div><div class='del'>-						   url-&gt;host, (char *)names-&gt;pdata[i]);</div><div class='del'>-			/* FIXME */</div><div class='del'>-			fi-&gt;message_count = fi-&gt;unread_message_count = -1;</div><div class='del'>-</div><div class='del'>-			if (last)</div><div class='del'>-				last-&gt;sibling = fi;</div><div class='del'>-			else</div><div class='del'>-				groups = fi;</div><div class='del'>-			last = fi;</div><div class='del'>-		}</div><div class='del'>-		camel_nntp_newsrc_free_group_names (nntp_store-&gt;newsrc, names);</div><div class='del'>-</div><div class='del'>-		return groups;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* getting a specific group */</div><div class='del'>-</div><div class='del'>-		fi = g_new0 (CamelFolderInfo, 1);</div><div class='del'>-		fi-&gt;name = g_strdup (top);</div><div class='del'>-		fi-&gt;full_name = g_strdup (top);</div><div class='del'>-		fi-&gt;url = g_strdup_printf ("nntp://%s/%s", url-&gt;host, top);</div><div class='del'>-		/* FIXME */</div><div class='del'>-		fi-&gt;message_count = fi-&gt;unread_message_count = -1;</div><div class='del'>-</div><div class='del'>-		return fi;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-nntp_store_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 gboolean</div><div class='del'>-nntp_store_folder_subscribed (CamelStore *store, const char *folder_name)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-</div><div class='del'>-	return camel_nntp_newsrc_group_is_subscribed (nntp_store-&gt;newsrc, folder_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_store_subscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			     CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-</div><div class='del'>-	camel_nntp_newsrc_subscribe_group (nntp_store-&gt;newsrc, folder_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-nntp_store_unsubscribe_folder (CamelStore *store, const char *folder_name,</div><div class='del'>-			       CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);</div><div class='del'>-</div><div class='del'>-	camel_nntp_newsrc_unsubscribe_group (nntp_store-&gt;newsrc, folder_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (object);</div><div class='del'>-	if (nntp_store-&gt;newsrc)</div><div class='del'>-		camel_nntp_newsrc_write (nntp_store-&gt;newsrc);</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'>-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_nntp_store_class);</div><div class='del'>-</div><div class='del'>-	remote_store_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs </div><div class='del'>-						      (camel_remote_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;connect = nntp_store_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = nntp_store_disconnect;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_generic = nntp_store_query_auth_types_generic;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_connected = nntp_store_query_auth_types_connected;</div><div class='del'>-	camel_service_class-&gt;get_name = nntp_store_get_name;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;get_folder = nntp_store_get_folder;</div><div class='del'>-	camel_store_class-&gt;get_root_folder_name = nntp_store_get_root_folder_name;</div><div class='del'>-	camel_store_class-&gt;get_folder_info = nntp_store_get_folder_info;</div><div class='del'>-	camel_store_class-&gt;free_folder_info = camel_store_free_folder_info_full;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;folder_subscribed = nntp_store_folder_subscribed;</div><div class='del'>-	camel_store_class-&gt;subscribe_folder = nntp_store_subscribe_folder;</div><div class='del'>-	camel_store_class-&gt;unsubscribe_folder = nntp_store_unsubscribe_folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</div><div class='del'>-	CamelStore *store = CAMEL_STORE (object);</div><div class='del'>-</div><div class='del'>-	remote_store-&gt;default_port = NNTP_PORT;</div><div class='del'>-</div><div class='del'>-	store-&gt;flags = CAMEL_STORE_SUBSCRIPTIONS;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_nntp_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_nntp_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_nntp_store_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_nntp_store_type = camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelNNTPStore",</div><div class='del'>-							     sizeof (CamelNNTPStore),</div><div class='del'>-							     sizeof (CamelNNTPStoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_nntp_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) camel_nntp_store_init,</div><div class='del'>-							     (CamelObjectFinalizeFunc) finalize);</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'>-/**</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: the response code of the nntp command.</div><div class='del'>- **/</div><div class='del'>-static int</div><div class='del'>-camel_nntp_command_send_recv (CamelNNTPStore *store, CamelException *ex, char **ret, char *cmd)</div><div class='del'>-{</div><div class='del'>-	char *respbuf;</div><div class='del'>-	int resp_code;</div><div class='del'>-	gboolean again;</div><div class='del'>-</div><div class='del'>-	do {</div><div class='del'>-		again = FALSE;</div><div class='del'>-</div><div class='del'>-		/* Send the command */</div><div class='del'>-		if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex, cmd) &lt; 0) {</div><div class='del'>-			return NNTP_PROTOCOL_ERROR;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Read the response */</div><div class='del'>-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &amp;respbuf, ex) &lt; 0) {</div><div class='del'>-			if (ret)</div><div class='del'>-				*ret = g_strdup (g_strerror (errno));</div><div class='del'>-			return NNTP_PROTOCOL_ERROR;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		resp_code = atoi (respbuf);</div><div class='del'>-</div><div class='del'>-		/* this is kind of a gross hack, but since an auth challenge</div><div class='del'>-		   can pop up at any time, and we want to shield this from our</div><div class='del'>-		   callers, we handle authentication here. */</div><div class='del'>-		if (resp_code == NNTP_AUTH_REQUIRED) {</div><div class='del'>-			resp_code = camel_nntp_auth_authenticate (store, ex);</div><div class='del'>-			if (resp_code != NNTP_AUTH_ACCEPTED) {</div><div class='del'>-				return resp_code;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* need to resend our command here */</div><div class='del'>-			again = TRUE;</div><div class='del'>-		}</div><div class='del'>-	} while (again);</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 resp_code;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-camel_nntp_command (CamelNNTPStore *store, CamelException *ex, char **ret, char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	char *cmdbuf;</div><div class='del'>-	va_list ap;</div><div class='del'>-	int resp_code;</div><div class='del'>-	char *real_fmt;</div><div class='del'>-</div><div class='del'>-	real_fmt = g_strdup_printf ("%s\r\n", fmt);</div><div class='del'>-</div><div class='del'>-	va_start (ap, fmt);</div><div class='del'>-	cmdbuf = g_strdup_vprintf (real_fmt, ap);</div><div class='del'>-	va_end (ap);</div><div class='del'>-</div><div class='del'>-	g_free (real_fmt);</div><div class='del'>-</div><div class='del'>-	resp_code = camel_nntp_command_send_recv (store, ex, ret, cmdbuf);</div><div class='del'>-</div><div class='del'>-	g_free (cmdbuf);</div><div class='del'>-</div><div class='del'>-	return resp_code;</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_command ( CAMEL_NNTP_STORE (store),</div><div class='del'>-				 ex, &amp;ret, "GROUP %s", group_name) == NNTP_GROUP_SELECTED) {</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 *top_dir;</div><div class='del'>-</div><div class='del'>-	g_assert(url != NULL);</div><div class='del'>-</div><div class='del'>-	top_dir = g_strdup_printf( "%s/evolution/news/%s",</div><div class='del'>-				   g_get_home_dir (),</div><div class='del'>-				   url-&gt;host );</div><div class='del'>-</div><div class='del'>-	return top_dir;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-ensure_news_dir_exists (CamelNNTPStore *store)</div><div class='del'>-{</div><div class='del'>-	gchar *dir = camel_nntp_store_get_toplevel_dir (store);</div><div class='del'>-</div><div class='del'>-	if (access (dir, F_OK) == 0) {</div><div class='del'>-		g_free (dir);</div><div class='del'>-		return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (e_mkdir_hier (dir, S_IRWXU) == -1) {</div><div class='del'>-		g_free (dir);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h<br/>deleted file mode 100644<br/>index 0566967fd7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,113 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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 "camel-remote-store.h"</div><div class='del'>-#include "camel-nntp-newsrc.h"</div><div class='del'>-#include "camel-nntp-types.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_STORE_TYPE     (camel_nntp_store_get_type ())</div><div class='del'>-#define CAMEL_NNTP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_STORE_TYPE, CamelNNTPStore))</div><div class='del'>-#define CAMEL_NNTP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_STORE_TYPE, CamelNNTPStoreClass))</div><div class='del'>-#define IS_CAMEL_NNTP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CAMEL_NNTP_OVER_FROM,</div><div class='del'>-	CAMEL_NNTP_OVER_SUBJECT,</div><div class='del'>-	CAMEL_NNTP_OVER_DATE,</div><div class='del'>-	CAMEL_NNTP_OVER_MESSAGE_ID,</div><div class='del'>-	CAMEL_NNTP_OVER_REFERENCES,</div><div class='del'>-	CAMEL_NNTP_OVER_BYTES,</div><div class='del'>-</div><div class='del'>-	CAMEL_NNTP_OVER_LAST</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct CamelNNTPOverField {</div><div class='del'>-	int index;</div><div class='del'>-	gboolean full; /* full in the OVER sense - the field name</div><div class='del'>-                          precedes the ':' in the XOVER list. */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct CamelNNTPStore {</div><div class='del'>-	CamelRemoteStore parent_object;	</div><div class='del'>-</div><div class='del'>-#define CAMEL_NNTP_EXT_SEARCH     (1&lt;&lt;0)</div><div class='del'>-#define CAMEL_NNTP_EXT_SETGET     (1&lt;&lt;1)</div><div class='del'>-#define CAMEL_NNTP_EXT_OVER       (1&lt;&lt;2)</div><div class='del'>-#define CAMEL_NNTP_EXT_XPATTEXT   (1&lt;&lt;3)</div><div class='del'>-#define CAMEL_NNTP_EXT_XACTIVE    (1&lt;&lt;4)</div><div class='del'>-#define CAMEL_NNTP_EXT_LISTMOTD   (1&lt;&lt;5)</div><div class='del'>-#define CAMEL_NNTP_EXT_LISTSUBSCR (1&lt;&lt;6)</div><div class='del'>-#define CAMEL_NNTP_EXT_LISTPNAMES (1&lt;&lt;7)</div><div class='del'>-	guint32 extensions;</div><div class='del'>-</div><div class='del'>-	gboolean posting_allowed;</div><div class='del'>-</div><div class='del'>-	int num_overview_fields;</div><div class='del'>-	CamelNNTPOverField overview_field[ CAMEL_NNTP_OVER_LAST ];</div><div class='del'>-</div><div class='del'>-	CamelNNTPNewsrc *newsrc;</div><div class='del'>-	CamelNNTPGroupList *group_list;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct CamelNNTPStoreClass {</div><div class='del'>-	CamelRemoteStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</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'>-int camel_nntp_command (CamelNNTPStore *store, CamelException *ex, char **ret, char *fmt, ...);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_nntp_store_get_type (void);</div><div class='del'>-</div><div class='del'>-#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-types.h b/camel/providers/nntp/camel-nntp-types.h<br/>deleted file mode 100644<br/>index b1d91779b1..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-types.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,34 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Author : Chris Toshok &lt;toshok@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'>-#ifndef CAMEL_NNTP_TYPES_H</div><div class='del'>-#define CAMEL_NNTP_TYPES_H 1</div><div class='del'>-</div><div class='del'>-typedef struct CamelNNTPGroupList CamelNNTPGroupList;</div><div class='del'>-typedef struct CamelNNTPGroupListEntry CamelNNTPGroupListEntry;</div><div class='del'>-typedef struct CamelNNTPOverField CamelNNTPOverField;</div><div class='del'>-typedef struct CamelNNTPStore CamelNNTPStore;</div><div class='del'>-typedef struct CamelNNTPStoreClass CamelNNTPStoreClass;</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_NNTP_TYPES_H */</div><div class='head'>diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c<br/>deleted file mode 100644<br/>index e8ee9bb112..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/nntp/camel-nntp-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/nntp/camel-nntp-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,249 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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-resp-codes.h"</div><div class='del'>-#include "camel-nntp-folder.h"</div><div class='del'>-#include "camel-nntp-store.h"</div><div class='del'>-#include "camel-nntp-utils.h"</div><div class='del'>-#include "camel-stream-mem.h"</div><div class='del'>-#include "camel-exception.h"</div><div class='del'>-</div><div class='del'>-#include &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, ex, NULL,</div><div class='del'>-				     "XOVER %d-%d",</div><div class='del'>-				     first_message,</div><div class='del'>-				     last_message);</div><div class='del'>-</div><div class='del'>-	if (status == NNTP_DATA_FOLLOWS) {</div><div class='del'>-		gboolean done = FALSE;</div><div class='del'>-</div><div class='del'>-		while (!done) {</div><div class='del'>-			char *line;</div><div class='del'>-</div><div class='del'>-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (nntp_store), &amp;line, ex) &lt; 0) {</div><div class='del'>-				g_warning ("failed to recv_line while building OVER header list\n");</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (*line == '.') {</div><div class='del'>-				done = TRUE;</div><div class='del'>-				g_print ("done\n");</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				CamelMessageInfo *new_info = g_new0(CamelMessageInfo, 1);</div><div class='del'>-				char **split_line = g_strsplit (line, "\t", 7);</div><div class='del'>-				char *subject, *from, *date, *message_id, *bytes;</div><div class='del'>-</div><div class='del'>-				subject = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_SUBJECT].index];</div><div class='del'>-				from = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_FROM].index];</div><div class='del'>-				date = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_DATE].index];</div><div class='del'>-				message_id = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_MESSAGE_ID].index];</div><div class='del'>-				bytes = split_line [nntp_store-&gt;overview_field [CAMEL_NNTP_OVER_BYTES].index];</div><div class='del'>-</div><div class='del'>-				/* if the overview format flagged this</div><div class='del'>-                                   field as "full", skip over the</div><div class='del'>-                                   preceding field name and colon */</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_SUBJECT ].full)</div><div class='del'>-					subject += strlen ("Subject:");</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_FROM ].full)</div><div class='del'>-					from += strlen ("From:");</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_DATE ].full)</div><div class='del'>-					date += strlen ("Date:");</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ].full)</div><div class='del'>-					message_id += strlen ("Message-ID:");</div><div class='del'>-				if (nntp_store-&gt;overview_field [ CAMEL_NNTP_OVER_BYTES ].full)</div><div class='del'>-					bytes += strlen ("Bytes:");</div><div class='del'>-</div><div class='del'>-				new_info-&gt;subject = g_strdup(subject);</div><div class='del'>-				new_info-&gt;from = g_strdup(from);</div><div class='del'>-				new_info-&gt;to = g_strdup(folder-&gt;name);</div><div class='del'>-				new_info-&gt;date_sent = header_decode_date(date, NULL);</div><div class='del'>-#if 0</div><div class='del'>-				/* XXX do we need to fill in both dates? */</div><div class='del'>-				new_info-&gt;headers.date_received = g_strdup(date);</div><div class='del'>-#endif</div><div class='del'>-				new_info-&gt;size = atoi(bytes);</div><div class='del'>-				new_info-&gt;uid = g_strdup_printf ("%s,%s", split_line[0], message_id);</div><div class='del'>-				new_info-&gt;message_id = g_strdup(message_id);</div><div class='del'>-</div><div class='del'>-				if (camel_nntp_newsrc_article_is_read (nntp_store-&gt;newsrc,</div><div class='del'>-								       folder-&gt;name,</div><div class='del'>-								       atoi (split_line[0])))</div><div class='del'>-				    new_info-&gt;flags |= CAMEL_MESSAGE_SEEN;</div><div class='del'>-</div><div class='del'>-				camel_folder_summary_add (nntp_folder-&gt;summary, new_info);</div><div class='del'>-				g_strfreev (split_line);</div><div class='del'>-			}</div><div class='del'>-			g_free (line);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		/* XXX */</div><div class='del'>-		g_warning ("weird nntp response for XOVER: %d\n", status);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static GArray*</div><div class='del'>-get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,</div><div class='del'>-		 int first_message, int last_message, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	for (i = first_message; i &lt; last_message; i ++) {</div><div class='del'>-		status = camel_nntp_command (nntp_store, ex, NULL,</div><div class='del'>-					     "HEAD %d", i);</div><div class='del'>-</div><div class='del'>-		if (status == NNTP_HEAD_FOLLOWS) {</div><div class='del'>-			gboolean done = FALSE;</div><div class='del'>-			char *buf;</div><div class='del'>-			int buf_len;</div><div class='del'>-			int buf_alloc;</div><div class='del'>-			int h;</div><div class='del'>-			CamelStream *header_stream;</div><div class='del'>-			GArray *header_array;</div><div class='del'>-			CamelStream *nntp_istream;</div><div class='del'>-			CamelMessageInfo *new_info = g_new0(CamelMessageInfo, 1);</div><div class='del'>-</div><div class='del'>-			buf_alloc = 2048;</div><div class='del'>-			buf_len = 0;</div><div class='del'>-			buf = g_malloc(buf_alloc);</div><div class='del'>-			done = FALSE;</div><div class='del'>-</div><div class='del'>-			buf[0] = 0;</div><div class='del'>-</div><div class='del'>-			nntp_istream = nntp_store-&gt;istream;</div><div class='del'>-</div><div class='del'>-			while (!done) {</div><div class='del'>-				char *line;</div><div class='del'>-				int line_length;</div><div class='del'>-</div><div class='del'>-				line = camel_stream_buffer_read_line ( </div><div class='del'>-						      CAMEL_STREAM_BUFFER ( nntp_istream ));</div><div class='del'>-				line_length = strlen ( line );</div><div class='del'>-</div><div class='del'>-				if (*line == '.') {</div><div class='del'>-					done = TRUE;</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					if (buf_len + line_length &gt; buf_alloc) {</div><div class='del'>-						buf_alloc *= 2;</div><div class='del'>-						buf = g_realloc (buf, buf_alloc);</div><div class='del'>-					}</div><div class='del'>-					strcat(buf, line);</div><div class='del'>-					strcat(buf, "\n");</div><div class='del'>-					buf_len += strlen(line);</div><div class='del'>-					g_free (line);</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* create a stream from which to parse the headers */</div><div class='del'>-			header_stream = camel_stream_mem_new_with_buffer(buf,</div><div class='del'>-								 buf_len,</div><div class='del'>-								 CAMEL_STREAM_MEM_READ);</div><div class='del'>-</div><div class='del'>-			header_array = get_header_array_from_stream (header_stream);</div><div class='del'>-</div><div class='del'>-			memset (&amp;info, 0, sizeof(info));</div><div class='del'>-</div><div class='del'>-			for (h = 0; h &lt; header_array-&gt;len; h ++) {</div><div class='del'>-				Rfc822Header *header = &amp;((Rfc822Header*)header_array-&gt;data)[h];</div><div class='del'>-				if (!g_strcasecmp(header-&gt;name, "From"))</div><div class='del'>-					new_info-&gt;from = g_strdup(header-&gt;value);</div><div class='del'>-				else if (!g_strcasecmp(header-&gt;name, "To"))</div><div class='del'>-					new_info-&gt;to = g_strdup(header-&gt;value);</div><div class='del'>-				else if (!g_strcasecmp(header-&gt;name, "Subject"))</div><div class='del'>-					new_info-&gt;subject = g_strdup(header-&gt;value);</div><div class='del'>-				else if (!g_strcasecmp(header-&gt;name, "Message-ID")) {</div><div class='del'>-					new_info-&gt;uid = g_strdup_printf("%d,%s", i, header-&gt;value);</div><div class='del'>-					new_info-&gt;message_id = g_strdup(header-&gt;value);</div><div class='del'>-				}</div><div class='del'>-				else if (!g_strcasecmp(header-&gt;name, "Date")) {</div><div class='del'>-					new_info-&gt;date_sent = header_decode_date (header-&gt;value);</div><div class='del'>-#if 0</div><div class='del'>-					new_info-&gt;date_sent = g_strdup(header-&gt;value);</div><div class='del'>-					new_info-&gt;date_received = g_strdup(header-&gt;value);</div><div class='del'>-#endif</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			camel_folder_summary_add (nntp_folder-&gt;summary, new_info);</div><div class='del'>-		}</div><div class='del'>-		else if (status == CAMEL_NNTP_FAIL) {</div><div class='del'>-			/* nasty things are afoot */</div><div class='del'>-			g_warning ("failure doing HEAD\n");</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-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, ex, &amp;ret,</div><div class='del'>-				     "GROUP %s", folder-&gt;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 == NNTP_NO_SUCH_GROUP) {</div><div class='del'>-		/* XXX throw invalid group exception */</div><div class='del'>-		camel_exception_setv (ex, </div><div class='del'>-				      CAMEL_EXCEPTION_FOLDER_INVALID,</div><div class='del'>-				      "group %s not found on server",</div><div class='del'>-				      folder-&gt;name);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	if (nntp_store-&gt;extensions &amp; CAMEL_NNTP_EXT_OVER) {</div><div class='del'>-		get_XOVER_headers (nntp_store, folder, first_message, last_message, ex);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		g_warning ("need to fix get_HEAD_headers\n");</div><div class='del'>-#if 0</div><div class='del'>-		get_HEAD_headers (nntp_store, folder, first_message, last_message, ex);</div><div class='del'>-#endif</div><div class='del'>-	}		</div><div class='del'>-}</div><div class='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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 608e640cd9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/pop3/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,36 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-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'>-	-I$(top_srcdir)/camel			\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	$(KRB4_CFLAGS)				\</div><div class='del'>-	$(GTK_INCLUDEDIR)			\</div><div class='del'>-	-DG_LOG_DOMAIN=\"camel-pop3-provider\"</div><div class='del'>-</div><div class='del'>-libcamelpop3_la_SOURCES = 			\</div><div class='del'>-	camel-pop3-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'>-libcamelpop3_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)</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 5cc0609e01..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-folder.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/pop3/camel-pop3-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,332 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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 (CAMEL_OBJECT_GET_CLASS(o)))</div><div class='del'>-static CamelFolderClass *parent_class;</div><div class='del'>-</div><div class='del'>-static void pop3_finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static void pop3_refresh_info (CamelFolder *folder, CamelException *ex);</div><div class='del'>-static void pop3_sync (CamelFolder *folder, gboolean expunge,</div><div class='del'>-		       CamelException *ex);</div><div class='del'>-</div><div class='del'>-static gint pop3_get_message_count (CamelFolder *folder);</div><div class='del'>-static GPtrArray *pop3_get_uids (CamelFolder *folder);</div><div class='del'>-static CamelMimeMessage *pop3_get_message (CamelFolder *folder, </div><div class='del'>-					   const char *uid,</div><div class='del'>-					   CamelException *ex);</div><div class='del'>-static void pop3_set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-				    guint32 flags, guint32 set);</div><div class='del'>-</div><div class='del'>-static GPtrArray *parse_listing (int count, char *data);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_folder_class_init (CamelPop3FolderClass *camel_pop3_folder_class)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *camel_folder_class =</div><div class='del'>-		CAMEL_FOLDER_CLASS (camel_pop3_folder_class);</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_folder_class-&gt;refresh_info = pop3_refresh_info;</div><div class='del'>-	camel_folder_class-&gt;sync = pop3_sync;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message_count = pop3_get_message_count;</div><div class='del'>-	camel_folder_class-&gt;get_uids = pop3_get_uids;</div><div class='del'>-	camel_folder_class-&gt;free_uids = camel_folder_free_nop;</div><div class='del'>-</div><div class='del'>-	camel_folder_class-&gt;get_message = pop3_get_message;</div><div class='del'>-	camel_folder_class-&gt;set_message_flags = pop3_set_message_flags;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_pop3_folder_init (gpointer object)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder = CAMEL_FOLDER (object);</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);</div><div class='del'>-</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'>-	pop3_folder-&gt;flags = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_pop3_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_pop3_folder_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (!camel_pop3_folder_type) {</div><div class='del'>-		camel_pop3_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelPop3Folder",</div><div class='del'>-							      sizeof (CamelPop3Folder),</div><div class='del'>-							      sizeof (CamelPop3FolderClass),</div><div class='del'>-							      (CamelObjectClassInitFunc) camel_pop3_folder_class_init,</div><div class='del'>-							      NULL,</div><div class='del'>-							      (CamelObjectInitFunc) camel_pop3_folder_init,</div><div class='del'>-							      (CamelObjectFinalizeFunc) pop3_finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_pop3_folder_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-pop3_finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (object);</div><div class='del'>-</div><div class='del'>-	camel_folder_free_deep (NULL, pop3_folder-&gt;uids);</div><div class='del'>-	g_free (pop3_folder-&gt;flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_pop3_folder_new (CamelStore *parent, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-</div><div class='del'>-	folder = CAMEL_FOLDER (camel_object_new (CAMEL_POP3_FOLDER_TYPE));</div><div class='del'>-	camel_folder_construct (folder, parent, "inbox", "inbox");</div><div class='del'>-</div><div class='del'>-	camel_folder_refresh_info (folder, ex);</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		folder = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-pop3_refresh_info (CamelFolder *folder, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-	int status, count;</div><div class='del'>-	char *data;</div><div class='del'>-	CamelPop3Folder *pop3_folder = (CamelPop3Folder *) folder;</div><div class='del'>-	CamelPop3Store *pop3_store = CAMEL_POP3_STORE (folder-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	status = camel_pop3_command (pop3_store, &amp;data, ex, "STAT");</div><div class='del'>-	if (status != CAMEL_POP3_OK)</div><div class='del'>-		return;</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, ex, "UIDL");</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAMEL_POP3_ERR:</div><div class='del'>-			pop3_store-&gt;supports_uidl = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		case CAMEL_POP3_FAIL:</div><div class='del'>-			return;</div><div class='del'>-		}</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'>-		uids = g_ptr_array_new ();</div><div class='del'>-		g_ptr_array_set_size (uids, count);</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; count; i++)</div><div class='del'>-			uids-&gt;pdata[i] = g_strdup_printf ("%d", i + 1);</div><div class='del'>-	} else {</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;</div><div class='del'>-</div><div class='del'>-		uids = parse_listing (count, data);</div><div class='del'>-		g_free (data);</div><div class='del'>-</div><div class='del'>-		if (!uids) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Could not open folder: "</div><div class='del'>-						"message listing was "</div><div class='del'>-						"incomplete."));</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	pop3_folder-&gt;uids = uids;</div><div class='del'>-	pop3_folder-&gt;flags = g_new0 (guint32, uids-&gt;len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-pop3_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder;</div><div class='del'>-	CamelPop3Store *pop3_store;</div><div class='del'>-	int i, status;</div><div class='del'>-	char *resp;</div><div class='del'>-</div><div class='del'>-	if (!expunge)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-	pop3_store = CAMEL_POP3_STORE (folder-&gt;parent_store);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; pop3_folder-&gt;uids-&gt;len; i++) {</div><div class='del'>-		if (pop3_folder-&gt;flags[i] &amp; CAMEL_MESSAGE_DELETED) {</div><div class='del'>-			status = camel_pop3_command (pop3_store, &amp;resp, ex,</div><div class='del'>-						     "DELE %d", i + 1);</div><div class='del'>-			if (status != CAMEL_POP3_OK)</div><div class='del'>-				return;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	camel_pop3_store_expunge (pop3_store, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</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 (CamelPop3Folder *pop3_folder, const char *uid)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; 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'>-pop3_get_message (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 (CAMEL_POP3_FOLDER (folder), uid);</div><div class='del'>-	if (num == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID,</div><div class='del'>-				      _("No message with uid %s"), uid);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	status = camel_pop3_command (CAMEL_POP3_STORE (folder-&gt;parent_store),</div><div class='del'>-				     &amp;result, ex, "RETR %d", num);</div><div class='del'>-	if (status != CAMEL_POP3_OK)</div><div class='del'>-		return NULL;</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),</div><div class='del'>-						  CAMEL_STREAM (msgstream));</div><div class='del'>-</div><div class='del'>-	camel_object_unref (CAMEL_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'>-pop3_set_message_flags (CamelFolder *folder, const char *uid,</div><div class='del'>-			guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-	int num;</div><div class='del'>-</div><div class='del'>-	num = uid_to_number (pop3_folder, uid);</div><div class='del'>-	if (num == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	pop3_folder-&gt;flags[num - 1] =</div><div class='del'>-		(pop3_folder-&gt;flags[num] &amp; ~flags) | (set &amp; flags);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-pop3_get_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	return pop3_folder-&gt;uids-&gt;len;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GPtrArray *</div><div class='del'>-pop3_get_uids (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Folder *pop3_folder = CAMEL_POP3_FOLDER (folder);</div><div class='del'>-</div><div class='del'>-	return pop3_folder-&gt;uids;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h<br/>deleted file mode 100644<br/>index b4cfd469b6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-folder.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 "camel-folder.h"</div><div class='del'>-</div><div class='del'>-#define CAMEL_POP3_FOLDER_TYPE     (camel_pop3_folder_get_type ())</div><div class='del'>-#define CAMEL_POP3_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_POP3_FOLDER_TYPE, CamelPop3Folder))</div><div class='del'>-#define CAMEL_POP3_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_FOLDER_TYPE, CamelPop3FolderClass))</div><div class='del'>-#define IS_CAMEL_POP3_FOLDER(o)    (CAMEL_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'>-	guint32 *flags;</div><div class='del'>-</div><div class='del'>-} CamelPop3Folder;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelFolderClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Virtual methods */	</div><div class='del'>-	</div><div class='del'>-} CamelPop3FolderClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-CamelFolder *camel_pop3_folder_new (CamelStore *parent, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_pop3_folder_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_POP3_FOLDER_H */</div><div class='head'>diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c<br/>deleted file mode 100644<br/>index 5af0dad73c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/pop3/camel-pop3-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-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'>-	N_("POP"),</div><div class='del'>-</div><div class='del'>-	N_("For connecting to POP servers. The POP protocol can also "</div><div class='del'>-	   "be used to retrieve mail from certain web mail providers "</div><div class='del'>-	   "and proprietary email systems."),</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_SOURCE,</div><div class='del'>-</div><div class='del'>-	CAMEL_URL_NEED_USER | CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_AUTH,</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 bdcf7996e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/pop3/camel-pop3-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,700 +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'>-#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'>-/* MIT krb4 des.h #defines _. Sigh. We don't need it. */</div><div class='del'>-#undef _</div><div class='del'>-</div><div class='del'>-#ifdef NEED_KRB_SENDAUTH_PROTO</div><div class='del'>-extern int krb_sendauth(long options, int fd, KTEXT ticket, char *service,</div><div class='del'>-			char *inst, char *realm, unsigned KRB4_32 checksum,</div><div class='del'>-			MSG_DAT *msg_data, CREDENTIALS *cred,</div><div class='del'>-			Key_schedule schedule, struct sockaddr_in *laddr,</div><div class='del'>-			struct sockaddr_in *faddr, char *version);</div><div class='del'>-#endif</div><div class='del'>-#endif</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 "e-util/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'>-static CamelRemoteStoreClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void finalize (CamelObject *object);</div><div class='del'>-</div><div class='del'>-static gboolean pop3_connect (CamelService *service, CamelException *ex);</div><div class='del'>-static gboolean pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex);</div><div class='del'>-static GList *query_auth_types_connected (CamelService *service, CamelException *ex);</div><div class='del'>-static GList *query_auth_types_generic (CamelService *service, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static CamelFolder *get_folder (CamelStore *store, const char *folder_name, </div><div class='del'>-				guint32 flags, CamelException *ex);</div><div class='del'>-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'>-static int pop3_get_response (CamelPop3Store *store, char **ret, 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'>-	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'>-	/*CamelRemoteStoreClass *camel_remote_store_class =</div><div class='del'>-	 *	CAMEL_STORE_CLASS (camel_pop3_store_class);</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	parent_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs </div><div class='del'>-						(camel_remote_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;query_auth_types_connected = query_auth_types_connected;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_generic = query_auth_types_generic;</div><div class='del'>-	camel_service_class-&gt;connect = pop3_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = pop3_disconnect;</div><div class='del'>-</div><div class='del'>-	camel_store_class-&gt;get_folder = get_folder;</div><div class='del'>-	camel_store_class-&gt;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'>-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);</div><div class='del'>-</div><div class='del'>-	remote_store-&gt;default_port = 110;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_pop3_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_pop3_store_type = CAMEL_INVALID_TYPE;</div><div class='del'>-</div><div class='del'>-	if (!camel_pop3_store_type) {</div><div class='del'>-		camel_pop3_store_type = camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelPop3Store",</div><div class='del'>-							     sizeof (CamelPop3Store),</div><div class='del'>-							     sizeof (CamelPop3StoreClass),</div><div class='del'>-							     (CamelObjectClassInitFunc) camel_pop3_store_class_init,</div><div class='del'>-							     NULL,</div><div class='del'>-							     (CamelObjectInitFunc) camel_pop3_store_init,</div><div class='del'>-							     finalize);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_pop3_store_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-finalize (CamelObject *object)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Store *pop3_store = CAMEL_POP3_STORE (object);</div><div class='del'>-</div><div class='del'>-	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'>-static CamelServiceAuthType password_authtype = {</div><div class='del'>-	N_("Password"),</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the POP server using a plaintext "</div><div class='del'>-	   "password. This is the only option supported by many POP servers."),</div><div class='del'>-</div><div class='del'>-	"",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static CamelServiceAuthType apop_authtype = {</div><div class='del'>-	"APOP",</div><div class='del'>-</div><div class='del'>-	N_("This option will connect to the POP server using an encrypted "</div><div class='del'>-	   "password via the APOP protocol. This may not work for all users "</div><div class='del'>-	   "even on servers that claim to support it."),</div><div class='del'>-</div><div class='del'>-	"+APOP",</div><div class='del'>-	TRUE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#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'>-	N_("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'>-	char *buf, *apoptime, *apopend;</div><div class='del'>-	gint status;</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'>-#endif</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'>-		struct hostent *h;</div><div class='del'>-		int fd;</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'>-		h = camel_service_gethost (service, ex);</div><div class='del'>-		hostname = g_strdup (h-&gt;h_name);</div><div class='del'>-</div><div class='del'>-		fd = CAMEL_STREAM_FS (CAMEL_REMOTE_STORE (service)-&gt;ostream)-&gt;fd;</div><div class='del'>-</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'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,</div><div class='del'>-					      _("Could not authenticate to "</div><div class='del'>-						"KPOP server: %s"),</div><div class='del'>-					      krb_err_txt[status]);</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'>-	/* Read the greeting, check status */</div><div class='del'>-	status = pop3_get_response (store, &amp;buf, ex);</div><div class='del'>-	if (status != CAMEL_POP3_OK)</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, ex, "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'>-			return FALSE;</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'>-				g_free (store-&gt;implementation);</div><div class='del'>-				store-&gt;implementation =</div><div class='del'>-					g_strndup (p + 15, len - 15);</div><div class='del'>-			} else if (len == 3 &amp;&amp; !strncmp (p, "TOP", 3))</div><div class='del'>-				store-&gt;supports_top = TRUE;</div><div class='del'>-			else if (len == 4 &amp;&amp; !strncmp (p, "UIDL", 4))</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'>-			if (*p)</div><div class='del'>-				p++;</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_connected (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'>-	ret = CAMEL_SERVICE_CLASS (parent_class)-&gt;query_auth_types_connected (service, ex);</div><div class='del'>-</div><div class='del'>-	passwd = camel_service_connect (service, ex);</div><div class='del'>-	/*ignore the exception here; the server may just not support passwd */</div><div class='del'>-	/*if (camel_exception_is_set (ex) != CAMEL_EXCEPTION_NONE)*/</div><div class='del'>-	/*return NULL;*/</div><div class='del'>-	</div><div class='del'>-	/* should we check apop too? */</div><div class='del'>-	apop = store-&gt;apop_timestamp != NULL;</div><div class='del'>-	if (passwd)</div><div class='del'>-		camel_service_disconnect (service, TRUE, ex);</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-</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 = camel_service_connect (service, ex);</div><div class='del'>-	service-&gt;url-&gt;port = saved_port;</div><div class='del'>-	/*ignore the exception here; the server may just not support kpop */</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'>-	if (kpop)</div><div class='del'>-		camel_service_disconnect (service, TRUE, ex);</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-#endif</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 GList *</div><div class='del'>-query_auth_types_generic (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *ret;</div><div class='del'>-</div><div class='del'>-	ret = g_list_append (NULL, &amp;password_authtype);</div><div class='del'>-	ret = g_list_append (ret, &amp;apop_authtype);</div><div class='del'>-#ifdef HAVE_KRB4</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'>-	return ret;</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, ex, "QUIT");</div><div class='del'>-	camel_service_disconnect (CAMEL_SERVICE (store), FALSE, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pop3_try_authenticate (CamelService *service, gboolean kpop,</div><div class='del'>-		       const char *errmsg, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Store *store = (CamelPop3Store *)service;</div><div class='del'>-	int status;</div><div class='del'>-	char *msg;</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. So if there's no</div><div class='del'>-	 * password stored, query for it.</div><div class='del'>-	 */</div><div class='del'>-	if (!service-&gt;url-&gt;passwd) {</div><div class='del'>-		char *prompt;</div><div class='del'>-</div><div class='del'>-		prompt = g_strdup_printf (_("%sPlease enter the POP3 password "</div><div class='del'>-					    "for %s@%s"), errmsg ? errmsg : "",</div><div class='del'>-					  service-&gt;url-&gt;user,</div><div class='del'>-					  service-&gt;url-&gt;host);</div><div class='del'>-		service-&gt;url-&gt;passwd = camel_session_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'>-			return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!service-&gt;url-&gt;authmech || kpop) {</div><div class='del'>-		status = camel_pop3_command (store, &amp;msg, ex, "USER %s",</div><div class='del'>-					     service-&gt;url-&gt;user);</div><div class='del'>-		switch (status) {</div><div class='del'>-		case CAMEL_POP3_ERR:</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.\nError sending "</div><div class='del'>-						"username: %s"),</div><div class='del'>-					      msg ? msg : _("(Unknown)"));</div><div class='del'>-			g_free (msg);</div><div class='del'>-			/*fallll*/</div><div class='del'>-		case CAMEL_POP3_FAIL:</div><div class='del'>-			return FALSE;</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, ex, "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, ex, "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'>-				     _("Unable to connect to POP server.\n"</div><div class='del'>-				       "No support for requested "</div><div class='del'>-				       "authentication mechanism."));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (status == CAMEL_POP3_ERR) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,</div><div class='del'>-				      _("Unable to connect to POP server.\n"</div><div class='del'>-					"Error sending password: %s"),</div><div class='del'>-				      msg ? msg : _("(Unknown)"));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (msg);</div><div class='del'>-	return camel_exception_is_set (ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pop3_connect (CamelService *service, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *errbuf = NULL;</div><div class='del'>-	gboolean tryagain, kpop = FALSE;</div><div class='del'>-	gboolean res;</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	gboolean set_port = FALSE;</div><div class='del'>-</div><div class='del'>-	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'>-		set_port = TRUE;</div><div class='del'>-		service-&gt;url-&gt;port = KPOP_PORT;</div><div class='del'>-	}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  	res = CAMEL_SERVICE_CLASS (parent_class)-&gt;connect (service, ex);</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_KRB4</div><div class='del'>-	/* This is veeery nasty. When we set the port, we're changing the</div><div class='del'>-	 * hash value of our URL. service_cache_remove() gets called when</div><div class='del'>-	 * we're done checking the mail, but the hash table lookup fails</div><div class='del'>-	 * because the url port has changed. Then, a finalized instance of</div><div class='del'>-	 * the CamelService is stuck in the hash table, and the next time</div><div class='del'>-	 * we try to look up the service, with a URL of port 0, we look</div><div class='del'>-	 * up the freed service and a segfault results.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (kpop &amp;&amp; set_port)</div><div class='del'>-		service-&gt;url-&gt;port = 0;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (res == FALSE)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/*FIXME integrate these functions */</div><div class='del'>-	if (!connect_to_server (service, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	camel_exception_clear (ex);</div><div class='del'>-	do {</div><div class='del'>-		if (camel_exception_is_set (ex)) {</div><div class='del'>-			errbuf = g_strdup_printf (</div><div class='del'>-				"%s\n\n",</div><div class='del'>-				camel_exception_get_description (ex));</div><div class='del'>-			camel_exception_clear (ex);</div><div class='del'>-</div><div class='del'>-			/* Uncache the password before prompting again. */</div><div class='del'>-			camel_session_query_authenticator (</div><div class='del'>-				camel_service_get_session (service),</div><div class='del'>-				CAMEL_AUTHENTICATOR_TELL, NULL, TRUE, service,</div><div class='del'>-				"password", ex);</div><div class='del'>-			g_free (service-&gt;url-&gt;passwd);</div><div class='del'>-			service-&gt;url-&gt;passwd = NULL;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		tryagain = pop3_try_authenticate (service, kpop, errbuf, ex);</div><div class='del'>-		g_free (errbuf);</div><div class='del'>-	} while (tryagain);</div><div class='del'>-</div><div class='del'>-	if (camel_exception_is_set (ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-pop3_disconnect (CamelService *service, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelPop3Store *store = CAMEL_POP3_STORE (service);</div><div class='del'>-</div><div class='del'>-	if (clean)</div><div class='del'>-		camel_pop3_command (store, NULL, ex, "QUIT");</div><div class='del'>-</div><div class='del'>-	if (!CAMEL_SERVICE_CLASS (parent_class)-&gt;disconnect (service, clean, ex))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	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'>-	    guint32 flags, CamelException *ex)</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, CamelException *ex, char *fmt, ...)</div><div class='del'>-{</div><div class='del'>-	char *cmdbuf;</div><div class='del'>-	va_list ap;</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_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex, "%s\r\n", cmdbuf) &lt; 0) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		if (ret)</div><div class='del'>-			*ret = NULL;</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'>-	return pop3_get_response (store, ret, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-pop3_get_response (CamelPop3Store *store, char **ret, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	char *respbuf;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &amp;respbuf, ex) &lt; 0) {</div><div class='del'>-		if (ret)</div><div class='del'>-			*ret = NULL;</div><div class='del'>-		return CAMEL_POP3_FAIL;</div><div class='del'>-	}</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, CamelException *ex)</div><div class='del'>-{</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'>-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &amp;buf, ex) &lt; 0) {</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'>-</div><div class='del'>-		g_ptr_array_add (data, buf);</div><div class='del'>-		len += strlen (buf) + 1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (buf)</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_malloc0 (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'>-			char *ptr, *datap;</div><div class='del'>-</div><div class='del'>-			datap = (char *) data-&gt;pdata[i];</div><div class='del'>-			ptr = (*datap == '.') ? datap + 1 : datap;</div><div class='del'>-			len = strlen (ptr);</div><div class='del'>-			memcpy (p, ptr, 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='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 cfa28f313f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/pop3/camel-pop3-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/pop3/camel-pop3-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,80 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-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 "camel-types.h"</div><div class='del'>-#include "camel-remote-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)     (CAMEL_CHECK_CAST((obj), CAMEL_POP3_STORE_TYPE, CamelPop3Store))</div><div class='del'>-#define CAMEL_POP3_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_POP3_STORE_TYPE, CamelPop3StoreClass))</div><div class='del'>-#define IS_CAMEL_POP3_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_POP3_STORE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelRemoteStore parent_object;</div><div class='del'>-</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'>-	CamelRemoteStoreClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelPop3StoreClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* public methods */</div><div class='del'>-void camel_pop3_store_expunge (CamelPop3Store *store, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* support functions */</div><div class='del'>-enum { CAMEL_POP3_OK, CAMEL_POP3_ERR, CAMEL_POP3_FAIL };</div><div class='del'>-int camel_pop3_command (CamelPop3Store *store, char **ret, CamelException *ex, char *fmt, ...);</div><div class='del'>-char *camel_pop3_command_get_additional_data (CamelPop3Store *store,</div><div class='del'>-					      CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_pop3_store_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_POP3_STORE_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/pop3/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 965f56afb8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/sendmail/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelsendmailincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-</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 d0e40b4cf8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/sendmail/camel-sendmail-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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'>-	N_("Sendmail"),</div><div class='del'>-</div><div class='del'>-	N_("For delivering mail by passing it to the \"sendmail\" program "</div><div class='del'>-	   "on the local system."),</div><div class='del'>-</div><div class='del'>-	"mail",</div><div class='del'>-</div><div class='del'>-	0,</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 137c1d32a9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-transport.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/sendmail/camel-sendmail-transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,223 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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 char *get_name (CamelService *service, gboolean brief);</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'>-	CamelServiceClass *camel_service_class =</div><div class='del'>-		CAMEL_SERVICE_CLASS (camel_sendmail_transport_class);</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-</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'>-CamelType</div><div class='del'>-camel_sendmail_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_sendmail_transport_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_sendmail_transport_type == CAMEL_INVALID_TYPE)	{</div><div class='del'>-		camel_sendmail_transport_type = camel_type_register (CAMEL_TRANSPORT_TYPE, "CamelSendmailTransport",</div><div class='del'>-								     sizeof (CamelSendmailTransport),</div><div class='del'>-								     sizeof (CamelSendmailTransportClass),</div><div class='del'>-								     (CamelObjectClassInitFunc) camel_sendmail_transport_class_init,</div><div class='del'>-								     NULL,</div><div class='del'>-								     (CamelObjectInitFunc) NULL,</div><div class='del'>-								     NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return camel_sendmail_transport_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_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"),</div><div class='del'>-				      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'>-		camel_object_unref (CAMEL_OBJECT (out));</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("Could not send message: %s"),</div><div class='del'>-				      strerror(errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (out));</div><div class='del'>-</div><div class='del'>-	/* Wait for sendmail to exit. */</div><div class='del'>-	while (waitpid (pid, &amp;wstat, 0) == -1 &amp;&amp; errno == EINTR)</div><div class='del'>-		;</div><div class='del'>-	sigprocmask (SIG_SETMASK, &amp;omask, NULL);</div><div class='del'>-</div><div class='del'>-	if (!WIFEXITED (wstat)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      _("sendmail exited with signal %s: "</div><div class='del'>-					"mail not sent."),</div><div class='del'>-				      g_strsignal (WTERMSIG (wstat)));</div><div class='del'>-		return FALSE;</div><div class='del'>-	} else if (WEXITSTATUS (wstat) != 0) {</div><div class='del'>-		if (WEXITSTATUS (wstat) == 255) {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("Could not execute %s: "</div><div class='del'>-						"mail not sent."),</div><div class='del'>-					      SENDMAIL_PATH);</div><div class='del'>-		} else {</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      _("sendmail exited with status "</div><div class='del'>-						"%d: mail not sent."),</div><div class='del'>-					      WEXITSTATUS (wstat));</div><div class='del'>-		}</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static 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='del'>-</div><div class='del'>-static char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup (_("sendmail"));</div><div class='del'>-	else</div><div class='del'>-		return g_strdup (_("Mail delivery via the sendmail program"));</div><div class='del'>-}</div><div class='head'>diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h<br/>deleted file mode 100644<br/>index bb5dca071b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/camel-sendmail-transport.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransport))</div><div class='del'>-#define CAMEL_SENDMAIL_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SENDMAIL_TRANSPORT_TYPE, CamelSendmailTransportClass))</div><div class='del'>-#define CAMEL_IS_SENDMAIL_TRANSPORT(o)    (CAMEL_CHECK_TYPE((o), CAMEL_SENDMAIL_TRANSPORT_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTransport parent_object;</div><div class='del'>-</div><div class='del'>-} CamelSendmailTransport;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	CamelTransportClass parent_class;</div><div class='del'>-</div><div class='del'>-} CamelSendmailTransportClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Standard Camel function */</div><div class='del'>-CamelType camel_sendmail_transport_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SENDMAIL_TRANSPORT_H */</div><div class='head'>diff --git a/camel/providers/sendmail/libcamelsendmail.urls b/camel/providers/sendmail/libcamelsendmail.urls<br/>deleted file mode 100644<br/>index ccad52828e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/sendmail/libcamelsendmail.urls?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 734a4e5128..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/smtp/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,33 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-libcamelsmtpincludedir = $(includedir)/camel</div><div class='del'>-</div><div class='del'>-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'>-	-I$(top_srcdir)/camel			\</div><div class='del'>-	-I$(top_srcdir)/e-util			\</div><div class='del'>-	$(GTK_INCLUDEDIR)			\</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'>-libcamelsmtp_la_LIBADD = $(top_builddir)/e-util/libeutil.la $(UNICODE_LIBS)</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 6d94536937..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/smtp/camel-smtp-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* 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'>-	N_("For delivering mail by connecting to a remote mailhub "</div><div class='del'>-	   "using SMTP."),</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'>-	CAMEL_URL_NEED_HOST,</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 6fa39bb930..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-transport.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/smtp/camel-smtp-transport.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,788 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* camel-smtp-transport.c : class for a smtp transport */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Authors: Jeffrey Stedfast &lt;fejj@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;ctype.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#undef MIN</div><div class='del'>-#undef MAX</div><div class='del'>-#include "camel-mime-filter-crlf.h"</div><div class='del'>-#include "camel-mime-filter-linewrap.h"</div><div class='del'>-#include "camel-stream-filter.h"</div><div class='del'>-#include "camel-smtp-transport.h"</div><div class='del'>-#include "camel-mime-message.h"</div><div class='del'>-#include "camel-multipart.h"</div><div class='del'>-#include "camel-mime-part.h"</div><div class='del'>-#include "camel-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'>-</div><div class='del'>-#define d(x) x</div><div class='del'>-</div><div class='del'>-/* Specified in RFC 821 */</div><div class='del'>-#define SMTP_PORT 25</div><div class='del'>-</div><div class='del'>-/* camel smtp transport class prototypes */</div><div class='del'>-static gboolean _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, gboolean clean, CamelException *ex);</div><div class='del'>-static GList *esmtp_get_authtypes(gchar *buffer);</div><div class='del'>-static GList *query_auth_types_connected (CamelService *service, CamelException *ex);</div><div class='del'>-static GList *query_auth_types_generic (CamelService *service, CamelException *ex);</div><div class='del'>-static void free_auth_types (CamelService *service, GList *authtypes);</div><div class='del'>-static char *get_name (CamelService *service, gboolean brief);</div><div class='del'>-</div><div class='del'>-static gboolean smtp_helo (CamelSmtpTransport *transport, CamelException *ex);</div><div class='del'>-static gboolean smtp_mail (CamelSmtpTransport *transport, const char *sender,</div><div class='del'>-			   gboolean has_8bit_parts, CamelException *ex);</div><div class='del'>-static gboolean smtp_rcpt (CamelSmtpTransport *transport, const char *recipient, CamelException *ex);</div><div class='del'>-static gboolean smtp_data (CamelSmtpTransport *transport, CamelMedium *message,</div><div class='del'>-			   gboolean has_8bit_parts, CamelException *ex);</div><div class='del'>-static gboolean smtp_rset (CamelSmtpTransport *transport, CamelException *ex);</div><div class='del'>-static gboolean smtp_quit (CamelSmtpTransport *transport, CamelException *ex);</div><div class='del'>-</div><div class='del'>-/* 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 = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));</div><div class='del'>-	</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	camel_service_class-&gt;connect = smtp_connect;</div><div class='del'>-	camel_service_class-&gt;disconnect = smtp_disconnect;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_generic = query_auth_types_generic;</div><div class='del'>-	camel_service_class-&gt;query_auth_types_connected = query_auth_types_connected;</div><div class='del'>-	camel_service_class-&gt;free_auth_types = free_auth_types;</div><div class='del'>-	camel_service_class-&gt;get_name = get_name;</div><div class='del'>-</div><div class='del'>-	camel_transport_class-&gt;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)</div><div class='del'>-{</div><div class='del'>-	CamelTransport *transport = CAMEL_TRANSPORT (object);</div><div class='del'>-	</div><div class='del'>-	transport-&gt;supports_8bit = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_smtp_transport_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType camel_smtp_transport_type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (camel_smtp_transport_type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		camel_smtp_transport_type =</div><div class='del'>-			camel_type_register (CAMEL_TRANSPORT_TYPE, "CamelSmtpTransport",</div><div class='del'>-					     sizeof (CamelSmtpTransport),</div><div class='del'>-					     sizeof (CamelSmtpTransportClass),</div><div class='del'>-					     (CamelObjectClassInitFunc) camel_smtp_transport_class_init,</div><div class='del'>-					     NULL,</div><div class='del'>-					     (CamelObjectInitFunc) camel_smtp_transport_init,</div><div class='del'>-					     NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return 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'>-	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;is_esmtp = FALSE;</div><div class='del'>-	transport-&gt;esmtp_supported_authtypes = NULL;</div><div class='del'>-	CAMEL_TRANSPORT (transport)-&gt;supports_8bit = 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 : 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 %d): %s",</div><div class='del'>-				      service-&gt;url-&gt;host,</div><div class='del'>-				      service-&gt;url-&gt;port ? service-&gt;url-&gt;port : SMTP_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 or not. */</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "220" */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "220", 3)) {</div><div class='del'>-			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;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;is_esmtp) {</div><div class='del'>-		/* If we did not auto-detect ESMTP, we should still send EHLO */</div><div class='del'>-		transport-&gt;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;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;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'>-		d(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'>-			d(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'>-		d(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, gboolean clean, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelSmtpTransport *transport = CAMEL_SMTP_TRANSPORT (service);</div><div class='del'>-	</div><div class='del'>-	/*if (!service-&gt;connected)</div><div class='del'>-	 *	return TRUE;</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (clean) {</div><div class='del'>-		/* send the QUIT command to the SMTP server */</div><div class='del'>-		smtp_quit (transport, ex);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!service_class-&gt;disconnect (service, clean, 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'>-	camel_object_unref (CAMEL_OBJECT (transport-&gt;ostream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (transport-&gt;istream));</div><div class='del'>-	transport-&gt;ostream = NULL;</div><div class='del'>-	transport-&gt;istream = NULL;</div><div class='del'>-	</div><div class='del'>-	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'>-	/* advance to the first token */</div><div class='del'>-	for (start = buffer; *start == ' ' || *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 == ' '; 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'>-/* FIXME: use these? */</div><div class='del'>-#ifdef notyet</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'>-#endif</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-query_auth_types_connected (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 GList *</div><div class='del'>-query_auth_types_generic (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 char *</div><div class='del'>-get_name (CamelService *service, gboolean brief)</div><div class='del'>-{</div><div class='del'>-	if (brief)</div><div class='del'>-		return g_strdup_printf ("SMTP server %s", service-&gt;url-&gt;host);</div><div class='del'>-	else {</div><div class='del'>-		return g_strdup_printf ("SMTP mail delivery via %s",</div><div class='del'>-					service-&gt;url-&gt;host);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-_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'>-	CamelSmtpTransport *smtp_transport = CAMEL_SMTP_TRANSPORT (transport);</div><div class='del'>-	CamelInternetAddress *cia;</div><div class='del'>-	char *recipient, *sender;</div><div class='del'>-	const char *addr;</div><div class='del'>-	gboolean has_8bit_parts;</div><div class='del'>-	GList *r;</div><div class='del'>-	</div><div class='del'>-	sender = g_strdup (camel_mime_message_get_from (CAMEL_MIME_MESSAGE (message)));</div><div class='del'>-	if (!sender) {</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'>-	cia = camel_internet_address_new ();</div><div class='del'>-	camel_address_decode (CAMEL_ADDRESS (cia), sender);</div><div class='del'>-	g_free (sender);</div><div class='del'>-	</div><div class='del'>-	if (!camel_internet_address_get (cia, 0, NULL, &amp;addr)) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Cannot send message: "</div><div class='del'>-				      "sender address not valid.");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* find out if the message has 8bit mime parts */</div><div class='del'>-	has_8bit_parts = camel_mime_message_has_8bit_parts (CAMEL_MIME_MESSAGE (message));</div><div class='del'>-	</div><div class='del'>-	/* rfc1652 (8BITMIME) requires that you notify the ESMTP daemon that</div><div class='del'>-	   you'll be sending an 8bit mime message at "MAIL FROM:" time. */</div><div class='del'>-	smtp_mail (smtp_transport, addr, has_8bit_parts, ex);</div><div class='del'>-	</div><div class='del'>-	if (!recipients) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "Cannot send message: "</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 (r = recipients; r; r = r-&gt;next) {</div><div class='del'>-		recipient = (char *) 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'>-	/* passing in has_8bit_parts saves time as we don't have to</div><div class='del'>-           recurse through the message all over again if the user is</div><div class='del'>-           not sending 8bit mime parts */</div><div class='del'>-	if (!smtp_data (smtp_transport, message, has_8bit_parts, ex))</div><div class='del'>-		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, 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 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;is_esmtp) {</div><div class='del'>-		if (host &amp;&amp; host-&gt;h_name)</div><div class='del'>-			cmdbuf = g_strdup_printf ("EHLO %s\r\n", host-&gt;h_name);</div><div class='del'>-		else</div><div class='del'>-			cmdbuf = g_strdup_printf ("EHLO [%s]\r\n", inet_ntoa (transport-&gt;localaddr.sin_addr));</div><div class='del'>-	} else {</div><div class='del'>-		if (host &amp;&amp; host-&gt;h_name)</div><div class='del'>-			cmdbuf = g_strdup_printf ("HELO %s\r\n", host-&gt;h_name);</div><div class='del'>-		else</div><div class='del'>-			cmdbuf = g_strdup_printf ("HELO [%s]\r\n", inet_ntoa (transport-&gt;localaddr.sin_addr));</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "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'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			g_free (respbuf);</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'>-		</div><div class='del'>-		if (strstr (respbuf, "8BITMIME")) {</div><div class='del'>-			d(fprintf (stderr, "This server supports 8bit\n"));</div><div class='del'>-			CAMEL_TRANSPORT (transport)-&gt;supports_8bit = TRUE;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (transport-&gt;is_esmtp &amp;&amp; strstr (respbuf, "AUTH")) {</div><div class='del'>-			/* parse for supported AUTH types */</div><div class='del'>-			char *auths = strstr (respbuf, "AUTH") + 4;</div><div class='del'>-			</div><div class='del'>-			transport-&gt;esmtp_supported_authtypes = esmtp_get_authtypes (auths);</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, const char *sender, gboolean has_8bit_parts, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* we gotta tell the smtp server who we are. (our email addy) */</div><div class='del'>-	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'>-	if (CAMEL_TRANSPORT (transport)-&gt;supports_8bit &amp;&amp; has_8bit_parts)</div><div class='del'>-		cmdbuf = g_strdup_printf ("MAIL FROM: &lt;%s&gt; BODY=8BITMIME\r\n", sender);</div><div class='del'>-	else</div><div class='del'>-		cmdbuf = g_strdup_printf ("MAIL FROM: &lt;%s&gt;\r\n", sender);</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "MAIL FROM request timed out: "</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'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			g_free (respbuf);</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, const char *recipient, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* we gotta tell the smtp server who we are going to be sending</div><div class='del'>-	 * our email to */</div><div class='del'>-	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'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "RCPT TO request timed out: "</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'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			g_free (respbuf);</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, gboolean has_8bit_parts, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/* now we can actually send what's important :p */</div><div class='del'>-	gchar *cmdbuf, *respbuf = NULL;</div><div class='del'>-	CamelStreamFilter *filtered_stream;</div><div class='del'>-	CamelMimeFilter *crlffilter, *lwfilter;</div><div class='del'>-	gint crlfid, lwid;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* if the message contains 8bit mime parts and the server</div><div class='del'>-           doesn't support it, encode 8bit parts to the best</div><div class='del'>-           encoding. */</div><div class='del'>-	if (has_8bit_parts &amp;&amp; !CAMEL_TRANSPORT (transport)-&gt;supports_8bit)</div><div class='del'>-		camel_mime_message_encode_8bit_parts (CAMEL_MIME_MESSAGE (message));</div><div class='del'>-	</div><div class='del'>-	cmdbuf = g_strdup ("DATA\r\n");</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "DATA request timed out: "</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'>-	d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-	</div><div class='del'>-	if (!respbuf || strncmp (respbuf, "354", 3)) {</div><div class='del'>-		/* we should have gotten instructions on how to use the DATA command:</div><div class='del'>-		 * 354 Enter mail, end with "." on a line by itself</div><div class='del'>-		 */</div><div class='del'>-		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'>-	g_free (respbuf);</div><div class='del'>-	respbuf = NULL;</div><div class='del'>-	</div><div class='del'>-	/* setup stream filtering */</div><div class='del'>-	lwfilter = camel_mime_filter_linewrap_new (998, 998, '\t');</div><div class='del'>-	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);</div><div class='del'>-	</div><div class='del'>-	filtered_stream = camel_stream_filter_new_with_stream (transport-&gt;ostream);</div><div class='del'>-	lwid = camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (lwfilter));</div><div class='del'>-	crlfid = camel_stream_filter_add (filtered_stream, CAMEL_MIME_FILTER (crlffilter));</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, lwid);</div><div class='del'>-	camel_stream_filter_remove (filtered_stream, crlfid);</div><div class='del'>-	camel_stream_flush (CAMEL_STREAM (filtered_stream));</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (filtered_stream));</div><div class='del'>-	</div><div class='del'>-	/* terminate the message body */</div><div class='del'>-	</div><div class='del'>-	d(fprintf (stderr, "sending : \\r\\n.\\r\\n\n"));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, "\r\n.\r\n", 5) == -1) {</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "DATA send timed out: message termination: "</div><div class='del'>-				      "%s: mail not sent",</div><div class='del'>-				      g_strerror (errno));</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	do {</div><div class='del'>-		/* Check for "250 Sender OK..." */</div><div class='del'>-		g_free (respbuf);</div><div class='del'>-		respbuf = camel_stream_buffer_read_line (CAMEL_STREAM_BUFFER (transport-&gt;istream));</div><div class='del'>-		</div><div class='del'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			g_free (respbuf);</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'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "RSET request timed out: "</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'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "250", 3)) {</div><div class='del'>-			g_free (respbuf);</div><div class='del'>-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-					      "RSET response error: %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'>-	d(fprintf (stderr, "sending : %s", cmdbuf));</div><div class='del'>-	</div><div class='del'>-	if (camel_stream_write (transport-&gt;ostream, cmdbuf, strlen (cmdbuf)) == -1) {</div><div class='del'>-		g_free (cmdbuf);</div><div class='del'>-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,</div><div class='del'>-				      "QUIT request timed out: "</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'>-		d(fprintf (stderr, "received: %s\n", respbuf ? respbuf : "(null)"));</div><div class='del'>-		</div><div class='del'>-		if (!respbuf || strncmp (respbuf, "221", 3)) {</div><div class='del'>-			g_free (respbuf);</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 b880230add..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/camel-smtp-transport.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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)     (CAMEL_CHECK_CAST((obj), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransport))</div><div class='del'>-#define CAMEL_SMTP_TRANSPORT_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_SMTP_TRANSPORT_TYPE, CamelSmtpTransportClass))</div><div class='del'>-#define IS_CAMEL_SMTP_TRANSPORT(o)    (CAMEL_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 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 Camel function */</div><div class='del'>-CamelType camel_smtp_transport_get_type (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* CAMEL_SMTP_TRANSPORT_H */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/camel/providers/smtp/libcamelsmtp.urls b/camel/providers/smtp/libcamelsmtp.urls<br/>deleted file mode 100644<br/>index ec2fc0fc16..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/smtp/libcamelsmtp.urls?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 6c0693b02d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/vee/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-## Process this file with automake to produce Makefile.in</div><div class='del'>-</div><div class='del'>-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 da47761754..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-folder.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/vee/camel-vee-folder.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,524 +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'>- *           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 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_sync (CamelFolder *folder, gboolean expunge, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static GPtrArray *vee_get_uids  (CamelFolder *folder);</div><div class='del'>-GPtrArray *vee_get_summary (CamelFolder *folder);</div><div class='del'>-</div><div class='del'>-static gint vee_get_message_count (CamelFolder *folder);</div><div class='del'>-static gint vee_get_unread_message_count (CamelFolder *folder);</div><div class='del'>-static CamelMimeMessage *vee_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex);</div><div class='del'>-</div><div class='del'>-static const CamelMessageInfo *vee_get_message_info (CamelFolder *folder, const char *uid);</div><div class='del'>-static GPtrArray *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);</div><div class='del'>-static void vee_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set);</div><div class='del'>-static gboolean vee_get_message_user_flag (CamelFolder *folder, const char *uid, const char *name);</div><div class='del'>-static void vee_set_message_user_flag (CamelFolder *folder, const char *uid, const char *name, gboolean value);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void camel_vee_folder_class_init (CamelVeeFolderClass *klass);</div><div class='del'>-static void camel_vee_folder_init       (CamelVeeFolder *obj);</div><div class='del'>-static void camel_vee_folder_finalise   (CamelObject *obj);</div><div class='del'>-</div><div class='del'>-static 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'>-CamelType</div><div class='del'>-camel_vee_folder_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_folder_get_type (), "CamelVeeFolder",</div><div class='del'>-					    sizeof (CamelVeeFolder),</div><div class='del'>-					    sizeof (CamelVeeFolderClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_vee_folder_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_vee_folder_init,</div><div class='del'>-					    (CamelObjectFinalizeFunc) camel_vee_folder_finalise);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_folder_class_init (CamelVeeFolderClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelFolderClass *folder_class = (CamelFolderClass *) klass;</div><div class='del'>-</div><div class='del'>-	camel_vee_folder_parent = CAMEL_FOLDER_CLASS(camel_type_get_global_classfuncs (camel_folder_get_type ()));</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;sync = vee_sync;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;get_uids = vee_get_uids;</div><div class='del'>-	folder_class-&gt;free_uids = camel_folder_free_deep;</div><div class='del'>-	folder_class-&gt;get_summary = vee_get_summary;</div><div class='del'>-	folder_class-&gt;free_summary = camel_folder_free_nop;</div><div class='del'>-	folder_class-&gt;get_message = vee_get_message;</div><div class='del'>-</div><div class='del'>-	folder_class-&gt;get_message_info = vee_get_message_info;</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;get_unread_message_count = vee_get_unread_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'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_folder_init (CamelVeeFolder *obj)</div><div class='del'>-{</div><div class='del'>-	struct _CamelVeeFolderPrivate *p;</div><div class='del'>-	CamelFolder *folder = (CamelFolder *)obj;</div><div class='del'>-</div><div class='del'>-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));</div><div class='del'>-</div><div class='del'>-	folder-&gt;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'>-</div><div class='del'>-static void</div><div class='del'>-camel_vee_folder_finalise (CamelObject *obj)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)obj;</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-	GList *node;</div><div class='del'>-</div><div class='del'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-		camel_object_unref((CamelObject *)f);</div><div class='del'>-		node = g_list_next(node);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * camel_vee_folder_new:</div><div class='del'>- * @parent_store: the parent CamelVeeStore</div><div class='del'>- * @name: the vfolder name</div><div class='del'>- * @ex: a CamelException</div><div class='del'>- *</div><div class='del'>- * Create a new CamelVeeFolder object.</div><div class='del'>- *</div><div class='del'>- * Return value: A new CamelVeeFolder widget.</div><div class='del'>- **/</div><div class='del'>-CamelFolder *</div><div class='del'>-camel_vee_folder_new (CamelStore *parent_store, const char *name,</div><div class='del'>-		      CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	CamelFolder *folder;</div><div class='del'>-	CamelVeeFolder *vf;</div><div class='del'>-	char *namepart, *searchpart;</div><div class='del'>-</div><div class='del'>-	folder =  CAMEL_FOLDER (camel_object_new (camel_vee_folder_get_type()));</div><div class='del'>-	vf = (CamelVeeFolder *)folder;</div><div class='del'>-</div><div class='del'>-	camel_folder_construct (folder, parent_store, name, name);</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'>-	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(searchpart);</div><div class='del'>-	vf-&gt;vname = namepart;</div><div class='del'>-</div><div class='del'>-	vee_folder_build(vf, ex);</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (folder));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return folder;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-folder_changed(CamelFolder *sub, gpointer type, CamelVeeFolder *vf)</div><div class='del'>-{</div><div class='del'>-	CamelException *ex;</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'>-	camel_object_trigger_event( CAMEL_OBJECT(vf), "folder_changed", GINT_TO_POINTER(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'>-	info = camel_folder_get_message_info(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_get_message_info((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'>-		camel_object_trigger_event( CAMEL_OBJECT(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'>-	camel_object_ref((CamelObject *)sub);</div><div class='del'>-	p-&gt;folders = g_list_append(p-&gt;folders, sub);</div><div class='del'>-</div><div class='del'>-	camel_object_hook_event ((CamelObject *)sub, "folder_changed", (CamelObjectEventHookFunc) folder_changed, vf);</div><div class='del'>-	camel_object_hook_event ((CamelObject *)sub, "message_changed", (CamelObjectEventHookFunc) message_changed, vf);</div><div class='del'>-</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'>-	camel_object_trigger_event( CAMEL_OBJECT(vf), "folder_changed", GINT_TO_POINTER(0));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint vee_get_message_count (CamelFolder *folder)</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 gint</div><div class='del'>-vee_get_unread_message_count (CamelFolder *folder)</div><div class='del'>-{</div><div class='del'>-	CamelVeeFolder *vee_folder = CAMEL_VEE_FOLDER (folder);</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-	GPtrArray *infolist;</div><div class='del'>-	gint i, count = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (folder != NULL, -1);</div><div class='del'>-</div><div class='del'>-	infolist = vee_folder-&gt;messages;</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; infolist-&gt;len; i++) {</div><div class='del'>-		info = (CamelMessageInfo *) g_ptr_array_index (infolist, i);</div><div class='del'>-		if (!(info-&gt;flags &amp; CAMEL_MESSAGE_SEEN))</div><div class='del'>-			count++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return count;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-get_real_message(CamelFolder *folder, const char *uid, CamelFolder **out_folder, const char **out_uid)</div><div class='del'>-{</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-</div><div class='del'>-	mi = (CamelVeeMessageInfo *)vee_get_message_info(folder, uid);</div><div class='del'>-	g_return_val_if_fail(mi != NULL, FALSE);</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(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)) {</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 NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return camel_folder_get_message (real_folder, real_uid, ex);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GPtrArray *vee_get_summary(CamelFolder *folder)</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'>-static const CamelMessageInfo *vee_get_message_info(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)</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 GPtrArray *</div><div class='del'>-vee_search_by_expression(CamelFolder *folder, const char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GList *node;</div><div class='del'>-	GPtrArray *matches, *result = g_ptr_array_new ();</div><div class='del'>-	char *expr;</div><div class='del'>-	CamelVeeFolder *vf = (CamelVeeFolder *)folder;</div><div class='del'>-	struct _CamelVeeFolderPrivate *p = _PRIVATE(vf);</div><div class='del'>-</div><div class='del'>-	expr = g_strdup_printf("(and %s %s)", vf-&gt;expression, expression);</div><div class='del'>-	node = p-&gt;folders;</div><div class='del'>-	while (node) {</div><div class='del'>-		CamelFolder *f = node-&gt;data;</div><div class='del'>-		int i;</div><div class='del'>-</div><div class='del'>-		matches = camel_folder_search_by_expression(f, expression, ex);</div><div class='del'>-		for (i = 0; i &lt; matches-&gt;len; i++) {</div><div class='del'>-			char *uid = matches-&gt;pdata[i];</div><div class='del'>-			g_ptr_array_add(result, g_strdup_printf("%p:%s", f, uid));</div><div class='del'>-		}</div><div class='del'>-		camel_folder_search_free(f, 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)</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))</div><div class='del'>-		return 0;</div><div class='del'>-</div><div class='del'>-	return camel_folder_get_message_flags(real_folder, real_uid);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-vee_set_message_flags(CamelFolder *folder, const char *uid, guint32 flags, guint32 set)</div><div class='del'>-{</div><div class='del'>-	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))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	camel_folder_set_message_flags(real_folder, real_uid, flags, set);</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, const char *name)</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))</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);</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'>-{</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))</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);</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'>-	int i;</div><div class='del'>-	GPtrArray *messages;</div><div class='del'>-	GHashTable *messages_uid;</div><div class='del'>-</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'>-		camel_message_info_free(mi);</div><div class='del'>-	}</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'>-		GPtrArray *matches;</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'>-		int i;</div><div class='del'>-</div><div class='del'>-		matches = camel_folder_search_by_expression(f, vf-&gt;expression, ex);</div><div class='del'>-		for (i = 0; i &lt; matches-&gt;len; i++) {</div><div class='del'>-			info = camel_folder_get_message_info(f, matches-&gt;pdata[i]);</div><div class='del'>-			if (info) {</div><div class='del'>-				mi = g_malloc0(sizeof(*mi));</div><div class='del'>-				camel_message_info_dup_to(info, (CamelMessageInfo *)mi);</div><div class='del'>-				g_free (mi-&gt;info.uid);</div><div class='del'>-				mi-&gt;info.uid = g_strdup_printf("%p:%s", f, info-&gt;uid);</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'>-		}</div><div class='del'>-		camel_folder_search_free(f, matches);</div><div class='del'>-		node = g_list_next(node);</div><div class='del'>-	}</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'>-	GPtrArray *matches;</div><div class='del'>-	CamelFolder *f = source;</div><div class='del'>-	CamelVeeMessageInfo *mi;</div><div class='del'>-	const CamelMessageInfo *info;</div><div class='del'>-</div><div class='del'>-	GPtrArray *messages;</div><div class='del'>-	GHashTable *messages_uid;</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'>-			camel_message_info_free((CamelMessageInfo *)mi);</div><div class='del'>-			i--;</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'>-	for (i = 0; i &lt; matches-&gt;len; i++) {</div><div class='del'>-		info = camel_folder_get_message_info(f, matches-&gt;pdata[i]);</div><div class='del'>-		if (info) {</div><div class='del'>-			mi = g_malloc0(sizeof(*mi));</div><div class='del'>-			camel_message_info_dup_to(info, (CamelMessageInfo*)mi);</div><div class='del'>-			g_free (mi-&gt;info.uid);</div><div class='del'>-			mi-&gt;info.uid = g_strdup_printf("%p:%s", f, info-&gt;uid);</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'>-	}</div><div class='del'>-	camel_folder_search_free(f, 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 2263854912..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-folder.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/vee/camel-vee-folder.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +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;camel/camel-folder.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_VEE_FOLDER(obj)         CAMEL_CHECK_CAST (obj, camel_vee_folder_get_type (), CamelVeeFolder)</div><div class='del'>-#define CAMEL_VEE_FOLDER_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_folder_get_type (), CamelVeeFolderClass)</div><div class='del'>-#define IS_CAMEL_VEE_FOLDER(obj)      CAMEL_CHECK_TYPE (obj, camel_vee_folder_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelVeeFolder      CamelVeeFolder;</div><div class='del'>-typedef struct _CamelVeeFolderClass CamelVeeFolderClass;</div><div class='del'>-</div><div class='del'>-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'>-CamelFolder    *camel_vee_folder_new		(CamelStore *parent_store,</div><div class='del'>-						 const char *name,</div><div class='del'>-						 CamelException *ex);</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 4588fb77d3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-provider.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/vee/camel-vee-provider.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +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'>-	N_("Virtual folder email provider"),</div><div class='del'>-</div><div class='del'>-	N_("For reading mail as a query of another set of folders"),</div><div class='del'>-</div><div class='del'>-	"vfolder",</div><div class='del'>-</div><div class='del'>-	0,</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 7acc127542..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-store.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/vee/camel-vee-store.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,102 +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, guint32 flags, 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'>-</div><div class='del'>-static CamelStoreClass *camel_vee_store_parent;</div><div class='del'>-</div><div class='del'>-CamelType</div><div class='del'>-camel_vee_store_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static CamelType type = CAMEL_INVALID_TYPE;</div><div class='del'>-	</div><div class='del'>-	if (type == CAMEL_INVALID_TYPE) {</div><div class='del'>-		type = camel_type_register (camel_store_get_type (), "CamelVeeStore",</div><div class='del'>-					    sizeof (CamelVeeStore),</div><div class='del'>-					    sizeof (CamelVeeStoreClass),</div><div class='del'>-					    (CamelObjectClassInitFunc) camel_vee_store_class_init,</div><div class='del'>-					    NULL,</div><div class='del'>-					    (CamelObjectInitFunc) camel_vee_store_init,</div><div class='del'>-					    NULL);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-</div><div class='del'>-camel_vee_store_class_init (CamelVeeStoreClass *klass)</div><div class='del'>-{</div><div class='del'>-	CamelStoreClass *store_class = (CamelStoreClass *) klass;</div><div class='del'>-	</div><div class='del'>-	camel_vee_store_parent = CAMEL_STORE_CLASS(camel_type_get_global_classfuncs (camel_store_get_type ()));</div><div class='del'>-</div><div class='del'>-	/* virtual method overload */</div><div class='del'>-	store_class-&gt;get_folder = vee_get_folder;</div><div class='del'>-	store_class-&gt;get_folder_name = vee_get_folder_name;</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'>-/**</div><div class='del'>- * camel_vee_store_new:</div><div class='del'>- *</div><div class='del'>- * Create a new CamelVeeStore object.</div><div class='del'>- * </div><div class='del'>- * Return value: A new CamelVeeStore widget.</div><div class='del'>- **/</div><div class='del'>-CamelVeeStore *</div><div class='del'>-camel_vee_store_new (void)</div><div class='del'>-{</div><div class='del'>-	CamelVeeStore *new = CAMEL_VEE_STORE ( camel_object_new (camel_vee_store_get_type ()));</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CamelFolder *</div><div class='del'>-vee_get_folder (CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	return camel_vee_folder_new (store, folder_name, ex);</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 d4ed7a0610..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/providers/vee/camel-vee-store.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/providers/vee/camel-vee-store.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,47 +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;camel/camel-store.h&gt;</div><div class='del'>-</div><div class='del'>-#define CAMEL_VEE_STORE(obj)         CAMEL_CHECK_CAST (obj, camel_vee_store_get_type (), CamelVeeStore)</div><div class='del'>-#define CAMEL_VEE_STORE_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_vee_store_get_type (), CamelVeeStoreClass)</div><div class='del'>-#define IS_CAMEL_VEE_STORE(obj)      CAMEL_CHECK_TYPE (obj, camel_vee_store_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _CamelVeeStore      CamelVeeStore;</div><div class='del'>-typedef struct _CamelVeeStoreClass CamelVeeStoreClass;</div><div class='del'>-</div><div class='del'>-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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 023aee16af..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/string-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/string-utils.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'>-/* string-util : utilities for gchar* strings  */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *          Jeffrey Stedfast &lt;fejj@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'>-void</div><div class='del'>-string_unquote (gchar *string)</div><div class='del'>-{</div><div class='del'>-	/* if the string is quoted, unquote it */</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (string != NULL);</div><div class='del'>-	</div><div class='del'>-	if (*string == '"' &amp;&amp; *(string + strlen (string) - 1) == '"') {</div><div class='del'>-		*(string + strlen (string) - 1) = '\0';</div><div class='del'>-		if (*string)</div><div class='del'>-			memmove (string, string+1, strlen (string));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-strip (gchar *string, gchar c)</div><div class='del'>-{</div><div class='del'>-	/* strip all occurances of c from the string */</div><div class='del'>-	gchar *src, *dst;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (string != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	for (src = dst = string; *src; src++)</div><div class='del'>-		if (*src != c)</div><div class='del'>-			*dst++ = *src;</div><div class='del'>-	*dst = '\0';</div><div class='del'>-	</div><div class='del'>-	return string;</div><div class='del'>-}</div><div class='head'>diff --git a/camel/string-utils.h b/camel/string-utils.h<br/>deleted file mode 100644<br/>index 1556faa1df..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/camel/string-utils.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>camel/string-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* string-util : utilities for normal gchar * strings  */</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- *</div><div class='del'>- * Authors: Bertrand Guiheneuf &lt;bertrand@helixcode.com&gt;</div><div class='del'>- *          Jeffrey Stedfast &lt;fejj@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,</div><div class='del'>-				 gboolean *suffix_found);</div><div class='del'>-</div><div class='del'>-void    string_unquote          (gchar *string);</div><div class='del'>-</div><div class='del'>-gchar   *strip                  (gchar *string, gchar c);</div><div class='del'>-</div><div class='del'>-#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 fe01043d2c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,19 +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='del'>-Composer-stubs.c</div><div class='del'>-Composer-skels.c</div><div class='del'>-Composer-common.c</div><div class='del'>-Composer.h</div><div class='del'>-HTMLEditor-stubs.c</div><div class='del'>-HTMLEditor-skels.c</div><div class='del'>-HTMLEditor.h</div><div class='del'>-HTMLEditor-common.c</div><div class='del'>-Evolution-Addressbook-SelectNames-common.c</div><div class='del'>-Evolution-Addressbook-SelectNames-skels.c</div><div class='del'>-Evolution-Addressbook-SelectNames-stubs.c</div><div class='del'>-Evolution-Addressbook-SelectNames.h</div><div class='head'>diff --git a/composer/ChangeLog b/composer/ChangeLog<br/>deleted file mode 100644<br/>index a64ac15f41..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,947 +0,0 @@</div><div class='del'>-2000-11-06  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c: Added #include &lt;config.h&gt;</div><div class='del'>-	* e-msg-composer-hdrs.c: s/_HAVE_CONFIG_H/HAVE_CONFIG_H for</div><div class='del'>-	working i18n.</div><div class='del'>-	</div><div class='del'>-2000-11-04  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new): fix</div><div class='del'>-	test for regular file to !S_ISREG (statbuf.st_mode)</div><div class='del'>-</div><div class='del'>-	* listener.c (resolve_image_url): use inline images hash table</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (init): create inlined images hash table</div><div class='del'>-	(destroy): destroy it</div><div class='del'>-	(clear_inline_images): helper function, used from</div><div class='del'>-	g_hash_table_foreach_remove to destroy one inline image record</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: added hash table with inlined images url -&gt;</div><div class='del'>-	cid info</div><div class='del'>-</div><div class='del'>-2000-11-03  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* listener.c (impl_event): updated for API changed</div><div class='del'>-	implemented image_url event</div><div class='del'>-	(resolve_image_url): new helper function, attaches image to mail</div><div class='del'>-	and returns new (resolved) url pointing to mime component</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	added conponent_id parameter</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c</div><div class='del'>-	(e_msg_composer_attachment_bar_attach): added parameter content_id</div><div class='del'>-	(add_from_file): likewise</div><div class='del'>-</div><div class='del'>-2000-11-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_new):</div><div class='del'>-	Don't allow attaching anything but regular files.</div><div class='del'>-</div><div class='del'>-2000-11-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Clean the idl-generated files properly.</div><div class='del'>-</div><div class='del'>-2000-11-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Don't create</div><div class='del'>-	the To, Cc, and Bcc lists based only on the address, use both the</div><div class='del'>-	name and address and camel_address_encode() them.</div><div class='del'>-</div><div class='del'>-2000-11-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Fix the</div><div class='del'>-	CTE kludge, calculate the best mime transfer encoding for the mime</div><div class='del'>-	part and use that. Include e-msg-composer-select-file.h</div><div class='del'>-</div><div class='del'>-2000-10-31  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (prepare_engine): new function, tries prepare</div><div class='del'>-	editor engine</div><div class='del'>-	(mark_orig_text): marks original text in editor</div><div class='del'>-	(set_editor_text): call mark_orig_text</div><div class='del'>-	(create_composer): call prepare_engine</div><div class='del'>-</div><div class='del'>-	* Makefile.am (IDL_GENERATED): added HTMLEditor generated files to</div><div class='del'>-	IDL_GENERATED</div><div class='del'>-	($(IDL_GENERATED)): generate also files from HTMLEditor.idl</div><div class='del'>-	(libcomposer_la_SOURCES): added listener.[ch]</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: added editor_engine and editor_listener to</div><div class='del'>-	EMsgComposer</div><div class='del'>-</div><div class='del'>-	* listener.[ch]: new files, implementation of HTMLEditor::Listener</div><div class='del'>-</div><div class='del'>-2000-10-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am ($(IDL_GENERATED)): Get `Composer.idl' from</div><div class='del'>-	`$(srcdir)' so that it builds with builddir != srcdir.</div><div class='del'>-</div><div class='del'>-2000-10-27  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Fixed my</div><div class='del'>-	not-quite-right logic so that we don't accidently set the body</div><div class='del'>-	contents using a plain text attachment instead of the actual body</div><div class='del'>-	of the message :-)</div><div class='del'>-</div><div class='del'>-2000-10-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Populate the</div><div class='del'>-	composer with any attachments.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c (create_file_selection): Set the</div><div class='del'>-	wmclass and wmclass_name for the file selectors so that Sawfish</div><div class='del'>-	doesn't make the dialogs the same size as the parent.</div><div class='del'>-</div><div class='del'>-2000-10-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-composer.c (init): Attach send/postpone signal</div><div class='del'>-	handlers to the EMsgComposer.</div><div class='del'>-	(evolution_composer_factory_init): Take send/postpone signal</div><div class='del'>-	handlers as arguments.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c, e-msg-composer-attachment-bar.c: add some</div><div class='del'>-	missing _()s.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.*, e-msg-composer-address-entry.*:</div><div class='del'>-	Old cruft. Remove.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Update for removed files.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Remove e-msg-composer-address-entry.h</div><div class='del'>-	include.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Remove e-msg-composer-address-dialog.h include</div><div class='del'>-	</div><div class='del'>-2000-10-23  Ariel Rios   &lt;ariel@arcavia.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Include Composer.h</div><div class='del'>-	instead of volution-Addressbook-SelectNames.h</div><div class='del'>-</div><div class='del'>-2000-10-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: No, don't ignore Evolution-Addressbook-SelectNames*.</div><div class='del'>-	They're not supposed to be there any more. </div><div class='del'>-</div><div class='del'>-2000-10-22  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_cb): Removed.</div><div class='del'>-	(add_from_user): Use `e_msg_composer_select_file()' instead of</div><div class='del'>-	doing the file selector widget magic by yourself.</div><div class='del'>-</div><div class='del'>-2000-10-20  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Ignore Evolution-Addressbook-SelectNames*</div><div class='del'>-</div><div class='del'>-2000-10-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Evolution-Composer.idl: Evolution::Composer interface</div><div class='del'>-</div><div class='del'>-	* evolution-composer.[ch]: Implementation and factory. So</div><div class='del'>-	entirely not tested.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcomposer_la_SOURCES): Add</div><div class='del'>-	evolution-composer.[ch]</div><div class='del'>-	(IDLS): Update this for Evolution-Composer.idl / Composer.idl</div><div class='del'>-</div><div class='del'>-	* main.c: Removed. (Old, dead code)</div><div class='del'>-</div><div class='del'>-2000-10-19  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (glade_data): Add `e-msg-composer-attachment.glade'.</div><div class='del'>-	(glade_messages): New.</div><div class='del'>-	(EXTRA_DIST): Add `$(glade_messages)'.</div><div class='del'>-</div><div class='del'>-2000-10-19  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_menubar_file, create_menubar_edit),</div><div class='del'>-	(create_menubar_format, create_menubar_view, create_menubar): kill.</div><div class='del'>-	(create_toolbar): die.</div><div class='del'>-	(setup_ui): impl.</div><div class='del'>-	(e_msg_composer_construct): hook in.</div><div class='del'>-	(menu_format_html_cb): update.</div><div class='del'>-	(menu_view_attachments_activate_cb): ditto.</div><div class='del'>-	(destroy): upd.</div><div class='del'>-	(e_msg_composer_construct): upd.</div><div class='del'>-	(e_msg_composer_set_send_html): upd.</div><div class='del'>-</div><div class='del'>-2000-10-16  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (init): Don't need the ID anymore.</div><div class='del'>-</div><div class='del'>-2000-10-17  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): If the body</div><div class='del'>-	text was NULL, then don't bother turning it into HTML (besides, it</div><div class='del'>-	causes a nasty segfault).</div><div class='del'>-</div><div class='del'>-2000-10-15  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Move CPPFLAGS flags to INCLUDES to avoid bashing</div><div class='del'>-	any CPPFLAGS set at configure time.</div><div class='del'>-</div><div class='del'>-2000-10-14  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (set_entry): If the entry widget is</div><div class='del'>-	NULL, obviously we can't set any text on it.</div><div class='del'>-</div><div class='del'>-2000-10-14  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (init): Create a unique-ish id for this set</div><div class='del'>-	of headers, so that only one select-names dialog will be created for</div><div class='del'>-	a given set of headers.</div><div class='del'>-	(address_button_clicked_cb): Pass the unique-ish id to the activate</div><div class='del'>-	dialog command.</div><div class='del'>-</div><div class='del'>-2000-10-13  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): stop using format_text,</div><div class='del'>-	gtkhtml handles this now.</div><div class='del'>-	(format_text): function removed.</div><div class='del'>-</div><div class='del'>-2000-10-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.c: Allow NULL pixbufs, and load the "broken" image</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): If the image isn't </div><div class='del'>-	found load the default text/plain icon.</div><div class='del'>-</div><div class='del'>-2000-10-02  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): If the body of the message has</div><div class='del'>-	8-bit chars, set the Content-Transfer-Encoding type to the best</div><div class='del'>-	encoding.</div><div class='del'>-</div><div class='del'>-2000-10-02  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.c: fix #include of gnome-canvas-pixbuf.h</div><div class='del'>-</div><div class='del'>-2000-10-02  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c: If the description of an attachment</div><div class='del'>-	is a blank string, revert to displaying the filename.</div><div class='del'>-</div><div class='del'>-2000-10-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-icon-list.c: If you try to add an icon from a file that doesn't</div><div class='del'>-	exist put a "Broken icon" image.</div><div class='del'>-</div><div class='del'>-	* bad-icon.xpm: Broken icon image.</div><div class='del'>-</div><div class='del'>-2000-10-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.[ch] (update): If the attachment is</div><div class='del'>-	an image, then make a thumbnail for it.</div><div class='del'>-	Base the attachment bar on e-icon-list instead of gnome-icon-list.</div><div class='del'>-</div><div class='del'>-	* e-icon-list.[ch]: New files. These are modified versions of </div><div class='del'>-	gnome-icon-list from gnome-libs HEAD that uses gdk-pixbuf instead</div><div class='del'>-	of the evil Imlib.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.[ch]: Add a pixbuf_cache member, to</div><div class='del'>-	save us having to generate a thumbnail for the attachment every</div><div class='del'>-	time the bar changes.</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Add dnd support for</div><div class='del'>-	files. Drag a file to the composer to add it as an attachment.</div><div class='del'>-</div><div class='del'>-2000-09-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Check to see if the body has</div><div class='del'>-	8bit chars, if so - set the Content-Transfer-Encoding to 8bit.</div><div class='del'>-	Addresses Bugzilla bug #652.</div><div class='del'>-</div><div class='del'>-2000-09-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (setup_headers): fix typo in tooltip.</div><div class='del'>-	* e-msg-composer.c (create_menubar_file): fix accelerator for</div><div class='del'>-	"Save as" to be different from "Save". (Both problems pointed out</div><div class='del'>-	by menthos@menthos.com.)</div><div class='del'>-</div><div class='del'>-2000-09-24  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature): Updated to handle FIFO</div><div class='del'>-	streams.</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Don't g_error out</div><div class='del'>-	if the html-editor-control fails.</div><div class='del'>-	(create_composer): New internal function to create and construct a</div><div class='del'>-	msg_composer and pop up an error message if it fails.</div><div class='del'>-	(e_msg_composer_new, e_msg_composer_new_with_sig_file,</div><div class='del'>-	e_msg_composer_new_with_message, e_msg_composer_new_from_url): Use</div><div class='del'>-	create_composer, return if it fails, change return type to</div><div class='del'>-	EMsgComposer *.</div><div class='del'>-</div><div class='del'>-2000-09-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c (get_mime_type): Use</div><div class='del'>-	gnome_vfs_get_file_info.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (update): Use gnome_vfs_mime</div><div class='del'>-	functions, not old gnome_mime.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS) and</div><div class='del'>-	$(EXTRA_GNOME_LIBS).  Removed unneeded libraries.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.c, e-msg-composer-address-entry.c,</div><div class='del'>-	e-msg-composer-attachment.c, e-msg-composer-hdrs.c,</div><div class='del'>-	e-msg-composer.c: Fixed the #include lines to deal properly with</div><div class='del'>-	gal.</div><div class='del'>-</div><div class='del'>-2000-09-12  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Update for new UI handler.</div><div class='del'>-</div><div class='del'>-2000-09-12  Larry Ewing  &lt;lewing@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (add_common): add a make sure</div><div class='del'>-	the attachment isn't NULL.  A more complete fix coming soon.</div><div class='del'>-</div><div class='del'>-2000-09-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am ($(IDL_GENERATED)): Add space after `-I'.</div><div class='del'>-</div><div class='del'>-2000-09-05  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_menubar_format): Accelerate the</div><div class='del'>-	`Format' menu with an `o' instead of an `f' [the `f' is already</div><div class='del'>-	taken by the "File" menu].</div><div class='del'>-</div><div class='del'>-2000-09-04  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): Applied</div><div class='del'>-	Jesse's patch that sets the composer's sig_file</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.c: Use e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-2000-09-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_get_sig_file): This needs to</div><div class='del'>-	return a const char * and not a char *, because we're not actually</div><div class='del'>-	allocating memory here.</div><div class='del'>-	(create_menubar_file): Changed "Send" to "Send Now" and added</div><div class='del'>-	"Send Later"</div><div class='del'>-	(menu_file_send_later_cb): New callback that emits the POSTPONE</div><div class='del'>-	signal (equivalent to "Send Later"</div><div class='del'>-</div><div class='del'>-2000-08-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Always</div><div class='del'>-	request to import the HTML version if at all possible so that we</div><div class='del'>-	maintain formatting and other nifty stuff :-)</div><div class='del'>-</div><div class='del'>-2000-08-28  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Set the</div><div class='del'>-	"From" address in the CamelMimeMessage. Also updated to use</div><div class='del'>-	get_subject to both make our lives easier and prepare for using UTF8</div><div class='del'>-	(e_msg_composer_hdrs_get_subject): Updated to behave similarly to</div><div class='del'>-	get_from and return allocated memory (it will have to return</div><div class='del'>-	allocated memory once it's converted to use UTF8 anyways)</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (setup_save_draft): Always set</div><div class='del'>-	composer-&gt;send_html = TRUE so that formatting is preserved.</div><div class='del'>-</div><div class='del'>-2000-08-24  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-entry.c: Use e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c: Use e_utf8 wrappers</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Use e_utf8 wrappers</div><div class='del'>-	</div><div class='del'>-2000-08-24  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Add builddir/shell so we can</div><div class='del'>-	get Evolution.h</div><div class='del'>-</div><div class='del'>-2000-08-12  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_text): get_text not get_txt.</div><div class='del'>-</div><div class='del'>-2000-08-11  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Use</div><div class='del'>-	new config accessors</div><div class='del'>-</div><div class='del'>-2000-08-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Remove unneeded e-setup.h include</div><div class='del'>-</div><div class='del'>-2000-08-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (exit_dialog_cb): Made async</div><div class='del'>-</div><div class='del'>-2000-08-10  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (do_exit): Temporarily disable draft saving</div><div class='del'>-	while we figure out how to work around Zucchi's new append_message.</div><div class='del'>-</div><div class='del'>-2000-08-10  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_from): Return the</div><div class='del'>-	text in GtkCombo-&gt;entry</div><div class='del'>-</div><div class='del'>-2000-08-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (create_dropdown_entry): Fixed the GList</div><div class='del'>-	identity stuff, should now display all configured identities.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.c: Fixed some warnings.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Switched the composer to use an EEntry</div><div class='del'>-	for the subject field.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Changed the non scaling objects in this vbox</div><div class='del'>-	to be FALSE, FALSE instead of FALSE, TRUE.</div><div class='del'>-</div><div class='del'>-2000-08-09  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (add_header): Modified to allow dropdown</div><div class='del'>-	entry-boxes as well (for headers like From:)</div><div class='del'>-	(setup_headers): Modified to use the correct enum type.</div><div class='del'>-	(create_dropdown_entry): New convenience function to add a</div><div class='del'>-	drop-down combo box and fill it in with identities</div><div class='del'>-	(init): Set from_entry to NULL</div><div class='del'>-	(e_msg_composer_hdrs_get_from): New convenience function to get</div><div class='del'>-	the text in the From widget in the composer</div><div class='del'>-	(e_msg_composer_hdrs_set_from): New convenience function to set</div><div class='del'>-	the From header in the composer</div><div class='del'>-</div><div class='del'>-2000-08-08  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Fix build by allowing includes for e-table dir</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart):</div><div class='del'>-	s/strcasecmp/g_strcasecmp</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: s/strncasecmp/g_strncasecmp - this will help</div><div class='del'>-	later with building on different platforms :-)</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_message): Added code</div><div class='del'>-	to set the body text based on the CamelMimeMessage.</div><div class='del'>-	(set_editor_text): Use lowercase html tags...</div><div class='del'>-</div><div class='del'>-2000-08-07  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (do_exit): Prompt the user to save their</div><div class='del'>-	composition in Drafts.</div><div class='del'>-	(set_editor_text): Uhm, use "-- \n" not "--\n" because the space</div><div class='del'>-	is called for in the standard</div><div class='del'>-	(e_msg_composer_new_with_message): New convenience function that</div><div class='del'>-	takes a CamelMimeMessage as an argument. This will be useful when</div><div class='del'>-	we code the ability to resume the editing of a message draft (like</div><div class='del'>-	in the Drafts folder).</div><div class='del'>-</div><div class='del'>-2000-08-01  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: Constify param</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature): Constify param</div><div class='del'>-	(set_editor_text): ditto</div><div class='del'>-	(e_msg_composer_new_with_sig_file): ditto</div><div class='del'>-</div><div class='del'>-2000-08-01  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (set_editor_text): sizeof("--\") !=</div><div class='del'>-	strlen("--\n"), breaking the test for the signature prefix.</div><div class='del'>-</div><div class='del'>-2000-07-28  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_with_sig_file): New</div><div class='del'>-	function to create composer with sig file set.</div><div class='del'>-	(e_msg_composer_get_sig_file): New function to get sig file</div><div class='del'>-	(e_msg_composer_set_sig_file): New function to set sig file</div><div class='del'>-</div><div class='del'>-2000-07-25  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_text): add textual exception printout.</div><div class='del'>-	(set_editor_text): close pre tags &amp; check for pre-existing</div><div class='del'>-	sig separator.</div><div class='del'>-</div><div class='del'>-2000-07-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_file_insert_file_cb): Mark this function</div><div class='del'>-	as FIXME because we're waiting for the HTML Editor Control to</div><div class='del'>-	support paste commands. Also some updates for when that happens.</div><div class='del'>-</div><div class='del'>-2000-07-24  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Remove GOAD support.</div><div class='del'>-	(create_editor): Try to give a more helpful error message when</div><div class='del'>-	failing to load the editor control.</div><div class='del'>-</div><div class='del'>-2000-07-23  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (menu_format_html_cb): New callback for the</div><div class='del'>-	"Send HTML" menu toggle item.</div><div class='del'>-	(create_menubar_format): New.</div><div class='del'>-	(create_menubar): Call it.</div><div class='del'>-	(create_menubar_options): Removed.</div><div class='del'>-	(init): Initialize `send_html' and `attachment_bar_visible' to</div><div class='del'>-	FALSE.</div><div class='del'>-	(get_signature): Add `void' to the declaration.  This is C, not</div><div class='del'>-	C++.</div><div class='del'>-	(menu_file_close_cb): Renamed from `exit_cb'.</div><div class='del'>-	(menu_file_send_cb): Renamed from `send_cb'.</div><div class='del'>-	(menu_file_save_as_cb): Renamed from `save_as_cb'.</div><div class='del'>-	(menu_file_save_cb): Renamed from `save_cb'.</div><div class='del'>-	(menu_file_open_cb): Renamed from `open_cb'.</div><div class='del'>-	(menu_file_add_attachment_cb): Renamed from `add_attachment_cb'.</div><div class='del'>-	(menu_file_insert_file_cb): Renamed from `insert_file_cb'.</div><div class='del'>-	(e_msg_composer_set_send_html): New.</div><div class='del'>-	(build_message): Use the `send_html' flag instead of peeking the</div><div class='del'>-	`msg_format' gnome-config value directly.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: New member `send_html' in `EMsgComposer'.</div><div class='del'>-</div><div class='del'>-2000-07-23  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Changed to use BonoboUIHandler stuff directly</div><div class='del'>-	instead of translating from GnomeUIInfo.</div><div class='del'>-	(create_menubar_file): New.</div><div class='del'>-	(create_menubar_edit): New.</div><div class='del'>-	(create_menubar_view): New.</div><div class='del'>-	(create_menubar_options): New.</div><div class='del'>-	(create_menubar): Use these functions to set up the menu bar.</div><div class='del'>-	(create_toolbar): Use BonoboUIHandler directly instead of</div><div class='del'>-	converting from GnomeUIInfo.</div><div class='del'>-	(toolbar_view_attachments_clicked_cb): Removed.</div><div class='del'>-	(address_dialog_cb): Removed.</div><div class='del'>-	(address_dialog_destroy_cb): Removed.</div><div class='del'>-	(address_dialog_apply_cb): Removed.</div><div class='del'>-	(setup_address_dialog): Removed.</div><div class='del'>-</div><div class='del'>-2000-07-12  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: (view_tree) Make the "View Attachments" item</div><div class='del'>-	a toggleitem ... so that it can be toggled...</div><div class='del'>-	(menu_view_attachments_activate_cb): Treat the widget correctly</div><div class='del'>-	and toggle correctly.</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (exit_cb): Use it.</div><div class='del'>-	(delete_event): New, handler for the "delete_event" signal.</div><div class='del'>-</div><div class='del'>-2000-07-09  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (set_editor_text): Don't load "" into the</div><div class='del'>-	editor, because it will cause the editor component to g_warning.</div><div class='del'>-</div><div class='del'>-2000-07-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Removed the extra frame here.</div><div class='del'>-</div><div class='del'>-2000-07-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_menubar): Create an empty "Edit" menu</div><div class='del'>-	for the editor control to insert itself into.</div><div class='del'>-</div><div class='del'>-2000-07-08  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* .cvsignore: Ignore dynamically created source files</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_entry): New.</div><div class='del'>-	(e_msg_composer_hdrs_set_to): Use it.</div><div class='del'>-	(e_msg_composer_hdrs_set_cc): Likewise</div><div class='del'>-	(e_msg_composer_hdrs_set_bcc): Likewise.</div><div class='del'>-	(e_msg_composer_hdrs_get_to): Replace implementation with a</div><div class='del'>-	`g_assert_not_reached()'.</div><div class='del'>-	(e_msg_composer_hdrs_get_cc): Likewise.</div><div class='del'>-	(e_msg_composer_hdrs_get_bcc): Likewise.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Get rid of cut/copy/paste/undo as they</div><div class='del'>-	duplicate the editor toolbar and cannot be made to work for all</div><div class='del'>-	the widgets anyway.</div><div class='del'>-</div><div class='del'>-2000-07-08  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: New member `corba_select_names' in</div><div class='del'>-	`EMsgComposerHdrsPrivate'.</div><div class='del'>-	(destroy): If not `CORBA_OBJECT_NIL', release.</div><div class='del'>-	(init): Init to `CORBA_OBJECT_NIL'.</div><div class='del'>-	(setup_corba): New.</div><div class='del'>-	(e_msg_composer_hdrs_new): Call it.</div><div class='del'>-	(add_entry): Create the entries by using the ::SelectNames</div><div class='del'>-	interface.</div><div class='del'>-	(address_button_clicked_cb): Activate the dialog through the</div><div class='del'>-	::SelectNames interface.</div><div class='del'>-</div><div class='del'>-2000-06-29  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Changed "Exit" to "Close" in the File menu.</div><div class='del'>-	This is a little more intuitive as it does not suggest exiting</div><div class='del'>-	the application, just says "close this window".</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-msg-composer-select-file.h for make</div><div class='del'>-	distcheck.</div><div class='del'>-</div><div class='del'>-2000-06-26  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c</div><div class='del'>-	(load): New.</div><div class='del'>-	(open_cb): Use it.</div><div class='del'>-	(save): New function.</div><div class='del'>-	(save_cb): Implemented by using it.</div><div class='del'>-	(save_as_cb): Likewise.</div><div class='del'>-</div><div class='del'>-2000-06-17  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): I18N the title bar.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libcomposerinclude_HEADERS): Removed.  Move all the</div><div class='del'>-	`.h' files into `libcomposer_la_SOURCES' so that they get</div><div class='del'>-	distributed, but not installed.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (open_cb): New; implement the `Open' command.</div><div class='del'>-	(save_as_cb): New; implement the `Save as' command.</div><div class='del'>-	(init): Initialize the `persist_file_interface' and</div><div class='del'>-	`persist_stream_interface' members to NULL.</div><div class='del'>-	(destroy): Release the PersistStream and PersistFile interfaces.</div><div class='del'>-	(e_msg_composer_construct): Query the PersistFile and</div><div class='del'>-	PersistStream interfaces on the control and save them in the</div><div class='del'>-	`persist_file_interface' and `persist_stream_interface' members.</div><div class='del'>-	(get_text): Renamed from `get_editor_text'.  Get a</div><div class='del'>-	@persist_stream_interface instead of querying it a the control.</div><div class='del'>-	(build_message): Return NULL if `persist_stream_interface' is nil.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: New member `persist_file_interface' in</div><div class='del'>-	`EMsgComposer'.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-select-file.c: New.</div><div class='del'>-	* e-msg-composer-select-file.h: New.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Make the `To:'</div><div class='del'>-	entry grab the keyboard focus.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_get_to_entry): New.</div><div class='del'>-	(e_msg_composer_hdrs_get_cc_entry): New.</div><div class='del'>-	(e_msg_composer_hdrs_get_bcc_entry): New.</div><div class='del'>-	(e_msg_composer_hdrs_get_subject_entry): New.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Set the scroll</div><div class='del'>-	frame's shadow type to `GTK_SHADOW_IN'.</div><div class='del'>-	(format_text): Initialize `tabbing' to zero to shut down the</div><div class='del'>-	compiler.</div><div class='del'>-</div><div class='del'>-2000-06-14  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (add_from_user): keep the</div><div class='del'>-	GtkFileSelection around between calls so we start up in the same</div><div class='del'>-	directory we ended up in last time around. (Also fixes a big</div><div class='del'>-	memory leak in that the code was already keeping the</div><div class='del'>-	GtkFileSelection around, it just wasn't remembering to reuse it.)</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (format_text): Don't line-wrap lines that start</div><div class='del'>-	with "&gt;".</div><div class='del'>-</div><div class='del'>-2000-06-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (format_text): If a paragraph starts with TABs,</div><div class='del'>-	indent the whole paragraph to that tab level.</div><div class='del'>-</div><div class='del'>-2000-06-12  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Make the `attachment_scroll_frame' an</div><div class='del'>-	`EScrollFrame'.</div><div class='del'>-	(exit_cb): I18N the quit message.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: `attachment_scrolled_window' renamed to</div><div class='del'>-	`attachment_scroll_frame'.</div><div class='del'>-</div><div class='del'>-2000-06-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (format_text): Don't break on non-breaking</div><div class='del'>-	spaces, don't keep non-breaking spaces that fall after a line</div><div class='del'>-	wrap, and translate non-breaking spaces to regular ones after</div><div class='del'>-	wrapping.</div><div class='del'>-</div><div class='del'>-2000-06-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_attach): New convenience</div><div class='del'>-	function.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.c: Store a CamelMimePart rather than</div><div class='del'>-	filename/description/mime_type info. Also record whether we were</div><div class='del'>-	told or guessed the MIME type.</div><div class='del'>-	(e_msg_composer_attachment_new_from_mime_part): New constructor.</div><div class='del'>-	(e_msg_composer_attachment_edit): Remove the "browse" button. (If</div><div class='del'>-	the user wants to change the actual file that the attachment is</div><div class='del'>-	based on, he should delete the attachment and create a new one...)</div><div class='del'>-	Remove the "Apply" button, because it's not all that useful. Make</div><div class='del'>-	the MIME type only track the filename if it was guessed rather</div><div class='del'>-	than being provided.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.glade: Remove "browse" and "apply"</div><div class='del'>-	buttons. Make filename editable.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (sort): Removed. Send the</div><div class='del'>-	attachments in the order the user attached them in.</div><div class='del'>-	(text_changed): Removed, since we weren't enabling the relevant</div><div class='del'>-	GnomeIconList functionality that would have used this.</div><div class='del'>-	(update): Don't print the size if it's 0.</div><div class='del'>-	(attach_to_multipart, etc): adjust for EMsgComposerAttachment</div><div class='del'>-	changes.</div><div class='del'>-	(attach_to_multipart): Use 7bit encoding for message/ subparts.</div><div class='del'>-	(e_msg_composer_attachment_bar_attach_mime_part): New convenience</div><div class='del'>-	function.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-06-02  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: Added the ability to save plain text mail.</div><div class='del'>-</div><div class='del'>-2000-05-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_editor_text): add a "format" argument so</div><div class='del'>-	we can fetch different kinds of text.</div><div class='del'>-	(format_text): New function to do line wrapping on plain text.</div><div class='del'>-	(build_message): Build multipart/alternative messages rather than</div><div class='del'>-	HTML-only ones. Yay. We don't suck (as much) any more!</div><div class='del'>-</div><div class='del'>-2000-05-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c: #include &lt;errno.h&gt;</div><div class='del'>-</div><div class='del'>-2000-05-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_editor_text, set_editor_text): Update for</div><div class='del'>-	PersistStream changes</div><div class='del'>-	(build_message): Update for CamelMultipart changes.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_signature): routine to read the user's</div><div class='del'>-	signature file.</div><div class='del'>-	(set_editor_text): If the user has configured a signature, append</div><div class='del'>-	it to the set text.</div><div class='del'>-	(e_msg_composer_new): Call set_editor_text with "" to load the</div><div class='del'>-	signature (if any).</div><div class='del'>-	</div><div class='del'>-2000-05-25  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Use camel_data_wrapper_new</div><div class='del'>-	instead of camel_simple_data_wrapper_new.</div><div class='del'>-</div><div class='del'>-2000-05-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Use</div><div class='del'>-	camel_simple_data_wrapper_new rather than camel_data_wrapper_new.</div><div class='del'>-</div><div class='del'>-2000-05-13  Valek Filippov  &lt;frob@df.ru&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment.glade: save translatable strings</div><div class='del'>-	* e-msg-composer-attachment.glade.h: file with strings</div><div class='del'>-	* e-msg-composer-address-dialog.glade: save translatable strings</div><div class='del'>-	* e-msg-composer-address-dialog.glade.h: file with strings</div><div class='del'>-</div><div class='del'>-2000-05-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_editor_text): NUL-terminate the data</div><div class='del'>-	extracted from the BonoboStream.</div><div class='del'>-</div><div class='del'>-2000-05-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): deal with</div><div class='del'>-	Content-Transfer-Encoding a little bit at least.</div><div class='del'>-</div><div class='del'>-2000-05-07  Mathieu Lacage &lt;mathieu@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_editor): remove FIXME and hardcoded </div><div class='del'>-	string. You can write mails with OAF now.</div><div class='del'>-	</div><div class='del'>-2000-05-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): unref content, etc. after</div><div class='del'>-	attaching it to message.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): unref</div><div class='del'>-	part after attaching it.</div><div class='del'>-</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: Turned off focus in the To, Cc, and Bcc</div><div class='del'>-	buttons.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-</div><div class='del'>-2000-04-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (set_recipients): Update (minimally) for</div><div class='del'>-	Camel recipient changes.</div><div class='del'>-</div><div class='del'>-2000-04-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new_from_url): New routine, to</div><div class='del'>-	process mailto URLs.</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Only generate a multipart</div><div class='del'>-	message if there are attachments. Otherwise generate a single</div><div class='del'>-	part.</div><div class='del'>-</div><div class='del'>-	* Update for CamelMimeBodyPart -&gt; CamelMimePart</div><div class='del'>-</div><div class='del'>-2000-04-26  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): add a</div><div class='del'>-	s/SIMPLE_// that notzed missed. Update to use</div><div class='del'>-	camel_mime_part_set_content.</div><div class='del'>-	* e-msg-composer.c (build_message): remove a now-unused variable.</div><div class='del'>-	Update for camel_mime_part_set_content.</div><div class='del'>-</div><div class='del'>-2000-04-26  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Use camel_mime_part_set_text()</div><div class='del'>-	to set the text rather than messing with data wrappers.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): Change</div><div class='del'>-	for new camel-stream interfaces.</div><div class='del'>-	(attach_to_multipart): Also set base64 encoding by default.</div><div class='del'>-</div><div class='del'>-2000-04-25  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_editor): use uih here</div><div class='del'>-	(e_msg_composer_construct): create menubar/toolbar before creating</div><div class='del'>-	editor control</div><div class='del'>-</div><div class='del'>-2000-04-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: build libcomposer static and don't install it.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-attachment-bar.c (attach_to_multipart): This was</div><div class='del'>-	only half-implemented. Finish it, mostly.</div><div class='del'>-</div><div class='del'>-2000-04-22  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_add_header): new function to</div><div class='del'>-	make the composer record additional headers it should output.</div><div class='del'>-	(In-Reply-To), etc.</div><div class='del'>-	(build_message): output them</div><div class='del'>-</div><div class='del'>-2000-04-21  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_set_headers): </div><div class='del'>-	(e_msg_composer_set_body_text): new functions</div><div class='del'>-	(exit_cb): Connect "Exit" menu item finally.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c: const poisoning</div><div class='del'>-	(e_msg_composer_hdrs_set_subject): </div><div class='del'>-	(e_msg_composer_hdrs_get_subject): new functions</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-entry.c: const poisoning</div><div class='del'>-</div><div class='del'>-2000-04-20  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (get_editor_text, set_editor_text): new</div><div class='del'>-	functions to get and set the contents of the HTML editor via</div><div class='del'>-	Bonobo::PersistStream.</div><div class='del'>-	(build_message): use get_editor_text. This works again.</div><div class='del'>-</div><div class='del'>-2000-04-17  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (build_message): Change</div><div class='del'>-	camel_mime_message_new_with_session to camel_mime_message_new</div><div class='del'>-</div><div class='del'>-2000-03-17  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_menubar): Pass the composer as the data</div><div class='del'>-	for the menubar callbacks.</div><div class='del'>-</div><div class='del'>-2000-03-12  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Modified to make the composer into a library, to be</div><div class='del'>-	used by the mail component.</div><div class='del'>-</div><div class='del'>-2000-03-07  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (create_toolbar): Pass the composer as the data</div><div class='del'>-	for the toolbar callbacks.</div><div class='del'>-	(e_msg_composer_construct): Connect the "changed" signal of the</div><div class='del'>-	attachment bar to `attachment_bar_changed()'.</div><div class='del'>-	(attachment_bar_changed): Renamed to `attachment_bar_changed_cb'.</div><div class='del'>-</div><div class='del'>-2000-03-02  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_new): Precondition:</div><div class='del'>-	gtk_main_level() greater than zero.</div><div class='del'>-	(e_msg_composer_construct): Likewise.</div><div class='del'>-	(create_menus): New function.  Set up menus through</div><div class='del'>-	BonoboUIHandler.</div><div class='del'>-	(e_msg_composer_construct): Use it.</div><div class='del'>-</div><div class='del'>-	* main.c (main): Initialize Bonobo.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (init): Initialize `uih' and `editor' to NULL.</div><div class='del'>-	Do not init `text' and `text_scrolled_window' anymore.</div><div class='del'>-	(destroy): Unref `uih'.</div><div class='del'>-	(e_msg_composer_construct): Create a new BonoboUIHandler and put</div><div class='del'>-	it into `uih'.</div><div class='del'>-	(create_editor): New helper function.</div><div class='del'>-	(e_msg_composer_construct): Use it to set up the editor.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: New member `uih' in `EMsgComposer'.  Removed</div><div class='del'>-	members `text', `text_scrolled_window'.  New member `editor'.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): Add `$(BONOBO_GNOME_CFLAGS)'.</div><div class='del'>-	(evolution_msg_composer_LDADD): Add `$(BONOBO_GNOME_LIBS)'.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.c (glade_connect): Removed.</div><div class='del'>-	(setup_signals): Removed.</div><div class='del'>-	(e_msg_composer_construct): Do not use libglade to set the toolbar</div><div class='del'>-	and menubar up.</div><div class='del'>-	(destroy): Removed libglade stuff.</div><div class='del'>-	(init): Likewise.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.h: Removed `menubar_gui', `toolbar_gui',</div><div class='del'>-	`appbar_gui'.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer.glade: Removed.</div><div class='del'>-</div><div class='del'>-2000-01-12  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (evolution_msg_composer_LDADD): </div><div class='del'>-	use $(EXTRA_GNOME_LIBS_THREADS) to link with gthread</div><div class='del'>-</div><div class='del'>-1999-11-17  Ettore Perazzoli  &lt;ettore@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: New Makefile to compile the message composer</div><div class='del'>-	executable.</div><div class='del'>-</div><div class='del'>-	* main.c: New file.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-hdrs.c (e_msg_composer_hdrs_to_message): Use</div><div class='del'>-	`CAMEL_RECIPIENT*' macros instead of the old `RECIPIENT*' ones</div><div class='del'>-	that do not exist anymore.</div><div class='del'>-</div><div class='del'>-	* e-msg-composer-address-dialog.c</div><div class='del'>-	(e_msg_composer_address_dialog_construct): Use `E_GLADEDIR'</div><div class='del'>-	instead of `E_GUIDIR'.</div><div class='del'>-	* e-msg-composer-attachment.c (e_msg_composer_attachment_edit):</div><div class='del'>-	Likewise.</div><div class='del'>-	* e-msg-composer.c (e_msg_composer_construct): Likewise.</div><div class='del'>-</div><div class='del'>-(See `$(top_srcdir)/widgets/ChangeLog' for previous changes to the</div><div class='del'>-message composer.)</div><div class='head'>diff --git a/composer/Composer.idl b/composer/Composer.idl<br/>deleted file mode 100644<br/>index a6cb35c037..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/Composer.idl?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/Composer.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-</div><div class='del'>-#include &lt;Evolution-Addressbook-SelectNames.idl&gt;</div><div class='del'>-#include &lt;Evolution-Composer.idl&gt;</div><div class='head'>diff --git a/composer/Evolution-Composer.idl b/composer/Evolution-Composer.idl<br/>deleted file mode 100644<br/>index 1e3701a594..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/Evolution-Composer.idl?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/Evolution-Composer.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-/* -*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Evolution-Composer.idl: Mail composer interfaces for Evolution</div><div class='del'>- *</div><div class='del'>- * Author:</div><div class='del'>- *   Dan Winship &lt;danw@helixcode.com&gt;</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;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module Evolution {</div><div class='del'>-	</div><div class='del'>-	interface Composer : Bonobo::Unknown {</div><div class='del'>-		struct Recipient {</div><div class='del'>-			string name;	/* UTF-8 */</div><div class='del'>-			string address;</div><div class='del'>-		};</div><div class='del'>-		typedef sequence&lt;Recipient&gt; RecipientList;</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * set_headers:</div><div class='del'>-		 * @to: the "To" recipients</div><div class='del'>-		 * @cc: the "CC" recipients</div><div class='del'>-		 * @bcc: the "Bcc" recipients</div><div class='del'>-		 * @subject: the subject of the message</div><div class='del'>-		 *</div><div class='del'>-		 * Sets the composer headers. Any of @to, @cc, and</div><div class='del'>-		 * @bcc may be an empty list, and @subject may be an</div><div class='del'>-		 * empty string.</div><div class='del'>-		 **/</div><div class='del'>-		void set_headers (in RecipientList to, in RecipientList cc,</div><div class='del'>-				  in RecipientList bcc, in string subject);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * set_body_text:</div><div class='del'>-		 * @body: the body</div><div class='del'>-		 *</div><div class='del'>-		 * Sets the text in the body of the composer to</div><div class='del'>-		 * the given UTF-8 plain text.</div><div class='del'>-		 **/</div><div class='del'>-		void set_body_text (in string body);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * attach_MIME:</div><div class='del'>-		 * @data: the attachment data</div><div class='del'>-		 *</div><div class='del'>-		 * This adds an attachment to the composer. @data</div><div class='del'>-		 * should be a fully-formed MIME body part.</div><div class='del'>-		 **/</div><div class='del'>-		exception CouldNotParse {};</div><div class='del'>-		void attach_MIME (in string data)</div><div class='del'>-			raises (CouldNotParse);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * attach_data:</div><div class='del'>-		 * @content_type: the Content-Type header</div><div class='del'>-		 * @filename: the suggested filename, or ""</div><div class='del'>-		 * @description: a description of the data, or ""</div><div class='del'>-		 * @show_inline: whether the attachment should be</div><div class='del'>-		 * displayed inline or not.</div><div class='del'>-		 * @data: the raw attachment data</div><div class='del'>-		 *</div><div class='del'>-		 * This adds @data as an attachment, using the provided</div><div class='del'>-		 * information to generate MIME headers. @content_type</div><div class='del'>-		 * may contain just a MIME content type, or it may</div><div class='del'>-		 * contain a complete Content-Type header. @filename</div><div class='del'>-		 * is a filename for the Content-Disposition header</div><div class='del'>-		 * @description (if not "") provides the</div><div class='del'>-		 * Content-Description, and @show_inline determines if the</div><div class='del'>-		 * Content-Disposition is "inline" or "attachment".</div><div class='del'>-		 *</div><div class='del'>-		 * If you need to specify headers or values other than</div><div class='del'>-		 * what this function can do, you will need to generate</div><div class='del'>-		 * all of the MIME headers yourself and use</div><div class='del'>-		 * add_attachment ().</div><div class='del'>-		 **/</div><div class='del'>-		void attach_data (in string content_type,</div><div class='del'>-				  in string filename,</div><div class='del'>-				  in string description,</div><div class='del'>-				  in boolean show_inline,</div><div class='del'>-				  in string data);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * show:</div><div class='del'>-		 *</div><div class='del'>-		 * Shows the composer and lets the user edit things</div><div class='del'>-		 * and send the message.</div><div class='del'>-		 **/</div><div class='del'>-		void show ();</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/composer/Makefile.am b/composer/Makefile.am<br/>deleted file mode 100644<br/>index 144c3f85a8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,87 +0,0 @@</div><div class='del'>-## CORBA stuff</div><div class='del'>-</div><div class='del'>-IDLS =				\</div><div class='del'>-	Evolution-Composer.idl	\</div><div class='del'>-	Composer.idl</div><div class='del'>-</div><div class='del'>-IDL_GENERATED =			\</div><div class='del'>-	Composer.h		\</div><div class='del'>-	Composer-common.c	\</div><div class='del'>-	Composer-skels.c	\</div><div class='del'>-	Composer-stubs.c</div><div class='del'>-</div><div class='del'>-HTML_EDITOR_GENERATED =		\</div><div class='del'>-	HTMLEditor.h		\</div><div class='del'>-	HTMLEditor-common.c	\</div><div class='del'>-	HTMLEditor-skels.c	\</div><div class='del'>-	HTMLEditor-stubs.c</div><div class='del'>-</div><div class='del'>-selectnamesdir = $(top_srcdir)/addressbook/gui/component/select-names</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS) $(selectnamesdir)/Evolution-Addressbook-SelectNames.idl</div><div class='del'>-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl`	\</div><div class='del'>-		-I $(selectnamesdir) -I . $(srcdir)/Composer.idl</div><div class='del'>-</div><div class='del'>-$(HTML_EDITOR_GENERATED): $(GTK_HTML_EDITOR_IDL)</div><div class='del'>-	$(ORBIT_IDL) `$(GNOME_CONFIG) --cflags idl` $(GTK_HTML_EDITOR_IDL)</div><div class='del'>-</div><div class='del'>-##</div><div class='del'>-</div><div class='del'>-gladedir = $(datadir)/evolution/glade</div><div class='del'>-</div><div class='del'>-glade_DATA =					\</div><div class='del'>-	e-msg-composer-attachment.glade</div><div class='del'>-</div><div class='del'>-glade_messages = \</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)/widgets						\</div><div class='del'>-	-I$(top_builddir)/widgets					\</div><div class='del'>-	-I$(top_srcdir)/camel					 	\</div><div class='del'>-	-I$(top_builddir)/camel					 	\</div><div class='del'>-	-I$(top_builddir)/addressbook/gui/component/select-names	\</div><div class='del'>-	-I$(top_builddir)/shell						\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)						\</div><div class='del'>-	$(GNOME_INCLUDEDIR)						\</div><div class='del'>-	$(BONOBO_GNOME_CFLAGS)						\</div><div class='del'>-	$(GTKHTML_CFLAGS)						\</div><div class='del'>-	$(UNICODE_CFLAGS)						\</div><div class='del'>-	-DEVOLUTION_DATADIR=\"$(datadir)\"				\</div><div class='del'>-	-DE_GLADEDIR=\"$(gladedir)\"					\</div><div class='del'>-	-DG_LOG_DOMAIN=\"composer\"</div><div class='del'>-</div><div class='del'>-libcomposer_la_SOURCES = 			\</div><div class='del'>-	$(IDL_GENERATED)			\</div><div class='del'>-	$(HTML_EDITOR_GENERATED)		\</div><div class='del'>-	e-msg-composer-attachment-bar.c		\</div><div class='del'>-	e-msg-composer-attachment-bar.h		\</div><div class='del'>-	e-msg-composer-attachment.c		\</div><div class='del'>-	e-msg-composer-attachment.h		\</div><div class='del'>-	e-msg-composer-hdrs.c			\</div><div class='del'>-	e-msg-composer-hdrs.h			\</div><div class='del'>-	e-msg-composer-select-file.c		\</div><div class='del'>-	e-msg-composer-select-file.h		\</div><div class='del'>-	e-msg-composer.c			\</div><div class='del'>-	e-msg-composer.h			\</div><div class='del'>-	e-icon-list.c				\</div><div class='del'>-	e-icon-list.h				\</div><div class='del'>-	evolution-composer.c			\</div><div class='del'>-	evolution-composer.h			\</div><div class='del'>-	listener.c				\</div><div class='del'>-	listener.h</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =					\</div><div class='del'>-	$(glade_DATA)				\</div><div class='del'>-	$(glade_messages)			\</div><div class='del'>-	bad-icon.xpm</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED)</div><div class='del'>-CLEANFILES   += $(BUILT_SOURCES)</div><div class='head'>diff --git a/composer/bad-icon.xpm b/composer/bad-icon.xpm<br/>deleted file mode 100644<br/>index 0a9cac23cd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/bad-icon.xpm?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/bad-icon.xpm</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,53 +0,0 @@</div><div class='del'>-/* XPM */</div><div class='del'>-static char * bad_icon_xpm[] = {</div><div class='del'>-"48 48 2 1",</div><div class='del'>-" 	g None",</div><div class='del'>-".	g #000000",</div><div class='del'>-"................................................",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".        .                              .      .",</div><div class='del'>-".         .                            .       .",</div><div class='del'>-".          .                          .        .",</div><div class='del'>-".           .                        .         .",</div><div class='del'>-".            .                      .          .",</div><div class='del'>-".             .                    .           .",</div><div class='del'>-".              .                  .            .",</div><div class='del'>-".               .                .             .",</div><div class='del'>-".                .              .              .",</div><div class='del'>-".                 .            .               .",</div><div class='del'>-".                  .          .                .",</div><div class='del'>-".                   .        .                 .",</div><div class='del'>-".                    .      .                  .",</div><div class='del'>-".                     .    .                   .",</div><div class='del'>-".                      .  .                    .",</div><div class='del'>-".                       ..                     .",</div><div class='del'>-".                       ..                     .",</div><div class='del'>-".                      .  .                    .",</div><div class='del'>-".                     .    .                   .",</div><div class='del'>-".                    .      .                  .",</div><div class='del'>-".                   .        .                 .",</div><div class='del'>-".                  .          .                .",</div><div class='del'>-".                 .            .               .",</div><div class='del'>-".                .              .              .",</div><div class='del'>-".               .                .             .",</div><div class='del'>-".              .                  .            .",</div><div class='del'>-".             .                    .           .",</div><div class='del'>-".            .                      .          .",</div><div class='del'>-".           .                        .         .",</div><div class='del'>-".          .                          .        .",</div><div class='del'>-".         .                            .       .",</div><div class='del'>-".        .                              .      .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-".                                              .",</div><div class='del'>-"................................................"};</div><div class='head'>diff --git a/composer/e-icon-list.c b/composer/e-icon-list.c<br/>deleted file mode 100644<br/>index bdff6c5abe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-icon-list.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-icon-list.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2666 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 1998, 1999, 2000 Free Software Foundation</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This file is part of the Gnome Library.</div><div class='del'>- *</div><div class='del'>- * The Gnome Library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public License as</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * The Gnome Library is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with the Gnome Library; see the file COPYING.LIB.  If not,</div><div class='del'>- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>-  @NOTATION@</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * GnomeIconList widget - scrollable icon list</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *    Federico Mena &lt;federico@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'>- * Rewrote from scratch from the code written by Federico Mena</div><div class='del'>- * &lt;federico@nuclecu.unam.mx&gt; to be based on a GnomeCanvas, and</div><div class='del'>- * to support banding selection and allow inline icon renaming.</div><div class='del'>- *</div><div class='del'>- * Redone somewhat by Elliot to support gdk-pixbuf, and to use GArray instead of GList for item storage.</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;stdio.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-#include "e-icon-list.h"</div><div class='del'>-#include &lt;libgnomeui/gnome-icon-item.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas-rect-ellipse.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "bad-icon.xpm"</div><div class='del'>-</div><div class='del'>-/* Aliases to minimize screen use in my laptop */</div><div class='del'>-#define EIL(x)       E_ICON_LIST(x)</div><div class='del'>-#define EIL_CLASS(x) E_ICON_LIST_CLASS(x)</div><div class='del'>-#define IS_EIL(x)    E_IS_ICON_LIST(x)</div><div class='del'>-</div><div class='del'>-typedef EIconList Eil;</div><div class='del'>-typedef EIconListClass EilClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* default spacings */</div><div class='del'>-#define DEFAULT_ROW_SPACING  4</div><div class='del'>-#define DEFAULT_COL_SPACING  2</div><div class='del'>-#define DEFAULT_TEXT_SPACING 2</div><div class='del'>-#define DEFAULT_ICON_BORDER  2</div><div class='del'>-</div><div class='del'>-/* Autoscroll timeout in milliseconds */</div><div class='del'>-#define SCROLL_TIMEOUT 30</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signals */</div><div class='del'>-enum {</div><div class='del'>-	SELECT_ICON,</div><div class='del'>-	UNSELECT_ICON,</div><div class='del'>-	TEXT_CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	SYNC_INSERT,</div><div class='del'>-	SYNC_REMOVE</div><div class='del'>-} SyncType;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint eil_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GnomeCanvasClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Icon structure */</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Icon image and text items */</div><div class='del'>-	GnomeCanvasPixbuf *image;</div><div class='del'>-	GnomeIconTextItem *text;</div><div class='del'>-</div><div class='del'>-	/* Filename of the icon file. */</div><div class='del'>-	gchar *icon_filename;</div><div class='del'>-</div><div class='del'>-	/* User data and destroy notify function */</div><div class='del'>-	gpointer data;</div><div class='del'>-	GtkDestroyNotify destroy;</div><div class='del'>-</div><div class='del'>-	/* ID for the text item's event signal handler */</div><div class='del'>-	guint text_event_id;</div><div class='del'>-</div><div class='del'>-	/* Whether the icon is selected, and temporary storage for rubberband</div><div class='del'>-         * selections.</div><div class='del'>-	 */</div><div class='del'>-	guint selected : 1;</div><div class='del'>-	guint tmp_selected : 1;</div><div class='del'>-} Icon;</div><div class='del'>-</div><div class='del'>-/* A row of icons */</div><div class='del'>-typedef struct {</div><div class='del'>-	GList *line_icons;</div><div class='del'>-	gint16 y;</div><div class='del'>-	gint16 icon_height, text_height;</div><div class='del'>-} IconLine;</div><div class='del'>-</div><div class='del'>-/* Private data of the EIconList structure */</div><div class='del'>-struct _EIconListPrivate {</div><div class='del'>-	/* List of icons */</div><div class='del'>-	GArray *icon_list;</div><div class='del'>-</div><div class='del'>-	/* List of rows of icons */</div><div class='del'>-	GList *lines;</div><div class='del'>-</div><div class='del'>-	/* Separators used to wrap the text below icons */</div><div class='del'>-	char *separators;</div><div class='del'>-</div><div class='del'>-	Icon *last_selected_icon;</div><div class='del'>-</div><div class='del'>-	/* Rubberband rectangle */</div><div class='del'>-	GnomeCanvasItem *sel_rect;</div><div class='del'>-</div><div class='del'>-	/* Saved event for a pending selection */</div><div class='del'>-	GdkEvent select_pending_event;</div><div class='del'>-</div><div class='del'>-	/* Max of the height of all the icon rows and window height */</div><div class='del'>-	int total_height;</div><div class='del'>-</div><div class='del'>-	/* Selection mode */</div><div class='del'>-	GtkSelectionMode selection_mode;</div><div class='del'>-</div><div class='del'>-	/* A list of integers with the indices of the currently selected icons */</div><div class='del'>-	GList *selection;</div><div class='del'>-</div><div class='del'>-	/* Number of icons in the list */</div><div class='del'>-	int icons;</div><div class='del'>-</div><div class='del'>-	/* Freeze count */</div><div class='del'>-	int frozen;</div><div class='del'>-</div><div class='del'>-	/* Width allocated for icons */</div><div class='del'>-	int icon_width;</div><div class='del'>-</div><div class='del'>-	/* Spacing values */</div><div class='del'>-	int row_spacing;</div><div class='del'>-	int col_spacing;</div><div class='del'>-	int text_spacing;</div><div class='del'>-	int icon_border;</div><div class='del'>-</div><div class='del'>-	/* Index and pointer to last selected icon */</div><div class='del'>-	int last_selected_idx;</div><div class='del'>-</div><div class='del'>-	/* Timeout ID for autoscrolling */</div><div class='del'>-	guint timer_tag;</div><div class='del'>-</div><div class='del'>-	/* Change the adjustment value by this amount when autoscrolling */</div><div class='del'>-	int value_diff;</div><div class='del'>-</div><div class='del'>-	/* Mouse position for autoscrolling */</div><div class='del'>-	int event_last_x;</div><div class='del'>-	int event_last_y;</div><div class='del'>-</div><div class='del'>-	/* Selection start position */</div><div class='del'>-	int sel_start_x;</div><div class='del'>-	int sel_start_y;</div><div class='del'>-</div><div class='del'>-	/* Modifier state when the selection began */</div><div class='del'>-	guint sel_state;</div><div class='del'>-</div><div class='del'>-	/* Whether the icon texts are editable */</div><div class='del'>-	guint is_editable : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the icon texts need to be copied */</div><div class='del'>-	guint static_text : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the icons need to be laid out */</div><div class='del'>-	guint dirty : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the user is performing a rubberband selection */</div><div class='del'>-	guint selecting : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether editing an icon is pending after a button press */</div><div class='del'>-	guint edit_pending : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether selection is pending after a button press */</div><div class='del'>-	guint select_pending : 1;</div><div class='del'>-</div><div class='del'>-	/* Whether the icon that is pending selection was selected to begin with */</div><div class='del'>-	guint select_pending_was_selected : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static inline int</div><div class='del'>-icon_line_height (Eil *eil, IconLine *il)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	return il-&gt;icon_height + il-&gt;text_height + priv-&gt;row_spacing + priv-&gt;text_spacing;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-icon_get_height (Icon *icon, int *icon_height, int *text_height)</div><div class='del'>-{</div><div class='del'>-	double d_icon_height;</div><div class='del'>-	gtk_object_get(GTK_OBJECT(icon-&gt;image), "height", &amp;d_icon_height, NULL);</div><div class='del'>-	*icon_height = d_icon_height;</div><div class='del'>-	*text_height = icon-&gt;text-&gt;ti-&gt;height;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-eil_get_items_per_line (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int items_per_line;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	items_per_line = GTK_WIDGET (eil)-&gt;allocation.width / (priv-&gt;icon_width + priv-&gt;col_spacing);</div><div class='del'>-	if (items_per_line == 0)</div><div class='del'>-		items_per_line = 1;</div><div class='del'>-</div><div class='del'>-	return items_per_line;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_items_per_line:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- *</div><div class='del'>- * Returns the number of icons that fit in a line or row.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_get_items_per_line (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (eil != NULL, 1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), 1);</div><div class='del'>-</div><div class='del'>-	return eil_get_items_per_line (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_place_icon (Eil *eil, Icon *icon, int x, int y, int icon_height)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int x_offset, y_offset;</div><div class='del'>-	double d_icon_image_height;</div><div class='del'>-	double d_icon_image_width;</div><div class='del'>-	int icon_image_height;</div><div class='del'>-	int icon_image_width;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(icon-&gt;image), "height", &amp;d_icon_image_height, NULL);</div><div class='del'>-	icon_image_height = d_icon_image_height;</div><div class='del'>-	g_assert(icon_image_height != 0);</div><div class='del'>-	if (icon_height &gt; icon_image_height)</div><div class='del'>-		y_offset = (icon_height - icon_image_height) / 2;</div><div class='del'>-	else</div><div class='del'>-		y_offset = 0;</div><div class='del'>-</div><div class='del'>-	gtk_object_get(GTK_OBJECT(icon-&gt;image), "width", &amp;d_icon_image_width, NULL);</div><div class='del'>-	icon_image_width = d_icon_image_width;</div><div class='del'>-	g_assert(icon_image_width != 0);</div><div class='del'>-	if (priv-&gt;icon_width &gt; icon_image_width)</div><div class='del'>-		x_offset = (priv-&gt;icon_width - icon_image_width) / 2;</div><div class='del'>-	else</div><div class='del'>-		x_offset = 0;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon-&gt;image),</div><div class='del'>-			       "x",  (double) (x + x_offset),</div><div class='del'>-			       "y",  (double) (y + y_offset),</div><div class='del'>-			       NULL);</div><div class='del'>-	gnome_icon_text_item_setxy (icon-&gt;text,</div><div class='del'>-				    x,</div><div class='del'>-				    y + icon_height + priv-&gt;text_spacing);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_layout_line (Eil *eil, IconLine *il)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-	int x;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	x = 0;</div><div class='del'>-	for (l = il-&gt;line_icons; l; l = l-&gt;next) {</div><div class='del'>-		Icon *icon = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		eil_place_icon (eil, icon, x, il-&gt;y, il-&gt;icon_height);</div><div class='del'>-		x += priv-&gt;icon_width + priv-&gt;col_spacing;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_add_and_layout_line (Eil *eil, GList *line_icons, int y,</div><div class='del'>-			 int icon_height, int text_height)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	IconLine *il;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	il = g_new (IconLine, 1);</div><div class='del'>-	il-&gt;line_icons = line_icons;</div><div class='del'>-	il-&gt;y = y;</div><div class='del'>-	il-&gt;icon_height = icon_height;</div><div class='del'>-	il-&gt;text_height = text_height;</div><div class='del'>-</div><div class='del'>-	eil_layout_line (eil, il);</div><div class='del'>-	priv-&gt;lines = g_list_append (priv-&gt;lines, il);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_relayout_icons_at (Eil *eil, int pos, int y)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int col, row, text_height, icon_height;</div><div class='del'>-	int items_per_line, n;</div><div class='del'>-	GList *line_icons;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	items_per_line = eil_get_items_per_line (eil);</div><div class='del'>-</div><div class='del'>-	col = row = text_height = icon_height = 0;</div><div class='del'>-	line_icons = NULL;</div><div class='del'>-</div><div class='del'>-	for (n = pos; n &lt; priv-&gt;icon_list-&gt;len; n++) {</div><div class='del'>-		Icon *icon = g_array_index(priv-&gt;icon_list, Icon*, n);</div><div class='del'>-		int ih, th;</div><div class='del'>-</div><div class='del'>-		if (!(n % items_per_line)) {</div><div class='del'>-			if (line_icons) {</div><div class='del'>-				eil_add_and_layout_line (eil, line_icons, y,</div><div class='del'>-							 icon_height, text_height);</div><div class='del'>-				line_icons = NULL;</div><div class='del'>-</div><div class='del'>-				y += (icon_height + text_height</div><div class='del'>-				      + priv-&gt;row_spacing + priv-&gt;text_spacing);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			icon_height = 0;</div><div class='del'>-			text_height = 0;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		icon_get_height (icon, &amp;ih, &amp;th);</div><div class='del'>-</div><div class='del'>-		icon_height = MAX (ih, icon_height);</div><div class='del'>-		text_height = MAX (th, text_height);</div><div class='del'>-</div><div class='del'>-		line_icons = g_list_append (line_icons, icon);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (line_icons)</div><div class='del'>-		eil_add_and_layout_line (eil, line_icons, y, icon_height, text_height);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_free_line_info (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (l = priv-&gt;lines; l; l = l-&gt;next) {</div><div class='del'>-		IconLine *il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_list_free (il-&gt;line_icons);</div><div class='del'>-		g_free (il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (priv-&gt;lines);</div><div class='del'>-	priv-&gt;lines = NULL;</div><div class='del'>-	priv-&gt;total_height = 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_free_line_info_from (Eil *eil, int first_line)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GList *l, *ll;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	ll = g_list_nth (priv-&gt;lines, first_line);</div><div class='del'>-</div><div class='del'>-	for (l = ll; l; l = l-&gt;next) {</div><div class='del'>-		IconLine *il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		g_list_free (il-&gt;line_icons);</div><div class='del'>-		g_free (il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;lines) {</div><div class='del'>-		if (ll-&gt;prev)</div><div class='del'>-			ll-&gt;prev-&gt;next = NULL;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;lines = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_list_free (ll);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_layout_from_line (Eil *eil, int line)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GList *l;</div><div class='del'>-	int height;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	eil_free_line_info_from (eil, line);</div><div class='del'>-</div><div class='del'>-	height = 0;</div><div class='del'>-	for (l = priv-&gt;lines; l; l = l-&gt;next) {</div><div class='del'>-		IconLine *il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		height += icon_line_height (eil, il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eil_relayout_icons_at (eil, line * eil_get_items_per_line (eil), height);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_layout_all_icons (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_REALIZED (eil))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	eil_free_line_info (eil);</div><div class='del'>-	eil_relayout_icons_at (eil, 0, 0);</div><div class='del'>-	priv-&gt;dirty = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_scrollbar_adjust (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	GList *l;</div><div class='del'>-	double wx, wy, wx1, wy1, wx2, wy2;</div><div class='del'>-	int height, step_increment;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_REALIZED (eil))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	height = 0;</div><div class='del'>-	step_increment = 0;</div><div class='del'>-	for (l = priv-&gt;lines; l; l = l-&gt;next) {</div><div class='del'>-		IconLine *il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		height += icon_line_height (eil, il);</div><div class='del'>-</div><div class='del'>-		if (l == priv-&gt;lines)</div><div class='del'>-			step_increment = height;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!step_increment)</div><div class='del'>-		step_increment = 10;</div><div class='del'>-</div><div class='del'>-	priv-&gt;total_height = MAX (height, GTK_WIDGET (eil)-&gt;allocation.height);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_c2w (GNOME_CANVAS (eil), 0, 0, &amp;wx1, &amp;wy1);</div><div class='del'>-	gnome_canvas_c2w (GNOME_CANVAS (eil),</div><div class='del'>-			  GTK_WIDGET (eil)-&gt;allocation.width,</div><div class='del'>-			  priv-&gt;total_height,</div><div class='del'>-			  &amp;wx2, &amp;wy2);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (eil),</div><div class='del'>-					wx1, wy1, wx2, wy2);</div><div class='del'>-</div><div class='del'>-	wx = wy = 0;</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), 0, 0, &amp;wx, &amp;wy);</div><div class='del'>-</div><div class='del'>-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));</div><div class='del'>-</div><div class='del'>-	adj-&gt;upper = priv-&gt;total_height;</div><div class='del'>-	adj-&gt;step_increment = step_increment;</div><div class='del'>-	adj-&gt;page_increment = GTK_WIDGET (eil)-&gt;allocation.height;</div><div class='del'>-	adj-&gt;page_size = GTK_WIDGET (eil)-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-	if (wy &gt; adj-&gt;upper - adj-&gt;page_size)</div><div class='del'>-		wy = adj-&gt;upper - adj-&gt;page_size;</div><div class='del'>-</div><div class='del'>-	adj-&gt;value = wy;</div><div class='del'>-</div><div class='del'>-	gtk_adjustment_changed (adj);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Emits the select_icon or unselect_icon signals as appropriate */</div><div class='del'>-static void</div><div class='del'>-emit_select (Eil *eil, int sel, int i, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (eil),</div><div class='del'>-			 eil_signals[sel ? SELECT_ICON : UNSELECT_ICON],</div><div class='del'>-			 i,</div><div class='del'>-			 event);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-eil_unselect_all (EIconList *eil, GdkEvent *event, gpointer keep)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	Icon *icon;</div><div class='del'>-	int i, idx = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), 0);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, i);</div><div class='del'>-</div><div class='del'>-		if (icon == keep)</div><div class='del'>-			idx = i;</div><div class='del'>-		else if (icon-&gt;selected)</div><div class='del'>-			emit_select (eil, FALSE, i, event);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_unselect_all:</div><div class='del'>- * @eil:   An icon list.</div><div class='del'>- *</div><div class='del'>- * Returns: the number of icons in the icon list</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_unselect_all (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	return eil_unselect_all (eil, NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-sync_selection (Eil *eil, int pos, SyncType type)</div><div class='del'>-{</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	for (list = eil-&gt;_priv-&gt;selection; list; list = list-&gt;next) {</div><div class='del'>-		if (GPOINTER_TO_INT (list-&gt;data) &gt;= pos) {</div><div class='del'>-			int i = GPOINTER_TO_INT (list-&gt;data);</div><div class='del'>-</div><div class='del'>-			switch (type) {</div><div class='del'>-			case SYNC_INSERT:</div><div class='del'>-				list-&gt;data = GINT_TO_POINTER (i + 1);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case SYNC_REMOVE:</div><div class='del'>-				list-&gt;data = GINT_TO_POINTER (i - 1);</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				g_assert_not_reached ();</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-eil_icon_to_index (Eil *eil, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; priv-&gt;icon_list-&gt;len; n++)</div><div class='del'>-		if (g_array_index(priv-&gt;icon_list, Icon*, n) == icon)</div><div class='del'>-			return n;</div><div class='del'>-</div><div class='del'>-	g_assert_not_reached ();</div><div class='del'>-	return -1; /* Shut up the compiler */</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for icons when we are in SINGLE or BROWSE mode */</div><div class='del'>-static gint</div><div class='del'>-selection_one_icon_event (Eil *eil, Icon *icon, int idx, int on_text, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GnomeIconTextItem *text;</div><div class='del'>-	int retval;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	/* We use a separate variable and ref the object because it may be</div><div class='del'>-	 * destroyed by one of the signal handlers.</div><div class='del'>-	 */</div><div class='del'>-	text = icon-&gt;text;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (text));</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		priv-&gt;edit_pending = FALSE;</div><div class='del'>-		priv-&gt;select_pending = FALSE;</div><div class='del'>-</div><div class='del'>-		/* Ignore wheel mouse clicks for now */</div><div class='del'>-		if (event-&gt;button.button &gt; 3)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		if (!icon-&gt;selected) {</div><div class='del'>-			eil_unselect_all (eil, NULL, NULL);</div><div class='del'>-			emit_select (eil, TRUE, idx, event);</div><div class='del'>-		} else {</div><div class='del'>-			if (priv-&gt;selection_mode == GTK_SELECTION_SINGLE</div><div class='del'>-			    &amp;&amp; (event-&gt;button.state &amp; GDK_CONTROL_MASK))</div><div class='del'>-				emit_select (eil, FALSE, idx, event);</div><div class='del'>-			else if (on_text &amp;&amp; priv-&gt;is_editable &amp;&amp; event-&gt;button.button == 1)</div><div class='del'>-				priv-&gt;edit_pending = TRUE;</div><div class='del'>-			else</div><div class='del'>-				emit_select (eil, TRUE, idx, event);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-	case GDK_3BUTTON_PRESS:</div><div class='del'>-		/* Ignore wheel mouse clicks for now */</div><div class='del'>-		if (event-&gt;button.button &gt; 3)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		emit_select (eil, TRUE, idx, event);</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (priv-&gt;edit_pending) {</div><div class='del'>-			gnome_icon_text_item_start_editing (text);</div><div class='del'>-			priv-&gt;edit_pending = FALSE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the click was on the text and we actually did something, stop the</div><div class='del'>-	 * icon text item's own handler from executing.</div><div class='del'>-	 */</div><div class='del'>-	if (on_text &amp;&amp; retval)</div><div class='del'>-		gtk_signal_emit_stop_by_name (GTK_OBJECT (text), "event");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (text));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handles range selections when clicking on an icon */</div><div class='del'>-static void</div><div class='del'>-select_range (Eil *eil, Icon *icon, int idx, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int a, b;</div><div class='del'>-	Icon *i;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;last_selected_idx == -1) {</div><div class='del'>-		priv-&gt;last_selected_idx = idx;</div><div class='del'>-		priv-&gt;last_selected_icon = icon;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (idx &lt; priv-&gt;last_selected_idx) {</div><div class='del'>-		a = idx;</div><div class='del'>-		b = priv-&gt;last_selected_idx;</div><div class='del'>-	} else {</div><div class='del'>-		a = priv-&gt;last_selected_idx;</div><div class='del'>-		b = idx;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (; a &lt;= b; a++) {</div><div class='del'>-		i = g_array_index(priv-&gt;icon_list, Icon*, a);</div><div class='del'>-</div><div class='del'>-		if (!i-&gt;selected)</div><div class='del'>-			emit_select (eil, TRUE, a, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Actually notify the client of the event */</div><div class='del'>-	emit_select (eil, TRUE, idx, event);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handles icon selection for MULTIPLE or EXTENDED selection modes */</div><div class='del'>-static void</div><div class='del'>-do_select_many (Eil *eil, Icon *icon, int idx, GdkEvent *event, int use_event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int range, additive;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	range = (event-&gt;button.state &amp; GDK_SHIFT_MASK) != 0;</div><div class='del'>-	additive = (event-&gt;button.state &amp; GDK_CONTROL_MASK) != 0;</div><div class='del'>-</div><div class='del'>-	if (!additive) {</div><div class='del'>-		if (icon-&gt;selected)</div><div class='del'>-			eil_unselect_all (eil, NULL, icon);</div><div class='del'>-		else</div><div class='del'>-			eil_unselect_all (eil, NULL, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!range) {</div><div class='del'>-		if (additive)</div><div class='del'>-			emit_select (eil, !icon-&gt;selected, idx, use_event ? event : NULL);</div><div class='del'>-		else</div><div class='del'>-			emit_select (eil, TRUE, idx, use_event ? event : NULL);</div><div class='del'>-</div><div class='del'>-		priv-&gt;last_selected_idx = idx;</div><div class='del'>-		priv-&gt;last_selected_icon = icon;</div><div class='del'>-	} else</div><div class='del'>-		select_range (eil, icon, idx, use_event ? event : NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for icons when we are in MULTIPLE or EXTENDED mode */</div><div class='del'>-static gint</div><div class='del'>-selection_many_icon_event (Eil *eil, Icon *icon, int idx, int on_text, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GnomeIconTextItem *text;</div><div class='del'>-	int retval;</div><div class='del'>-	int additive, range;</div><div class='del'>-	int do_select;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	retval = FALSE;</div><div class='del'>-</div><div class='del'>-	/* We use a separate variable and ref the object because it may be</div><div class='del'>-	 * destroyed by one of the signal handlers.</div><div class='del'>-	 */</div><div class='del'>-	text = icon-&gt;text;</div><div class='del'>-	gtk_object_ref (GTK_OBJECT (text));</div><div class='del'>-</div><div class='del'>-	range = (event-&gt;button.state &amp; GDK_SHIFT_MASK) != 0;</div><div class='del'>-	additive = (event-&gt;button.state &amp; GDK_CONTROL_MASK) != 0;</div><div class='del'>-</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		priv-&gt;edit_pending = FALSE;</div><div class='del'>-		priv-&gt;select_pending = FALSE;</div><div class='del'>-</div><div class='del'>-		/* Ignore wheel mouse clicks for now */</div><div class='del'>-		if (event-&gt;button.button &gt; 3)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		do_select = TRUE;</div><div class='del'>-</div><div class='del'>-		if (additive || range) {</div><div class='del'>-			if (additive &amp;&amp; !range) {</div><div class='del'>-				priv-&gt;select_pending = TRUE;</div><div class='del'>-				priv-&gt;select_pending_event = *event;</div><div class='del'>-				priv-&gt;select_pending_was_selected = icon-&gt;selected;</div><div class='del'>-</div><div class='del'>-				/* We have to emit this so that the client will</div><div class='del'>-				 * know about the click.</div><div class='del'>-				 */</div><div class='del'>-				emit_select (eil, TRUE, idx, event);</div><div class='del'>-				do_select = FALSE;</div><div class='del'>-			}</div><div class='del'>-		} else if (icon-&gt;selected) {</div><div class='del'>-			priv-&gt;select_pending = TRUE;</div><div class='del'>-			priv-&gt;select_pending_event = *event;</div><div class='del'>-			priv-&gt;select_pending_was_selected = icon-&gt;selected;</div><div class='del'>-</div><div class='del'>-			if (on_text &amp;&amp; priv-&gt;is_editable &amp;&amp; event-&gt;button.button == 1)</div><div class='del'>-				priv-&gt;edit_pending = TRUE;</div><div class='del'>-</div><div class='del'>-			emit_select (eil, TRUE, idx, event);</div><div class='del'>-			do_select = FALSE;</div><div class='del'>-		}</div><div class='del'>-#if 0</div><div class='del'>-		} else if (icon-&gt;selected &amp;&amp; on_text &amp;&amp; priv-&gt;is_editable</div><div class='del'>-			   &amp;&amp; event-&gt;button.button == 1) {</div><div class='del'>-			priv-&gt;edit_pending = TRUE;</div><div class='del'>-			do_select = FALSE;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		if (do_select)</div><div class='del'>-			do_select_many (eil, icon, idx, event, TRUE);</div><div class='del'>-</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-	case GDK_3BUTTON_PRESS:</div><div class='del'>-		/* Ignore wheel mouse clicks for now */</div><div class='del'>-		if (event-&gt;button.button &gt; 3)</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		emit_select (eil, TRUE, idx, event);</div><div class='del'>-		retval = TRUE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (priv-&gt;select_pending) {</div><div class='del'>-			icon-&gt;selected = priv-&gt;select_pending_was_selected;</div><div class='del'>-			do_select_many (eil, icon, idx, &amp;priv-&gt;select_pending_event, FALSE);</div><div class='del'>-			priv-&gt;select_pending = FALSE;</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (priv-&gt;edit_pending) {</div><div class='del'>-			gnome_icon_text_item_start_editing (text);</div><div class='del'>-			priv-&gt;edit_pending = FALSE;</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		}</div><div class='del'>-#if 0</div><div class='del'>-		if (priv-&gt;select_pending) {</div><div class='del'>-			icon-&gt;selected = priv-&gt;select_pending_was_selected;</div><div class='del'>-			do_select_many (eil, icon, idx, &amp;priv-&gt;select_pending_event);</div><div class='del'>-			priv-&gt;select_pending = FALSE;</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		} else if (priv-&gt;edit_pending) {</div><div class='del'>-			gnome_icon_text_item_start_editing (text);</div><div class='del'>-			priv-&gt;edit_pending = FALSE;</div><div class='del'>-			retval = TRUE;</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* If the click was on the text and we actually did something, stop the</div><div class='del'>-	 * icon text item's own handler from executing.</div><div class='del'>-	 */</div><div class='del'>-	if (on_text &amp;&amp; retval)</div><div class='del'>-		gtk_signal_emit_stop_by_name (GTK_OBJECT (text), "event");</div><div class='del'>-</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (text));</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Event handler for icons in the icon list */</div><div class='del'>-static gint</div><div class='del'>-icon_event (GnomeCanvasItem *item, GdkEvent *event, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int idx;</div><div class='del'>-	int on_text;</div><div class='del'>-</div><div class='del'>-	icon = data;</div><div class='del'>-	eil = EIL (item-&gt;canvas);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	idx = eil_icon_to_index (eil, icon);</div><div class='del'>-	on_text = item == GNOME_CANVAS_ITEM (icon-&gt;text);</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_SINGLE:</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-		return selection_one_icon_event (eil, icon, idx, on_text, event);</div><div class='del'>-</div><div class='del'>-	case GTK_SELECTION_MULTIPLE:</div><div class='del'>-	case GTK_SELECTION_EXTENDED:</div><div class='del'>-		return selection_many_icon_event (eil, icon, idx, on_text, event);</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		return FALSE; /* Shut up the compiler */</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handler for the editing_started signal of an icon text item.  We block the</div><div class='del'>- * event handler so that it will not be called while the text is being edited.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-editing_started (GnomeIconTextItem *iti, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	icon = data;</div><div class='del'>-	gtk_signal_handler_block (GTK_OBJECT (iti), icon-&gt;text_event_id);</div><div class='del'>-	eil_unselect_all (EIL (GNOME_CANVAS_ITEM (iti)-&gt;canvas), NULL, icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Handler for the editing_stopped signal of an icon text item.  We unblock the</div><div class='del'>- * event handler so that we can get events from it again.</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-editing_stopped (GnomeIconTextItem *iti, gpointer data)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	icon = data;</div><div class='del'>-	gtk_signal_handler_unblock (GTK_OBJECT (iti), icon-&gt;text_event_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-text_changed (GnomeCanvasItem *item, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	gboolean accept;</div><div class='del'>-	int idx;</div><div class='del'>-</div><div class='del'>-	eil = EIL (item-&gt;canvas);</div><div class='del'>-	accept = TRUE;</div><div class='del'>-</div><div class='del'>-	idx = eil_icon_to_index (eil, icon);</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (eil),</div><div class='del'>-			 eil_signals[TEXT_CHANGED],</div><div class='del'>-			 idx, gnome_icon_text_item_get_text (icon-&gt;text),</div><div class='del'>-			 &amp;accept);</div><div class='del'>-</div><div class='del'>-	return accept;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-height_changed (GnomeCanvasItem *item, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-</div><div class='del'>-	eil = EIL (item-&gt;canvas);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!GTK_WIDGET_REALIZED (eil))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen) {</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	n = eil_icon_to_index (eil, icon);</div><div class='del'>-	eil_layout_from_line (eil, n / eil_get_items_per_line (eil));</div><div class='del'>-	eil_scrollbar_adjust (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Icon *</div><div class='del'>-icon_new_from_pixbuf (EIconList *eil, GdkPixbuf *im,</div><div class='del'>-		      const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GnomeCanvas *canvas;</div><div class='del'>-	GnomeCanvasGroup *group;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	canvas = GNOME_CANVAS (eil);</div><div class='del'>-	group = GNOME_CANVAS_GROUP (canvas-&gt;root);</div><div class='del'>-</div><div class='del'>-	icon = g_new0 (Icon, 1);</div><div class='del'>-</div><div class='del'>-	if (icon_filename)</div><div class='del'>-		icon-&gt;icon_filename = g_strdup (icon_filename);</div><div class='del'>-	else</div><div class='del'>-		icon-&gt;icon_filename = NULL;</div><div class='del'>-</div><div class='del'>-	if (im == NULL)</div><div class='del'>-		im = gdk_pixbuf_new_from_xpm_data ((const char**) bad_icon_xpm); </div><div class='del'>-	else</div><div class='del'>-		gdk_pixbuf_ref (im);</div><div class='del'>-</div><div class='del'>-	icon-&gt;image = GNOME_CANVAS_PIXBUF (gnome_canvas_item_new (</div><div class='del'>-		group,</div><div class='del'>-		gnome_canvas_pixbuf_get_type (),</div><div class='del'>-		"x", 0.0,</div><div class='del'>-		"y", 0.0,</div><div class='del'>-		"width", (double) gdk_pixbuf_get_width (im),</div><div class='del'>-		"height", (double) gdk_pixbuf_get_height (im),</div><div class='del'>-		"pixbuf", im,</div><div class='del'>-		NULL));</div><div class='del'>-	gdk_pixbuf_unref (im);</div><div class='del'>-</div><div class='del'>-	icon-&gt;text = GNOME_ICON_TEXT_ITEM (gnome_canvas_item_new (</div><div class='del'>-		group,</div><div class='del'>-		gnome_icon_text_item_get_type (),</div><div class='del'>-		NULL));</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (GNOME_CANVAS_ITEM (icon-&gt;text),</div><div class='del'>-			       "use_broken_event_handling", FALSE,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	gnome_icon_text_item_configure (icon-&gt;text,</div><div class='del'>-					0, 0, priv-&gt;icon_width, </div><div class='del'>-					"-adobe-helvetica-medium-r-normal-*-*-120-*-*-p-*-iso8859-1",</div><div class='del'>-					text, priv-&gt;is_editable, priv-&gt;static_text);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;image), "event",</div><div class='del'>-			    GTK_SIGNAL_FUNC (icon_event),</div><div class='del'>-			    icon);</div><div class='del'>-	icon-&gt;text_event_id = gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "event",</div><div class='del'>-						  GTK_SIGNAL_FUNC (icon_event),</div><div class='del'>-						  icon);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "editing_started",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editing_started),</div><div class='del'>-			    icon);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "editing_stopped",</div><div class='del'>-			    GTK_SIGNAL_FUNC (editing_stopped),</div><div class='del'>-			    icon);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "text_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (text_changed),</div><div class='del'>-			    icon);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (icon-&gt;text), "height_changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (height_changed),</div><div class='del'>-			    icon);</div><div class='del'>-</div><div class='del'>-	return icon;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static Icon *</div><div class='del'>-icon_new (Eil *eil, const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	GdkPixbuf *im;</div><div class='del'>-	Icon *retval;</div><div class='del'>-</div><div class='del'>-	if (icon_filename) {</div><div class='del'>-		im = gdk_pixbuf_new_from_file (icon_filename);</div><div class='del'>-</div><div class='del'>-		/* Bad icon image </div><div class='del'>-		   Fixme. Need a better graphic. */</div><div class='del'>-		if (im == NULL)</div><div class='del'>-			im = gdk_pixbuf_new_from_xpm_data ((const char**) bad_icon_xpm); </div><div class='del'>-	} else</div><div class='del'>-		im = NULL;</div><div class='del'>-</div><div class='del'>-	retval = icon_new_from_pixbuf (eil, im, icon_filename, text);</div><div class='del'>-</div><div class='del'>-	if(im)</div><div class='del'>-		gdk_pixbuf_unref(im);</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-icon_list_append (Eil *eil, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int pos;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	pos = priv-&gt;icons++;</div><div class='del'>-	g_array_append_val(priv-&gt;icon_list, icon);</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-		e_icon_list_select_icon (eil, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		/* FIXME: this should only layout the last line */</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;icons - 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-icon_list_insert (Eil *eil, int pos, Icon *icon)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (pos == priv-&gt;icons) {</div><div class='del'>-		icon_list_append (eil, icon);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_insert_val(priv-&gt;icon_list, pos, icon);</div><div class='del'>-	priv-&gt;icons++;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-		e_icon_list_select_icon (eil, 0);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		/* FIXME: this should only layout the lines from then one</div><div class='del'>-		 * containing the Icon to the end.</div><div class='del'>-		 */</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	sync_selection (eil, pos, SYNC_INSERT);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_insert_pixbuf:</div><div class='del'>- * @eil:      An icon list.</div><div class='del'>- * @pos:      Position at which the new icon should be inserted.</div><div class='del'>- * @im:       Pixbuf image with the icon image.</div><div class='del'>- * @filename: Filename of the image file.</div><div class='del'>- * @text:     Text to be used for the icon's caption.</div><div class='del'>- *</div><div class='del'>- * Inserts an icon in the specified icon list.  The icon is created from the</div><div class='del'>- * specified Imlib image, and it is inserted at the @pos index.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_insert_pixbuf (EIconList *eil, int pos, GdkPixbuf *im,</div><div class='del'>-			       const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	icon = icon_new_from_pixbuf (eil, im, icon_filename, text);</div><div class='del'>-	icon_list_insert (eil, pos, icon);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_insert:</div><div class='del'>- * @eil:           An icon list.</div><div class='del'>- * @pos:           Position at which the new icon should be inserted.</div><div class='del'>- * @icon_filename: Name of the file that holds the icon's image.</div><div class='del'>- * @text:          Text to be used for the icon's caption.</div><div class='del'>- *</div><div class='del'>- * Inserts an icon in the specified icon list.  The icon's image is loaded</div><div class='del'>- * from the specified file, and it is inserted at the @pos index.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_insert (EIconList *eil, int pos, const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	icon = icon_new (eil, icon_filename, text);</div><div class='del'>-	icon_list_insert (eil, pos, icon);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_append_pixbuf:</div><div class='del'>- * @eil:      An icon list.</div><div class='del'>- * @im:       Pixbuf image with the icon image.</div><div class='del'>- * @filename: Filename of the image file.</div><div class='del'>- * @text:     Text to be used for the icon's caption.</div><div class='del'>- *</div><div class='del'>- * Appends an icon to the specified icon list.  The icon is created from</div><div class='del'>- * the specified Imlib image.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_append_pixbuf (EIconList *eil, GdkPixbuf *im,</div><div class='del'>-			       const char *icon_filename, const char *text)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-</div><div class='del'>-	icon = icon_new_from_pixbuf (eil, im, icon_filename, text);</div><div class='del'>-	return icon_list_append (eil, icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_append:</div><div class='del'>- * @eil:           An icon list.</div><div class='del'>- * @icon_filename: Name of the file that holds the icon's image.</div><div class='del'>- * @text:          Text to be used for the icon's caption.</div><div class='del'>- *</div><div class='del'>- * Appends an icon to the specified icon list.  The icon's image is loaded from</div><div class='del'>- * the specified file, and it is inserted at the @pos index.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_append (EIconList *eil, const char *icon_filename,</div><div class='del'>-			const char *text)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-</div><div class='del'>-	icon = icon_new (eil, icon_filename, text);</div><div class='del'>-	return icon_list_append (eil, icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-icon_destroy (Icon *icon)</div><div class='del'>-{</div><div class='del'>-	if (icon-&gt;destroy)</div><div class='del'>-		(* icon-&gt;destroy) (icon-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_free (icon-&gt;icon_filename);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (icon-&gt;image));</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (icon-&gt;text));</div><div class='del'>-	g_free (icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_remove:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of the icon that should be removed.</div><div class='del'>- *</div><div class='del'>- * Removes the icon at index position @pos.  If a destroy handler was specified</div><div class='del'>- * for that icon, it will be called with the appropriate data.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_remove (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int was_selected;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	was_selected = FALSE;</div><div class='del'>-</div><div class='del'>-	icon = g_array_index(priv-&gt;icon_list, Icon*, pos);</div><div class='del'>-</div><div class='del'>-	if (icon-&gt;selected) {</div><div class='del'>-		was_selected = TRUE;</div><div class='del'>-</div><div class='del'>-		switch (priv-&gt;selection_mode) {</div><div class='del'>-		case GTK_SELECTION_SINGLE:</div><div class='del'>-		case GTK_SELECTION_BROWSE:</div><div class='del'>-		case GTK_SELECTION_MULTIPLE:</div><div class='del'>-		case GTK_SELECTION_EXTENDED:</div><div class='del'>-			e_icon_list_unselect_icon (eil, pos);</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_array_remove_index(priv-&gt;icon_list, pos);</div><div class='del'>-	priv-&gt;icons--;</div><div class='del'>-</div><div class='del'>-	sync_selection (eil, pos, SYNC_REMOVE);</div><div class='del'>-</div><div class='del'>-	if (was_selected) {</div><div class='del'>-		switch (priv-&gt;selection_mode) {</div><div class='del'>-		case GTK_SELECTION_BROWSE:</div><div class='del'>-			if (pos == priv-&gt;icons)</div><div class='del'>-				e_icon_list_select_icon (eil, pos - 1);</div><div class='del'>-			else</div><div class='del'>-				e_icon_list_select_icon (eil, pos);</div><div class='del'>-</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;icons &gt;= priv-&gt;last_selected_idx)</div><div class='del'>-		priv-&gt;last_selected_idx = -1;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;last_selected_icon == icon)</div><div class='del'>-		priv-&gt;last_selected_icon = NULL;</div><div class='del'>-</div><div class='del'>-	icon_destroy (icon);</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		/* FIXME: Optimize, only re-layout from pos to end */</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_clear:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- *</div><div class='del'>- * Clears the contents for the icon list by removing all the icons.  If destroy</div><div class='del'>- * handlers were specified for any of the icons, they will be called with the</div><div class='del'>- * appropriate data.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_clear (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++)</div><div class='del'>-		icon_destroy (g_array_index (priv-&gt;icon_list, Icon*, i));</div><div class='del'>-</div><div class='del'>-	eil_free_line_info (eil);</div><div class='del'>-</div><div class='del'>-	g_list_free (priv-&gt;selection);</div><div class='del'>-	priv-&gt;selection = NULL;</div><div class='del'>-	g_array_set_size(priv-&gt;icon_list, 0);</div><div class='del'>-	priv-&gt;icons = 0;</div><div class='del'>-	priv-&gt;last_selected_idx = -1;</div><div class='del'>-	priv-&gt;last_selected_icon = NULL;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-</div><div class='del'>-	/* remember, destroy can be run multiple times! */</div><div class='del'>-</div><div class='del'>-	eil = EIL (object);</div><div class='del'>-</div><div class='del'>-	g_free (eil-&gt;_priv-&gt;separators);</div><div class='del'>-	eil-&gt;_priv-&gt;separators = NULL;</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;frozen = 1;</div><div class='del'>-	eil-&gt;_priv-&gt;dirty  = TRUE;</div><div class='del'>-	if(eil-&gt;_priv-&gt;icon_list) {</div><div class='del'>-		e_icon_list_clear (eil);</div><div class='del'>-		g_array_free(eil-&gt;_priv-&gt;icon_list, TRUE);</div><div class='del'>-	}</div><div class='del'>-	eil-&gt;_priv-&gt;icon_list = NULL;</div><div class='del'>-</div><div class='del'>-	if (eil-&gt;_priv-&gt;timer_tag != 0) {</div><div class='del'>-		gtk_timeout_remove (eil-&gt;_priv-&gt;timer_tag);</div><div class='del'>-		eil-&gt;_priv-&gt;timer_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-		(*GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_finalize (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-</div><div class='del'>-	eil = EIL (object);</div><div class='del'>-</div><div class='del'>-	g_free (eil-&gt;_priv);</div><div class='del'>-	eil-&gt;_priv = NULL;</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;finalize)</div><div class='del'>-		(*GTK_OBJECT_CLASS (parent_class)-&gt;finalize) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-select_icon (Eil *eil, int pos, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	gint i;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_SINGLE:</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-		i = 0;</div><div class='del'>-</div><div class='del'>-		for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++) {</div><div class='del'>-			icon = g_array_index (priv-&gt;icon_list, Icon*, i);</div><div class='del'>-</div><div class='del'>-			if (i != pos &amp;&amp; icon-&gt;selected)</div><div class='del'>-				emit_select (eil, FALSE, i, event);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		emit_select (eil, TRUE, pos, event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case GTK_SELECTION_MULTIPLE:</div><div class='del'>-	case GTK_SELECTION_EXTENDED:</div><div class='del'>-		emit_select (eil, TRUE, pos, event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_select_icon:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of the icon to be selected.</div><div class='del'>- *</div><div class='del'>- * Selects the icon at the index specified by @pos.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_select_icon (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	select_icon (eil, pos, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-unselect_icon (Eil *eil, int pos, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	switch (priv-&gt;selection_mode) {</div><div class='del'>-	case GTK_SELECTION_SINGLE:</div><div class='del'>-	case GTK_SELECTION_BROWSE:</div><div class='del'>-	case GTK_SELECTION_MULTIPLE:</div><div class='del'>-	case GTK_SELECTION_EXTENDED:</div><div class='del'>-		emit_select (eil, FALSE, pos, event);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_unselect_icon:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of the icon to be unselected.</div><div class='del'>- *</div><div class='del'>- * Unselects the icon at the index specified by @pos.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_unselect_icon (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	unselect_icon (eil, pos, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_size_request (GtkWidget *widget, GtkRequisition *requisition)</div><div class='del'>-{</div><div class='del'>-	requisition-&gt;width = 1;</div><div class='del'>-	requisition-&gt;height = 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_size_allocate (GtkWidget *widget, GtkAllocation *allocation)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;size_allocate) (widget, allocation);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	eil_layout_all_icons (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_realize (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkStyle *style;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;frozen++;</div><div class='del'>-</div><div class='del'>-	if (GTK_WIDGET_CLASS (parent_class)-&gt;realize)</div><div class='del'>-		(* GTK_WIDGET_CLASS (parent_class)-&gt;realize) (widget);</div><div class='del'>-</div><div class='del'>-	priv-&gt;frozen--;</div><div class='del'>-</div><div class='del'>-	/* Change the style to use the base color as the background */</div><div class='del'>-</div><div class='del'>-	style = gtk_style_copy (gtk_widget_get_style (widget));</div><div class='del'>-	style-&gt;bg[GTK_STATE_NORMAL] = style-&gt;base[GTK_STATE_NORMAL];</div><div class='del'>-	gtk_widget_set_style (widget, style);</div><div class='del'>-</div><div class='del'>-	gdk_window_set_background (GTK_LAYOUT (eil)-&gt;bin_window,</div><div class='del'>-				   &amp;widget-&gt;style-&gt;bg[GTK_STATE_NORMAL]);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;dirty) {</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_select_icon (Eil *eil, gint num, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (num &gt;= 0 &amp;&amp; num &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (priv-&gt;icon_list, Icon*, num);</div><div class='del'>-</div><div class='del'>-	if (icon-&gt;selected)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	icon-&gt;selected = TRUE;</div><div class='del'>-	gnome_icon_text_item_select (icon-&gt;text, TRUE);</div><div class='del'>-	priv-&gt;selection = g_list_append (priv-&gt;selection, GINT_TO_POINTER (num));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_unselect_icon (Eil *eil, gint num, GdkEvent *event)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (num &gt;= 0 &amp;&amp; num &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (priv-&gt;icon_list, Icon*, num);</div><div class='del'>-</div><div class='del'>-	if (!icon-&gt;selected)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	icon-&gt;selected = FALSE;</div><div class='del'>-	gnome_icon_text_item_select (icon-&gt;text, FALSE);</div><div class='del'>-	priv-&gt;selection = g_list_remove (priv-&gt;selection, GINT_TO_POINTER (num));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Saves the selection of the icon list to temporary storage */</div><div class='del'>-static void</div><div class='del'>-store_temp_selection (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int i;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, i);</div><div class='del'>-</div><div class='del'>-		icon-&gt;tmp_selected = icon-&gt;selected;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define gray50_width 2</div><div class='del'>-#define gray50_height 2</div><div class='del'>-static const char gray50_bits[] = {</div><div class='del'>-  0x02, 0x01, };</div><div class='del'>-</div><div class='del'>-/* Button press handler for the icon list */</div><div class='del'>-static gint</div><div class='del'>-eil_button_press (GtkWidget *widget, GdkEventButton *event)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int only_one;</div><div class='del'>-	GdkBitmap *stipple;</div><div class='del'>-	double tx, ty;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	/* Invoke the canvas event handler and see if an item picks up the event */</div><div class='del'>-</div><div class='del'>-	if ((* GTK_WIDGET_CLASS (parent_class)-&gt;button_press_event) (widget, event))</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (!(event-&gt;type == GDK_BUTTON_PRESS</div><div class='del'>-	      &amp;&amp; event-&gt;button == 1</div><div class='del'>-	      &amp;&amp; priv-&gt;selection_mode != GTK_SELECTION_BROWSE))</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	only_one = priv-&gt;selection_mode == GTK_SELECTION_SINGLE;</div><div class='del'>-</div><div class='del'>-	if (only_one || (event-&gt;state &amp; (GDK_SHIFT_MASK | GDK_CONTROL_MASK)) == 0)</div><div class='del'>-		eil_unselect_all (eil, NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (only_one)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;selecting)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event-&gt;x, event-&gt;y, &amp;tx, &amp;ty);</div><div class='del'>-	priv-&gt;sel_start_x = tx;</div><div class='del'>-	priv-&gt;sel_start_y = ty;</div><div class='del'>-	priv-&gt;sel_state = event-&gt;state;</div><div class='del'>-	priv-&gt;selecting = TRUE;</div><div class='del'>-</div><div class='del'>-	store_temp_selection (eil);</div><div class='del'>-</div><div class='del'>-	stipple = gdk_bitmap_create_from_data (NULL, gray50_bits, gray50_width, gray50_height);</div><div class='del'>-	priv-&gt;sel_rect = gnome_canvas_item_new (gnome_canvas_root (GNOME_CANVAS (eil)),</div><div class='del'>-						gnome_canvas_rect_get_type (),</div><div class='del'>-						"x1", tx,</div><div class='del'>-						"y1", ty,</div><div class='del'>-						"x2", tx,</div><div class='del'>-						"y2", ty,</div><div class='del'>-						"outline_color", "black",</div><div class='del'>-						"width_pixels", 1,</div><div class='del'>-						"outline_stipple", stipple,</div><div class='del'>-						NULL);</div><div class='del'>-	gdk_bitmap_unref (stipple);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_grab (priv-&gt;sel_rect, GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,</div><div class='del'>-				NULL, event-&gt;time);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns whether the specified icon is at least partially inside the specified</div><div class='del'>- * rectangle.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-icon_is_in_area (Icon *icon, int x1, int y1, int x2, int y2)</div><div class='del'>-{</div><div class='del'>-	double ix1, iy1, ix2, iy2;</div><div class='del'>-</div><div class='del'>-	if (x1 == x2 &amp;&amp; y1 == y2)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (icon-&gt;image), &amp;ix1, &amp;iy1, &amp;ix2, &amp;iy2);</div><div class='del'>-</div><div class='del'>-	if (ix1 &lt;= x2 &amp;&amp; iy1 &lt;= y2 &amp;&amp; ix2 &gt;= x1 &amp;&amp; iy2 &gt;= y1)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (icon-&gt;text), &amp;ix1, &amp;iy1, &amp;ix2, &amp;iy2);</div><div class='del'>-</div><div class='del'>-	if (ix1 &lt;= x2 &amp;&amp; iy1 &lt;= y2 &amp;&amp; ix2 &gt;= x1 &amp;&amp; iy2 &gt;= y1)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Updates the rubberband selection to the specified point */</div><div class='del'>-static void</div><div class='del'>-update_drag_selection (Eil *eil, int x, int y)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int x1, x2, y1, y2;</div><div class='del'>-	int i;</div><div class='del'>-	Icon *icon;</div><div class='del'>-	int additive, invert;</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	/* Update rubberband */</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sel_start_x &lt; x) {</div><div class='del'>-		x1 = priv-&gt;sel_start_x;</div><div class='del'>-		x2 = x;</div><div class='del'>-	} else {</div><div class='del'>-		x1 = x;</div><div class='del'>-		x2 = priv-&gt;sel_start_x;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;sel_start_y &lt; y) {</div><div class='del'>-		y1 = priv-&gt;sel_start_y;</div><div class='del'>-		y2 = y;</div><div class='del'>-	} else {</div><div class='del'>-		y1 = y;</div><div class='del'>-		y2 = priv-&gt;sel_start_y;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (x1 &lt; 0)</div><div class='del'>-		x1 = 0;</div><div class='del'>-</div><div class='del'>-	if (y1 &lt; 0)</div><div class='del'>-		y1 = 0;</div><div class='del'>-</div><div class='del'>-	if (x2 &gt;= GTK_WIDGET (eil)-&gt;allocation.width)</div><div class='del'>-		x2 = GTK_WIDGET (eil)-&gt;allocation.width - 1;</div><div class='del'>-</div><div class='del'>-	if (y2 &gt;= priv-&gt;total_height)</div><div class='del'>-		y2 = priv-&gt;total_height - 1;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_item_set (priv-&gt;sel_rect,</div><div class='del'>-			       "x1", (double) x1,</div><div class='del'>-			       "y1", (double) y1,</div><div class='del'>-			       "x2", (double) x2,</div><div class='del'>-			       "y2", (double) y2,</div><div class='del'>-			       NULL);</div><div class='del'>-</div><div class='del'>-	/* Select or unselect icons as appropriate */</div><div class='del'>-</div><div class='del'>-	additive = priv-&gt;sel_state &amp; GDK_SHIFT_MASK;</div><div class='del'>-	invert = priv-&gt;sel_state &amp; GDK_CONTROL_MASK;</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; priv-&gt;icon_list-&gt;len; i++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, i);</div><div class='del'>-</div><div class='del'>-		if (icon_is_in_area (icon, x1, y1, x2, y2)) {</div><div class='del'>-			if (invert) {</div><div class='del'>-				if (icon-&gt;selected == icon-&gt;tmp_selected)</div><div class='del'>-					emit_select (eil, !icon-&gt;selected, i, NULL);</div><div class='del'>-			} else if (additive) {</div><div class='del'>-				if (!icon-&gt;selected)</div><div class='del'>-					emit_select (eil, TRUE, i, NULL);</div><div class='del'>-			} else {</div><div class='del'>-				if (!icon-&gt;selected)</div><div class='del'>-					emit_select (eil, TRUE, i, NULL);</div><div class='del'>-			}</div><div class='del'>-		} else if (icon-&gt;selected != icon-&gt;tmp_selected)</div><div class='del'>-			emit_select (eil, icon-&gt;tmp_selected, i, NULL);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Button release handler for the icon list */</div><div class='del'>-static gint</div><div class='del'>-eil_button_release (GtkWidget *widget, GdkEventButton *event)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	double x, y;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;selecting)</div><div class='del'>-		return (* GTK_WIDGET_CLASS (parent_class)-&gt;button_release_event) (widget, event);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;button != 1)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event-&gt;x, event-&gt;y, &amp;x, &amp;y);</div><div class='del'>-	update_drag_selection (eil, x, y);</div><div class='del'>-	gnome_canvas_item_ungrab (priv-&gt;sel_rect, event-&gt;time);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (priv-&gt;sel_rect));</div><div class='del'>-	priv-&gt;sel_rect = NULL;</div><div class='del'>-	priv-&gt;selecting = FALSE;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;timer_tag != 0) {</div><div class='del'>-		gtk_timeout_remove (priv-&gt;timer_tag);</div><div class='del'>-		priv-&gt;timer_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Autoscroll timeout handler for the icon list */</div><div class='del'>-static gint</div><div class='del'>-scroll_timeout (gpointer data)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	double x, y;</div><div class='del'>-	int value;</div><div class='del'>-</div><div class='del'>-	eil = data;</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_ENTER ();</div><div class='del'>-</div><div class='del'>-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));</div><div class='del'>-</div><div class='del'>-	value = adj-&gt;value + priv-&gt;value_diff;</div><div class='del'>-	if (value &gt; adj-&gt;upper - adj-&gt;page_size)</div><div class='del'>-		value = adj-&gt;upper - adj-&gt;page_size;</div><div class='del'>-</div><div class='del'>-	gtk_adjustment_set_value (adj, value);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil),</div><div class='del'>-				      priv-&gt;event_last_x, priv-&gt;event_last_y,</div><div class='del'>-				      &amp;x, &amp;y);</div><div class='del'>-	update_drag_selection (eil, x, y);</div><div class='del'>-</div><div class='del'>-	GDK_THREADS_LEAVE();</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Motion event handler for the icon list */</div><div class='del'>-static gint</div><div class='del'>-eil_motion_notify (GtkWidget *widget, GdkEventMotion *event)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	double x, y;</div><div class='del'>-</div><div class='del'>-	eil = EIL (widget);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;selecting)</div><div class='del'>-		return (* GTK_WIDGET_CLASS (parent_class)-&gt;motion_notify_event) (widget, event);</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), event-&gt;x, event-&gt;y, &amp;x, &amp;y);</div><div class='del'>-	update_drag_selection (eil, x, y);</div><div class='del'>-</div><div class='del'>-	/* If we are out of bounds, schedule a timeout that will do the scrolling */</div><div class='del'>-</div><div class='del'>-	if (event-&gt;y &lt; 0 || event-&gt;y &gt; widget-&gt;allocation.height) {</div><div class='del'>-		if (priv-&gt;timer_tag == 0)</div><div class='del'>-			priv-&gt;timer_tag = gtk_timeout_add (SCROLL_TIMEOUT, scroll_timeout, eil);</div><div class='del'>-</div><div class='del'>-		if (event-&gt;y &lt; 0)</div><div class='del'>-			priv-&gt;value_diff = event-&gt;y;</div><div class='del'>-		else</div><div class='del'>-			priv-&gt;value_diff = event-&gt;y - widget-&gt;allocation.height;</div><div class='del'>-</div><div class='del'>-		priv-&gt;event_last_x = event-&gt;x;</div><div class='del'>-		priv-&gt;event_last_y = event-&gt;y;</div><div class='del'>-</div><div class='del'>-		/* Make the steppings be relative to the mouse distance from the</div><div class='del'>-		 * canvas.  Also notice the timeout above is small to give a</div><div class='del'>-		 * more smooth movement.</div><div class='del'>-		 */</div><div class='del'>-		priv-&gt;value_diff /= 5;</div><div class='del'>-	} else if (priv-&gt;timer_tag != 0) {</div><div class='del'>-		gtk_timeout_remove (priv-&gt;timer_tag);</div><div class='del'>-		priv-&gt;timer_tag = 0;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gboolean (*xGtkSignal_BOOL__INT_POINTER) (GtkObject * object,</div><div class='del'>-						  gint     arg1,</div><div class='del'>-						  gpointer arg2,</div><div class='del'>-						  gpointer user_data);</div><div class='del'>-static void</div><div class='del'>-xgtk_marshal_BOOL__INT_POINTER (GtkObject *object, GtkSignalFunc func, gpointer func_data,</div><div class='del'>-				GtkArg *args)</div><div class='del'>-{</div><div class='del'>-  xGtkSignal_BOOL__INT_POINTER rfunc;</div><div class='del'>-  gboolean *return_val;</div><div class='del'>-</div><div class='del'>-  return_val = GTK_RETLOC_BOOL (args[2]);</div><div class='del'>-  rfunc = (xGtkSignal_BOOL__INT_POINTER) func;</div><div class='del'>-  *return_val = (*rfunc) (object,</div><div class='del'>-			  GTK_VALUE_INT (args[0]),</div><div class='del'>-			  GTK_VALUE_POINTER (args[1]),</div><div class='del'>-			  func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EIconList *eil;</div><div class='del'>-</div><div class='del'>-	eil = E_ICON_LIST (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	EIconList *eil;</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	eil = E_ICON_LIST (object);</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_class_init (EilClass *eil_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	GtkLayoutClass *layout_class;</div><div class='del'>-	GnomeCanvasClass *canvas_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass *)   eil_class;</div><div class='del'>-	widget_class = (GtkWidgetClass *)   eil_class;</div><div class='del'>-	layout_class = (GtkLayoutClass *)   eil_class;</div><div class='del'>-	canvas_class = (GnomeCanvasClass *) eil_class;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gnome_canvas_get_type ());</div><div class='del'>-</div><div class='del'>-	eil_signals[SELECT_ICON] =</div><div class='del'>-		gtk_signal_new (</div><div class='del'>-			"select_icon",</div><div class='del'>-			GTK_RUN_FIRST,</div><div class='del'>-			object_class-&gt;type,</div><div class='del'>-			GTK_SIGNAL_OFFSET (EIconListClass, select_icon),</div><div class='del'>-			gtk_marshal_NONE__INT_POINTER,</div><div class='del'>-			GTK_TYPE_NONE, 2,</div><div class='del'>-			GTK_TYPE_INT,</div><div class='del'>-			GTK_TYPE_GDK_EVENT);</div><div class='del'>-</div><div class='del'>-	eil_signals[UNSELECT_ICON] =</div><div class='del'>-		gtk_signal_new (</div><div class='del'>-			"unselect_icon",</div><div class='del'>-			GTK_RUN_FIRST,</div><div class='del'>-			object_class-&gt;type,</div><div class='del'>-			GTK_SIGNAL_OFFSET (EIconListClass, unselect_icon),</div><div class='del'>-			gtk_marshal_NONE__INT_POINTER,</div><div class='del'>-			GTK_TYPE_NONE, 2,</div><div class='del'>-			GTK_TYPE_INT,</div><div class='del'>-			GTK_TYPE_GDK_EVENT);</div><div class='del'>-</div><div class='del'>-	eil_signals[TEXT_CHANGED] =</div><div class='del'>-		gtk_signal_new (</div><div class='del'>-			"text_changed",</div><div class='del'>-			GTK_RUN_LAST,</div><div class='del'>-			object_class-&gt;type,</div><div class='del'>-			GTK_SIGNAL_OFFSET (EIconListClass, text_changed),</div><div class='del'>-			xgtk_marshal_BOOL__INT_POINTER,</div><div class='del'>-			GTK_TYPE_BOOL, 2,</div><div class='del'>-			GTK_TYPE_INT,</div><div class='del'>-			GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, eil_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = eil_destroy;</div><div class='del'>-	object_class-&gt;finalize = eil_finalize;</div><div class='del'>-	object_class-&gt;set_arg = eil_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = eil_get_arg;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;size_request = eil_size_request;</div><div class='del'>-	widget_class-&gt;size_allocate = eil_size_allocate;</div><div class='del'>-	widget_class-&gt;realize = eil_realize;</div><div class='del'>-	widget_class-&gt;button_press_event = eil_button_press;</div><div class='del'>-	widget_class-&gt;button_release_event = eil_button_release;</div><div class='del'>-	widget_class-&gt;motion_notify_event = eil_motion_notify;</div><div class='del'>-</div><div class='del'>-	eil_class-&gt;select_icon = real_select_icon;</div><div class='del'>-	eil_class-&gt;unselect_icon = real_unselect_icon;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-eil_init (Eil *eil)</div><div class='del'>-{</div><div class='del'>-	eil-&gt;_priv = g_new0 (EIconListPrivate, 1);</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;icon_list = g_array_new(FALSE, FALSE, sizeof(gpointer));</div><div class='del'>-	eil-&gt;_priv-&gt;row_spacing = DEFAULT_ROW_SPACING;</div><div class='del'>-	eil-&gt;_priv-&gt;col_spacing = DEFAULT_COL_SPACING;</div><div class='del'>-	eil-&gt;_priv-&gt;text_spacing = DEFAULT_TEXT_SPACING;</div><div class='del'>-	eil-&gt;_priv-&gt;icon_border = DEFAULT_ICON_BORDER;</div><div class='del'>-	eil-&gt;_priv-&gt;separators = g_strdup (" ");</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;selection_mode = GTK_SELECTION_SINGLE;</div><div class='del'>-	eil-&gt;_priv-&gt;dirty = TRUE;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_set_scroll_region (GNOME_CANVAS (eil), 0.0, 0.0, 1000000.0, 1000000.0);</div><div class='del'>-	gnome_canvas_scroll_to (GNOME_CANVAS (eil), 0, 0);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_type:</div><div class='del'>- *</div><div class='del'>- * Registers the &amp;EIconList class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- *</div><div class='del'>- * Returns: The type ID of the &amp;EIconList class.</div><div class='del'>- */</div><div class='del'>-guint</div><div class='del'>-e_icon_list_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint eil_type = 0;</div><div class='del'>-</div><div class='del'>-	if (!eil_type) {</div><div class='del'>-		GtkTypeInfo eil_info = {</div><div class='del'>-			"EIconList",</div><div class='del'>-			sizeof (EIconList),</div><div class='del'>-			sizeof (EIconListClass),</div><div class='del'>-			(GtkClassInitFunc) eil_class_init,</div><div class='del'>-			(GtkObjectInitFunc) eil_init,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL,</div><div class='del'>-			NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		eil_type = gtk_type_unique (gnome_canvas_get_type (),</div><div class='del'>-					    &amp;eil_info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return eil_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_icon_width:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @w:   New width for the icon columns.</div><div class='del'>- *</div><div class='del'>- * Sets the amount of horizontal space allocated to the icons, i.e. the column</div><div class='del'>- * width of the icon list.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_icon_width (EIconList *eil, int w)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;icon_width  = w;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen) {</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eil_layout_all_icons (eil);</div><div class='del'>-	eil_scrollbar_adjust (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_construct:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @icon_width: Width for the icon columns.</div><div class='del'>- * @flags: A combination of %E_ICON_LIST_IS_EDITABLE and %E_ICON_LIST_STATIC_TEXT.</div><div class='del'>- *</div><div class='del'>- * Constructor for the icon list, to be used by derived classes.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_icon_list_construct (EIconList *eil, guint icon_width, int flags)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	e_icon_list_set_icon_width (eil, icon_width);</div><div class='del'>-	priv-&gt;is_editable = (flags &amp; E_ICON_LIST_IS_EDITABLE) != 0;</div><div class='del'>-	priv-&gt;static_text = (flags &amp; E_ICON_LIST_STATIC_TEXT) != 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_new: [constructor]</div><div class='del'>- * @icon_width: Width for the icon columns.</div><div class='del'>- * @flags:      A combination of %E_ICON_LIST_IS_EDITABLE and %E_ICON_LIST_STATIC_TEXT.</div><div class='del'>- *</div><div class='del'>- * Creates a new icon list widget.  The icon columns are allocated a width of</div><div class='del'>- * @icon_width pixels.  Icon captions will be word-wrapped to this width as</div><div class='del'>- * well.</div><div class='del'>- *</div><div class='del'>- * If @flags has the %E_ICON_LIST_IS_EDITABLE flag set, then the user will be</div><div class='del'>- * able to edit the text in the icon captions, and the "text_changed" signal</div><div class='del'>- * will be emitted when an icon's text is changed.</div><div class='del'>- *</div><div class='del'>- * If @flags has the %E_ICON_LIST_STATIC_TEXT flags set, then the text</div><div class='del'>- * for the icon captions will not be copied inside the icon list; it will only</div><div class='del'>- * store the pointers to the original text strings specified by the application.</div><div class='del'>- * This is intended to save memory.  If this flag is not set, then the text</div><div class='del'>- * strings will be copied and managed internally.</div><div class='del'>- *</div><div class='del'>- * Returns: a newly-created icon list widget</div><div class='del'>- */</div><div class='del'>-GtkWidget *</div><div class='del'>-e_icon_list_new (guint icon_width, int flags)</div><div class='del'>-{</div><div class='del'>-	Eil *eil;</div><div class='del'>-</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-	eil = EIL (gtk_type_new (e_icon_list_get_type ()));</div><div class='del'>-	gtk_widget_pop_colormap ();</div><div class='del'>-</div><div class='del'>-	e_icon_list_construct (eil, icon_width, flags);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_freeze:</div><div class='del'>- * @eil:  An icon list.</div><div class='del'>- *</div><div class='del'>- * Freezes an icon list so that any changes made to it will not be</div><div class='del'>- * reflected on the screen until it is thawed with e_icon_list_thaw().</div><div class='del'>- * It is recommended to freeze the icon list before inserting or deleting</div><div class='del'>- * many icons, for example, so that the layout process will only be executed</div><div class='del'>- * once, when the icon list is finally thawed.</div><div class='del'>- *</div><div class='del'>- * You can call this function multiple times, but it must be balanced with the</div><div class='del'>- * same number of calls to e_icon_list_thaw() before the changes will take</div><div class='del'>- * effect.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_freeze (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;frozen++;</div><div class='del'>-</div><div class='del'>-	/* We hide the root so that the user will not see any changes while the</div><div class='del'>-	 * icon list is doing stuff.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (eil-&gt;_priv-&gt;frozen == 1)</div><div class='del'>-		gnome_canvas_item_hide (GNOME_CANVAS (eil)-&gt;root);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_thaw:</div><div class='del'>- * @eil:  An icon list.</div><div class='del'>- *</div><div class='del'>- * Thaws the icon list and performs any pending layout operations.  This</div><div class='del'>- * is to be used in conjunction with e_icon_list_freeze().</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_thaw (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (eil-&gt;_priv-&gt;frozen &gt; 0);</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;frozen--;</div><div class='del'>-</div><div class='del'>-	if (eil-&gt;_priv-&gt;dirty) {</div><div class='del'>-                eil_layout_all_icons (eil);</div><div class='del'>-                eil_scrollbar_adjust (eil);</div><div class='del'>-        }</div><div class='del'>-</div><div class='del'>-	if (eil-&gt;_priv-&gt;frozen == 0)</div><div class='del'>-		gnome_canvas_item_show (GNOME_CANVAS (eil)-&gt;root);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_selection_mode</div><div class='del'>- * @eil:  An icon list.</div><div class='del'>- * @mode: New selection mode.</div><div class='del'>- *</div><div class='del'>- * Sets the selection mode for an icon list.  The %GTK_SELECTION_MULTIPLE and</div><div class='del'>- * %GTK_SELECTION_EXTENDED modes are considered equivalent.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_selection_mode (EIconList *eil, GtkSelectionMode mode)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	eil-&gt;_priv-&gt;selection_mode = mode;</div><div class='del'>-	eil-&gt;_priv-&gt;last_selected_idx = -1;</div><div class='del'>-	eil-&gt;_priv-&gt;last_selected_icon = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_icon_data_full:</div><div class='del'>- * @eil:     An icon list.</div><div class='del'>- * @pos:     Index of an icon.</div><div class='del'>- * @data:    User data to set on the icon.</div><div class='del'>- * @destroy: Destroy notification handler for the icon.</div><div class='del'>- *</div><div class='del'>- * Associates the @data pointer to the icon at the index specified by @pos.  The</div><div class='del'>- * @destroy argument points to a function that will be called when the icon is</div><div class='del'>- * destroyed, or NULL if no function is to be called when this happens.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_icon_data_full (EIconList *eil,</div><div class='del'>-				    int pos, gpointer data,</div><div class='del'>-				    GtkDestroyNotify destroy)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (eil-&gt;_priv-&gt;icon_list, Icon*, pos);</div><div class='del'>-	icon-&gt;data = data;</div><div class='del'>-	icon-&gt;destroy = destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_icon_data:</div><div class='del'>- * @eil:  An icon list.</div><div class='del'>- * @pos:  Index of an icon.</div><div class='del'>- * @data: User data to set on the icon.</div><div class='del'>- *</div><div class='del'>- * Associates the @data pointer to the icon at the index specified by @pos.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_icon_data (EIconList *eil, int pos, gpointer data)</div><div class='del'>-{</div><div class='del'>-	e_icon_list_set_icon_data_full (eil, pos, data, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_icon_data:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of an icon.</div><div class='del'>- *</div><div class='del'>- * Returns the user data pointer associated to the icon at the index specified</div><div class='del'>- * by @pos.</div><div class='del'>- */</div><div class='del'>-gpointer</div><div class='del'>-e_icon_list_get_icon_data (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), NULL);</div><div class='del'>-	g_return_val_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons, NULL);</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (eil-&gt;_priv-&gt;icon_list, Icon*, pos);</div><div class='del'>-	return icon-&gt;data;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_find_icon_from_data:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @data:   Data pointer associated to an icon.</div><div class='del'>- *</div><div class='del'>- * Returns the index of the icon whose user data has been set to @data,</div><div class='del'>- * or -1 if no icon has this data associated to it.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_find_icon_from_data (EIconList *eil, gpointer data)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; priv-&gt;icon_list-&gt;len; n++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, n);</div><div class='del'>-		if (icon-&gt;data == data)</div><div class='del'>-			return n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Sets an integer value in the private structure of the icon list, and updates it */</div><div class='del'>-static void</div><div class='del'>-set_value (EIconList *eil, EIconListPrivate *priv, int *dest, int val)</div><div class='del'>-{</div><div class='del'>-	if (val == *dest)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*dest = val;</div><div class='del'>-</div><div class='del'>-	if (!priv-&gt;frozen) {</div><div class='del'>-		eil_layout_all_icons (eil);</div><div class='del'>-		eil_scrollbar_adjust (eil);</div><div class='del'>-	} else</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_row_spacing:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pixels: Number of pixels for inter-row spacing.</div><div class='del'>- *</div><div class='del'>- * Sets the spacing to be used between rows of icons.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_row_spacing (EIconList *eil, int pixels)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	set_value (eil, priv, &amp;priv-&gt;row_spacing, pixels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_col_spacing:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pixels: Number of pixels for inter-column spacing.</div><div class='del'>- *</div><div class='del'>- * Sets the spacing to be used between columns of icons.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_col_spacing (EIconList *eil, int pixels)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	set_value (eil, priv, &amp;priv-&gt;col_spacing, pixels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_text_spacing:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pixels: Number of pixels between an icon's image and its caption.</div><div class='del'>- *</div><div class='del'>- * Sets the spacing to be used between an icon's image and its text caption.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_text_spacing (EIconList *eil, int pixels)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	set_value (eil, priv, &amp;priv-&gt;text_spacing, pixels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_icon_border:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pixels: Number of border pixels to be used around an icon's image.</div><div class='del'>- *</div><div class='del'>- * Sets the width of the border to be displayed around an icon's image.  This is</div><div class='del'>- * currently not implemented.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_icon_border (EIconList *eil, int pixels)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-	set_value (eil, priv, &amp;priv-&gt;icon_border, pixels);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_set_separators:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @sep: String with characters to be used as word separators.</div><div class='del'>- *</div><div class='del'>- * Sets the characters that can be used as word separators when doing</div><div class='del'>- * word-wrapping in the icon text captions.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_set_separators (EIconList *eil, const char *sep)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (sep != NULL);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;separators)</div><div class='del'>-		g_free (priv-&gt;separators);</div><div class='del'>-</div><div class='del'>-	priv-&gt;separators = g_strdup (sep);</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;frozen) {</div><div class='del'>-		priv-&gt;dirty = TRUE;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	eil_layout_all_icons (eil);</div><div class='del'>-	eil_scrollbar_adjust (eil);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_moveto:</div><div class='del'>- * @eil:    An icon list.</div><div class='del'>- * @pos:    Index of an icon.</div><div class='del'>- * @yalign: Vertical alignment of the icon.</div><div class='del'>- *</div><div class='del'>- * Makes the icon whose index is @pos be visible on the screen.  The icon list</div><div class='del'>- * gets scrolled so that the icon is visible.  An alignment of 0.0 represents</div><div class='del'>- * the top of the visible part of the icon list, and 1.0 represents the bottom.</div><div class='del'>- * An icon can be centered on the icon list.</div><div class='del'>- */</div><div class='del'>-void</div><div class='del'>-e_icon_list_moveto (EIconList *eil, int pos, double yalign)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	IconLine *il;</div><div class='del'>-	GList *l;</div><div class='del'>-	int i, y, uh, line;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (eil != NULL);</div><div class='del'>-	g_return_if_fail (IS_EIL (eil));</div><div class='del'>-	g_return_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons);</div><div class='del'>-	g_return_if_fail (yalign &gt;= 0.0 &amp;&amp; yalign &lt;= 1.0);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;lines != NULL);</div><div class='del'>-</div><div class='del'>-	line = pos / eil_get_items_per_line (eil);</div><div class='del'>-</div><div class='del'>-	y = 0;</div><div class='del'>-	for (i = 0, l = priv-&gt;lines; l &amp;&amp; i &lt; line; l = l-&gt;next, i++) {</div><div class='del'>-		il = l-&gt;data;</div><div class='del'>-		y += icon_line_height (eil, il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	il = l-&gt;data;</div><div class='del'>-</div><div class='del'>-	uh = GTK_WIDGET (eil)-&gt;allocation.height - icon_line_height (eil,il);</div><div class='del'>-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));</div><div class='del'>-	gtk_adjustment_set_value (adj, y - uh * yalign);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_is_visible:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @pos: Index of an icon.</div><div class='del'>- *</div><div class='del'>- * Returns whether the icon at the index specified by @pos is visible.  This</div><div class='del'>- * will be %GTK_VISIBILITY_NONE if the icon is not visible at all,</div><div class='del'>- * %GTK_VISIBILITY_PARTIAL if the icon is at least partially shown, and</div><div class='del'>- * %GTK_VISIBILITY_FULL if the icon is fully visible.</div><div class='del'>- */</div><div class='del'>-GtkVisibility</div><div class='del'>-e_icon_list_icon_is_visible (EIconList *eil, int pos)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-	IconLine *il;</div><div class='del'>-	GList *l;</div><div class='del'>-	int line, y1, y2, i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, GTK_VISIBILITY_NONE);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), GTK_VISIBILITY_NONE);</div><div class='del'>-	g_return_val_if_fail (pos &gt;= 0 &amp;&amp; pos &lt; eil-&gt;_priv-&gt;icons,</div><div class='del'>-			      GTK_VISIBILITY_NONE);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;lines == NULL)</div><div class='del'>-		return GTK_VISIBILITY_NONE;</div><div class='del'>-</div><div class='del'>-	line = pos / eil_get_items_per_line (eil);</div><div class='del'>-	y1 = 0;</div><div class='del'>-	for (i = 0, l = priv-&gt;lines; l &amp;&amp; i &lt; line; l = l-&gt;next, i++) {</div><div class='del'>-		il = l-&gt;data;</div><div class='del'>-		y1 += icon_line_height (eil, il);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	y2 = y1 + icon_line_height (eil, (IconLine *) l-&gt;data);</div><div class='del'>-</div><div class='del'>-	adj = gtk_layout_get_vadjustment (GTK_LAYOUT (eil));</div><div class='del'>-</div><div class='del'>-	if (y2 &lt; adj-&gt;value)</div><div class='del'>-		return GTK_VISIBILITY_NONE;</div><div class='del'>-</div><div class='del'>-	if (y1 &gt; adj-&gt;value + GTK_WIDGET (eil)-&gt;allocation.height)</div><div class='del'>-		return GTK_VISIBILITY_NONE;</div><div class='del'>-</div><div class='del'>-	if (y2 &lt;= adj-&gt;value + GTK_WIDGET (eil)-&gt;allocation.height &amp;&amp;</div><div class='del'>-	    y1 &gt;= adj-&gt;value)</div><div class='del'>-		return GTK_VISIBILITY_FULL;</div><div class='del'>-</div><div class='del'>-	return GTK_VISIBILITY_PARTIAL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_icon_at:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @x:   X position in the icon list window.</div><div class='del'>- * @y:   Y position in the icon list window.</div><div class='del'>- *</div><div class='del'>- * Returns the index of the icon that is under the specified coordinates, which</div><div class='del'>- * are relative to the icon list's window.  If there is no icon in that</div><div class='del'>- * position, -1 is returned.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_get_icon_at (EIconList *eil, int x, int y)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	double wx, wy;</div><div class='del'>-	double dx, dy;</div><div class='del'>-	int cx, cy;</div><div class='del'>-	int n;</div><div class='del'>-	GnomeCanvasItem *item;</div><div class='del'>-	double dist;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	dx = x;</div><div class='del'>-	dy = y;</div><div class='del'>-</div><div class='del'>-	gnome_canvas_window_to_world (GNOME_CANVAS (eil), dx, dy, &amp;wx, &amp;wy);</div><div class='del'>-	gnome_canvas_w2c (GNOME_CANVAS (eil), wx, wy, &amp;cx, &amp;cy);</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; priv-&gt;icon_list-&gt;len; n++) {</div><div class='del'>-		Icon *icon = g_array_index(priv-&gt;icon_list, Icon*, n);</div><div class='del'>-		GnomeCanvasItem *image = GNOME_CANVAS_ITEM (icon-&gt;image);</div><div class='del'>-		GnomeCanvasItem *text = GNOME_CANVAS_ITEM (icon-&gt;text);</div><div class='del'>-</div><div class='del'>-		if (wx &gt;= image-&gt;x1 &amp;&amp; wx &lt;= image-&gt;x2 &amp;&amp; wy &gt;= image-&gt;y1 &amp;&amp; wy &lt;= image-&gt;y2) {</div><div class='del'>-			dist = (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT (image)-&gt;klass)-&gt;point) (</div><div class='del'>-				image,</div><div class='del'>-				wx, wy,</div><div class='del'>-				cx, cy,</div><div class='del'>-				&amp;item);</div><div class='del'>-</div><div class='del'>-			if ((int) (dist * GNOME_CANVAS (eil)-&gt;pixels_per_unit + 0.5)</div><div class='del'>-			    &lt;= GNOME_CANVAS (eil)-&gt;close_enough)</div><div class='del'>-				return n;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (wx &gt;= text-&gt;x1 &amp;&amp; wx &lt;= text-&gt;x2 &amp;&amp; wy &gt;= text-&gt;y1 &amp;&amp; wy &lt;= text-&gt;y2) {</div><div class='del'>-			dist = (* GNOME_CANVAS_ITEM_CLASS (GTK_OBJECT (text)-&gt;klass)-&gt;point) (</div><div class='del'>-				text,</div><div class='del'>-				wx, wy,</div><div class='del'>-				cx, cy,</div><div class='del'>-				&amp;item);</div><div class='del'>-</div><div class='del'>-			if ((int) (dist * GNOME_CANVAS (eil)-&gt;pixels_per_unit + 0.5)</div><div class='del'>-			    &lt;= GNOME_CANVAS (eil)-&gt;close_enough)</div><div class='del'>-				return n;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_num_icons:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- *</div><div class='del'>- * Returns the number of icons in the icon list.</div><div class='del'>- */</div><div class='del'>-guint</div><div class='del'>-e_icon_list_get_num_icons (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_ICON_LIST (eil), 0);</div><div class='del'>-</div><div class='del'>-	return eil-&gt;_priv-&gt;icons;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_selection:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- *</div><div class='del'>- * Returns a list of integers with the indices of the currently selected icons.</div><div class='del'>- */</div><div class='del'>-GList *</div><div class='del'>-e_icon_list_get_selection (EIconList *eil)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (E_IS_ICON_LIST (eil), NULL);</div><div class='del'>-</div><div class='del'>-	return eil-&gt;_priv-&gt;selection;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_get_selection:</div><div class='del'>- * @eil: An icon list.</div><div class='del'>- * @idx: Index of an @icon.</div><div class='del'>- *</div><div class='del'>- * Returns the filename of the icon with index @idx.</div><div class='del'>- */</div><div class='del'>-gchar *</div><div class='del'>-e_icon_list_get_icon_filename (EIconList *eil, int idx)</div><div class='del'>-{</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), NULL);</div><div class='del'>-	g_return_val_if_fail (idx &gt;= 0 &amp;&amp; idx &lt; eil-&gt;_priv-&gt;icons, NULL);</div><div class='del'>-</div><div class='del'>-	icon = g_array_index (eil-&gt;_priv-&gt;icon_list, Icon*, idx);</div><div class='del'>-	return icon-&gt;icon_filename;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_icon_list_find_icon_from_filename:</div><div class='del'>- * @eil:       An icon list.</div><div class='del'>- * @filename:  Filename of an icon.</div><div class='del'>- *</div><div class='del'>- * Returns the index of the icon whose filename is @filename or -1 if</div><div class='del'>- * there is no icon with this filename.</div><div class='del'>- */</div><div class='del'>-int</div><div class='del'>-e_icon_list_find_icon_from_filename (EIconList *eil,</div><div class='del'>-				     const gchar *filename)</div><div class='del'>-{</div><div class='del'>-	EIconListPrivate *priv;</div><div class='del'>-	int n;</div><div class='del'>-	Icon *icon;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (eil != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EIL (eil), -1);</div><div class='del'>-	g_return_val_if_fail (filename != NULL, -1);</div><div class='del'>-</div><div class='del'>-	priv = eil-&gt;_priv;</div><div class='del'>-</div><div class='del'>-	for (n = 0; n &lt; priv-&gt;icon_list-&gt;len; n++) {</div><div class='del'>-		icon = g_array_index(priv-&gt;icon_list, Icon*, n);</div><div class='del'>-		if (!strcmp (icon-&gt;icon_filename, filename))</div><div class='del'>-			return n;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/composer/e-icon-list.h b/composer/e-icon-list.h<br/>deleted file mode 100644<br/>index 43f2fa105d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-icon-list.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-icon-list.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,178 +0,0 @@</div><div class='del'>-/*</div><div class='del'>- * Copyright (C) 1998, 1999 Free Software Foundation</div><div class='del'>- * Copyright (C) 2000 Red Hat, Inc.</div><div class='del'>- * All rights reserved.</div><div class='del'>- *</div><div class='del'>- * This file is part of the Gnome Library.</div><div class='del'>- *</div><div class='del'>- * The Gnome Library is free software; you can redistribute it and/or</div><div class='del'>- * modify it under the terms of the GNU Library General Public License as</div><div class='del'>- * published by the Free Software Foundation; either version 2 of the</div><div class='del'>- * License, or (at your option) any later version.</div><div class='del'>- *</div><div class='del'>- * The Gnome Library is distributed in the hope that it will be useful,</div><div class='del'>- * but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU</div><div class='del'>- * Library General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU Library General Public</div><div class='del'>- * License along with the Gnome Library; see the file COPYING.LIB.  If not,</div><div class='del'>- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-/*</div><div class='del'>-  @NOTATION@</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* GnomeIconList widget - scrollable icon list</div><div class='del'>- *</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Federico Mena   &lt;federico@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 _E_ICON_LIST_H_</div><div class='del'>-#define _E_ICON_LIST_H_</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define E_TYPE_ICON_LIST            (e_icon_list_get_type ())</div><div class='del'>-#define E_ICON_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ICON_LIST, EIconList))</div><div class='del'>-#define E_ICON_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ICON_LIST, EIconListClass))</div><div class='del'>-#define E_IS_ICON_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ICON_LIST))</div><div class='del'>-#define E_IS_ICON_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ICON_LIST))</div><div class='del'>-#define E_ICON_LIST_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), E_TYPE_ICON_LIST, EIconListClass))</div><div class='del'>-</div><div class='del'>-typedef struct _EIconList        EIconList;</div><div class='del'>-typedef struct _EIconListPrivate EIconListPrivate;</div><div class='del'>-typedef struct _EIconListClass   EIconListClass;</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_ICON_LIST_ICONS,</div><div class='del'>-	E_ICON_LIST_TEXT_BELOW,</div><div class='del'>-	E_ICON_LIST_TEXT_RIGHT</div><div class='del'>-} EIconListMode;</div><div class='del'>-</div><div class='del'>-/* This structure has been converted to use public and private parts.  To avoid</div><div class='del'>- * breaking binary compatibility, the slots for private fields have been</div><div class='del'>- * replaced with padding.  Please remove these fields when gnome-libs has</div><div class='del'>- * reached another major version and it is "fine" to break binary compatibility.</div><div class='del'>- */</div><div class='del'>-struct _EIconList {</div><div class='del'>-	GnomeCanvas canvas;</div><div class='del'>-</div><div class='del'>-	/*&lt; private &gt;*/</div><div class='del'>-	EIconListPrivate * _priv;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EIconListClass {</div><div class='del'>-	GnomeCanvasClass parent_class;</div><div class='del'>-</div><div class='del'>-	void     (*select_icon)    (EIconList *gil, gint num, GdkEvent *event);</div><div class='del'>-	void     (*unselect_icon)  (EIconList *gil, gint num, GdkEvent *event);</div><div class='del'>-	gboolean (*text_changed)   (EIconList *gil, gint num, const char *new_text);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	E_ICON_LIST_IS_EDITABLE	= 1 &lt;&lt; 0,</div><div class='del'>-	E_ICON_LIST_STATIC_TEXT	= 1 &lt;&lt; 1</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint          e_icon_list_get_type            (void) G_GNUC_CONST;</div><div class='del'>-</div><div class='del'>-GtkWidget     *e_icon_list_new                 (guint         icon_width,</div><div class='del'>-						int           flags);</div><div class='del'>-void           e_icon_list_construct           (EIconList *gil,</div><div class='del'>-						guint icon_width,</div><div class='del'>-						int flags);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* To avoid excesive recomputes during insertion/deletion */</div><div class='del'>-void           e_icon_list_freeze              (EIconList *gil);</div><div class='del'>-void           e_icon_list_thaw                (EIconList *gil);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void           e_icon_list_insert              (EIconList *gil,</div><div class='del'>-						int idx,</div><div class='del'>-						const char *icon_filename,</div><div class='del'>-						const char *text);</div><div class='del'>-void           e_icon_list_insert_pixbuf       (EIconList *gil,</div><div class='del'>-						int idx,</div><div class='del'>-						GdkPixbuf *im,</div><div class='del'>-						const char *icon_filename,</div><div class='del'>-						const char *text);</div><div class='del'>-</div><div class='del'>-int            e_icon_list_append              (EIconList *gil,</div><div class='del'>-						const char *icon_filename,</div><div class='del'>-						const char *text);</div><div class='del'>-int            e_icon_list_append_pixbuf       (EIconList *gil,</div><div class='del'>-						GdkPixbuf *im,</div><div class='del'>-						const char *icon_filename,</div><div class='del'>-						const char *text);</div><div class='del'>-</div><div class='del'>-void           e_icon_list_clear               (EIconList *gil);</div><div class='del'>-void           e_icon_list_remove              (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-</div><div class='del'>-guint          e_icon_list_get_num_icons       (EIconList *gil);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Managing the selection */</div><div class='del'>-void           e_icon_list_set_selection_mode  (EIconList *gil,</div><div class='del'>-						GtkSelectionMode mode);</div><div class='del'>-void           e_icon_list_select_icon         (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-void           e_icon_list_unselect_icon       (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-int            e_icon_list_unselect_all        (EIconList *gil);</div><div class='del'>-GList *        e_icon_list_get_selection       (EIconList *gil);</div><div class='del'>-</div><div class='del'>-/* Setting the spacing values */</div><div class='del'>-void           e_icon_list_set_icon_width      (EIconList *gil,</div><div class='del'>-						int w);</div><div class='del'>-void           e_icon_list_set_row_spacing     (EIconList *gil,</div><div class='del'>-						int pixels);</div><div class='del'>-void           e_icon_list_set_col_spacing     (EIconList *gil,</div><div class='del'>-						int pixels);</div><div class='del'>-void           e_icon_list_set_text_spacing    (EIconList *gil,</div><div class='del'>-						int pixels);</div><div class='del'>-void           e_icon_list_set_icon_border     (EIconList *gil,</div><div class='del'>-						int pixels);</div><div class='del'>-void           e_icon_list_set_separators      (EIconList *gil,</div><div class='del'>-						const char *sep);</div><div class='del'>-/* Icon filename. */</div><div class='del'>-gchar *        e_icon_list_get_icon_filename   (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-int            e_icon_list_find_icon_from_filename (EIconList *gil,</div><div class='del'>-						    const char *filename);</div><div class='del'>-</div><div class='del'>-/* Attaching information to the icons */</div><div class='del'>-void           e_icon_list_set_icon_data       (EIconList *gil,</div><div class='del'>-						int idx, gpointer data);</div><div class='del'>-void           e_icon_list_set_icon_data_full  (EIconList *gil,</div><div class='del'>-						int idx, gpointer data,</div><div class='del'>-						GtkDestroyNotify destroy);</div><div class='del'>-int            e_icon_list_find_icon_from_data (EIconList *gil,</div><div class='del'>-						gpointer data);</div><div class='del'>-gpointer       e_icon_list_get_icon_data       (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-</div><div class='del'>-/* Visibility */</div><div class='del'>-void           e_icon_list_moveto              (EIconList *gil,</div><div class='del'>-						int idx, double yalign);</div><div class='del'>-GtkVisibility  e_icon_list_icon_is_visible     (EIconList *gil,</div><div class='del'>-						int idx);</div><div class='del'>-</div><div class='del'>-int            e_icon_list_get_icon_at         (EIconList *gil,</div><div class='del'>-						int x, int y);</div><div class='del'>-</div><div class='del'>-int            e_icon_list_get_items_per_line  (EIconList *gil);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* _GNOME_ICON_LIST_H_ */</div><div class='head'>diff --git a/composer/e-msg-composer-attachment-bar.c b/composer/e-msg-composer-attachment-bar.c<br/>deleted file mode 100644<br/>index 07debafdd0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment-bar.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer-attachment-bar.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,779 +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;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;libgnomevfs/gnome-vfs-mime-info.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf-loader.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-#include "e-msg-composer-select-file.h"</div><div class='del'>-#include "e-msg-composer-attachment.h"</div><div class='del'>-#include "e-msg-composer-attachment-bar.h"</div><div class='del'>-</div><div class='del'>-#include "e-icon-list.h"</div><div class='del'>-</div><div class='del'>-#include "camel/camel-data-wrapper.h"</div><div class='del'>-#include "camel/camel-stream-fs.h"</div><div class='del'>-#include "camel/camel-stream-mem.h"</div><div class='del'>-#include "camel/camel-mime-part.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define ICON_WIDTH 64</div><div class='del'>-#define ICON_SEPARATORS " /-_"</div><div class='del'>-#define ICON_SPACING 2</div><div class='del'>-#define ICON_ROW_SPACING ICON_SPACING</div><div class='del'>-#define ICON_COL_SPACING ICON_SPACING</div><div class='del'>-#define ICON_BORDER 2</div><div class='del'>-#define ICON_TEXT_SPACING 2</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static EIconListClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachmentBarPrivate {</div><div class='del'>-	GList *attachments;</div><div class='del'>-	guint num_attachments;</div><div class='del'>-</div><div class='del'>-	GtkWidget *context_menu;</div><div class='del'>-	GtkWidget *icon_context_menu;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	CHANGED,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void update (EMsgComposerAttachmentBar *bar);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-size_to_string (gulong size)</div><div class='del'>-{</div><div class='del'>-	gchar *size_string;</div><div class='del'>-</div><div class='del'>-	/* FIXME: The following should probably go into a separate module, as</div><div class='del'>-           we might have to do the same thing in other places as well.  Also,</div><div class='del'>-	   I am not sure this will be OK for all the languages.  */</div><div class='del'>-</div><div class='del'>-	if (size &lt; 1e3L) {</div><div class='del'>-		if (size == 1)</div><div class='del'>-			size_string = g_strdup (_("1 byte"));</div><div class='del'>-		else</div><div class='del'>-			size_string = g_strdup_printf (_("%u bytes"),</div><div class='del'>-						       (guint) size);</div><div class='del'>-	} else {</div><div class='del'>-		gdouble displayed_size;</div><div class='del'>-</div><div class='del'>-		if (size &lt; 1e6L) {</div><div class='del'>-			displayed_size = (gdouble) size / 1.0e3;</div><div class='del'>-			size_string = g_strdup_printf (_("%.1fK"),</div><div class='del'>-						       displayed_size);</div><div class='del'>-		} else if (size &lt; 1e9L) {</div><div class='del'>-			displayed_size = (gdouble) size / 1.0e6;</div><div class='del'>-			size_string = g_strdup_printf (_("%.1fM"),</div><div class='del'>-						       displayed_size);</div><div class='del'>-		} else {</div><div class='del'>-			displayed_size = (gdouble) size / 1.0e9;</div><div class='del'>-			size_string = g_strdup_printf (_("%.1fG"),</div><div class='del'>-						       displayed_size);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return size_string;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Attachment handling functions.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_attachment_list (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	priv = bar-&gt;priv;</div><div class='del'>-</div><div class='del'>-	for (p = priv-&gt;attachments; p != NULL; p = p-&gt;next)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (p-&gt;data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attachment_changed_cb (EMsgComposerAttachment *attachment,</div><div class='del'>-		       gpointer data)</div><div class='del'>-{</div><div class='del'>-	update (E_MSG_COMPOSER_ATTACHMENT_BAR (data));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_common (EMsgComposerAttachmentBar *bar,</div><div class='del'>-	    EMsgComposerAttachment *attachment)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (attachment != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (attachment), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (attachment_changed_cb),</div><div class='del'>-			    bar);</div><div class='del'>-</div><div class='del'>-	bar-&gt;priv-&gt;attachments = g_list_append (bar-&gt;priv-&gt;attachments,</div><div class='del'>-						attachment);</div><div class='del'>-	bar-&gt;priv-&gt;num_attachments++;</div><div class='del'>-</div><div class='del'>-	update (bar);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (bar), signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_from_mime_part (EMsgComposerAttachmentBar *bar,</div><div class='del'>-		    CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	add_common (bar, e_msg_composer_attachment_new_from_mime_part (part));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_from_file (EMsgComposerAttachmentBar *bar,</div><div class='del'>-	       const gchar *file_name, const gchar *content_id)</div><div class='del'>-{</div><div class='del'>-	add_common (bar, e_msg_composer_attachment_new (file_name, content_id));</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'>-	EIconList *icon_list;</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	priv = bar-&gt;priv;</div><div class='del'>-	icon_list = E_ICON_LIST (bar);</div><div class='del'>-</div><div class='del'>-	e_icon_list_freeze (icon_list);</div><div class='del'>-</div><div class='del'>-	e_icon_list_clear (icon_list);</div><div class='del'>-</div><div class='del'>-	/* FIXME could be faster, but we don't care.  */</div><div class='del'>-	for (p = priv-&gt;attachments; p != NULL; p = p-&gt;next) {</div><div class='del'>-		EMsgComposerAttachment *attachment;</div><div class='del'>-		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'>-		GdkPixbuf *pixbuf;</div><div class='del'>-		gboolean image = FALSE;</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'>-</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_vfs_mime_get_value (mime_type,</div><div class='del'>-						      "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_vfs_mime_get_value ("text/plain",</div><div class='del'>-							      "icon-filename");</div><div class='del'>-</div><div class='del'>-		/* Get the image out of the attachment </div><div class='del'>-		   and create a thumbnail for it */</div><div class='del'>-		if (strcmp (content_type-&gt;type, "image") == 0)</div><div class='del'>-			image = TRUE;</div><div class='del'>-		else</div><div class='del'>-			image = FALSE;</div><div class='del'>-		</div><div class='del'>-		if (image &amp;&amp; attachment-&gt;pixbuf_cache == NULL) {</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelStream *mstream;</div><div class='del'>-			GdkPixbufLoader *loader;</div><div class='del'>-			gboolean error = TRUE;</div><div class='del'>-			char tmp[4096];</div><div class='del'>-			int t;</div><div class='del'>-</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (attachment-&gt;body));</div><div class='del'>-			mstream = camel_stream_mem_new ();</div><div class='del'>-</div><div class='del'>-			camel_data_wrapper_write_to_stream (wrapper, mstream);</div><div class='del'>-</div><div class='del'>-			camel_stream_reset (mstream);</div><div class='del'>-</div><div class='del'>-			/* Stream image into pixbuf loader */</div><div class='del'>-			loader = gdk_pixbuf_loader_new ();</div><div class='del'>-			do {</div><div class='del'>-				t = camel_stream_read (mstream, tmp, 4096);</div><div class='del'>-				if (t &gt; 0) {</div><div class='del'>-					error = !gdk_pixbuf_loader_write (loader,</div><div class='del'>-									  tmp, t);</div><div class='del'>-					if (error) {</div><div class='del'>-						break;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					if (camel_stream_eos (mstream))</div><div class='del'>-						break;</div><div class='del'>-					error = TRUE;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-			} while (!camel_stream_eos (mstream));</div><div class='del'>-</div><div class='del'>-			if (!error) {</div><div class='del'>-				int ratio, width, height;</div><div class='del'>-				</div><div class='del'>-				/* Shrink pixbuf */</div><div class='del'>-				pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);</div><div class='del'>-				width = gdk_pixbuf_get_width (pixbuf);</div><div class='del'>-				height = gdk_pixbuf_get_height (pixbuf);</div><div class='del'>-				if (width &gt;= height) {</div><div class='del'>-					if (width &gt; 48) {</div><div class='del'>-						ratio = width / 48;</div><div class='del'>-						width = 48;</div><div class='del'>-						height = height / ratio;</div><div class='del'>-					}</div><div class='del'>-				} else {</div><div class='del'>-					if (height &gt; 48) {</div><div class='del'>-						ratio = height / 48;</div><div class='del'>-						height = 48;</div><div class='del'>-						width = width / ratio;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-				</div><div class='del'>-				attachment-&gt;pixbuf_cache = gdk_pixbuf_scale_simple </div><div class='del'>-					(pixbuf,</div><div class='del'>-					 width,</div><div class='del'>-					 height,</div><div class='del'>-					 GDK_INTERP_BILINEAR);</div><div class='del'>-			} else {</div><div class='del'>-				g_warning ("GdkPixbufLoader Error");</div><div class='del'>-				image = FALSE;</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			/* Destroy everything */</div><div class='del'>-			gdk_pixbuf_loader_close (loader);</div><div class='del'>-			gtk_object_destroy (GTK_OBJECT (loader));</div><div class='del'>-			camel_stream_close (mstream);</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		desc = camel_mime_part_get_description (attachment-&gt;body);</div><div class='del'>-		if (!desc || *desc == '\0')</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'>-		if (image) {</div><div class='del'>-			e_icon_list_append_pixbuf (icon_list, attachment-&gt;pixbuf_cache, icon_name, label);</div><div class='del'>-		} else {</div><div class='del'>-			if (icon_name)</div><div class='del'>-				pixbuf = gdk_pixbuf_new_from_file (icon_name);</div><div class='del'>-			else</div><div class='del'>-				pixbuf = NULL;</div><div class='del'>-</div><div class='del'>-			/* Get the default */</div><div class='del'>-			if (pixbuf == NULL) {</div><div class='del'>-				icon_name = gnome_vfs_mime_get_value ("text/plain",</div><div class='del'>-								      "icon-filename");</div><div class='del'>-				if (icon_name != NULL)</div><div class='del'>-					pixbuf = gdk_pixbuf_new_from_file (icon_name);</div><div class='del'>-			}</div><div class='del'>-			e_icon_list_append_pixbuf (icon_list, pixbuf, </div><div class='del'>-						   icon_name, label);</div><div class='del'>-			if (pixbuf)</div><div class='del'>-				gdk_pixbuf_unref (pixbuf);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		g_free (label);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_icon_list_thaw (icon_list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-remove_selected (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EIconList *icon_list;</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-	GList *attachment_list;</div><div class='del'>-	GList *p;</div><div class='del'>-	gint num;</div><div class='del'>-</div><div class='del'>-	icon_list = E_ICON_LIST (bar);</div><div class='del'>-</div><div class='del'>-	/* Weee!  I am especially proud of this piece of cheesy code: it is</div><div class='del'>-           truly awful.  But unless one attaches a huge number of files, it</div><div class='del'>-           will not be as greedy as intended.  FIXME of course.  */</div><div class='del'>-</div><div class='del'>-	attachment_list = NULL;</div><div class='del'>-	p = e_icon_list_get_selection (icon_list);</div><div class='del'>-	for (; p != NULL; p = p-&gt;next) {</div><div class='del'>-		num = GPOINTER_TO_INT (p-&gt;data);</div><div class='del'>-		attachment = E_MSG_COMPOSER_ATTACHMENT</div><div class='del'>-			(g_list_nth (bar-&gt;priv-&gt;attachments, num)-&gt;data);</div><div class='del'>-		attachment_list = g_list_prepend (attachment_list, attachment);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (p = attachment_list; p != NULL; p = p-&gt;next)</div><div class='del'>-		remove_attachment (bar, E_MSG_COMPOSER_ATTACHMENT (p-&gt;data));</div><div class='del'>-</div><div class='del'>-	g_list_free (attachment_list);</div><div class='del'>-</div><div class='del'>-	update (bar);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_selected (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EIconList *icon_list;</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-	GList *selection;</div><div class='del'>-	gint num;</div><div class='del'>-</div><div class='del'>-	icon_list = E_ICON_LIST (bar);</div><div class='del'>-</div><div class='del'>-	selection = e_icon_list_get_selection (icon_list);</div><div class='del'>-	num = GPOINTER_TO_INT (selection-&gt;data);</div><div class='del'>-	attachment = g_list_nth (bar-&gt;priv-&gt;attachments, num)-&gt;data;</div><div class='del'>-</div><div class='del'>-	e_msg_composer_attachment_edit (attachment, GTK_WIDGET (bar));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* "Attach" dialog.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-add_from_user (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	char *file_name;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (gtk_widget_get_toplevel (GTK_WIDGET (bar)));</div><div class='del'>-	</div><div class='del'>-	file_name = e_msg_composer_select_file (composer, _("Attach a file"));</div><div class='del'>-	</div><div class='del'>-	add_from_file (bar, file_name, NULL);</div><div class='del'>-	</div><div class='del'>-	g_free (file_name);</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'>-	EIconList *icon_list;</div><div class='del'>-	gint icon_number;</div><div class='del'>-</div><div class='del'>-	bar = E_MSG_COMPOSER_ATTACHMENT_BAR (widget);</div><div class='del'>-	icon_list = E_ICON_LIST (widget);</div><div class='del'>-</div><div class='del'>-	if (event-&gt;button != 3)</div><div class='del'>-		return GTK_WIDGET_CLASS (parent_class)-&gt;button_press_event</div><div class='del'>-			(widget, event);</div><div class='del'>-</div><div class='del'>-	icon_number = e_icon_list_get_icon_at (icon_list,</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'>-		e_icon_list_select_icon (icon_list, icon_number);</div><div class='del'>-		popup_icon_context_menu (bar, icon_number, event);</div><div class='del'>-	} else {</div><div class='del'>-		popup_context_menu (bar, event);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Initialization.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMsgComposerAttachmentBarClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	EIconListClass *icon_list_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (class);</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS (class);</div><div class='del'>-	icon_list_class = E_ICON_LIST_CLASS (class);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (e_icon_list_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-</div><div class='del'>-	widget_class-&gt;button_press_event = button_press_event;</div><div class='del'>-</div><div class='del'>-	/* Setup signals.  */</div><div class='del'>-</div><div class='del'>-	signals[CHANGED] =</div><div class='del'>-		gtk_signal_new ("changed",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerAttachmentBarClass,</div><div class='del'>-						   changed),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMsgComposerAttachmentBar *bar)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-	guint icon_size;</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 (e_icon_list_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_attachment_bar_new (GtkAdjustment *adj)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachmentBar *new;</div><div class='del'>-	EIconList *icon_list;</div><div class='del'>-</div><div class='del'>-	gdk_rgb_init ();</div><div class='del'>-	gtk_widget_push_visual (gdk_rgb_get_visual ());</div><div class='del'>-	gtk_widget_push_colormap (gdk_rgb_get_cmap ());</div><div class='del'>-	new = gtk_type_new (e_msg_composer_attachment_bar_get_type ());</div><div class='del'>-	gtk_widget_pop_visual ();</div><div class='del'>-	gtk_widget_pop_colormap ();</div><div class='del'>-</div><div class='del'>-	icon_list = E_ICON_LIST (new);</div><div class='del'>-</div><div class='del'>-	e_icon_list_construct (icon_list, ICON_WIDTH, 0);</div><div class='del'>-</div><div class='del'>-	e_icon_list_set_separators (icon_list, ICON_SEPARATORS);</div><div class='del'>-	e_icon_list_set_row_spacing (icon_list, ICON_ROW_SPACING);</div><div class='del'>-	e_icon_list_set_col_spacing (icon_list, ICON_COL_SPACING);</div><div class='del'>-	e_icon_list_set_icon_border (icon_list, ICON_BORDER);</div><div class='del'>-	e_icon_list_set_text_spacing (icon_list, ICON_TEXT_SPACING);</div><div class='del'>-	e_icon_list_set_selection_mode (icon_list, GTK_SELECTION_MULTIPLE);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (new);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: is_8bit() and best_encoding() should really be shared</div><div class='del'>-   between e-msg-composer.c and this file. */</div><div class='del'>-static gboolean</div><div class='del'>-is_8bit (const guchar *text)</div><div class='del'>-{</div><div class='del'>-	guchar *c;</div><div class='del'>-	</div><div class='del'>-	for (c = (guchar *) text; *c; c++)</div><div class='del'>-		if (*c &gt; (guchar) 127)</div><div class='del'>-			return TRUE;</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-best_encoding (const guchar *text)</div><div class='del'>-{</div><div class='del'>-	guchar *ch;</div><div class='del'>-	int count = 0;</div><div class='del'>-	int total;</div><div class='del'>-	</div><div class='del'>-	for (ch = (guchar *) text; *ch; ch++)</div><div class='del'>-		if (*ch &gt; (guchar) 127)</div><div class='del'>-			count++;</div><div class='del'>-	</div><div class='del'>-	total = (int) (ch - text);</div><div class='del'>-	</div><div class='del'>-	if ((float) count &lt;= total * 0.17)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;</div><div class='del'>-	else</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_BASE64;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static 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'>-	if (!g_strcasecmp (content_type-&gt;type, "text")) {</div><div class='del'>-		CamelStream *stream;</div><div class='del'>-		GByteArray *array;</div><div class='del'>-		guchar *text;</div><div class='del'>-		</div><div class='del'>-		array = g_byte_array_new ();</div><div class='del'>-		stream = camel_stream_mem_new_with_byte_array (array);</div><div class='del'>-		camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (attachment-&gt;body), stream);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-		g_byte_array_append (array, "", 1);</div><div class='del'>-		text = array-&gt;data;</div><div class='del'>-		</div><div class='del'>-		if (is_8bit (text))</div><div class='del'>-			camel_mime_part_set_encoding (attachment-&gt;body, best_encoding (text));</div><div class='del'>-		else</div><div class='del'>-			camel_mime_part_set_encoding (attachment-&gt;body, CAMEL_MIME_PART_ENCODING_7BIT);</div><div class='del'>-		</div><div class='del'>-		g_byte_array_free (array, TRUE);</div><div class='del'>-	} else if (g_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, const gchar *content_id)</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, content_id);</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 31a59cc149..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment-bar.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer-attachment-bar.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* msg-composer-attachment-bar.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 1999  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 "e-icon-list.h"</div><div class='del'>-#include &lt;camel/camel-multipart.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR \</div><div class='del'>-	(e_msg_composer_attachment_bar_get_type ())</div><div class='del'>-#define E_MSG_COMPOSER_ATTACHMENT_BAR(obj) \</div><div class='del'>-	(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBar))</div><div class='del'>-#define E_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \</div><div class='del'>-	(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR, EMsgComposerAttachmentBarClass))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR(obj) \</div><div class='del'>-	(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ATTACHMENT_BAR_CLASS(klass) \</div><div class='del'>-	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT_BAR))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMsgComposerAttachmentBarPrivate EMsgComposerAttachmentBarPrivate;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachmentBar {</div><div class='del'>-	EIconList parent;</div><div class='del'>-</div><div class='del'>-	EMsgComposerAttachmentBarPrivate *priv;</div><div class='del'>-};</div><div class='del'>-typedef struct _EMsgComposerAttachmentBar       EMsgComposerAttachmentBar;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachmentBarClass {</div><div class='del'>-	EIconListClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* changed) (EMsgComposerAttachmentBar *bar);</div><div class='del'>-};</div><div class='del'>-typedef struct _EMsgComposerAttachmentBarClass  EMsgComposerAttachmentBarClass;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_msg_composer_attachment_bar_get_type (void);</div><div class='del'>-GtkWidget *e_msg_composer_attachment_bar_new (GtkAdjustment *adj);</div><div class='del'>-void e_msg_composer_attachment_bar_to_multipart (EMsgComposerAttachmentBar *bar, CamelMultipart *multipart);</div><div class='del'>-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, const gchar *content_id);</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 537774d109..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer-attachment.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,442 +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'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.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 gchar *</div><div class='del'>-get_mime_type (const gchar *file_name)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSFileInfo info;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-</div><div class='del'>-	result = gnome_vfs_get_file_info (file_name, &amp;info,</div><div class='del'>-					  GNOME_VFS_FILE_INFO_GET_MIME_TYPE |</div><div class='del'>-					  GNOME_VFS_FILE_INFO_FOLLOW_LINKS);</div><div class='del'>-	if (result == GNOME_VFS_OK) {</div><div class='del'>-		gchar *type;</div><div class='del'>-</div><div class='del'>-		type = g_strdup (gnome_vfs_file_info_get_mime_type (&amp;info));</div><div class='del'>-		gnome_vfs_file_info_unref (&amp;info);</div><div class='del'>-		return type;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-changed (EMsgComposerAttachment *attachment)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (attachment), signals[CHANGED]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-</div><div class='del'>-	attachment = E_MSG_COMPOSER_ATTACHMENT (object);</div><div class='del'>-</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (attachment-&gt;body));</div><div class='del'>-	if (attachment-&gt;pixbuf_cache != NULL)</div><div class='del'>-		gdk_pixbuf_unref (attachment-&gt;pixbuf_cache);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Signals.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-real_changed (EMsgComposerAttachment *msg_composer_attachment)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (msg_composer_attachment != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_ATTACHMENT (msg_composer_attachment));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMsgComposerAttachmentClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-</div><div class='del'>-	signals[CHANGED] = gtk_signal_new ("changed",</div><div class='del'>-					   GTK_RUN_FIRST,</div><div class='del'>-					   object_class-&gt;type,</div><div class='del'>-					   GTK_SIGNAL_OFFSET</div><div class='del'>-					   	(EMsgComposerAttachmentClass,</div><div class='del'>-						 changed),</div><div class='del'>-					   gtk_marshal_NONE__NONE,</div><div class='del'>-					   GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	klass-&gt;changed = real_changed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMsgComposerAttachment *msg_composer_attachment)</div><div class='del'>-{</div><div class='del'>-	msg_composer_attachment-&gt;editor_gui = NULL;</div><div class='del'>-	msg_composer_attachment-&gt;body = NULL;</div><div class='del'>-	msg_composer_attachment-&gt;size = 0;</div><div class='del'>-	msg_composer_attachment-&gt;pixbuf_cache = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_msg_composer_attachment_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (type == 0) {</div><div class='del'>-		static const GtkTypeInfo info = {</div><div class='del'>-			"EMsgComposerAttachment",</div><div class='del'>-			sizeof (EMsgComposerAttachment),</div><div class='del'>-			sizeof (EMsgComposerAttachmentClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_attachment_new:</div><div class='del'>- * @file_name: </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, const gchar *content_id)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachment *new;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	CamelDataWrapper *wrapper;</div><div class='del'>-	CamelStream *stream;</div><div class='del'>-	struct stat statbuf;</div><div class='del'>-	gchar *mime_type;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (file_name != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	if (stat (file_name, &amp;statbuf) &lt; 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	/* return if it's not a regular file */</div><div class='del'>-	if (!S_ISREG (statbuf.st_mode))</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	stream = camel_stream_fs_new_with_name (file_name, O_RDONLY, 0);</div><div class='del'>-	if (!stream)</div><div class='del'>-		return NULL;</div><div class='del'>-	wrapper = camel_data_wrapper_new ();</div><div class='del'>-	camel_data_wrapper_construct_from_stream (wrapper, stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (stream));</div><div class='del'>-	mime_type = get_mime_type (file_name);</div><div class='del'>-	if (mime_type) {</div><div class='del'>-		camel_data_wrapper_set_mime_type (wrapper, mime_type);</div><div class='del'>-		g_free (mime_type);</div><div class='del'>-	} else</div><div class='del'>-		camel_data_wrapper_set_mime_type (wrapper, "application/octet-stream");</div><div class='del'>-	</div><div class='del'>-	part = camel_mime_part_new ();</div><div class='del'>-	camel_medium_set_content_object (CAMEL_MEDIUM (part), wrapper);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (wrapper));</div><div class='del'>-</div><div class='del'>-	if (content_id) {</div><div class='del'>-		gchar *id;</div><div class='del'>-</div><div class='del'>-		id = g_strconcat ("&lt;", content_id, "&gt;", NULL);</div><div class='del'>-		camel_mime_part_set_content_id (part, id);</div><div class='del'>-		g_free (id);</div><div class='del'>-	}</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'>-	</div><div class='del'>-	new-&gt;size = statbuf.st_size;</div><div class='del'>-	new-&gt;guessed_type = TRUE;</div><div class='del'>-	</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_attachment_new_from_mime_part:</div><div class='del'>- * @part: a CamelMimePart</div><div class='del'>- * </div><div class='del'>- * Return value: a new EMsgComposerAttachment based on the mime part</div><div class='del'>- **/</div><div class='del'>-EMsgComposerAttachment *</div><div class='del'>-e_msg_composer_attachment_new_from_mime_part (CamelMimePart *part)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerAttachment *new;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (CAMEL_IS_MIME_PART (part), NULL);</div><div class='del'>-</div><div class='del'>-	new = gtk_type_new (e_msg_composer_attachment_get_type ());</div><div class='del'>-</div><div class='del'>-	new-&gt;editor_gui = NULL;</div><div class='del'>-	new-&gt;body = part;</div><div class='del'>-	camel_object_ref (CAMEL_OBJECT (part));</div><div class='del'>-	new-&gt;guessed_type = FALSE;</div><div class='del'>-	new-&gt;size = 0;</div><div class='del'>-</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* The attachment property dialog.  */</div><div class='del'>-</div><div class='del'>-struct _DialogData {</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkEntry *file_name_entry;</div><div class='del'>-	GtkEntry *description_entry;</div><div class='del'>-	GtkEntry *mime_type_entry;</div><div class='del'>-	EMsgComposerAttachment *attachment;</div><div class='del'>-};</div><div class='del'>-typedef struct _DialogData DialogData;</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy_dialog_data (DialogData *data)</div><div class='del'>-{</div><div class='del'>-	g_free (data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * fixme: I am converting EVERYTHING to/from UTF-8, although mime types</div><div class='del'>- * are in ASCII. This is not strictly necessary, but we want to be</div><div class='del'>- * consistent and possibly check for errors somewhere.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_mime_type (DialogData *data)</div><div class='del'>-{</div><div class='del'>-	const gchar *mime_type;</div><div class='del'>-	gchar *file_name;</div><div class='del'>-</div><div class='del'>-	if (!data-&gt;attachment-&gt;guessed_type)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	file_name = e_utf8_gtk_entry_get_text (data-&gt;file_name_entry);</div><div class='del'>-	mime_type = get_mime_type (file_name);</div><div class='del'>-	g_free (file_name);</div><div class='del'>-</div><div class='del'>-	e_utf8_gtk_entry_set_text (data-&gt;mime_type_entry, mime_type);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_entry (GladeXML *xml,</div><div class='del'>-	   const gchar *widget_name,</div><div class='del'>-	   const gchar *value)</div><div class='del'>-{</div><div class='del'>-	GtkEntry *entry;</div><div class='del'>-</div><div class='del'>-	entry = GTK_ENTRY (glade_xml_get_widget (xml, widget_name));</div><div class='del'>-	if (entry == NULL)</div><div class='del'>-		g_warning ("Entry for `%s' not found.", widget_name);</div><div class='del'>-	else</div><div class='del'>-		e_utf8_gtk_entry_set_text (entry, value ? value : "");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-connect_widget (GladeXML *gui,</div><div class='del'>-		const gchar *name,</div><div class='del'>-		const gchar *signal_name,</div><div class='del'>-		GtkSignalFunc func,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget (gui, name);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (widget), signal_name, func, data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_cb (GtkWidget *widget,</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'>-	gchar *str;</div><div class='del'>-</div><div class='del'>-	dialog_data = (DialogData *) data;</div><div class='del'>-	attachment = dialog_data-&gt;attachment;</div><div class='del'>-</div><div class='del'>-	str = e_utf8_gtk_entry_get_text (dialog_data-&gt;file_name_entry);</div><div class='del'>-	camel_mime_part_set_filename (attachment-&gt;body, str);</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	str = e_utf8_gtk_entry_get_text (dialog_data-&gt;description_entry);</div><div class='del'>-	camel_mime_part_set_description (attachment-&gt;body, str);</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	str = e_utf8_gtk_entry_get_text (dialog_data-&gt;mime_type_entry);</div><div class='del'>-	camel_mime_part_set_content_type (attachment-&gt;body, str);</div><div class='del'>-</div><div class='del'>-	camel_data_wrapper_set_mime_type (</div><div class='del'>-		camel_medium_get_content_object (CAMEL_MEDIUM (attachment-&gt;body)), str);</div><div class='del'>-	g_free (str);</div><div class='del'>-</div><div class='del'>-	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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 f3d8922276..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-attachment.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer-attachment.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-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'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define E_TYPE_MSG_COMPOSER_ATTACHMENT			(e_msg_composer_attachment_get_type ())</div><div class='del'>-#define E_MSG_COMPOSER_ATTACHMENT(obj)			(GTK_CHECK_CAST ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachment))</div><div class='del'>-#define E_MSG_COMPOSER_ATTACHMENT_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TYPE_MSG_COMPOSER_ATTACHMENT, EMsgComposerAttachmentClass))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ATTACHMENT(obj)		(GTK_CHECK_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))</div><div class='del'>-#define E_IS_MSG_COMPOSER_ATTACHMENT_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((obj), E_TYPE_MSG_COMPOSER_ATTACHMENT))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _EMsgComposerAttachment       EMsgComposerAttachment;</div><div class='del'>-typedef struct _EMsgComposerAttachmentClass  EMsgComposerAttachmentClass;</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachment {</div><div class='del'>-	GtkObject parent;</div><div class='del'>-</div><div class='del'>-	GladeXML *editor_gui;</div><div class='del'>-</div><div class='del'>-	CamelMimePart *body;</div><div class='del'>-	gboolean guessed_type;</div><div class='del'>-	gulong size;</div><div class='del'>-</div><div class='del'>-	GdkPixbuf *pixbuf_cache;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerAttachmentClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (*changed)	(EMsgComposerAttachment *msg_composer_attachment);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType e_msg_composer_attachment_get_type (void);</div><div class='del'>-EMsgComposerAttachment *e_msg_composer_attachment_new (const gchar *file_name, const gchar *content_id);</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 21be22b3b2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-hdrs.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer-hdrs.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,712 +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 &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Composer.h"</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer-hdrs.h"</div><div class='del'>-#include &lt;gal/e-text/e-entry.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-#include "mail/mail-config.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define SELECT_NAMES_OAFID "OAFIID:addressbook:select-names:39301deb-174b-40d1-8a6e-5edc300f7b61"</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerHdrsPrivate {</div><div class='del'>-	Evolution_Addressbook_SelectNames corba_select_names;</div><div class='del'>-</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 *from_entry;</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'>-enum {</div><div class='del'>-	HEADER_ADDRBOOK,</div><div class='del'>-	HEADER_COMBOBOX,</div><div class='del'>-	HEADER_ENTRYBOX</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 gboolean</div><div class='del'>-setup_corba (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	g_assert (priv-&gt;corba_select_names == CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	priv-&gt;corba_select_names = oaf_activate_from_id (SELECT_NAMES_OAFID, 0, NULL, &amp;ev);</div><div class='del'>-</div><div class='del'>-	/* OAF seems to be broken -- it can return a CORBA_OBJECT_NIL without</div><div class='del'>-           raising an exception in `ev'.  */</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION || priv-&gt;corba_select_names == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("Cannot activate -- %s", SELECT_NAMES_OAFID);</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'>-</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'>-	EMsgComposerHdrs *hdrs;</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	hdrs = E_MSG_COMPOSER_HDRS (data);</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	/* FIXME: Section ID */</div><div class='del'>-	Evolution_Addressbook_SelectNames_activate_dialog (priv-&gt;corba_select_names, "", &amp;ev);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_dropdown_entry (EMsgComposerHdrs *hdrs,</div><div class='del'>-		       const char *name)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *combo;</div><div class='del'>-	GList *values = NULL;</div><div class='del'>-	</div><div class='del'>-	combo = gtk_combo_new ();</div><div class='del'>-	gtk_combo_set_use_arrows (GTK_COMBO (combo), TRUE);</div><div class='del'>-	gtk_combo_set_case_sensitive (GTK_COMBO (combo), FALSE);</div><div class='del'>-	if (!strcmp (name, _("From:"))) {</div><div class='del'>-		CamelInternetAddress *ciaddr;</div><div class='del'>-		GSList *ids, *stmp;</div><div class='del'>-		GList *tmp;</div><div class='del'>-		MailConfigIdentity *id;</div><div class='del'>-		char *val;</div><div class='del'>-		</div><div class='del'>-		ids = mail_config_get_identities ();</div><div class='del'>-		stmp = ids;</div><div class='del'>-		while (stmp) {</div><div class='del'>-			char *address;</div><div class='del'>-			</div><div class='del'>-			id = stmp-&gt;data;</div><div class='del'>-			g_assert (id);			</div><div class='del'>-			g_assert (id-&gt;name);</div><div class='del'>-			g_assert (id-&gt;address);</div><div class='del'>-			</div><div class='del'>-			ciaddr = camel_internet_address_new ();</div><div class='del'>-			camel_internet_address_add (ciaddr, id-&gt;name, id-&gt;address);</div><div class='del'>-			address = camel_address_encode (CAMEL_ADDRESS (ciaddr));</div><div class='del'>-			values = g_list_append (values, address);</div><div class='del'>-			stmp = stmp-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		gtk_combo_set_popdown_strings (GTK_COMBO (combo), values);</div><div class='del'>-</div><div class='del'>-		tmp = values;</div><div class='del'>-		while (tmp) {</div><div class='del'>-			g_free (tmp-&gt;data);</div><div class='del'>-			tmp = tmp-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		g_list_free (values);</div><div class='del'>-</div><div class='del'>-		id = mail_config_get_default_identity ();</div><div class='del'>-		g_assert (id);			</div><div class='del'>-		g_assert (id-&gt;name);</div><div class='del'>-		g_assert (id-&gt;address);</div><div class='del'>-		</div><div class='del'>-		ciaddr = camel_internet_address_new ();</div><div class='del'>-		camel_internet_address_add (ciaddr, id-&gt;name, id-&gt;address);</div><div class='del'>-		val = camel_address_encode (CAMEL_ADDRESS (ciaddr));</div><div class='del'>-		</div><div class='del'>-		e_utf8_gtk_entry_set_text (GTK_ENTRY (GTK_COMBO (combo)-&gt;entry), val);</div><div class='del'>-		g_free (val);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return combo;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static GtkWidget *</div><div class='del'>-create_addressbook_entry (EMsgComposerHdrs *hdrs,</div><div class='del'>-			  const char *name)</div><div class='del'>-{</div><div class='del'>-	EMsgComposerHdrsPrivate *priv;</div><div class='del'>-	Evolution_Addressbook_SelectNames corba_select_names;</div><div class='del'>-	Bonobo_Control corba_control;</div><div class='del'>-	GtkWidget *control_widget;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	priv = hdrs-&gt;priv;</div><div class='del'>-	corba_select_names = priv-&gt;corba_select_names;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	Evolution_Addressbook_SelectNames_add_section (corba_select_names, name, name, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	corba_control = Evolution_Addressbook_SelectNames_get_entry_for_section (corba_select_names, name, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	return control_widget;</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'>-	    int type)</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 (type == HEADER_ADDRBOOK) {</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'>-	switch (type) {</div><div class='del'>-	case HEADER_ADDRBOOK:</div><div class='del'>-		entry = create_addressbook_entry (hdrs, name);</div><div class='del'>-		break;</div><div class='del'>-	case HEADER_COMBOBOX:</div><div class='del'>-		entry = create_dropdown_entry (hdrs, name);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		entry = e_entry_new ();</div><div class='del'>-		gtk_object_set(GTK_OBJECT(entry),</div><div class='del'>-			       "editable", TRUE,</div><div class='del'>-			       "use_ellipsis", TRUE,</div><div class='del'>-			       NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (entry != NULL) {</div><div class='del'>-		gtk_widget_show (entry);</div><div class='del'>-		</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, 0,</div><div class='del'>-				  2, 2);</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'>-	</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;from_entry = add_header</div><div class='del'>-		(hdrs, _("From:"), </div><div class='del'>-		 _("Enter the identity you wish to send this message from"),</div><div class='del'>-		 NULL,</div><div class='del'>-		 HEADER_COMBOBOX);</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'>-		 HEADER_ADDRBOOK);</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'>-		 HEADER_ADDRBOOK);</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'>-		 HEADER_ADDRBOOK);</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'>-		 HEADER_ENTRYBOX);</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'>-	if (priv-&gt;corba_select_names != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		CORBA_Object_release (priv-&gt;corba_select_names, &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	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;corba_select_names = CORBA_OBJECT_NIL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;from_entry    = NULL;</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'>-	if (! setup_corba (new)) {</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (new));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	setup_headers (new);</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 GList *</div><div class='del'>-decode_addresses (const char *s)</div><div class='del'>-{</div><div class='del'>-	const char *p, *oldp;</div><div class='del'>-	gboolean in_quotes;</div><div class='del'>-	GList *list;</div><div class='del'>-</div><div class='del'>-	g_print ("Decoding addresses -- %s\n", s ? s : "(null)");</div><div class='del'>-</div><div class='del'>-	if (s == NULL)</div><div class='del'>-		return NULL;</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'>-				char *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'>-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'>-	GList *list;</div><div class='del'>-	GList *p;</div><div class='del'>-	struct _header_address *addr;</div><div class='del'>-	char *s;</div><div class='del'>-</div><div class='del'>-	bonobo_widget_get_property (BONOBO_WIDGET (entry_widget), "text", &amp;s, NULL);</div><div class='del'>-</div><div class='del'>-	list = decode_addresses (s);</div><div class='del'>-</div><div class='del'>-	g_free (s);</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'>-	gchar *subject;</div><div class='del'>-	gchar *from;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (hdrs != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	g_return_if_fail (msg != NULL);</div><div class='del'>-	g_return_if_fail (CAMEL_IS_MIME_MESSAGE (msg));</div><div class='del'>-	</div><div class='del'>-	subject = e_msg_composer_hdrs_get_subject (hdrs);</div><div class='del'>-	camel_mime_message_set_subject (msg, subject);</div><div class='del'>-	g_free (subject);</div><div class='del'>-	</div><div class='del'>-	from = e_msg_composer_hdrs_get_from (hdrs);</div><div class='del'>-	camel_mime_message_set_from (msg, from);</div><div class='del'>-	g_free (from);</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'>-static void</div><div class='del'>-set_entry (BonoboWidget *bonobo_widget,</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'>-	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'>-	bonobo_widget_set_property (BONOBO_WIDGET (bonobo_widget), "text", string-&gt;str, NULL);</div><div class='del'>-</div><div class='del'>-	g_string_free (string, TRUE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_msg_composer_hdrs_set_from (EMsgComposerHdrs *hdrs,</div><div class='del'>-			      const char *from)</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'>-	</div><div class='del'>-	entry = GTK_ENTRY (GTK_COMBO (hdrs-&gt;priv-&gt;from_entry)-&gt;entry);</div><div class='del'>-	e_utf8_gtk_entry_set_text (entry, from);</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'>-	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'>-	set_entry (BONOBO_WIDGET (hdrs-&gt;priv-&gt;to_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'>-	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'>-	set_entry (BONOBO_WIDGET (hdrs-&gt;priv-&gt;cc_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'>-	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'>-	set_entry (BONOBO_WIDGET (hdrs-&gt;priv-&gt;bcc_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'>-	g_return_if_fail (hdrs != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));</div><div class='del'>-	g_return_if_fail (subject != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_object_set (GTK_OBJECT (hdrs-&gt;priv-&gt;subject_entry),</div><div class='del'>-			"text", subject,</div><div class='del'>-			NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_msg_composer_hdrs_get_from (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_utf8_gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (hdrs-&gt;priv-&gt;from_entry)-&gt;entry));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME this is currently unused and broken.  */</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'>-	g_assert_not_reached ();</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME this is currently unused and broken.  */</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'>-	g_assert_not_reached ();</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME this is currently unused and broken.  */</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'>-	g_assert_not_reached ();</div><div class='del'>-	</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: This is just changed to return allooc'd mem to be consistant with get_from */</div><div class='del'>-char *</div><div class='del'>-e_msg_composer_hdrs_get_subject (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	gchar *subject;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	gtk_object_get (GTK_OBJECT (hdrs-&gt;priv-&gt;subject_entry),</div><div class='del'>-			"text", &amp;subject, NULL);</div><div class='del'>-	</div><div class='del'>-	return g_strdup (subject);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_to_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-</div><div class='del'>-	return hdrs-&gt;priv-&gt;to_entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_cc_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-	</div><div class='del'>-	return hdrs-&gt;priv-&gt;cc_entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_bcc_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-</div><div class='del'>-	return hdrs-&gt;priv-&gt;bcc_entry;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_msg_composer_hdrs_get_subject_entry (EMsgComposerHdrs *hdrs)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (hdrs != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs), NULL);</div><div class='del'>-</div><div class='del'>-	return hdrs-&gt;priv-&gt;subject_entry;</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h<br/>deleted file mode 100644<br/>index a495fd853c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-hdrs.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer-hdrs.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* 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_from           (EMsgComposerHdrs *hdrs,</div><div class='del'>-						    const char       *from);</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'>-char       *e_msg_composer_hdrs_get_from           (EMsgComposerHdrs *hdrs);</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'>-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 36b53c8446..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer-select-file.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer-select-file.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,173 +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'>-	gtk_window_set_wmclass (GTK_WINDOW (widget), "fileselection", </div><div class='del'>-				"Evolution:composer");</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'>-	GDK_THREADS_ENTER();</div><div class='del'>-	gtk_main ();</div><div class='del'>-	GDK_THREADS_LEAVE();</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 456b8a54f9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1904 +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'>- * Authors: Ettore Perazzoli, Jeffrey Stedfast</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'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-</div><div class='del'>-#include "camel/camel.h"</div><div class='del'>-#include "camel-charset-map.h"</div><div class='del'>-</div><div class='del'>-#include "mail/mail.h"</div><div class='del'>-#include "mail/mail-tools.h"</div><div class='del'>-#include "mail/mail-threads.h"</div><div class='del'>-</div><div class='del'>-#include "e-util/e-html-utils.h"</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-scroll-frame.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-#include "e-msg-composer-attachment-bar.h"</div><div class='del'>-#include "e-msg-composer-hdrs.h"</div><div class='del'>-#include "e-msg-composer-select-file.h"</div><div class='del'>-</div><div class='del'>-#include "HTMLEditor.h"</div><div class='del'>-#include "listener.h"</div><div class='del'>-</div><div class='del'>-#define HTML_EDITOR_CONTROL_ID "OAFIID:control:html-editor:63c5499b-8b0c-475a-9948-81ec96a9662c"</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'>-/* local prototypes */</div><div class='del'>-static GList *add_recipients (GList *list, const char *recips, gboolean decode);</div><div class='del'>-static void free_recipients (GList *list);</div><div class='del'>-static void handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth);</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)),</div><div class='del'>-				   format, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Exception getting mail '%s'",</div><div class='del'>-			   bonobo_exception_get_text (&amp;ev));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	stream_mem = BONOBO_STREAM_MEM (stream);</div><div class='del'>-	text = g_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'>-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'>-static gboolean</div><div class='del'>-is_8bit (const guchar *text)</div><div class='del'>-{</div><div class='del'>-	guchar *c;</div><div class='del'>-	</div><div class='del'>-	for (c = (guchar *) text; *c; c++)</div><div class='del'>-		if (*c &gt; (guchar) 127)</div><div class='del'>-			return TRUE;</div><div class='del'>-	</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-best_encoding (const guchar *text)</div><div class='del'>-{</div><div class='del'>-	guchar *ch;</div><div class='del'>-	int count = 0;</div><div class='del'>-	int total;</div><div class='del'>-	</div><div class='del'>-	for (ch = (guchar *) text; *ch; ch++)</div><div class='del'>-		if (*ch &gt; (guchar) 127)</div><div class='del'>-			count++;</div><div class='del'>-	</div><div class='del'>-	total = (int) (ch - text);</div><div class='del'>-	</div><div class='del'>-	if ((float) count &lt;= total * 0.17)</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_QUOTEDPRINTABLE;</div><div class='del'>-	else</div><div class='del'>-		return CAMEL_MIME_PART_ENCODING_BASE64;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-best_content (gchar *plain)</div><div class='del'>-{</div><div class='del'>-	char *result;</div><div class='del'>-	const char *best;</div><div class='del'>-</div><div class='del'>-	if ((best = camel_charset_best (plain, strlen (plain)))) {</div><div class='del'>-		result = g_strdup_printf ("text/plain ; charset=%s", best);</div><div class='del'>-	} else {</div><div class='del'>-		result = g_strdup ("text/plain");</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'>-/* 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'>-	MsgFormat type = MSG_FORMAT_ALTERNATIVE;</div><div class='del'>-	CamelMimeMessage *new;</div><div class='del'>-	CamelMultipart *body = NULL;</div><div class='del'>-	CamelMimePart *part;</div><div class='del'>-	gchar *from = NULL;</div><div class='del'>-	gboolean e8bit;</div><div class='del'>-	char *html = NULL, *plain = NULL;</div><div class='del'>-	char *content_type = NULL;</div><div class='del'>-	int i;</div><div class='del'>-	</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'>-	if (composer-&gt;send_html)</div><div class='del'>-		type = MSG_FORMAT_ALTERNATIVE;</div><div class='del'>-	else</div><div class='del'>-		type = MSG_FORMAT_PLAIN;</div><div class='del'>-	</div><div class='del'>-	/* get and/or set the From field */</div><div class='del'>-	from = e_msg_composer_hdrs_get_from (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs));</div><div class='del'>-	if (!from) {</div><div class='del'>-		const MailConfigIdentity *id = NULL;</div><div class='del'>-		CamelInternetAddress *ciaddr;</div><div class='del'>-		</div><div class='del'>-		id = mail_config_get_default_identity ();</div><div class='del'>-		ciaddr = camel_internet_address_new ();</div><div class='del'>-		camel_internet_address_add (ciaddr, id-&gt;name, id-&gt;address);</div><div class='del'>-		from = camel_address_encode (CAMEL_ADDRESS (ciaddr));</div><div class='del'>-		e_msg_composer_hdrs_set_from (E_MSG_COMPOSER_HDRS (composer-&gt;hdrs), from);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (ciaddr));</div><div class='del'>-	}</div><div class='del'>-	g_free (from);</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'>-</div><div class='del'>-	/* the component has probably died */ </div><div class='del'>-	if (plain == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	e8bit = is_8bit (plain);</div><div class='del'>-	content_type = best_content (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'>-		/* the component has probably died */ </div><div class='del'>-		if (html == NULL) {</div><div class='del'>-			g_free (plain);</div><div class='del'>-			g_free (content_type);</div><div class='del'>-			return NULL;</div><div class='del'>-		}</div><div class='del'>-	}</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'>-</div><div class='del'>-		camel_mime_part_set_content (part, plain, strlen (plain), content_type);</div><div class='del'>-</div><div class='del'>-		if (e8bit)</div><div class='del'>-			camel_mime_part_set_encoding (part, best_encoding (plain));		</div><div class='del'>-</div><div class='del'>-		g_free (plain);</div><div class='del'>-		g_free (content_type);</div><div class='del'>-		camel_multipart_add_part (body, part);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-		</div><div class='del'>-		part = camel_mime_part_new ();</div><div class='del'>-		camel_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'>-		camel_object_unref (CAMEL_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'>-			camel_object_unref (CAMEL_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, plain, strlen (plain), best_content (plain));</div><div class='del'>-</div><div class='del'>-			if (e8bit)</div><div class='del'>-				camel_mime_part_set_encoding (part, best_encoding (plain));</div><div class='del'>-</div><div class='del'>-			g_free (plain);</div><div class='del'>-			g_free (content_type);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-		camel_multipart_add_part (multipart, part);</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (part));</div><div class='del'>-		</div><div class='del'>-		e_msg_composer_attachment_bar_to_multipart (attachment_bar, multipart);</div><div class='del'>-		</div><div class='del'>-		camel_medium_set_content_object (CAMEL_MEDIUM (new), CAMEL_DATA_WRAPPER (multipart));</div><div class='del'>-		camel_object_unref (CAMEL_OBJECT (multipart));</div><div class='del'>-	} else {</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'>-			camel_object_unref (CAMEL_OBJECT (body));</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case MSG_FORMAT_PLAIN:</div><div class='del'>-			camel_mime_part_set_content (CAMEL_MIME_PART (new), plain, strlen (plain), best_content (plain));</div><div class='del'>-</div><div class='del'>-			if (e8bit)</div><div class='del'>-				camel_mime_part_set_encoding (CAMEL_MIME_PART (new), best_encoding (plain));</div><div class='del'>-</div><div class='del'>-			g_free (plain);</div><div class='del'>-			g_free (content_type);</div><div class='del'>-			break;</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 (const char *sigfile)</div><div class='del'>-{</div><div class='del'>-	GString *rawsig;</div><div class='del'>-	char buf[1024];</div><div class='del'>-	char *htmlsig = NULL;</div><div class='del'>-	int fd, n;</div><div class='del'>-	</div><div class='del'>-	if (!sigfile || !*sigfile) {</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	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"</div><div class='del'>-					 "%s"), 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'>-	rawsig = g_string_new ("");</div><div class='del'>-	while ((n = read (fd, buf, 1023)) &gt; 0) {</div><div class='del'>-		buf[n] = '\0';</div><div class='del'>-		g_string_append (rawsig, buf);</div><div class='del'>-	}</div><div class='del'>-	close (fd);</div><div class='del'>-	</div><div class='del'>-	htmlsig = e_text_to_html (rawsig-&gt;str, 0);</div><div class='del'>-	g_string_free (rawsig, TRUE);</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'>-prepare_engine (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_assert (composer);</div><div class='del'>-	g_assert (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	/* printf ("prepare_engine\n"); */</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	composer-&gt;editor_engine = (HTMLEditor_Engine) bonobo_object_client_query_interface</div><div class='del'>-		(bonobo_widget_get_server (BONOBO_WIDGET (composer-&gt;editor)), "IDL:HTMLEditor/Engine:1.0", &amp;ev);</div><div class='del'>-	if (composer-&gt;editor_engine != CORBA_OBJECT_NIL) {</div><div class='del'>-		</div><div class='del'>-		/* printf ("trying set listener\n"); */</div><div class='del'>-		composer-&gt;editor_listener = BONOBO_OBJECT (html_editor_listener_new (composer));</div><div class='del'>-		if (composer-&gt;editor_listener != CORBA_OBJECT_NIL)</div><div class='del'>-			HTMLEditor_Engine__set_listener (composer-&gt;editor_engine,</div><div class='del'>-							 (HTMLEditor_Listener)</div><div class='del'>-							 bonobo_object_dup_ref</div><div class='del'>-							 (bonobo_object_corba_objref (composer-&gt;editor_listener), &amp;ev),</div><div class='del'>-							 &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-mark_orig_text (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_assert (composer);</div><div class='del'>-	g_assert (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;editor_engine != CORBA_OBJECT_NIL) {</div><div class='del'>-		CORBA_Environment ev;</div><div class='del'>-		CORBA_any *flag = bonobo_arg_new (TC_boolean);</div><div class='del'>-		*((CORBA_boolean *) flag-&gt;_value) = CORBA_TRUE;</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		HTMLEditor_Engine_set_object_data_by_type (composer-&gt;editor_engine, "ClueFlow", "orig", flag, &amp;ev);</div><div class='del'>-		CORBA_free (flag);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_editor_text (EMsgComposer *composer, const char *sig_file, const char *text)</div><div class='del'>-{</div><div class='del'>-	Bonobo_PersistStream persist;</div><div class='del'>-	BonoboStream *stream;</div><div class='del'>-	BonoboWidget *editor;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *sig, *fulltext;</div><div class='del'>-	</div><div class='del'>-	editor = BONOBO_WIDGET (composer-&gt;editor);</div><div class='del'>-	sig    = get_signature (sig_file);</div><div class='del'>-	if (sig) {</div><div class='del'>-		if (!strncmp ("-- \n", sig, 3))</div><div class='del'>-			fulltext = g_strdup_printf ("%s&lt;br&gt;\n&lt;pre&gt;\n%s&lt;/pre&gt;",</div><div class='del'>-						    text, sig);</div><div class='del'>-		else</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'>-		if (!*text)</div><div class='del'>-			return;</div><div class='del'>-		fulltext = (char*)text;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	persist = (Bonobo_PersistStream) bonobo_object_client_query_interface (</div><div class='del'>-		bonobo_widget_get_server (editor), "IDL:Bonobo/PersistStream:1.0", &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)),</div><div class='del'>-				   "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'>-	mark_orig_text (composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Commands.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-show_attachments (EMsgComposer *composer,</div><div class='del'>-		  gboolean show)</div><div class='del'>-{</div><div class='del'>-	if (show) {</div><div class='del'>-		gtk_widget_show (composer-&gt;attachment_scroll_frame);</div><div class='del'>-		gtk_widget_show (composer-&gt;attachment_bar);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_hide (composer-&gt;attachment_scroll_frame);</div><div class='del'>-		gtk_widget_hide (composer-&gt;attachment_bar);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	composer-&gt;attachment_bar_visible = show;</div><div class='del'>-</div><div class='del'>-	/* Update the GUI.  */</div><div class='del'>-</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'>-static void</div><div class='del'>-save (EMsgComposer *composer,</div><div class='del'>-      const char *file_name)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	char *my_file_name;</div><div class='del'>-</div><div class='del'>-	if (file_name != NULL)</div><div class='del'>-		my_file_name = g_strdup (file_name);</div><div class='del'>-	else</div><div class='del'>-		my_file_name = e_msg_composer_select_file (composer, _("Save as..."));</div><div class='del'>-</div><div class='del'>-	if (my_file_name == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	Bonobo_PersistFile_save (composer-&gt;persist_file_interface, my_file_name, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Error saving file: %s"), g_basename (file_name));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	g_free (my_file_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load (EMsgComposer *composer,</div><div class='del'>-      const char *file_name)</div><div class='del'>-{</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	Bonobo_PersistFile_load (composer-&gt;persist_file_interface, file_name, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION)</div><div class='del'>-		e_notice (GTK_WINDOW (composer), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Error loading file: %s"), g_basename (file_name));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Exit dialog.  (Displays a "Save composition to 'Drafts' before exiting?" warning before actually exiting.)  */</div><div class='del'>-</div><div class='del'>-enum { REPLY_YES = 0, REPLY_NO, REPLY_CANCEL };</div><div class='del'>-</div><div class='del'>-typedef struct save_draft_input_s {</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-} save_draft_input_t;</div><div class='del'>-</div><div class='del'>-typedef struct save_draft_data_s {</div><div class='del'>-	CamelMimeMessage *msg;</div><div class='del'>-	CamelMessageInfo *info;</div><div class='del'>-} save_draft_data_t;</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-describe_save_draft (gpointer in_data, gboolean gerund)</div><div class='del'>-{</div><div class='del'>-	if (gerund) {</div><div class='del'>-		return g_strdup (_("Saving changes to message..."));</div><div class='del'>-	} else {</div><div class='del'>-		return g_strdup (_("Save changes to message..."));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_save_draft (gpointer in_data, gpointer op_data, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	save_draft_input_t *input = (save_draft_input_t *) in_data;</div><div class='del'>-	save_draft_data_t *data = (save_draft_data_t *) op_data;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (input-&gt;composer != NULL);</div><div class='del'>-	</div><div class='del'>-	/* initialize op_data */</div><div class='del'>-	input-&gt;composer-&gt;send_html = TRUE;  /* always save drafts as HTML to keep formatting */</div><div class='del'>-	data-&gt;msg = e_msg_composer_get_message (input-&gt;composer);</div><div class='del'>-	data-&gt;info = g_new0 (CamelMessageInfo, 1);</div><div class='del'>-	data-&gt;info-&gt;flags = CAMEL_MESSAGE_DRAFT;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-do_save_draft (gpointer in_data, gpointer op_data, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	/*save_draft_input_t *input = (save_draft_input_t *) in_data;*/</div><div class='del'>-	save_draft_data_t *data = (save_draft_data_t *) op_data;</div><div class='del'>-	extern CamelFolder *drafts_folder;</div><div class='del'>-	</div><div class='del'>-	/* perform camel operations */</div><div class='del'>-	mail_tool_camel_lock_up ();</div><div class='del'>-	camel_folder_append_message (drafts_folder, data-&gt;msg, data-&gt;info, ex);</div><div class='del'>-	mail_tool_camel_lock_down ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-cleanup_save_draft (gpointer in_data, gpointer op_data, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	save_draft_input_t *input = (save_draft_input_t *) in_data;</div><div class='del'>-	/*save_draft_data_t *data = (save_draft_data_t *) op_data;*/</div><div class='del'>-	</div><div class='del'>-	if (camel_exception_is_set (ex)) {</div><div class='del'>-		char *reason;</div><div class='del'>-		</div><div class='del'>-		reason = g_strdup_printf (_("Error saving composition to 'Drafts': %s"),</div><div class='del'>-					  camel_exception_get_description (ex));</div><div class='del'>-		</div><div class='del'>-		gnome_warning_dialog_parented (reason, GTK_WINDOW (input-&gt;composer));</div><div class='del'>-		g_free (reason);</div><div class='del'>-	} else {</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (input-&gt;composer));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const mail_operation_spec op_save_draft = {</div><div class='del'>-	describe_save_draft,</div><div class='del'>-	sizeof (save_draft_data_t),</div><div class='del'>-	setup_save_draft,</div><div class='del'>-	do_save_draft,</div><div class='del'>-	cleanup_save_draft</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-exit_dialog_cb (int reply, EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	save_draft_input_t *input;</div><div class='del'>-	</div><div class='del'>-	switch (reply) {</div><div class='del'>-	case REPLY_YES:</div><div class='del'>-		/* this has to be done async */</div><div class='del'>-		input = g_new0 (save_draft_input_t, 1);</div><div class='del'>-		input-&gt;composer = composer;</div><div class='del'>-		mail_operation_queue (&amp;op_save_draft, input, TRUE);</div><div class='del'>-	case REPLY_NO:</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (composer));</div><div class='del'>-		break;</div><div class='del'>-	case REPLY_CANCEL:</div><div class='del'>-	default:</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>- </div><div class='del'>-static void</div><div class='del'>-do_exit (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *dialog;</div><div class='del'>-	GtkWidget *label;</div><div class='del'>-	gint button;</div><div class='del'>-	</div><div class='del'>-	dialog = gnome_dialog_new (_("Evolution"),</div><div class='del'>-				   GNOME_STOCK_BUTTON_YES,      /* Save */</div><div class='del'>-				   GNOME_STOCK_BUTTON_NO,       /* Don't save */</div><div class='del'>-				   GNOME_STOCK_BUTTON_CANCEL,   /* Cancel */</div><div class='del'>-				   NULL);</div><div class='del'>-	</div><div class='del'>-	label = gtk_label_new (_("This message has not been sent.\n\nDo you wish to save your changes?"));</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)-&gt;vbox), label, TRUE, TRUE, 0);</div><div class='del'>-	gtk_widget_show (label);</div><div class='del'>-	gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (composer));</div><div class='del'>-	gnome_dialog_set_default (GNOME_DIALOG (dialog), 0);</div><div class='del'>-	button = gnome_dialog_run_and_close (GNOME_DIALOG (dialog));</div><div class='del'>-	</div><div class='del'>-	exit_dialog_cb (button, composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Menu callbacks.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_open_cb (BonoboUIComponent *uic,</div><div class='del'>-		   void *data,</div><div class='del'>-		   const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	char *file_name;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	file_name = e_msg_composer_select_file (composer, _("Open file"));</div><div class='del'>-	if (file_name == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	load (composer, file_name);</div><div class='del'>-	</div><div class='del'>-	g_free (file_name);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_save_cb (BonoboUIComponent *uic,</div><div class='del'>-		   void *data,</div><div class='del'>-		   const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	CORBA_char *file_name;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	file_name = Bonobo_PersistFile_getCurrentFile (composer-&gt;persist_file_interface, &amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		save (composer, NULL);</div><div class='del'>-	} else {</div><div class='del'>-		save (composer, file_name);</div><div class='del'>-		CORBA_free (file_name);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_save_as_cb (BonoboUIComponent *uic,</div><div class='del'>-		      void *data,</div><div class='del'>-		      const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	save (composer, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_send_cb (BonoboUIComponent *uic,</div><div class='del'>-		   void *data,</div><div class='del'>-		   const char *path)</div><div class='del'>-{</div><div class='del'>-	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'>-menu_file_send_later_cb (BonoboUIComponent *uic,</div><div class='del'>-			 void *data,</div><div class='del'>-			 const char *path)</div><div class='del'>-{</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (data), signals[POSTPONE]);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_file_close_cb (BonoboUIComponent *uic,</div><div class='del'>-		    void *data,</div><div class='del'>-		    const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	do_exit (composer);</div><div class='del'>-}</div><div class='del'>-	</div><div class='del'>-static void</div><div class='del'>-menu_file_add_attachment_cb (BonoboUIComponent *uic,</div><div class='del'>-			     void *data,</div><div class='del'>-			     const char *path)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_attachment_bar_attach</div><div class='del'>-		(E_MSG_COMPOSER_ATTACHMENT_BAR (composer-&gt;attachment_bar),</div><div class='del'>-		 NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_view_attachments_activate_cb (BonoboUIComponent           *component,</div><div class='del'>-				   const char                  *path,</div><div class='del'>-				   Bonobo_UIComponent_EventType type,</div><div class='del'>-				   const char                  *state,</div><div class='del'>-				   gpointer                     user_data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	gboolean new_state;</div><div class='del'>-	</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	new_state = atoi (state);</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_show_attachments (E_MSG_COMPOSER (user_data), new_state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-insert_file_ok_cb (GtkWidget *widget, void *user_data)</div><div class='del'>-{</div><div class='del'>-	GtkFileSelection *fs;</div><div class='del'>-	GdkAtom selection_atom = GDK_NONE;</div><div class='del'>-	char *name;</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	struct stat sb;</div><div class='del'>-	int fd;</div><div class='del'>-	guint8 *buffer;</div><div class='del'>-	size_t bufsz, actual;</div><div class='del'>-	</div><div class='del'>-	fs = GTK_FILE_SELECTION (gtk_widget_get_ancestor (widget,</div><div class='del'>-							  GTK_TYPE_FILE_SELECTION));</div><div class='del'>-	composer = E_MSG_COMPOSER (user_data);</div><div class='del'>-	name = gtk_file_selection_get_filename (fs);</div><div class='del'>-	</div><div class='del'>-	if (stat (name, &amp;sb) &lt; 0) {</div><div class='del'>-		GtkWidget *dlg;</div><div class='del'>-		</div><div class='del'>-		dlg = gnome_error_dialog_parented( _("That file does not exist."),</div><div class='del'>-						   GTK_WINDOW (fs));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (dlg));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (!(S_ISREG (sb.st_mode))) {</div><div class='del'>-		GtkWidget *dlg;</div><div class='del'>-		</div><div class='del'>-		dlg = gnome_error_dialog_parented (_("That is not a regular file."),</div><div class='del'>-						   GTK_WINDOW (fs));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (dlg));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (access (name, R_OK) != 0) {</div><div class='del'>-		GtkWidget *dlg;</div><div class='del'>-		</div><div class='del'>-		dlg = gnome_error_dialog_parented (_("That file exists but is not readable."),</div><div class='del'>-						   GTK_WINDOW (fs));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (dlg));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if ((fd = open (name, O_RDONLY)) &lt; 0) {</div><div class='del'>-		GtkWidget *dlg;</div><div class='del'>-		</div><div class='del'>-		dlg = gnome_error_dialog_parented (_("That file appeared accesible but open(2) failed."),</div><div class='del'>-						   GTK_WINDOW (fs));</div><div class='del'>-		gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-		gtk_widget_destroy (GTK_WIDGET (dlg));</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	buffer = NULL;</div><div class='del'>-	bufsz = 0;</div><div class='del'>-	actual = 0;</div><div class='del'>-#define CHUNK 5120</div><div class='del'>-	</div><div class='del'>-	while (TRUE) {</div><div class='del'>-		ssize_t chunk;</div><div class='del'>-		</div><div class='del'>-		if (bufsz - actual &lt; CHUNK) {</div><div class='del'>-			bufsz += CHUNK;</div><div class='del'>-			</div><div class='del'>-			if (bufsz &gt;= 102400) {</div><div class='del'>-				GtkWidget *dlg;</div><div class='del'>-				gint result;</div><div class='del'>-				</div><div class='del'>-				dlg = gnome_dialog_new (_("The file is very large (more than 100K).\n"</div><div class='del'>-							  "Are you sure you wish to insert it?"),</div><div class='del'>-							GNOME_STOCK_BUTTON_YES,</div><div class='del'>-							GNOME_STOCK_BUTTON_NO,</div><div class='del'>-							NULL);</div><div class='del'>-				gnome_dialog_set_parent (GNOME_DIALOG (dlg), GTK_WINDOW (fs));</div><div class='del'>-				result = gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-				gtk_widget_destroy (GTK_WIDGET (dlg));</div><div class='del'>-				</div><div class='del'>-				if (result == 1)</div><div class='del'>-					goto cleanup;</div><div class='del'>-			}</div><div class='del'>-			</div><div class='del'>-			buffer = g_realloc (buffer, bufsz * sizeof (guint8));</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		chunk = read (fd, &amp;(buffer[actual]), CHUNK);</div><div class='del'>-</div><div class='del'>-		if (chunk &lt; 0) {</div><div class='del'>-			GtkWidget *dlg;</div><div class='del'>-			</div><div class='del'>-			dlg = gnome_error_dialog_parented (_("An error occurred while reading the file."),</div><div class='del'>-							   GTK_WINDOW (fs));</div><div class='del'>-			gnome_dialog_run_and_close (GNOME_DIALOG (dlg));</div><div class='del'>-			gtk_widget_destroy (GTK_WIDGET (dlg));</div><div class='del'>-			goto cleanup;</div><div class='del'>-		}</div><div class='del'>-		</div><div class='del'>-		if (chunk == 0)</div><div class='del'>-			break;</div><div class='del'>-		</div><div class='del'>-		actual += chunk;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	buffer[actual] = '\0';</div><div class='del'>-	</div><div class='del'>-	if (selection_atom == GDK_NONE)</div><div class='del'>-		selection_atom = gdk_atom_intern ("TEMP_PASTE", FALSE);</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (fs), "ev_file_buffer", buffer);</div><div class='del'>-	gtk_selection_owner_set (GTK_WIDGET (fs), selection_atom, GDK_CURRENT_TIME);</div><div class='del'>-	/*gtk_html_paste (composer-&gt;send_html);*/</div><div class='del'>-	</div><div class='del'>- cleanup:</div><div class='del'>-	close (fd);</div><div class='del'>-	g_free (buffer);</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'>-fs_selection_get (GtkWidget *widget, GtkSelectionData *sdata,</div><div class='del'>-		  guint info, guint time)</div><div class='del'>-{</div><div class='del'>-	gchar *buffer;</div><div class='del'>-	GdkAtom encoding;</div><div class='del'>-	gint format;</div><div class='del'>-	guchar *ctext;</div><div class='del'>-	gint length;</div><div class='del'>-	</div><div class='del'>-	buffer = gtk_object_get_data (GTK_OBJECT (widget), "ev_file_buffer");</div><div class='del'>-	if (gdk_string_to_compound_text (buffer, &amp;encoding, &amp;format, &amp;ctext,</div><div class='del'>-					 &amp;length) == Success)</div><div class='del'>-		gtk_selection_data_set (sdata, encoding, format, ctext, length);</div><div class='del'>-	g_free (buffer);</div><div class='del'>-	gtk_object_remove_data (GTK_OBJECT (widget), "ev_file_buffer");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-static void</div><div class='del'>-menu_file_insert_file_cb (BonoboUIComponent *uic,</div><div class='del'>-		void *data,</div><div class='del'>-		const char *path)</div><div class='del'>-{</div><div class='del'>-#if 0</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	GtkFileSelection *fs;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (data);</div><div class='del'>-	</div><div class='del'>-	fs = GTK_FILE_SELECTION (gtk_file_selection_new ("Choose File"));</div><div class='del'>-	/* FIXME: remember the location or something */</div><div class='del'>-	/*gtk_file_selection_set_filename( fs, g_get_home_dir() );*/</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (fs-&gt;ok_button), "clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (insert_file_ok_cb), data);</div><div class='del'>-	gtk_signal_connect_object (GTK_OBJECT (fs-&gt;cancel_button), </div><div class='del'>-				   "clicked",</div><div class='del'>-				   GTK_SIGNAL_FUNC (gtk_widget_destroy), </div><div class='del'>-				   GTK_OBJECT (fs));</div><div class='del'>-	gtk_widget_show (GTK_WIDGET(fs));</div><div class='del'>-#else</div><div class='del'>-	g_message ("Insert file is unimplemented! oh no!");</div><div class='del'>-#endif</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-menu_format_html_cb (BonoboUIComponent           *component,</div><div class='del'>-		     const char                  *path,</div><div class='del'>-		     Bonobo_UIComponent_EventType type,</div><div class='del'>-		     const char                  *state,</div><div class='del'>-		     gpointer                     user_data)</div><div class='del'>-</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	gboolean new_state;</div><div class='del'>-	</div><div class='del'>-	if (type != Bonobo_UIComponent_STATE_CHANGED)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	composer = E_MSG_COMPOSER (user_data);</div><div class='del'>-	</div><div class='del'>-	new_state = atoi (state);</div><div class='del'>-	</div><div class='del'>-	if ((new_state &amp;&amp; composer-&gt;send_html) ||</div><div class='del'>-	    (! new_state &amp;&amp; ! composer-&gt;send_html))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_send_html (composer, new_state);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static BonoboUIVerb verbs [] = {</div><div class='del'>-</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileOpen",   menu_file_open_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSave",   menu_file_save_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSaveAs", menu_file_save_as_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileClose",  menu_file_close_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileInsertFile", menu_file_insert_file_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileAttach",     menu_file_add_attachment_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSend",       menu_file_send_cb),</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("FileSendLater",  menu_file_send_later_cb),</div><div class='del'>-	</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};	</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-setup_ui (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	BonoboUIContainer *container;</div><div class='del'>-	</div><div class='del'>-	container = bonobo_ui_container_new ();</div><div class='del'>-	bonobo_ui_container_set_win (container, BONOBO_WINDOW (composer));</div><div class='del'>-	</div><div class='del'>-	composer-&gt;uic = bonobo_ui_component_new ("evolution-message-composer");</div><div class='del'>-	bonobo_ui_component_set_container (</div><div class='del'>-		composer-&gt;uic, bonobo_object_corba_objref (BONOBO_OBJECT (container)));</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (</div><div class='del'>-		composer-&gt;uic, verbs, composer);	</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_util_set_ui (composer-&gt;uic, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-message-composer.xml",</div><div class='del'>-			       "evolution-message-composer");</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/commands/FormatHtml",</div><div class='del'>-				      "state", composer-&gt;send_html ? "1" : "0", NULL);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "FormatHtml",</div><div class='del'>-		menu_format_html_cb, composer);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_add_listener (</div><div class='del'>-		composer-&gt;uic, "ViewAttach",</div><div class='del'>-		menu_view_attachments_activate_cb, composer);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Miscellaneous callbacks.  */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-attachment_bar_changed_cb (EMsgComposerAttachmentBar *bar,</div><div class='del'>-			   void *data)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-	</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'>-/* GtkObject methods.  */</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-clear_inline_images (gpointer key, gpointer value, gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_free (key);</div><div class='del'>-	g_free (value);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static 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'>-	if (composer-&gt;uic)</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (composer-&gt;uic));</div><div class='del'>-	composer-&gt;uic = NULL;</div><div class='del'>-</div><div class='del'>-	/* FIXME?  I assume the Bonobo widget will get destroyed</div><div class='del'>-           normally?  */</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;address_dialog != NULL)</div><div class='del'>-		gtk_widget_destroy (composer-&gt;address_dialog);</div><div class='del'>-	if (composer-&gt;hdrs != NULL)</div><div class='del'>-		gtk_widget_destroy (composer-&gt;hdrs);</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;extra_hdr_names) {</div><div class='del'>-		int i;</div><div class='del'>-		</div><div class='del'>-		for (i = 0; i &lt; composer-&gt;extra_hdr_names-&gt;len; i++) {</div><div class='del'>-			g_free (composer-&gt;extra_hdr_names-&gt;pdata[i]);</div><div class='del'>-			g_free (composer-&gt;extra_hdr_values-&gt;pdata[i]);</div><div class='del'>-		}</div><div class='del'>-		g_ptr_array_free (composer-&gt;extra_hdr_names, TRUE);</div><div class='del'>-		g_ptr_array_free (composer-&gt;extra_hdr_values, TRUE);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;persist_stream_interface != CORBA_OBJECT_NIL) {</div><div class='del'>-		Bonobo_Unknown_unref (composer-&gt;persist_stream_interface, &amp;ev);</div><div class='del'>-		CORBA_Object_release (composer-&gt;persist_stream_interface, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;persist_file_interface != CORBA_OBJECT_NIL) {</div><div class='del'>-		Bonobo_Unknown_unref (composer-&gt;persist_file_interface, &amp;ev);</div><div class='del'>-		CORBA_Object_release (composer-&gt;persist_file_interface, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (composer-&gt;editor_engine != CORBA_OBJECT_NIL) {</div><div class='del'>-		Bonobo_Unknown_unref (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-		CORBA_Object_release (composer-&gt;editor_engine, &amp;ev);</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_foreach_remove (composer-&gt;inline_images, clear_inline_images, NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;editor_listener)</div><div class='del'>-		bonobo_object_unref (composer-&gt;editor_listener);</div><div class='del'>-</div><div class='del'>-	if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy != NULL)</div><div class='del'>-		(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkWidget methods.  */</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-delete_event (GtkWidget *widget,</div><div class='del'>-	      GdkEventAny *event)</div><div class='del'>-{</div><div class='del'>-	do_exit (E_MSG_COMPOSER (widget));</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-drag_data_received (EMsgComposer *composer,</div><div class='del'>-		    GdkDragContext *context,</div><div class='del'>-		    gint x,</div><div class='del'>-		    gint y,</div><div class='del'>-		    GtkSelectionData *selection,</div><div class='del'>-		    guint info,</div><div class='del'>-		    guint time)</div><div class='del'>-{</div><div class='del'>-	gchar *temp, *filename;</div><div class='del'>-	</div><div class='del'>-	filename = g_strdup (selection-&gt;data);</div><div class='del'>-	temp = strchr (filename, '\n');</div><div class='del'>-	if (temp) {</div><div class='del'>-		if (*(temp - 1) == '\r')</div><div class='del'>-			*(temp - 1) = '\0';</div><div class='del'>-		*temp = '\0';</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Chop the file: part off */</div><div class='del'>-	if (strncasecmp (filename, "file:", 5) == 0) {</div><div class='del'>-		temp = g_strdup (filename + 5);</div><div class='del'>-		g_free (filename);</div><div class='del'>-		filename = temp;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_attachment_bar_attach</div><div class='del'>-		(E_MSG_COMPOSER_ATTACHMENT_BAR (composer-&gt;attachment_bar),</div><div class='del'>-		 filename, NULL);</div><div class='del'>-	</div><div class='del'>-	g_free (filename);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EMsgComposerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	GtkWidgetClass *widget_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	widget_class = GTK_WIDGET_CLASS (klass);</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-	</div><div class='del'>-	widget_class-&gt;delete_event = delete_event;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (bonobo_window_get_type ());</div><div class='del'>-	</div><div class='del'>-	signals[SEND] =</div><div class='del'>-		gtk_signal_new ("send",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerClass, send),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	signals[POSTPONE] =</div><div class='del'>-		gtk_signal_new ("postpone",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EMsgComposerClass, postpone),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-	</div><div class='del'>-	gtk_object_class_add_signals (object_class, signals, LAST_SIGNAL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	composer-&gt;uic                      = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;hdrs                     = NULL;</div><div class='del'>-	composer-&gt;extra_hdr_names          = g_ptr_array_new ();</div><div class='del'>-	composer-&gt;extra_hdr_values         = g_ptr_array_new ();</div><div class='del'>-	</div><div class='del'>-	composer-&gt;editor                   = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;address_dialog           = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;attachment_bar           = NULL;</div><div class='del'>-	composer-&gt;attachment_scroll_frame  = NULL;</div><div class='del'>-	</div><div class='del'>-	composer-&gt;persist_file_interface   = CORBA_OBJECT_NIL;</div><div class='del'>-	composer-&gt;persist_stream_interface = CORBA_OBJECT_NIL;</div><div class='del'>-</div><div class='del'>-	composer-&gt;editor_engine            = CORBA_OBJECT_NIL;</div><div class='del'>-	composer-&gt;inline_images            = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-	</div><div class='del'>-	composer-&gt;attachment_bar_visible   = FALSE;</div><div class='del'>-	composer-&gt;send_html                = FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_msg_composer_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-	</div><div class='del'>-	if (type == 0) {</div><div class='del'>-		static const GtkTypeInfo info = {</div><div class='del'>-			"EMsgComposer",</div><div class='del'>-			sizeof (EMsgComposer),</div><div class='del'>-			sizeof (EMsgComposerClass),</div><div class='del'>-			(GtkClassInitFunc) class_init,</div><div class='del'>-			(GtkObjectInitFunc) init,</div><div class='del'>-			/* reserved_1 */ NULL,</div><div class='del'>-			/* reserved_2 */ NULL,</div><div class='del'>-			(GtkClassInitFunc) NULL,</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (bonobo_window_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</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'>-	static GtkTargetEntry drop_types[] = {</div><div class='del'>-		{"text/uri-list", 0, 1}</div><div class='del'>-	};</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'>-	bonobo_window_construct (BONOBO_WINDOW (composer), "e-msg-composer",</div><div class='del'>-			     _("Compose a message"));</div><div class='del'>-	</div><div class='del'>-	/* DND support */</div><div class='del'>-	gtk_drag_dest_set (GTK_WIDGET (composer), GTK_DEST_DEFAULT_ALL,</div><div class='del'>-			   drop_types, 1, GDK_ACTION_COPY);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer), "drag_data_received",</div><div class='del'>-			    GTK_SIGNAL_FUNC (drag_data_received), NULL);</div><div class='del'>-	</div><div class='del'>-	setup_ui (composer);</div><div class='del'>-	</div><div class='del'>-	vbox = gtk_vbox_new (FALSE, 0);</div><div class='del'>-	</div><div class='del'>-	composer-&gt;hdrs = e_msg_composer_hdrs_new ();</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (vbox), composer-&gt;hdrs, FALSE, FALSE, 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'>-	composer-&gt;editor = bonobo_widget_new_control (</div><div class='del'>-		HTML_EDITOR_CONTROL_ID,</div><div class='del'>-		bonobo_ui_component_get_container (composer-&gt;uic));</div><div class='del'>-	</div><div class='del'>-	if (!composer-&gt;editor)</div><div class='del'>-		return;</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, FALSE, GNOME_PAD_SMALL);</div><div class='del'>-	</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;attachment_bar), "changed",</div><div class='del'>-			    GTK_SIGNAL_FUNC (attachment_bar_changed_cb), composer);</div><div class='del'>-	</div><div class='del'>-	bonobo_window_set_contents (BONOBO_WINDOW (composer), vbox);</div><div class='del'>-	gtk_widget_show (vbox);</div><div class='del'>-	</div><div class='del'>-	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'>-static EMsgComposer *</div><div class='del'>-create_composer (void)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *new;</div><div class='del'>-	</div><div class='del'>-	new = gtk_type_new (E_TYPE_MSG_COMPOSER);</div><div class='del'>-	e_msg_composer_construct (new);</div><div class='del'>-	if (!new-&gt;editor) {</div><div class='del'>-		e_notice (GTK_WINDOW (new), GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Could not create composer window."));</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (new));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	prepare_engine (new);</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'>- * e_msg_composer_new:</div><div class='del'>- *</div><div class='del'>- * Create a new message composer widget.</div><div class='del'>- * </div><div class='del'>- * Return value: A pointer to the newly created widget</div><div class='del'>- **/</div><div class='del'>-EMsgComposer *</div><div class='del'>-e_msg_composer_new (void)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *new;</div><div class='del'>-	</div><div class='del'>-	new = create_composer ();</div><div class='del'>-	if (new) {</div><div class='del'>-		/* Load the signature, if any. */</div><div class='del'>-		set_editor_text (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='del'>-/**</div><div class='del'>- * e_msg_composer_new_with_sig_file:</div><div class='del'>- *</div><div class='del'>- * Create a new message composer widget. Sets the signature file.</div><div class='del'>- * </div><div class='del'>- * Return value: A pointer to the newly created widget</div><div class='del'>- **/</div><div class='del'>-EMsgComposer *</div><div class='del'>-e_msg_composer_new_with_sig_file (const char *sig_file)</div><div class='del'>-{</div><div class='del'>-	EMsgComposer *new;</div><div class='del'>-	</div><div class='del'>-	new = create_composer ();</div><div class='del'>-	if (new) {</div><div class='del'>-		/* Load the signature, if any. */</div><div class='del'>-		set_editor_text (new, sig_file, "");</div><div class='del'>-		</div><div class='del'>-		e_msg_composer_set_sig_file (new, sig_file);</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 void</div><div class='del'>-handle_multipart_alternative (EMsgComposer *composer, CamelMultipart *multipart)</div><div class='del'>-{</div><div class='del'>-	/* Find the text/html part and set the composer body to it's contents */</div><div class='del'>-	int i, nparts;</div><div class='del'>-	</div><div class='del'>-	nparts = camel_multipart_get_number (multipart);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; nparts; i++) {</div><div class='del'>-		GMimeContentField *content_type;</div><div class='del'>-		CamelMimePart *mime_part;</div><div class='del'>-		</div><div class='del'>-		mime_part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		content_type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-		</div><div class='del'>-		if (gmime_content_field_is_type (content_type, "text", "html")) {</div><div class='del'>-			CamelDataWrapper *contents;</div><div class='del'>-			char *text, *final_text;</div><div class='del'>-			gboolean is_html;</div><div class='del'>-			</div><div class='del'>-			contents = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			text = mail_get_message_body (contents, FALSE, &amp;is_html);</div><div class='del'>-			if (text) {</div><div class='del'>-				if (is_html)</div><div class='del'>-					final_text = g_strdup (text);</div><div class='del'>-				else</div><div class='del'>-					final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |</div><div class='del'>-								     E_TEXT_TO_HTML_CONVERT_SPACES);</div><div class='del'>-				g_free (text);</div><div class='del'>-				</div><div class='del'>-				e_msg_composer_set_body_text (composer, final_text);</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'>-</div><div class='del'>-static void</div><div class='del'>-handle_multipart (EMsgComposer *composer, CamelMultipart *multipart, int depth)</div><div class='del'>-{</div><div class='del'>-	int i, nparts;</div><div class='del'>-	</div><div class='del'>-	nparts = camel_multipart_get_number (multipart);</div><div class='del'>-	</div><div class='del'>-	for (i = 0; i &lt; nparts; i++) {</div><div class='del'>-		GMimeContentField *content_type;</div><div class='del'>-		CamelMimePart *mime_part;</div><div class='del'>-		</div><div class='del'>-		mime_part = camel_multipart_get_part (multipart, i);</div><div class='del'>-		content_type = camel_mime_part_get_content_type (mime_part);</div><div class='del'>-		</div><div class='del'>-		if (gmime_content_field_is_type (content_type, "multipart", "alternative")) {</div><div class='del'>-			/* this structure contains the body */</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelMultipart *mpart;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			mpart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-			</div><div class='del'>-			handle_multipart_alternative (composer, mpart);</div><div class='del'>-		} else if (gmime_content_field_is_type (content_type, "multipart", "*")) {</div><div class='del'>-			/* another layer of multipartness... */</div><div class='del'>-			CamelDataWrapper *wrapper;</div><div class='del'>-			CamelMultipart *mpart;</div><div class='del'>-			</div><div class='del'>-			wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			mpart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-			</div><div class='del'>-			handle_multipart (composer, mpart, depth + 1);</div><div class='del'>-		} else if (depth == 0 &amp;&amp; i == 0) {</div><div class='del'>-			/* Since the first part is not multipart/alternative, then this must be the body */</div><div class='del'>-			CamelDataWrapper *contents;</div><div class='del'>-			char *text, *final_text;</div><div class='del'>-			gboolean is_html;</div><div class='del'>-			</div><div class='del'>-			contents = camel_medium_get_content_object (CAMEL_MEDIUM (mime_part));</div><div class='del'>-			text = mail_get_message_body (contents, FALSE, &amp;is_html);</div><div class='del'>-			if (text) {</div><div class='del'>-				if (is_html)</div><div class='del'>-					final_text = g_strdup (text);</div><div class='del'>-				else</div><div class='del'>-					final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |</div><div class='del'>-								     E_TEXT_TO_HTML_CONVERT_SPACES);</div><div class='del'>-				g_free (text);</div><div class='del'>-				</div><div class='del'>-				e_msg_composer_set_body_text (composer, final_text);</div><div class='del'>-			}</div><div class='del'>-		} else {</div><div class='del'>-			/* this is a leaf of the tree, so attach it */</div><div class='del'>-			e_msg_composer_attach (composer, mime_part);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_new_with_message:</div><div class='del'>- *</div><div class='del'>- * Create a new message composer widget.</div><div class='del'>- * </div><div class='del'>- * Return value: A pointer to the newly created widget</div><div class='del'>- **/</div><div class='del'>-EMsgComposer *</div><div class='del'>-e_msg_composer_new_with_message (CamelMimeMessage *msg)</div><div class='del'>-{</div><div class='del'>-	const CamelInternetAddress *to, *cc, *bcc;</div><div class='del'>-	GList *To = NULL, *Cc = NULL, *Bcc = NULL;</div><div class='del'>-	GMimeContentField *content_type;</div><div class='del'>-	const gchar *subject;</div><div class='del'>-	EMsgComposer *new;</div><div class='del'>-	guint len, i;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (gtk_main_level () &gt; 0, NULL);</div><div class='del'>-	</div><div class='del'>-	new = create_composer ();</div><div class='del'>-	if (!new)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	subject = camel_mime_message_get_subject (msg);</div><div class='del'>-	</div><div class='del'>-	to = camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_TO);</div><div class='del'>-	cc = camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_CC);</div><div class='del'>-	bcc = camel_mime_message_get_recipients (msg, CAMEL_RECIPIENT_TYPE_BCC);</div><div class='del'>-	</div><div class='del'>-	len = CAMEL_ADDRESS (to)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		const char *name, *addr;</div><div class='del'>-		</div><div class='del'>-		if (camel_internet_address_get (to, i, &amp;name, &amp;addr)) {</div><div class='del'>-			CamelInternetAddress *cia;</div><div class='del'>-			</div><div class='del'>-			cia = camel_internet_address_new ();</div><div class='del'>-			camel_internet_address_add (cia, name, addr);</div><div class='del'>-			To = g_list_append (To, camel_address_encode (CAMEL_ADDRESS (cia)));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (cia));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	len = CAMEL_ADDRESS (cc)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		const char *name, *addr;</div><div class='del'>-		</div><div class='del'>-		if (camel_internet_address_get (to, i, &amp;name, &amp;addr)) {</div><div class='del'>-			CamelInternetAddress *cia;</div><div class='del'>-			</div><div class='del'>-			cia = camel_internet_address_new ();</div><div class='del'>-			camel_internet_address_add (cia, name, addr);</div><div class='del'>-			Cc = g_list_append (Cc, camel_address_encode (CAMEL_ADDRESS (cia)));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (cia));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	len = CAMEL_ADDRESS (bcc)-&gt;addresses-&gt;len;</div><div class='del'>-	for (i = 0; i &lt; len; i++) {</div><div class='del'>-		const char *name, *addr;</div><div class='del'>-		</div><div class='del'>-		if (camel_internet_address_get (to, i, &amp;name, &amp;addr)) {</div><div class='del'>-			CamelInternetAddress *cia;</div><div class='del'>-			</div><div class='del'>-			cia = camel_internet_address_new ();</div><div class='del'>-			camel_internet_address_add (cia, name, addr);</div><div class='del'>-			Bcc = g_list_append (Bcc, camel_address_encode (CAMEL_ADDRESS (cia)));</div><div class='del'>-			camel_object_unref (CAMEL_OBJECT (cia));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	e_msg_composer_set_headers (new, To, Cc, Bcc, subject);</div><div class='del'>-	</div><div class='del'>-	free_recipients (To);</div><div class='del'>-	free_recipients (Cc);</div><div class='del'>-	free_recipients (Bcc);</div><div class='del'>-	</div><div class='del'>-	content_type = camel_mime_part_get_content_type (CAMEL_MIME_PART (msg));</div><div class='del'>-	if (gmime_content_field_is_type (content_type, "multipart", "alternative")) {</div><div class='del'>-		/* multipart/alternative contains the text/plain and text/html versions of the message body */</div><div class='del'>-		CamelDataWrapper *wrapper;</div><div class='del'>-		CamelMultipart *multipart;</div><div class='del'>-		</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (msg)));</div><div class='del'>-		multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-		</div><div class='del'>-		handle_multipart_alternative (new, multipart);</div><div class='del'>-	} else if (gmime_content_field_is_type (content_type, "multipart", "*")) {</div><div class='del'>-		/* there must be attachments... */</div><div class='del'>-		CamelDataWrapper *wrapper;</div><div class='del'>-		CamelMultipart *multipart;</div><div class='del'>-		</div><div class='del'>-		wrapper = camel_medium_get_content_object (CAMEL_MEDIUM (CAMEL_MIME_PART (msg)));</div><div class='del'>-		multipart = CAMEL_MULTIPART (wrapper);</div><div class='del'>-		</div><div class='del'>-		handle_multipart (new, multipart, 0);</div><div class='del'>-	} else {</div><div class='del'>-		/* We either have a text/plain or a text/html part */</div><div class='del'>-		CamelDataWrapper *contents;</div><div class='del'>-		char *text, *final_text;</div><div class='del'>-		gboolean is_html;</div><div class='del'>-		</div><div class='del'>-		contents = camel_medium_get_content_object (CAMEL_MEDIUM (msg));</div><div class='del'>-		text = mail_get_message_body (contents, FALSE, &amp;is_html);</div><div class='del'>-		if (text) {</div><div class='del'>-			if (is_html)</div><div class='del'>-				final_text = g_strdup (text);</div><div class='del'>-			else</div><div class='del'>-				final_text = e_text_to_html (text, E_TEXT_TO_HTML_CONVERT_NL |</div><div class='del'>-							     E_TEXT_TO_HTML_CONVERT_SPACES);</div><div class='del'>-			g_free (text);</div><div class='del'>-			</div><div class='del'>-			e_msg_composer_set_body_text (new, final_text);</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 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'>-EMsgComposer *</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 (g_strncasecmp (url, "mailto:", 7) == 0, NULL);</div><div class='del'>-	</div><div class='del'>-	composer = e_msg_composer_new ();</div><div class='del'>-	if (!composer)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Parse recipients (everything after ':' until '?' or eos. */</div><div class='del'>-	p = url + 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 (!g_strncasecmp (header, "to", len))</div><div class='del'>-				to = add_recipients (to, content, FALSE);</div><div class='del'>-			else if (!g_strncasecmp (header, "cc", len))</div><div class='del'>-				cc = add_recipients (cc, content, FALSE);</div><div class='del'>-			else if (!g_strncasecmp (header, "bcc", len))</div><div class='del'>-				bcc = add_recipients (bcc, content, FALSE);</div><div class='del'>-			else if (!g_strncasecmp (header, "subject", len))</div><div class='del'>-				subject = g_strdup (content);</div><div class='del'>-			else if (!g_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'>-	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 (composer, NULL, htmlbody);</div><div class='del'>-		g_free (htmlbody);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return composer;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_show_attachments:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @show: A boolean specifying whether the attachment bar should be shown or</div><div class='del'>- * not</div><div class='del'>- * </div><div class='del'>- * If @show is %FALSE, hide the attachment bar.  Otherwise, show it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_show_attachments (EMsgComposer *composer,</div><div class='del'>-				 gboolean show)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	show_attachments (composer, show);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_headers:</div><div class='del'>- * @composer: a composer object</div><div class='del'>- * @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 (composer, composer-&gt;sig_file, 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='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_sig:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @path: Signature file</div><div class='del'>- * </div><div class='del'>- * Set a signature</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_sig_file (EMsgComposer *composer, const char *sig_file)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-	</div><div class='del'>-	composer-&gt;sig_file = g_strdup (sig_file);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_sig_file:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the signature file</div><div class='del'>- * </div><div class='del'>- * Return value: The signature file.</div><div class='del'>- **/</div><div class='del'>-const char *</div><div class='del'>-e_msg_composer_get_sig_file (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 composer-&gt;sig_file;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_set_send_html:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * @send_html: Whether the composer should have the "Send HTML" flag set</div><div class='del'>- * </div><div class='del'>- * Set the status of the "Send HTML" toggle item.  The user can override it.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_msg_composer_set_send_html (EMsgComposer *composer,</div><div class='del'>-			      gboolean send_html)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_MSG_COMPOSER (composer));</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;send_html &amp;&amp; send_html)</div><div class='del'>-		return;</div><div class='del'>-	if (! composer-&gt;send_html &amp;&amp; ! send_html)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	composer-&gt;send_html = send_html;</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_set_prop (composer-&gt;uic, "/commands/FormatHtml",</div><div class='del'>-				      "state", composer-&gt;send_html ? "1" : "0", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_msg_composer_get_send_html:</div><div class='del'>- * @composer: A message composer widget</div><div class='del'>- * </div><div class='del'>- * Get the status of the "Send HTML mail" flag.</div><div class='del'>- * </div><div class='del'>- * Return value: The status of the "Send HTML mail" flag.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_msg_composer_get_send_html (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (composer != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (E_IS_MSG_COMPOSER (composer), FALSE);</div><div class='del'>-</div><div class='del'>-	return composer-&gt;send_html;</div><div class='del'>-}</div><div class='head'>diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h<br/>deleted file mode 100644<br/>index 08d7da9906..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/e-msg-composer.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/e-msg-composer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,123 +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'>-typedef struct _EMsgComposer       EMsgComposer;</div><div class='del'>-typedef struct _EMsgComposerClass  EMsgComposerClass;</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'>-#include "HTMLEditor.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'>-</div><div class='del'>-struct _EMsgComposer {</div><div class='del'>-	BonoboWindow parent;</div><div class='del'>-	</div><div class='del'>-	BonoboUIComponent *uic;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *hdrs;</div><div class='del'>-	GPtrArray *extra_hdr_names, *extra_hdr_values;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *editor;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *attachment_bar;</div><div class='del'>-	GtkWidget *attachment_scroll_frame;</div><div class='del'>-	</div><div class='del'>-	GtkWidget *address_dialog;</div><div class='del'>-	</div><div class='del'>-	Bonobo_PersistFile   persist_file_interface;</div><div class='del'>-	Bonobo_PersistStream persist_stream_interface;</div><div class='del'>-	HTMLEditor_Engine    editor_engine;</div><div class='del'>-	BonoboObject        *editor_listener;</div><div class='del'>-	GHashTable          *inline_images;</div><div class='del'>-</div><div class='del'>-	char *sig_file;</div><div class='del'>-	</div><div class='del'>-	gboolean attachment_bar_visible : 1;</div><div class='del'>-	gboolean send_html : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EMsgComposerClass {</div><div class='del'>-	BonoboWindowClass parent_class;</div><div class='del'>-	</div><div class='del'>-	void (* send) (EMsgComposer *composer);</div><div class='del'>-	void (* postpone) (EMsgComposer *composer);</div><div class='del'>-};</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'>-EMsgComposer     *e_msg_composer_new               (void);</div><div class='del'>-EMsgComposer     *e_msg_composer_new_with_sig_file (const char *sig_file);</div><div class='del'>-EMsgComposer     *e_msg_composer_new_with_message  (CamelMimeMessage *msg);</div><div class='del'>-EMsgComposer     *e_msg_composer_new_from_url      (const char *url);</div><div class='del'>-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'>-void              e_msg_composer_set_sig_file      (EMsgComposer *composer,</div><div class='del'>-						    const char *sig_file);</div><div class='del'>-const char       *e_msg_composer_get_sig_file      (EMsgComposer *composer);</div><div class='del'>-</div><div class='del'>-void              e_msg_composer_set_send_html     (EMsgComposer *composer,</div><div class='del'>-						    gboolean send_html);</div><div class='del'>-gboolean          e_msg_composer_get_send_html     (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/evolution-composer.c b/composer/evolution-composer.c<br/>deleted file mode 100644<br/>index f39482336c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/evolution-composer.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/evolution-composer.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,313 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* evolution-composer.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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: Dan Winship &lt;danw@helixcode.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;camel/camel.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include "evolution-composer.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE BONOBO_OBJECT_TYPE</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-static void (*send_cb) (EMsgComposer *, gpointer);</div><div class='del'>-static void (*postpone_cb) (EMsgComposer *, gpointer);</div><div class='del'>-</div><div class='del'>-/* CORBA interface implementation.  */</div><div class='del'>-</div><div class='del'>-static POA_Evolution_Composer__vepv Composer_vepv;</div><div class='del'>-</div><div class='del'>-static GList *</div><div class='del'>-corba_recipientlist_to_glist (const Evolution_Composer_RecipientList *cl)</div><div class='del'>-{</div><div class='del'>-	Evolution_Composer_Recipient *recip;</div><div class='del'>-	GList *gl = NULL;</div><div class='del'>-	char *str;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = cl-&gt;_length - 1; i &gt;= 0; i--) {</div><div class='del'>-		recip = &amp;(cl-&gt;_buffer[i]);</div><div class='del'>-</div><div class='del'>-		/* Let's copy this code into yet another place! */</div><div class='del'>-		if (*recip-&gt;name) {</div><div class='del'>-			str = g_strdup_printf ("\"%s\" &lt;%s&gt;",</div><div class='del'>-					       recip-&gt;name, recip-&gt;address);</div><div class='del'>-		} else</div><div class='del'>-			str = g_strdup (recip-&gt;address);</div><div class='del'>-</div><div class='del'>-		gl = g_list_prepend (gl, str);		</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return gl;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_recipient_glist (GList *gl)</div><div class='del'>-{</div><div class='del'>-	GList *tmp;</div><div class='del'>-</div><div class='del'>-	while (gl) {</div><div class='del'>-		tmp = gl-&gt;next;</div><div class='del'>-		g_free (gl-&gt;data);</div><div class='del'>-		g_list_free_1 (gl);</div><div class='del'>-		gl = tmp;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_set_headers (PortableServer_Servant servant,</div><div class='del'>-			   const Evolution_Composer_RecipientList *to,</div><div class='del'>-			   const Evolution_Composer_RecipientList *cc,</div><div class='del'>-			   const Evolution_Composer_RecipientList *bcc,</div><div class='del'>-			   const CORBA_char *subject,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-	GList *gto, *gcc, *gbcc;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gto = corba_recipientlist_to_glist (to);</div><div class='del'>-	gcc = corba_recipientlist_to_glist (cc);</div><div class='del'>-	gbcc = corba_recipientlist_to_glist (bcc);</div><div class='del'>-</div><div class='del'>-	e_msg_composer_set_headers (composer-&gt;composer, gto, gcc, gbcc,</div><div class='del'>-				    subject);</div><div class='del'>-</div><div class='del'>-	free_recipient_glist (gto);</div><div class='del'>-	free_recipient_glist (gcc);</div><div class='del'>-	free_recipient_glist (gbcc);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_set_body_text (PortableServer_Servant servant,</div><div class='del'>-			     const CORBA_char *text,</div><div class='del'>-			     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	e_msg_composer_set_body_text (composer-&gt;composer, text);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_attach_MIME (PortableServer_Servant servant,</div><div class='del'>-			   const CORBA_char *data,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-	CamelMimePart *attachment;</div><div class='del'>-	CamelStream *mem_stream;</div><div class='del'>-	int status;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	mem_stream = camel_stream_mem_new_with_buffer (data, strlen (data));</div><div class='del'>-	attachment = camel_mime_part_new ();</div><div class='del'>-	status = camel_data_wrapper_construct_from_stream (</div><div class='del'>-		CAMEL_DATA_WRAPPER (attachment), mem_stream);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (mem_stream));</div><div class='del'>-</div><div class='del'>-	if (status == -1) {</div><div class='del'>-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,</div><div class='del'>-				     ex_Evolution_Composer_CouldNotParse,</div><div class='del'>-				     NULL);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_msg_composer_attach (composer-&gt;composer, attachment);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (attachment));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_attach_data (PortableServer_Servant servant,</div><div class='del'>-			   const CORBA_char *content_type,</div><div class='del'>-			   const CORBA_char *filename,</div><div class='del'>-			   const CORBA_char *description,</div><div class='del'>-			   const CORBA_boolean show_inline,</div><div class='del'>-			   const CORBA_char *data,</div><div class='del'>-			   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-	CamelMimePart *attachment;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	attachment = camel_mime_part_new ();</div><div class='del'>-	camel_mime_part_set_content (attachment, data, strlen (data),</div><div class='del'>-				     content_type);</div><div class='del'>-</div><div class='del'>-	if (*filename)</div><div class='del'>-		camel_mime_part_set_filename (attachment, filename);</div><div class='del'>-	if (*description)</div><div class='del'>-		camel_mime_part_set_description (attachment, description);</div><div class='del'>-	camel_mime_part_set_disposition (attachment, show_inline ?</div><div class='del'>-					 "inline" : "attachment");</div><div class='del'>-</div><div class='del'>-	e_msg_composer_attach (composer-&gt;composer, attachment);</div><div class='del'>-	camel_object_unref (CAMEL_OBJECT (attachment));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Composer_show (PortableServer_Servant servant,</div><div class='del'>-		    CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	EvolutionComposer *composer;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	composer = EVOLUTION_COMPOSER (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_widget_show (GTK_WIDGET (composer-&gt;composer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-POA_Evolution_Composer__epv *</div><div class='del'>-evolution_composer_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Composer__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_Composer__epv, 1);</div><div class='del'>-	epv-&gt;set_headers = impl_Composer_set_headers;</div><div class='del'>-	epv-&gt;set_body_text = impl_Composer_set_body_text;</div><div class='del'>-	epv-&gt;attach_MIME = impl_Composer_attach_MIME;</div><div class='del'>-	epv-&gt;attach_data = impl_Composer_attach_data;</div><div class='del'>-	epv-&gt;show = impl_Composer_show;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* GtkObject stuff */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EvolutionComposer *composer = EVOLUTION_COMPOSER (object);</div><div class='del'>-</div><div class='del'>-	if (composer-&gt;composer)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (composer-&gt;composer));</div><div class='del'>-</div><div class='del'>-	GTK_OBJECT_CLASS (parent_class)-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-class_init (EvolutionComposerClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = destroy;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	Composer_vepv.Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	Composer_vepv.Evolution_Composer_epv = evolution_composer_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init (EvolutionComposer *composer)</div><div class='del'>-{</div><div class='del'>-	composer-&gt;composer = e_msg_composer_new ();</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;composer), "send",</div><div class='del'>-			    GTK_SIGNAL_FUNC (send_cb), NULL);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (composer-&gt;composer), "postpone",</div><div class='del'>-			    GTK_SIGNAL_FUNC (postpone_cb), NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-evolution_composer_construct (EvolutionComposer *composer,</div><div class='del'>-			      Evolution_Composer corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (composer != NULL);</div><div class='del'>-	g_return_if_fail (EVOLUTION_IS_COMPOSER (composer));</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (composer), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EvolutionComposer *</div><div class='del'>-evolution_composer_new (void)</div><div class='del'>-{</div><div class='del'>-	EvolutionComposer *new;</div><div class='del'>-	POA_Evolution_Composer *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Composer corba_object;</div><div class='del'>-</div><div class='del'>-	servant = (POA_Evolution_Composer *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;Composer_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_Evolution_Composer__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	new = gtk_type_new (evolution_composer_get_type ());</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (new),</div><div class='del'>-						       servant);</div><div class='del'>-	evolution_composer_construct (new, corba_object);</div><div class='del'>-</div><div class='del'>-	return new;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (evolution_composer, "EvolutionComposer", EvolutionComposer, class_init, init, PARENT_TYPE)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#define COMPOSER_FACTORY_ID "OAFIID:evolution-composer-factory:evolution-mail:fcfda393-60ee-485f-b782-e9323434bff3"</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *factory, void *closure)</div><div class='del'>-{</div><div class='del'>-	return BONOBO_OBJECT (evolution_composer_new ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),</div><div class='del'>-				 void (*postpone) (EMsgComposer *, gpointer))</div><div class='del'>-{</div><div class='del'>-	if (bonobo_generic_factory_new (COMPOSER_FACTORY_ID,</div><div class='del'>-					factory_fn, NULL) == NULL) {</div><div class='del'>-		e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-			  _("Cannot initialize Evolution's composer."));</div><div class='del'>-		exit (1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	send_cb = send;</div><div class='del'>-	postpone_cb = postpone;</div><div class='del'>-}</div><div class='head'>diff --git a/composer/evolution-composer.h b/composer/evolution-composer.h<br/>deleted file mode 100644<br/>index 6f248dae22..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/evolution-composer.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/evolution-composer.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,70 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* evolution-composer.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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: Dan Winship</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __EVOLUTION_COMPOSER_H__</div><div class='del'>-#define __EVOLUTION_COMPOSER_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Composer.h"</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#define EVOLUTION_TYPE_COMPOSER            (evolution_composer_get_type ())</div><div class='del'>-#define EVOLUTION_COMPOSER(obj)            (GTK_CHECK_CAST ((obj), EVOLUTION_TYPE_COMPOSER, EvolutionComposer))</div><div class='del'>-#define EVOLUTION_COMPOSER_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), EVOLUTION_TYPE_COMPOSER, EvolutionComposerClass))</div><div class='del'>-#define EVOLUTION_IS_COMPOSER(obj)         (GTK_CHECK_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))</div><div class='del'>-#define EVOLUTION_IS_COMPOSER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EVOLUTION_TYPE_COMPOSER))</div><div class='del'>-</div><div class='del'>-typedef struct _EvolutionComposer        EvolutionComposer;</div><div class='del'>-typedef struct _EvolutionComposerClass   EvolutionComposerClass;</div><div class='del'>-</div><div class='del'>-struct _EvolutionComposer {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EvolutionComposerClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-POA_Evolution_Composer__epv *evolution_composer_get_epv            (void);</div><div class='del'>-</div><div class='del'>-GtkType            evolution_composer_get_type     (void);</div><div class='del'>-void               evolution_composer_construct    (EvolutionComposer *,</div><div class='del'>-						    Evolution_Composer);</div><div class='del'>-EvolutionComposer *evolution_composer_new          (void);</div><div class='del'>-</div><div class='del'>-void               evolution_composer_factory_init (void (*send) (EMsgComposer *, gpointer),</div><div class='del'>-						    void (*postpone) (EMsgComposer *, gpointer));</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#endif /* __EVOLUTION_COMPOSER_H__ */</div><div class='head'>diff --git a/composer/listener.c b/composer/listener.c<br/>deleted file mode 100644<br/>index 3b90e7200f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/listener.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/listener.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'>-/*  This file is part of gnome-spell bonobo component</div><div class='del'>-</div><div class='del'>-    Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>-    Authors:           Radek Doulik &lt;rodo@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 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 License</div><div class='del'>-    along with this library; see the file COPYING.LIB.  If not, write to</div><div class='del'>-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>-    Boston, MA 02111-1307, USA.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include "listener.h"</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *listener_parent_class;</div><div class='del'>-static POA_HTMLEditor_Listener__vepv listener_vepv;</div><div class='del'>-</div><div class='del'>-inline static HTMLEditorListener *</div><div class='del'>-html_editor_listener_from_servant (PortableServer_Servant servant)</div><div class='del'>-{</div><div class='del'>-	return HTML_EDITOR_LISTENER (bonobo_object_from_servant (servant));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_any *</div><div class='del'>-get_any_null ()</div><div class='del'>-{</div><div class='del'>-	CORBA_any *rv;</div><div class='del'>-</div><div class='del'>-	rv = CORBA_any__alloc ();</div><div class='del'>-	rv-&gt;_type = TC_null;</div><div class='del'>-</div><div class='del'>-	return rv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-resolve_image_url (HTMLEditorListener *l, gchar *url)</div><div class='del'>-{</div><div class='del'>-	gchar *cid = NULL;</div><div class='del'>-</div><div class='del'>-	if (!strncmp (url, "file:", 5)) {</div><div class='del'>-		gchar *id;</div><div class='del'>-</div><div class='del'>-		id = (gchar *) g_hash_table_lookup (l-&gt;composer-&gt;inline_images, url + 5);</div><div class='del'>-		if (!id) {</div><div class='del'>-			id = header_msgid_generate ();</div><div class='del'>-			e_msg_composer_attachment_bar_attach (E_MSG_COMPOSER_ATTACHMENT_BAR (l-&gt;composer-&gt;attachment_bar),</div><div class='del'>-							      url + 5, id);</div><div class='del'>-			g_hash_table_insert (l-&gt;composer-&gt;inline_images, g_strdup (url + 5), id);</div><div class='del'>-		}</div><div class='del'>-		cid = g_strconcat ("cid:", id, NULL);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return cid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_any *</div><div class='del'>-impl_event (PortableServer_Servant _servant,</div><div class='del'>-       const CORBA_char * name, const CORBA_any * arg,</div><div class='del'>-       CORBA_Environment * ev)</div><div class='del'>-{</div><div class='del'>-	HTMLEditorListener *l = html_editor_listener_from_servant (_servant);</div><div class='del'>-	BonoboArg *data;</div><div class='del'>-	CORBA_any *rv = NULL;</div><div class='del'>-</div><div class='del'>-	/* printf ("impl_event\n"); */</div><div class='del'>-</div><div class='del'>-	if (!strcmp (name, "command")) {</div><div class='del'>-		/* FIXME check for insert-paragraph command */</div><div class='del'>-		data = HTMLEditor_Engine_get_paragraph_data (l-&gt;composer-&gt;editor_engine, "orig", ev);</div><div class='del'>-		if (ev-&gt;_major == CORBA_NO_EXCEPTION &amp;&amp; data) {</div><div class='del'>-			if (CORBA_TypeCode_equal (data-&gt;_type, TC_boolean, ev) &amp;&amp; BONOBO_ARG_GET_BOOLEAN (data)) {</div><div class='del'>-				HTMLEditor_Engine_command (l-&gt;composer-&gt;editor_engine, "style-normal", ev);</div><div class='del'>-				HTMLEditor_Engine_command (l-&gt;composer-&gt;editor_engine, "indent-zero", ev);</div><div class='del'>-				HTMLEditor_Engine_command (l-&gt;composer-&gt;editor_engine, "italic-off", ev);</div><div class='del'>-			}</div><div class='del'>-			BONOBO_ARG_SET_BOOLEAN (data, CORBA_FALSE);</div><div class='del'>-			HTMLEditor_Engine_set_paragraph_data (l-&gt;composer-&gt;editor_engine, "orig", data, ev);</div><div class='del'>-		}</div><div class='del'>-	} else if (!strcmp (name, "image_url")) {</div><div class='del'>-		gchar *url;</div><div class='del'>-</div><div class='del'>-		if ((url = resolve_image_url (l, BONOBO_ARG_GET_STRING (arg)))) {</div><div class='del'>-			rv = bonobo_arg_new (TC_string);</div><div class='del'>-			BONOBO_ARG_SET_STRING (rv, url);</div><div class='del'>-			printf ("new url: %s\n", url);</div><div class='del'>-			g_free (url);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return rv ? rv : get_any_null ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-POA_HTMLEditor_Listener__epv *</div><div class='del'>-html_editor_listener_get_epv (void)</div><div class='del'>-{</div><div class='del'>-	POA_HTMLEditor_Listener__epv *epv;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_HTMLEditor_Listener__epv, 1);</div><div class='del'>-</div><div class='del'>-	epv-&gt;event = impl_event;</div><div class='del'>-</div><div class='del'>-	return epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-init_listener_corba_class (void)</div><div class='del'>-{</div><div class='del'>-	listener_vepv.Bonobo_Unknown_epv    = bonobo_object_get_epv ();</div><div class='del'>-	listener_vepv.HTMLEditor_Listener_epv = html_editor_listener_get_epv ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-listener_class_init (HTMLEditorListenerClass *klass)</div><div class='del'>-{</div><div class='del'>-	listener_parent_class = gtk_type_class (bonobo_object_get_type ());</div><div class='del'>-</div><div class='del'>-	init_listener_corba_class ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-html_editor_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'>-			"HTMLEditorListener",</div><div class='del'>-			sizeof (HTMLEditorListener),</div><div class='del'>-			sizeof (HTMLEditorListenerClass),</div><div class='del'>-			(GtkClassInitFunc) listener_class_init,</div><div class='del'>-			(GtkObjectInitFunc) NULL,</div><div class='del'>-			NULL, /* reserved 1 */</div><div class='del'>-			NULL, /* reserved 2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (bonobo_object_get_type (), &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-HTMLEditorListener *</div><div class='del'>-html_editor_listener_construct (HTMLEditorListener *listener, HTMLEditor_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_HTML_EDITOR_LISTENER (listener), NULL);</div><div class='del'>-	g_return_val_if_fail (corba_listener != CORBA_OBJECT_NIL, NULL);</div><div class='del'>-</div><div class='del'>-	if (!bonobo_object_construct (BONOBO_OBJECT (listener), (CORBA_Object) corba_listener))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	return listener;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static HTMLEditor_Listener</div><div class='del'>-create_listener (BonoboObject *listener)</div><div class='del'>-{</div><div class='del'>-	POA_HTMLEditor_Listener *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_HTMLEditor_Listener *) g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;listener_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_HTMLEditor_Listener__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	ORBIT_OBJECT_KEY(servant-&gt;_private)-&gt;object = NULL;</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION){</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return (HTMLEditor_Listener) bonobo_object_activate_servant (listener, servant);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-HTMLEditorListener *</div><div class='del'>-html_editor_listener_new (EMsgComposer *composer)</div><div class='del'>-{</div><div class='del'>-	HTMLEditorListener *listener;</div><div class='del'>-	HTMLEditor_Listener corba_listener;</div><div class='del'>-</div><div class='del'>-	listener = gtk_type_new (HTML_EDITOR_LISTENER_TYPE);</div><div class='del'>-	listener-&gt;composer = composer;</div><div class='del'>-</div><div class='del'>-	corba_listener = create_listener (BONOBO_OBJECT (listener));</div><div class='del'>-</div><div class='del'>-	if (corba_listener == CORBA_OBJECT_NIL) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (listener));</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return html_editor_listener_construct (listener, corba_listener);</div><div class='del'>-}</div><div class='head'>diff --git a/composer/listener.h b/composer/listener.h<br/>deleted file mode 100644<br/>index e2815a3221..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/composer/listener.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>composer/listener.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'>-/*  This file is part of gnome-spell bonobo component</div><div class='del'>-</div><div class='del'>-    Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>-    Authors:           Radek Doulik &lt;rodo@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 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 License</div><div class='del'>-    along with this library; see the file COPYING.LIB.  If not, write to</div><div class='del'>-    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>-    Boston, MA 02111-1307, USA.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#ifndef LISTENER_H_</div><div class='del'>-#define LISTENER_H_</div><div class='del'>-</div><div class='del'>-#include &lt;libgnome/gnome-defs.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include "HTMLEditor.h"</div><div class='del'>-#include "e-msg-composer.h"</div><div class='del'>-</div><div class='del'>-BEGIN_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#define HTML_EDITOR_LISTENER_TYPE        (html_editor_listener_get_type ())</div><div class='del'>-#define HTML_EDITOR_LISTENER(o)          (GTK_CHECK_CAST ((o), HTML_EDITOR_LISTENER_TYPE, HTMLEditorListener))</div><div class='del'>-#define HTML_EDITOR_LISTENER_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), HTML_EDITOR_LISTENER_TYPE, HTMLEditorListenerClass))</div><div class='del'>-#define IS_HTML_EDITOR_LISTENER(o)       (GTK_CHECK_TYPE ((o), HTML_EDITOR_LISTENER_TYPE))</div><div class='del'>-#define IS_HTML_EDITOR_LISTENER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), HTML_EDITOR_LISTENER_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-	EMsgComposer *composer;</div><div class='del'>-} HTMLEditorListener;</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-} HTMLEditorListenerClass;</div><div class='del'>-</div><div class='del'>-GtkType                       html_editor_listener_get_type   (void);</div><div class='del'>-HTMLEditorListener           *html_editor_listener_construct  (HTMLEditorListener  *listener,</div><div class='del'>-							       HTMLEditor_Listener  corba_listener);</div><div class='del'>-HTMLEditorListener           *html_editor_listener_new        (EMsgComposer *composer);</div><div class='del'>-POA_HTMLEditor_Listener__epv *html_editor_listener_get_epv    (void);</div><div class='del'>-</div><div class='del'>-END_GNOME_DECLS</div><div class='del'>-</div><div class='del'>-#endif /* LISTENER_H_ */</div><div class='head'>diff --git a/configure.in b/configure.in<br/>deleted file mode 100644<br/>index 0a0418b3ca..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/configure.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>configure.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,699 +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=6</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="ca da de el en_GB es fi fr ga gl hu it ja ko lt nl nn no pl pt ru sl sv tr uk"</div><div class='del'>-</div><div class='del'>-AM_GNOME_GETTEXT</div><div class='del'>-localedir='$(prefix)/$(DATADIRNAME)/locale'</div><div class='del'>-AC_SUBST(localedir)</div><div class='del'>-</div><div class='del'>-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 mkdtemp isblank)</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl ctime_r prototype</div><div class='del'>-dnl **************************************************</div><div class='del'>-</div><div class='del'>-AC_CACHE_CHECK([if ctime_r wants three arguments], ac_cv_ctime_r_three_args,</div><div class='del'>-[</div><div class='del'>-	AC_TRY_COMPILE([</div><div class='del'>-		#include &lt;time.h&gt;</div><div class='del'>-	],[</div><div class='del'>-		char *buf;</div><div class='del'>-		time_t date;</div><div class='del'>-		ctime_r( &amp;date, buf, 100 );</div><div class='del'>-	],[</div><div class='del'>-		ac_cv_ctime_r_three_args=yes</div><div class='del'>-	],[</div><div class='del'>-		ac_cv_ctime_r_three_args=no</div><div class='del'>-	])</div><div class='del'>-])</div><div class='del'>-	</div><div class='del'>-if test x"$ac_cv_ctime_r_three_args" = xyes ; then</div><div class='del'>-	AC_DEFINE(CTIME_R_THREE_ARGS)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl **************************************************</div><div class='del'>-dnl * 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 * Except on RH7.0, which puts db in yet another place</div><div class='del'>-dnl **************************************************</div><div class='del'>-AC_CHECK_HEADERS(db_185.h)</div><div class='del'>-AC_CHECK_HEADERS(db1/db.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'>-	msg_ldap=Yes</div><div class='del'>-else</div><div class='del'>-	AC_MSG_WARN(no ldap support present)</div><div class='del'>-	msg_ldap=No</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'>-dnl Hah! Threads are no longer an option</div><div class='del'>-dnl AC_ARG_WITH(threads, [  --with-threads          Include thread support],[</div><div class='del'>-dnl FIXME: support more thread types, pth at least</div><div class='del'>-</div><div class='del'>-GNOME_PTHREAD_CHECK</div><div class='del'>-</div><div class='del'>-if test "x$PTHREAD_LIB" = "x" ; then</div><div class='del'>-	AC_MSG_ERROR([POSIX threads are currently required for Evolution])</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl</div><div class='del'>-dnl Notice that this is a hack, and we wont be able to use this forever, but</div><div class='del'>-dnl at least for some time</div><div class='del'>-dnl</div><div class='del'>-</div><div class='del'>-THREADS_LIBS="$PTHREAD_LIB `glib-config --libs gthread`"</div><div class='del'>-THREADS_CFLAGS="`glib-config --cflags gthread`"</div><div class='del'>-</div><div class='del'>-AC_SUBST(THREADS_LIBS)</div><div class='del'>-AC_SUBST(THREADS_CFLAGS)</div><div class='del'>-</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 version either 0.20 or later)</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-//" | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`</div><div class='del'>-    if test "$vers" -ge 20; then</div><div class='del'>-      if test "$vers" -ge 21; then</div><div class='del'>-          AC_MSG_RESULT(found &gt;=0.21)</div><div class='del'>-      else</div><div class='del'>-          AC_MSG_RESULT(found 0.20)</div><div class='del'>-	  AC_DEFINE(USING_GNOME_PRINT_0_20)</div><div class='del'>-      fi</div><div class='del'>-    else</div><div class='del'>-        AC_MSG_ERROR(Please upgrade your gnome-print to version 0.20 or later.)</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'>-</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 Check for Bonobo</div><div class='del'>-dnl ******************************</div><div class='del'>-AC_MSG_CHECKING(for Bonobo &gt;= 0.27)</div><div class='del'>-if gnome-config --libs bonobox &gt; /dev/null 2&gt;&amp;1; then</div><div class='del'>-	vers=`gnome-config --modversion bonobo | sed -e "s/bonobo-//" | \</div><div class='del'>-		awk 'BEGIN { FS = "."; } { printf "%d", $1 * 1000 + $2;}'`</div><div class='del'>-	if test "$vers" -ge 27; then</div><div class='del'>-		bonobo_ok=true</div><div class='del'>-	else</div><div class='del'>-		bonobo_ok=false</div><div class='del'>-	fi</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.20 or newer is required to compile Evolution)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl OAF</div><div class='del'>-dnl ******************************</div><div class='del'>-</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("The oaf-config program 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'>-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'>-</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'>-dnl ******************************</div><div class='del'>-dnl Gnome App Lib checking</div><div class='del'>-dnl ******************************</div><div class='del'>-AC_MSG_CHECKING(for Gnome App libraries (GAL) &gt;= 0.2.1.2)</div><div class='del'>-if gnome-config --libs gal &gt; /dev/null 2&gt;&amp;1; then </div><div class='del'>-    vers=`gnome-config --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \</div><div class='del'>-        awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`</div><div class='del'>-    if test "$vers" -ge 20102; 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 Application libs 0.2.1.2 for this version of Evolution)</div><div class='del'>-    fi</div><div class='del'>-else</div><div class='del'>-    AC_MSG_ERROR(Did not find GnomeAppLib (GAL) 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 gal` $THREADS_LIBS $UNICODE_LIBS"</div><div class='del'>-EXTRA_GNOME_CFLAGS="`gnome-config --cflags libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal` $THREADS_CFLAGS $UNICODE_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 bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui` $UNICODE_LIBS $OAF_LIBS"</div><div class='del'>-BONOBO_GNOME_CFLAGS="`gnome-config --cflags bonobox_print libglade gdk_pixbuf gnomecanvaspixbuf gnomeui ` $UNICODE_CFLAGS $OAF_CFLAGS"</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 bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_LIBS $UNICODE_LIBS"</div><div class='del'>-BONOBO_HTML_GNOME_CFLAGS="`gnome-config --cflags bonobox_print libglade gdk_pixbuf gtkhtml gnomecanvaspixbuf gnomeui ` $THREAD_CFLAGS $UNICODE_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.[01234567]) 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.8 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'>-if test x${prefix} = xNONE; then</div><div class='del'>-	html_prefix=$ac_default_prefix</div><div class='del'>-else</div><div class='del'>-	html_prefix=$prefix</div><div class='del'>-fi</div><div class='del'>-AC_MSG_CHECKING(for HTMLEditor.idl in `gnome-config --datadir`/gtkhtml or ${html_prefix}/share/gtkhtml)</div><div class='del'>-if test -f `gnome-config --datadir`/gtkhtml/HTMLEditor.idl; then</div><div class='del'>-	GTK_HTML_EDITOR_IDL=`gnome-config --datadir`/gtkhtml/HTMLEditor.idl</div><div class='del'>-	AC_MSG_RESULT(found)</div><div class='del'>-else</div><div class='del'>-	if test -f ${html_prefix}/share/gtkhtml/HTMLEditor.idl; then</div><div class='del'>-		GTK_HTML_EDITOR_IDL=${html_prefix}/share/gtkhtml/HTMLEditor.idl</div><div class='del'>-		AC_MSG_RESULT(found)</div><div class='del'>-	else</div><div class='del'>-		AC_MSG_ERROR(HTMLEditor.idl is required to compile Evolution composer, it's included in GtkHTML</div><div class='del'>-You need GtkHTML build with html-editor-control)</div><div class='del'>-	fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(GTK_HTML_EDITOR_IDL)</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'>-	vers=`gnome-config --modversion vfs`</div><div class='del'>-	case $vers</div><div class='del'>-	in</div><div class='del'>-	    gnome-vfs-0.[012]) vfs_ok=false ;;</div><div class='del'>-	    *) vfs_ok=true ;;</div><div class='del'>-	esac</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($vers)</div><div class='del'>-else</div><div class='del'>-	AC_MSG_ERROR(GNOME-VFS 0.3 or newer is required to compile Evolution)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-GNOME_VFS_LIBS="`gnome-config --libs vfs`"</div><div class='del'>-GNOME_VFS_CFLAGS="`gnome-config --cflags vfs`"</div><div class='del'>-AC_SUBST(GNOME_VFS_LIBS)</div><div class='del'>-AC_SUBST(GNOME_VFS_CFLAGS)</div><div class='del'>-</div><div class='del'>-BONOBO_VFS_GNOME_LIBS="`gnome-config --libs bonobox libglade gdk_pixbuf gnomecanvaspixbuf vfs gnomeui `"</div><div class='del'>-BONOBO_VFS_GNOME_CFLAGS="`gnome-config --cflags bonobox 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'>-AC_ARG_ENABLE(pilot-conduits, </div><div class='del'>-[  --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no)</div><div class='del'>-if test "x$enable_pilot_conduits" = "xyes"; then</div><div class='del'>-GNOME_PILOT_CHECK</div><div class='del'>-fi</div><div class='del'>-AM_CONDITIONAL(ENABLE_PILOT_CONDUITS, test "x$enable_pilot_conduits" = "xyes")</div><div class='del'>-if test x$enable_pilot_conduits = xyes; then</div><div class='del'>-   msg_pilot=Yes</div><div class='del'>-else</div><div class='del'>-   msg_pilot=No</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl ******</div><div class='del'>-dnl 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'>-</div><div class='del'>-dnl ********</div><div class='del'>-dnl Kerberos</div><div class='del'>-dnl ********</div><div class='del'>-AC_ARG_WITH(krb5, [  --with-krb5=PREFIX      Location of Kerberos 5 libs/includes])</div><div class='del'>-AC_ARG_WITH(krb4, [  --with-krb4=PREFIX      Location of Kerberos 4 libs/includes])</div><div class='del'>-msg_krb5=No</div><div class='del'>-if test x${with_krb5:=no} != xno; then</div><div class='del'>-	CFLAGS_save="$CFLAGS"</div><div class='del'>-	LDFLAGS_save="$LDFLAGS"</div><div class='del'>-	CFLAGS="-I$with_krb5/include/krb5"</div><div class='del'>-	LDFLAGS="-L$with_krb5/lib"</div><div class='del'>-	AC_CHECK_LIB(krb5, krb5_init_context,</div><div class='del'>-	[</div><div class='del'>-		AC_DEFINE(HAVE_KRB5)</div><div class='del'>-		KRB5_CFLAGS="$CFLAGS"</div><div class='del'>-		KRB5_LDFLAGS="$LDFLAGS -lkrb5 -lk5crypto -lcom_err"</div><div class='del'>-		msg_krb5=Yes</div><div class='del'>-	],[</div><div class='del'>-		AC_MSG_WARN([A sample Kerberos 5 program could not be compiled with the</div><div class='del'>-Kerberos found in $with_krb5. Please verify that the prefix is correct.])</div><div class='del'>-		with_krb5=no</div><div class='del'>-	], [-lk5crypto -lcom_err])</div><div class='del'>-	CFLAGS="$CFLAGS_save"</div><div class='del'>-	LDFLAGS="$LIBS_save"</div><div class='del'>-else</div><div class='del'>-	AC_MSG_CHECKING(for Kerberos 5)</div><div class='del'>-	AC_MSG_RESULT($with_krb5)</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-msg_krb4=No</div><div class='del'>-if test x${with_krb4:=no} != xno; then</div><div class='del'>-	CFLAGS_save="$CFLAGS"</div><div class='del'>-	LDFLAGS_save="$LDFLAGS"</div><div class='del'>-	CFLAGS="-I$with_krb4/include/kerberosIV -I$with_krb4/include/kerberos"</div><div class='del'>-	test -f "$with_krb4/include/krb.h" &amp;&amp; \</div><div class='del'>-		CFLAGS="$CFLAGS -I$with_krb4/include"</div><div class='del'>-	test -f "$with_krb4/include/port-sockets.h" &amp;&amp; \</div><div class='del'>-		CFLAGS="$CFLAGS -I$with_krb4/include"</div><div class='del'>-</div><div class='del'>-	LDFLAGS="-L$with_krb4/lib"</div><div class='del'>-	AC_CHECK_LIB(krb, krb_mk_req,</div><div class='del'>-	[</div><div class='del'>-		AC_DEFINE(HAVE_KRB4)</div><div class='del'>-		KRB4_CFLAGS="$CFLAGS"</div><div class='del'>-		KRB4_LDFLAGS="$LDFLAGS -lkrb"</div><div class='del'>-		msg_krb4=Yes</div><div class='del'>-	],[</div><div class='del'>-		AC_CHECK_LIB(krb, krb_rd_req,</div><div class='del'>-		[</div><div class='del'>-			AC_DEFINE(HAVE_KRB4)</div><div class='del'>-			KRB4_CFLAGS="$CFLAGS"</div><div class='del'>-			KRB4_LDFLAGS="$LDFLAGS -lkrb -ldes"</div><div class='del'>-			msg_krb4=Yes</div><div class='del'>-		],[</div><div class='del'>-			AC_CHECK_LIB(krb4, krb_mk_req,</div><div class='del'>-			[</div><div class='del'>-				AC_DEFINE(HAVE_KRB4)</div><div class='del'>-				KRB4_CFLAGS="$CFLAGS"</div><div class='del'>-				KRB4_LDFLAGS="$LDFLAGS -lkrb4 -ldes425 $KRB5_LDFLAGS"</div><div class='del'>-				msg_krb4=Yes</div><div class='del'>-			],[</div><div class='del'>-				AC_MSG_WARN([A sample Kerberos 4 program could not be compiled with the</div><div class='del'>-Kerberos found in $with_krb4. Please verify that the prefix is correct.])</div><div class='del'>-				with_krb4=no</div><div class='del'>-			],[-ldes425 $KRB5_LDFLAGS])</div><div class='del'>-		],[-ldes])</div><div class='del'>-	])</div><div class='del'>-</div><div class='del'>-	AC_TRY_COMPILE([#include "krb.h"</div><div class='del'>-	int krb_sendauth;</div><div class='del'>-	],[return 0],[AC_DEFINE(NEED_KRB_SENDAUTH_PROTO)],)</div><div class='del'>-</div><div class='del'>-	CFLAGS="$CFLAGS_save"</div><div class='del'>-	LDFLAGS="$LIBS_save"</div><div class='del'>-else</div><div class='del'>-	AC_MSG_CHECKING(for Kerberos 4)</div><div class='del'>-	AC_MSG_RESULT(${with_krb4})</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-AC_SUBST(KRB5_CFLAGS)</div><div class='del'>-AC_SUBST(KRB5_LDFLAGS)</div><div class='del'>-AC_SUBST(KRB4_CFLAGS)</div><div class='del'>-AC_SUBST(KRB4_LDFLAGS)</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl gtk-doc</div><div class='del'>-dnl ******************************</div><div class='del'>-</div><div class='del'>-AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false)</div><div class='del'>-AM_CONDITIONAL(HAVE_GTK_DOC, $GTKDOC)</div><div class='del'>-AC_SUBST(HAVE_GTK_DOC)</div><div class='del'>-</div><div class='del'>-dnl Let people disable the gtk-doc stuff.</div><div class='del'>-AC_ARG_ENABLE(gtk-doc, [  --enable-gtk-doc  Use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)</div><div class='del'>-</div><div class='del'>-if test x$enable_gtk_doc = xauto ; then</div><div class='del'>-  if test x$GTKDOC = xtrue ; then</div><div class='del'>-    enable_gtk_doc=yes</div><div class='del'>-  else</div><div class='del'>-    enable_gtk_doc=no</div><div class='del'>-  fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl NOTE: We need to use a separate automake conditional for this</div><div class='del'>-dnl       to make this work with the tarballs.</div><div class='del'>-AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)</div><div class='del'>-</div><div class='del'>-dnl ********</div><div class='del'>-dnl movemail</div><div class='del'>-dnl ********</div><div class='del'>-AC_ARG_WITH(movemail, [  --with-movemail=PATH    Path to a movemail binary])</div><div class='del'>-AC_MSG_CHECKING(for movemail)</div><div class='del'>-if test x$with_movemail = xyes -o x$with_movemail = x; then</div><div class='del'>-    with_movemail=no</div><div class='del'>-fi</div><div class='del'>-if test x$with_movemail != xno; then</div><div class='del'>-    AC_DEFINE_UNQUOTED(MOVEMAIL_PATH, "$with_movemail")</div><div class='del'>-    AC_MSG_RESULT($with_movemail)</div><div class='del'>-else</div><div class='del'>-    emacs_exec_dir=`emacs --batch --eval '(message exec-directory)' 2&gt;&amp;1`</div><div class='del'>-    case $emacs_exec_dir in</div><div class='del'>-    /*) if test -x $emacs_exec_dir/movemail; then</div><div class='del'>-	    if test -u $emacs_exec_dir/movemail -o -g $emacs_exec_dir/movemail; then</div><div class='del'>-		AC_MSG_RESULT($emacs_exec_dir/movemail)</div><div class='del'>-		AC_DEFINE_UNQUOTED(MOVEMAIL_PATH, "$emacs_exec_dir/movemail")</div><div class='del'>-	    else</div><div class='del'>-		AC_MSG_RESULT($emacs_exec_dir/movemail... not set-id: ignored)</div><div class='del'>-	    fi</div><div class='del'>-	else</div><div class='del'>-	    AC_MSG_RESULT(no)</div><div class='del'>-	fi</div><div class='del'>-	;;</div><div class='del'>-    *)</div><div class='del'>-	AC_MSG_RESULT(no)</div><div class='del'>-	;;</div><div class='del'>-    esac</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl **********</div><div class='del'>-dnl GPGPGPGPGP</div><div class='del'>-dnl **********</div><div class='del'>-AC_PATH_PROG(GPG, gpg)</div><div class='del'>-priv=None</div><div class='del'>-if test -n "$GPG"; then</div><div class='del'>-	AC_DEFINE_UNQUOTED(GPG_PATH, "$GPG")</div><div class='del'>-	AC_DEFINE(PGP_PROGRAM, "GPG")</div><div class='del'>-	priv="GNU PG"</div><div class='del'>-else</div><div class='del'>-	AC_PATH_PROG(PGP5, pgpv)</div><div class='del'>-	if test -n "$PGP5"; then</div><div class='del'>-		AC_DEFINE_UNQUOTED(PGP5_PATH, "$PGP5")</div><div class='del'>-		AC_DEFINE(PGP_PROGRAM, "PGP")</div><div class='del'>-		priv="PGP5"</div><div class='del'>-	else</div><div class='del'>-		AC_PATH_PROG(PGP, pgp)</div><div class='del'>-		if test -n "$PGP"; then</div><div class='del'>-			AC_DEFINE_UNQUOTED(PGP_PATH, "$PGP")</div><div class='del'>-			AC_DEFINE(PGP_PROGRAM, "PGP")</div><div class='del'>-			priv=PGP</div><div class='del'>-		fi</div><div class='del'>-	fi</div><div class='del'>-fi</div><div class='del'>-</div><div class='del'>-dnl ******************************</div><div class='del'>-dnl Makefiles</div><div class='del'>-dnl ******************************</div><div class='del'>-</div><div class='del'>-AC_CONFIG_SUBDIRS(libical)</div><div class='del'>-</div><div class='del'>-EVOLUTION_DIR=`(cd $srcdir; pwd)`</div><div class='del'>-AC_SUBST(EVOLUTION_DIR)</div><div class='del'>-</div><div class='del'>-AC_OUTPUT([</div><div class='del'>-Makefile</div><div class='del'>-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'>-e-util/ename/Makefile</div><div class='del'>-libibex/Makefile</div><div class='del'>-executive-summary/Makefile</div><div class='del'>-executive-summary/evolution-services/Makefile</div><div class='del'>-executive-summary/widgets/Makefile</div><div class='del'>-executive-summary/idl/Makefile</div><div class='del'>-executive-summary/component/Makefile</div><div class='del'>-executive-summary/test-service/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'>-camel/providers/mh/Makefile</div><div class='del'>-camel/providers/nntp/Makefile</div><div class='del'>-composer/Makefile</div><div class='del'>-widgets/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/conduit/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/widgets/Makefile</div><div class='del'>-addressbook/gui/search/Makefile</div><div class='del'>-addressbook/gui/component/Makefile</div><div class='del'>-addressbook/gui/component/select-names/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/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'>-calendar/conduits/Makefile</div><div class='del'>-calendar/conduits/calendar/Makefile</div><div class='del'>-calendar/conduits/todo/Makefile</div><div class='del'>-filter/Makefile</div><div class='del'>-wombat/Makefile</div><div class='del'>-art/Makefile</div><div class='del'>-ui/Makefile</div><div class='del'>-default_user/Makefile</div><div class='del'>-default_user/local/Makefile</div><div class='del'>-default_user/local/Calendar/Makefile</div><div class='del'>-default_user/local/Contacts/Makefile</div><div class='del'>-default_user/local/Drafts/Makefile</div><div class='del'>-default_user/local/Executive-Summary/Makefile</div><div class='del'>-default_user/local/Inbox/Makefile</div><div class='del'>-default_user/local/Outbox/Makefile</div><div class='del'>-default_user/local/Sent/Makefile</div><div class='del'>-default_user/local/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'>-doc/devel/Makefile</div><div class='del'>-doc/devel/calendar/Makefile</div><div class='del'>-doc/devel/calendar/cal-client/Makefile</div><div class='del'>-doc/devel/calendar/cal-util/Makefile</div><div class='del'>-])</div><div class='del'>-</div><div class='del'>-echo "</div><div class='del'>-	Evolution has been configured as follows:</div><div class='del'>-</div><div class='del'>-	Mail Directory:   $system_mail_dir</div><div class='del'>-	LDAP support:     $msg_ldap</div><div class='del'>-	Pilot conduits:   $msg_pilot</div><div class='del'>-	Kerberos 4/5:     $msg_krb4/$msg_krb5</div><div class='del'>-	Use movemail:     $with_movemail</div><div class='del'>-	Crypto support:   $priv</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 1748709438..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>data/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-mimedir = $(datadir)/mime-info</div><div class='del'>-mime_DATA = evolution.keys</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	evolution.desktop	\</div><div class='del'>-	$(mime_DATA)
\ 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 390e8f2e3a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/evolution.desktop?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>data/evolution.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,28 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Evolution</div><div class='del'>-Name[pt_BR]=Evolution</div><div class='del'>-Name[da]=Evolution</div><div class='del'>-Name[es]=Evolution</div><div class='del'>-Name[fr]=Evolucija</div><div class='del'>-Name[hu]=Evolúció</div><div class='del'>-Name[lt]=Evolution</div><div class='del'>-Name[no]=Evolution</div><div class='del'>-Name[ru]=ü×ÏÌÀÃÉÑ</div><div class='del'>-Name[sl]=Evolucija</div><div class='del'>-Name[sv]=Evolution</div><div class='del'>-Name[tr]=Evolution</div><div class='del'>-Comment=Mail, Contacts and Task.</div><div class='del'>-Comment[pt_BR]=Correio, Contatos e Tarefa.</div><div class='del'>-Comment[da]=E-post, kontakter og opgaver.</div><div class='del'>-Comment[es]=Correo electrónico, contactos y agenda de tareas.</div><div class='del'>-Comment[fr]=Courrier électronique, Contacts, Agenda et Tâches.</div><div class='del'>-Comment[hu]=E-mail, névjegyek, munkák.</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'>-Comment[sl]=Po¹ta, stiki in naloge.</div><div class='del'>-Comment[sv]=E-post, kontakter och uppgifter.</div><div class='del'>-Comment[tr]=ePosta, tanýk ve görevler</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/data/evolution.keys b/data/evolution.keys<br/>deleted file mode 100644<br/>index 7f28de5c8a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/data/evolution.keys?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>data/evolution.keys</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-text/x-vcard</div><div class='del'>-	description=address card</div><div class='del'>-	default_action_type=component</div><div class='del'>-	default_component_iid=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9</div><div class='del'>-	short_list_component_iids_for_novice_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9</div><div class='del'>-	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9</div><div class='del'>-	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_minicard:f9542709-fb31-4c6a-bc00-d462ba41e4b9</div><div class='del'>-</div><div class='del'>-text/x-calendar</div><div class='del'>-	description=calendar information</div><div class='del'>-	default_action_type=component</div><div class='del'>-	default_component_iid=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad</div><div class='del'>-	short_list_component_iids_for_novice_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad</div><div class='del'>-	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad</div><div class='del'>-	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad</div><div class='del'>-</div><div class='del'>-text/calendar</div><div class='del'>-	description=calendar information</div><div class='del'>-	default_action_type=component</div><div class='del'>-	default_component_iid=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad</div><div class='del'>-	short_list_component_iids_for_novice_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad</div><div class='del'>-	short_list_component_iids_for_intermediate_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad</div><div class='del'>-	short_list_component_iids_for_hacker_user_level=OAFIID:control:e_itipview:1eef8614-cce4-4398-aed4-f32e920fb6ad</div><div class='del'>-</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 7f728d3a22..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,134 +0,0 @@</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Added executive-summary again.</div><div class='del'>-</div><div class='del'>-	* shortcurts.xml: In out, in out and shake it all about</div><div class='del'>-	The executive summary is back in.</div><div class='del'>-</div><div class='del'>-2000-10-12  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: And removed it again.</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: Commented out the Exec-summary.</div><div class='del'>-</div><div class='del'>-2000-10-10  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Added the Executive-Summary dir.</div><div class='del'>-</div><div class='del'>-2000-10-05  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile: Added Executive-Summary.</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: Added the Executive-Summary</div><div class='del'>-</div><div class='del'>-	* local/Executive-Summary/*: Added.</div><div class='del'>-</div><div class='del'>-2000-09-22  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ldapservers.xml: added yahoo, whowhere, and infospace servers.</div><div class='del'>-</div><div class='del'>-2000-09-19  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (defaultdir): Use $(datadir), not $(prefix)/share</div><div class='del'>-</div><div class='del'>-2000-09-13  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Sent/Makefile.am (defaultcalendardir): Install the Sent</div><div class='del'>-	dir in Sent, not Sentbox</div><div class='del'>-</div><div class='del'>-2000-09-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Renamed Sentbox to Sent</div><div class='del'>-</div><div class='del'>-	* local/{Sent\ Mail,Sentbox}/*: removed</div><div class='del'>-</div><div class='del'>-	* local/Sent/*: created</div><div class='del'>-</div><div class='del'>-2000-09-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	Reversed my last change, folders with spaces in the name breaks</div><div class='del'>-	configure</div><div class='del'>-</div><div class='del'>-2000-09-03  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Renamed Sentbox to Sent\ Mail</div><div class='del'>-</div><div class='del'>-	* local/Sent\ Mail/*: Updated</div><div class='del'>-</div><div class='del'>-2000-09-01  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am: Added Sentbox</div><div class='del'>-</div><div class='del'>-	* local/Sentbox/*: New folder for storing sent messages</div><div class='del'>-</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	(install-data-hook): ignore error on mkdir.</div><div class='del'>-	</div><div class='del'>-2000-07-12  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (install-data-hook): create an empty news directory</div><div class='del'>-	in $(defaultdir).</div><div class='del'>-</div><div class='del'>-2000-07-06  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ldapservers.xml: break up the uri into it's component pieces. -</div><div class='del'>-	don't store the uri in this file.</div><div class='del'>-</div><div class='del'>-2000-07-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: remove the Internet Directories group.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (default_DATA): add ldapservers.xml.</div><div class='del'>-</div><div class='del'>-	* local/Makefile.am (SUBDIRS): remove Directories.</div><div class='del'>-</div><div class='del'>-	* ldapservers.xml: new ldap metadata.</div><div class='del'>-	</div><div class='del'>-	* local/Directories/*: remove directories.</div><div class='del'>-</div><div class='del'>-2000-06-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Inbox/mbox: Removed `&lt;blockquote&gt;' from the main text so</div><div class='del'>-	that the welcome mail is all visible when loaded into Evolution at</div><div class='del'>-	startup.</div><div class='del'>-</div><div class='del'>-2000-05-10  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Inbox/mbox: Commented out currently unimplemented shortcut</div><div class='del'>-	items.</div><div class='del'>-</div><div class='del'>-2000-05-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am, local/Calendar/Makefile.am,</div><div class='del'>-	local/Contacts/Makefile.am, local/Directories/Makefile.am,</div><div class='del'>-	local/Directories/subfolders/Bigfoot/Makefile.am,</div><div class='del'>-	local/Directories/subfolders/Netcenter/Makefile.am,</div><div class='del'>-	local/Drafts/Makefile.am, local/Inbox/Makefile.am,</div><div class='del'>-	local/Outbox/Makefile.am, local/Trash/Makefile.am: Created a</div><div class='del'>-	proper EXTRA_DIST section.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Directories/subfolders/Bigfoot/.cvsignore: New .cvsignore</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Contacts/Makefile.am, local/Contacts/addressbook.db:</div><div class='del'>-	Removed addressbook.db since this is now handled by the pas.</div><div class='del'>-</div><div class='del'>-2000-05-08  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* shortcuts.xml: Removed unused shortcuts which point to</div><div class='del'>-	unimplemented folders.</div><div class='del'>-</div><div class='del'>-2000-05-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* local/Contacts/Makefile.am: Install `addressbook.db'.</div><div class='del'>-</div><div class='del'>-000-05-06  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* default_user/local/Inbox/Makefile.am: Install `mbox'.</div><div class='del'>-</div><div class='del'>-	</div><div class='head'>diff --git a/default_user/Makefile.am b/default_user/Makefile.am<br/>deleted file mode 100644<br/>index a7455498a8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-SUBDIRS = local</div><div class='del'>-</div><div class='del'>-defaultdir = $(datadir)/evolution/default_user</div><div class='del'>-default_DATA = ldapservers.xml shortcuts.xml</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(default_DATA)</div><div class='del'>-</div><div class='del'>-install-data-hook:</div><div class='del'>-	-mkdir $(defaultdir)/news</div><div class='head'>diff --git a/default_user/ldapservers.xml b/default_user/ldapservers.xml<br/>deleted file mode 100644<br/>index 46620d21a9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/ldapservers.xml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/ldapservers.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,43 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;contactservers&gt;</div><div class='del'>-  &lt;contactserver&gt;</div><div class='del'>-      &lt;name&gt;Bigfoot&lt;/name&gt;</div><div class='del'>-      &lt;description&gt;Bigfoot&lt;/description&gt;</div><div class='del'>-      &lt;host&gt;ldap.bigfoot.com&lt;/host&gt;</div><div class='del'>-      &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-      &lt;rootdn&gt;&lt;/rootdn&gt;</div><div class='del'>-      &lt;scope&gt;one&lt;/scope&gt;</div><div class='del'>-  &lt;/contactserver&gt;</div><div class='del'>-  &lt;contactserver&gt;</div><div class='del'>-      &lt;name&gt;InfoSpace&lt;/name&gt;</div><div class='del'>-      &lt;description&gt;Infospace&lt;/description&gt;</div><div class='del'>-      &lt;host&gt;ldap.infospace.com&lt;/host&gt;</div><div class='del'>-      &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-      &lt;rootdn&gt;&lt;/rootdn&gt;</div><div class='del'>-      &lt;scope&gt;one&lt;/scope&gt;</div><div class='del'>-  &lt;/contactserver&gt;</div><div class='del'>-  &lt;contactserver&gt;</div><div class='del'>-      &lt;name&gt;Netcenter&lt;/name&gt;</div><div class='del'>-      &lt;description&gt;Netcenter Member Directory&lt;/description&gt;</div><div class='del'>-      &lt;host&gt;memberdir.netscape.com&lt;/host&gt;</div><div class='del'>-      &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-      &lt;rootdn&gt;ou=member_directory,o=netcenter.com&lt;/rootdn&gt;</div><div class='del'>-      &lt;scope&gt;one&lt;/scope&gt;</div><div class='del'>-  &lt;/contactserver&gt;</div><div class='del'>-  &lt;contactserver&gt;</div><div class='del'>-      &lt;name&gt;WhoWhere&lt;/name&gt;</div><div class='del'>-      &lt;description&gt;WhoWhere&lt;/description&gt;</div><div class='del'>-      &lt;host&gt;ldap.whowhere.com&lt;/host&gt;</div><div class='del'>-      &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-      &lt;rootdn&gt;&lt;/rootdn&gt;</div><div class='del'>-      &lt;scope&gt;one&lt;/scope&gt;</div><div class='del'>-  &lt;/contactserver&gt;</div><div class='del'>-  &lt;contactserver&gt;</div><div class='del'>-      &lt;name&gt;Yahoo!&lt;/name&gt;</div><div class='del'>-      &lt;description&gt;Yahoo! People Search&lt;/description&gt;</div><div class='del'>-      &lt;host&gt;ldap.yahoo.com&lt;/host&gt;</div><div class='del'>-      &lt;port&gt;389&lt;/port&gt;</div><div class='del'>-      &lt;rootdn&gt;&lt;/rootdn&gt;</div><div class='del'>-      &lt;scope&gt;one&lt;/scope&gt;</div><div class='del'>-  &lt;/contactserver&gt;</div><div class='del'>-&lt;/contactservers&gt;</div><div class='head'>diff --git a/default_user/local/.cvsignore b/default_user/local/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/local/Contacts/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;contacts&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Contacts&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/Drafts/.cvsignore b/default_user/local/Drafts/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Drafts/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/Executive-Summary/.cvsignore b/default_user/local/Executive-Summary/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Executive-Summary/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/local/Executive-Summary/.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/Executive-Summary/Makefile.am b/default_user/local/Executive-Summary/Makefile.am<br/>deleted file mode 100644<br/>index 6fae47d4ab..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Executive-Summary/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/local/Executive-Summary/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-defaultcalendardir = $(datadir)/evolution/default_user/local/Executive-Summary</div><div class='del'>-</div><div class='del'>-defaultcalendar_DATA = 		\</div><div class='del'>-	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/Executive-Summary/folder-metadata.xml b/default_user/local/Executive-Summary/folder-metadata.xml<br/>deleted file mode 100644<br/>index 86e9e425e4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Executive-Summary/folder-metadata.xml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/local/Executive-Summary/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;executive-summary&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Executive Summary folder&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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 fa7974678d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/local/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-SUBDIRS =					\</div><div class='del'>-	Calendar				\</div><div class='del'>-	Contacts				\</div><div class='del'>-	Drafts					\</div><div class='del'>-	Executive-Summary			\</div><div class='del'>-	Inbox					\</div><div class='del'>-	Outbox					\</div><div class='del'>-	Sent					\</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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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/Sent/.cvsignore b/default_user/local/Sent/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Sent/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/local/Sent/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/default_user/local/Sent/Makefile.am b/default_user/local/Sent/Makefile.am<br/>deleted file mode 100644<br/>index 024f5c76eb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Sent/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/local/Sent/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-defaultcalendardir = $(datadir)/evolution/default_user/local/Sent</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/Sent/folder-metadata.xml b/default_user/local/Sent/folder-metadata.xml<br/>deleted file mode 100644<br/>index 87188daedb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/local/Sent/folder-metadata.xml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/local/Sent/folder-metadata.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-&lt;?xml version="1.0"?&gt;</div><div class='del'>-&lt;efolder&gt;</div><div class='del'>-	&lt;type&gt;mail&lt;/type&gt;</div><div class='del'>-	&lt;description&gt;Sent&lt;/description&gt;</div><div class='del'>-&lt;/efolder&gt;</div><div class='head'>diff --git a/default_user/local/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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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 1107fa043e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/default_user/shortcuts.xml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>default_user/shortcuts.xml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,18 +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/Executive-Summary&lt;/item&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;!--	&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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>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=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/camel/tmpl/camel-folder.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,96 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelFolder</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-Represents a folder of messages on a store.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-CamelFolder represents a folder in a message store. </div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelFolder ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_get_folder ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@folder_name: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_create ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_delete ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@recurse: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_delete_messages ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_get_parent_folder ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_get_parent_store ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_get_mode ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_folder_list_subfolders ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@folder: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-mime-message.sgml b/devel-docs/camel/tmpl/camel-mime-message.sgml<br/>deleted file mode 100644<br/>index 704f3d3572..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-mime-message.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/camel/tmpl/camel-mime-message.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,171 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelMimeMessage</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelMimeMessage ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_remove_recipient ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_recipients ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@recipient_type: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_flag ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@flag: </div><div class='del'>-@value: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_subject ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@subject: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_reply_to ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_from ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_reply_to ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@reply_to: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_sent_date ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_new_with_session ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@session: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_add_recipient ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_subject ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_from ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@from: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_flag ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@flag: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_message_number ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_get_received_date ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_message_set_received_date ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_message: </div><div class='del'>-@received_date: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-mime-part.sgml b/devel-docs/camel/tmpl/camel-mime-part.sgml<br/>deleted file mode 100644<br/>index 2db158b25f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-mime-part.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/camel/tmpl/camel-mime-part.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,151 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelMimePart</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_filename ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@filename: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_disposition ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_content_MD5 ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_encoding ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_header_lines ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@header_lines: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_content_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@description: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_text ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@camel_mime_part: </div><div class='del'>-@text: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_encoding ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@encoding: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_disposition ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@disposition: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_filename ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_content_languages ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_set_content_languages ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@content_languages: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_header_lines ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_mime_part_get_description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@mime_part: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-recipient.sgml b/devel-docs/camel/tmpl/camel-recipient.sgml<br/>deleted file mode 100644<br/>index 4af84cf58e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-recipient.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/camel/tmpl/camel-recipient.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelRecipientTable</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelRecipientTable ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_hash_table: </div><div class='del'>-@ref_count: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_unref ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_get ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-@recipient_type: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_add ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_remove ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_add_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-@recipient_type: </div><div class='del'>-@recipient_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_recipient_table_ref ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recipient_table: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-service.sgml b/devel-docs/camel/tmpl/camel-service.sgml<br/>deleted file mode 100644<br/>index 5b51ea902e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-service.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/camel/tmpl/camel-service.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,72 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelService</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelService ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@e: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_connect ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_is_connected ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_connect_to_with_login_passwd ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-@host: </div><div class='del'>-@login: </div><div class='del'>-@passwd: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_connect_to_with_login_passwd_port ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-@host: </div><div class='del'>-@login: </div><div class='del'>-@passwd: </div><div class='del'>-@port: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_service_get_url ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@service: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-store.sgml b/devel-docs/camel/tmpl/camel-store.sgml<br/>deleted file mode 100644<br/>index 2882c09986..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-store.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/camel/tmpl/camel-store.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,45 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelStore</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-A class representing a message (local or distant) repository</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-The store class models a place where messages can be stored and retreived. It can be a local </div><div class='del'>-store (for example an mbox-style store) or a distant server (for example an POP3 server). Messages are</div><div class='del'>-not retreived or stored directly with a CamelStore object. Instead, a CamelFolder object must be</div><div class='del'>-obtained from the store first. </div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CamelStore ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_store_get_separator ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@store: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_store_get_folder ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@store: </div><div class='del'>-@folder_name: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/camel/tmpl/camel-stream.sgml b/devel-docs/camel/tmpl/camel-stream.sgml<br/>deleted file mode 100644<br/>index e965db2e45..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/camel/tmpl/camel-stream.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/camel/tmpl/camel-stream.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,101 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CamelStream</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_seek ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@offset: </div><div class='del'>-@policy: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_write ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@buffer: </div><div class='del'>-@n: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_flush ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_eos ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO camel_stream_write_string ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@string: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_close ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_write_strings ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@Varargs: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_read ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@buffer: </div><div class='del'>-@n: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION camel_stream_available ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@stream: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/devel-docs/misc/ref_and_id_proposition.txt b/devel-docs/misc/ref_and_id_proposition.txt<br/>deleted file mode 100644<br/>index 2127b45a57..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/misc/ref_and_id_proposition.txt?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/misc/ref_and_id_proposition.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,237 +0,0 @@</div><div class='del'>-Author: Bertrand Guiheneuf &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-Date: August 9th 1999</div><div class='del'>-Last revision date : September 3rd 1999</div><div class='del'>-Version: 0.2</div><div class='del'>-</div><div class='del'>-The last version of this document is always available in gnome CVS in</div><div class='del'>-the gnome-mailer module: devel-docs/misc/ref_and_id_proposition.txt</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-A) Identifying messages within folders</div><div class='del'>---------------------------------------</div><div class='del'>-</div><div class='del'>-Currently, in Camel there is only one way to retrieve a message from a</div><div class='del'>-mail store:</div><div class='del'>-     CamelMimeMessage * </div><div class='del'>-     get_message (CamelFolder *folder, gint number)</div><div class='del'>-</div><div class='del'>-where number is an integer representing the message rank within its</div><div class='del'>-parent folder.</div><div class='del'>-</div><div class='del'>-This is a traditional method (JavaMail, MAPI) and it is very useful</div><div class='del'>-because this is often the only way to get a message in from a</div><div class='del'>-classical store (pop3 for example).</div><div class='del'>-</div><div class='del'>-Moreover, various documents ([1], [2]) proposed to generalize the URL</div><div class='del'>-scheme used in Camel ([3]) to access mail stores in order to identify</div><div class='del'>-messages. Such an URL would be, for instance:</div><div class='del'>-</div><div class='del'>-pop3://po.myisp.com:1</div><div class='del'>-</div><div class='del'>-Meaning: "Access message 1 on Pop3 server po.myisp.com"</div><div class='del'>-</div><div class='del'>- </div><div class='del'>-However, referencing a message with its number within a folder is a</div><div class='del'>-very unreliable method:</div><div class='del'>-</div><div class='del'>-1) Message order in a folder can change during a session: </div><div class='del'>-   </div><div class='del'>-   The user can move or remove messages from the folder, thus</div><div class='del'>-   completely changing message numbers.  We could however imagine to</div><div class='del'>-   follow message operations in order to keep camel in a coherent</div><div class='del'>-   state at each time instant. This could be quite complex but may</div><div class='del'>-   be feasible using gtk signal system.</div><div class='del'>-</div><div class='del'>-2) Message order can change between sessions:</div><div class='del'>-</div><div class='del'>-   Gnome-mailer was designed from the begining to allow messages to be</div><div class='del'>-   stored in classical mailboxes (mbox, maildir, MH, IMAP ...), in</div><div class='del'>-   order to allow users to run other MUA on their mailboxes if</div><div class='del'>-   necessary.  These other MUA can change message order within folders</div><div class='del'>-   without any chance for Camel to trace the operations.</div><div class='del'>-   </div><div class='del'>-These two scenarii show that it is quite impossible to use reliable</div><div class='del'>-folder caching or message referencing if messages are referenced only</div><div class='del'>-by their position within their parent folder.</div><div class='del'>-   </div><div class='del'>-</div><div class='del'>-We thus have to find a general way to identify and retreive a message</div><div class='del'>-within its folder. One thing is sure, however: all folders</div><div class='del'>-implementation won't allow this method. Pop3 stores will always access</div><div class='del'>-messages using their rank on the server. MUA using Camel will thus</div><div class='del'>-have to be prepared to access some stores providing only the old</div><div class='del'>-fashionned message number access method.</div><div class='del'>-</div><div class='del'>-Basically, we have two choices:</div><div class='del'>-</div><div class='del'>-1) Accessing messages using (mailbox) Unique ID (UID)</div><div class='del'>-</div><div class='del'>-   A UID is a string identifier associated to a message, which is</div><div class='del'>-   guaranteed to be unique within its parent folder and which will not</div><div class='del'>-   change between sessions.</div><div class='del'>-</div><div class='del'>-2) Accessing messages using Message ID</div><div class='del'>-</div><div class='del'>-   A Message ID is a string identifier associated to a messages which</div><div class='del'>-   is guaranteed to be unique in the world, that is, no other message</div><div class='del'>-   can have the same Message ID. The message ID is defined in RFC 822,</div><div class='del'>-   and is stored as the message header "Message-id"</div><div class='del'>-   </div><div class='del'>-Method (1) already exists in IMAP.  </div><div class='del'>-It is quite simple to define on local stores (MH, mbox, ....) but it</div><div class='del'>-may not resist to message modification by other MUA.</div><div class='del'>-Methods based on Message-id matching or message content checksum seem</div><div class='del'>-to be the best one. Using an "X-" header is another possibility for</div><div class='del'>-non read-only folders. A combination of these three methods may be the</div><div class='del'>-most reliable solution.</div><div class='del'>-The UID is impossible to implement in a POP3 store provider.</div><div class='del'>-</div><div class='del'>-(2) Can be used with IMAP, but would be very ineficient. </div><div class='del'>-The main issue with this method is its dependancy upon other MUAs and</div><div class='del'>-MTAs. Message-id is set before or during message transport. Moreover,</div><div class='del'>-some rfc822 compliant messages may not even have any Message-id</div><div class='del'>-header.</div><div class='del'>-These are major issues when accessing read-only stores.  </div><div class='del'>-The M-ID is also impossible to implement in a POP3 store provider.</div><div class='del'>-   </div><div class='del'>-</div><div class='del'>-We may not rely on external MUA and MTA to guarentee the uniqueness of</div><div class='del'>-the identifier . We may loose messages by never being able to read them</div><div class='del'>-if two had the same uid. It would be possible to find workarounds, but</div><div class='del'>-it could make Camel use a bit tricky.</div><div class='del'>-</div><div class='del'>-Given that most users will use IMAP or a database based store as their</div><div class='del'>-main mail store, and given that this stores allow UID very</div><div class='del'>-easily, I suggest that we use method (1). Discussion is still open,</div><div class='del'>-though.</div><div class='del'>-</div><div class='del'>-Here are the public methods I propose to add to CamelFolder:</div><div class='del'>-</div><div class='del'>-gboolean camel_folder_supports_uid (CamelFolder *folder)</div><div class='del'>-    returns true if the folder can get messages </div><div class='del'>-    by their uid.</div><div class='del'>-</div><div class='del'>-gchar * camel_folder_get_uid_by_number (CamelFolder *folder, gint message_number)</div><div class='del'>-    return the uid of message which number in the folder</div><div class='del'>-    is %message_number.</div><div class='del'>-</div><div class='del'>-gchar * camel_folder_get_message_uid (CamelFolder *folder, CamelMimeMessage *message)</div><div class='del'>-    return the uid of the message within the folder.</div><div class='del'>-</div><div class='del'>-CamelMimeMessage *camel_folder_get_message_by_uid  (CamelFolder *folder, gchar *uid)</div><div class='del'>-    return the message which uid is %uid</div><div class='del'>-</div><div class='del'>-In addition, the CamelMessage Class will have a new public method</div><div class='del'>-</div><div class='del'>-gchar * camel_mime_message_get_uid (CamelMimeMessage *message) </div><div class='del'>-    return the uid associated to the message in its physical parent</div><div class='del'>-    folder.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-B) Handling message references in (v)folders.</div><div class='del'>----------------------------------------------</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-We want the future Gnome mailer to be able to build (virtual) folders</div><div class='del'>-holding references to messages physically located in other</div><div class='del'>-folders. More generally, we would like folders to be able to hold:</div><div class='del'>-</div><div class='del'>-1) messages</div><div class='del'>-2) subfolders</div><div class='del'>-3) references to messages</div><div class='del'>-</div><div class='del'>-(1) and (2) are already implemented in Camel because most mail stores</div><div class='del'>-can hold messages and/or subfolders.</div><div class='del'>-</div><div class='del'>-(3) is a different issue, because no existing mail store can currently</div><div class='del'>-hold, within folders, references to messages in other folders.</div><div class='del'>-It will thus be a specific gnome-mailer extension. </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-One of the main issue is to determine what kind of behaviour we expect</div><div class='del'>-from folders holding references. Here is a possible API.</div><div class='del'>-</div><div class='del'>-( the world (v)folder is used to distinguish between the physical</div><div class='del'>-parent folder and the folder holding a reference to the message, when</div><div class='del'>-a confusion may arise)</div><div class='del'>-</div><div class='del'>-Addition to CamelFolder:</div><div class='del'>-</div><div class='del'>-gboolean camel_folder_can_hold_references (CamelFolder *folder)</div><div class='del'>-    return true if the folder can contain references</div><div class='del'>-</div><div class='del'>-void camel_folder_add_reference_by_uid (CamelFolder *folder, gchar *folder_url, gchar *message_uid)</div><div class='del'>-    add a reference into a folder. %folder_url is the url of </div><div class='del'>-    the folder, %message_uid is the uid of the message within </div><div class='del'>-    its physical parent folder.</div><div class='del'>- </div><div class='del'>-void camel_folder_add_reference_by_message (CamelFolder *folder, CamelMessage *message)</div><div class='del'>-    add a reference. The place where the reference points </div><div class='del'>-    to is found using CamelMessage methods</div><div class='del'>-</div><div class='del'>-void camel_folder_remove_reference_by_uid (CamelFolder *folder, gchar *uid)</div><div class='del'>-    remove a message reference form a folder. Reference </div><div class='del'>-    is identified using its uid within the folder.</div><div class='del'>-</div><div class='del'>-gboolean camel_folder_uid_is_reference (CamelFolder *folder, gchar *uid)</div><div class='del'>-    return true if the message corresponding to the uid is a reference.</div><div class='del'>-</div><div class='del'>-Then all usual operations on the folder act if the message was</div><div class='del'>-actually physically stored in this folder. For example, when the mailer</div><div class='del'>-uses camel_folder_get_message_by_uid onto the (v)folder, the actual</div><div class='del'>-message is retreived from its physical store.</div><div class='del'>-</div><div class='del'>-As you can see, the uid of the message within its physical parent</div><div class='del'>-folder is different than its uid within the (v)folder. This is because</div><div class='del'>-there is no way to guarantee that the uids of two messages in two</div><div class='del'>-different folders would be different. Using references on this two</div><div class='del'>-message in the same vfolder would break uniqueness of the uid in the</div><div class='del'>-(v)folder.</div><div class='del'>-</div><div class='del'>-A couple of other methods could be defined but all the basics are</div><div class='del'>-described here.  </div><div class='del'>-</div><div class='del'>-This draft API is far from complete nor perfect, and is described here</div><div class='del'>-only to stimulate discussions before the actual implementation.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-The question now is to know how we store references. There are basically </div><div class='del'>-two ways:</div><div class='del'>-</div><div class='del'>-1) references are stored using the URL of the physical folder</div><div class='del'>-   and the uid of the message within the folder</div><div class='del'>-</div><div class='del'>-2) a list of reference is kept, and in this list, reference are stored</div><div class='del'>-as in (1). Folders would refer to the actual message using index in</div><div class='del'>-the list</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   </div><div class='del'>-The main problem with (1) is that references get lost as soon</div><div class='del'>-as the actual message is moved. There is no way to find in which</div><div class='del'>-folders references to the message exist. </div><div class='del'>-</div><div class='del'>-(2) is a way to solve this issue. When messages are used, Camel looks</div><div class='del'>-in the list to see if the message is refered somewhere, and actualize </div><div class='del'>-the URL and the uid with their new values. </div><div class='del'>-</div><div class='del'>-The problem with (2) is that we need to keep this information in a file</div><div class='del'>-and libraries writing automatically to files are generally a bad idea.</div><div class='del'>-</div><div class='del'>-As in additional remark, it is clear that Camel will only be able to</div><div class='del'>-hold references to messages on stores supporting UIDs.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Thanks in advance for your comments and ideas,</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-       Bertrand &lt;Bertrand.Guiheneuf@aful.org&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>---</div><div class='del'>-</div><div class='del'>-[1] : http://www.selequa.com/%7epurp/gnomail/mail2db.html </div><div class='del'>-[2] : http://www.selequa.com/%7epurp/gnomail/dbRecFmt.html </div><div class='del'>-[3] : http://www.gnome.org/mailing-lists/archives/gnome-mailer-list/1999-April/0248.shtml</div><div class='head'>diff --git a/devel-docs/query/virtual-folder-in-depth.sgml b/devel-docs/query/virtual-folder-in-depth.sgml<br/>deleted file mode 100644<br/>index d3e3e0504b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/query/virtual-folder-in-depth.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/query/virtual-folder-in-depth.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,407 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" []&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- SGMLized by Bertrand &lt;Bertrand.Guiheneuf@aful.org&gt; --&gt;</div><div class='del'>-</div><div class='del'>-&lt;article id="index"&gt;</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Giao&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Nguyen&lt;/surname&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;title&gt;An in-depth look at the virtual folder mechanism&lt;/title&gt;</div><div class='del'>-    &lt;abstract&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This document describes a different way of approaching mail</div><div class='del'>-	organization and how all things are possible in this brave new</div><div class='del'>-	world. This document does not describe physical storage issues</div><div class='del'>-	nor interface issues.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Historically mail has been organized into folders. These</div><div class='del'>-	folders usually mapped to a single storage medium. The</div><div class='del'>-	relationship between mail organization and storage medium was</div><div class='del'>-	one to one. There was one mail organization for every storage</div><div class='del'>-	medium. This scheme had its limitations.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	Efforts at categorizations are only meaningful at the instance that</div><div class='del'>-	one categorized. To find any piece of data, regardless of how well</div><div class='del'>-	it was categorized, required some amount of searching. Therefore, any</div><div class='del'>-	attempts to nullify searching is doomed to fail. It's time to embrace</div><div class='del'>-	searching as a way of life.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	These are the terms and their definitions. The example rules used are</div><div class='del'>-	based on the syntax for VM (http://www.wonderworks.com/vm/) by Kyle</div><div class='del'>-	Jones whose ideas form the basis for this. I'm only adding the</div><div class='del'>-	existence of summary files to aid in scaling. I currently use VM and</div><div class='del'>-	it's virtual-folder rules for my daily mail purposes. To date, my only </div><div class='del'>-	complaints are speed (it has no caches) and for the unitiated, it's</div><div class='del'>-	not very user-friendly.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	Comments, questions, rants, etc. should be directed at Giao Nguyen</div><div class='del'>-	(grail@cafebabe.org) who will try to address issues in a timely</div><div class='del'>-	manner.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/abstract&gt;</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Definitions --&gt;</div><div class='del'>-  &lt;sect1 id="definitions"&gt;</div><div class='del'>-    &lt;title&gt;Definitions&lt;/title&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Store&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	A location where mail can be found. This may be a file (Berkeley</div><div class='del'>-	mbox), directory (MH), IMAP server, POP3 server, Exchange server,</div><div class='del'>-	Lotus Notes server, a stack of Post-Its by your monitor fed through</div><div class='del'>-	some OCR system.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Message&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	An individual mail message.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Vfolder&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	A group of messages sharing some commonality. This is the result of a</div><div class='del'>-	query. The vfolder maybe contained in a store, but it is not necessary</div><div class='del'>-	that a store holds only one vfolder. There is always an implicit</div><div class='del'>-	vfolder rule which matches all messages. A store contains the vfolder</div><div class='del'>-	which is the result of the query (any). It's short for virtual folder</div><div class='del'>-	or maybe view folder. I dunno.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Default-vfolder&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	The vfolder defined by (any) applied to the store. This is not the</div><div class='del'>-	inbox. The inbox could easily be defined by a query. A default rule</div><div class='del'>-	for the inbox could be (new) but it doesn't have to be. Mine happens</div><div class='del'>-	to be (or (unread) (new)).</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Folder&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	The classical mail folder approach: one message organization per</div><div class='del'>-	store.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Query&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	A search for messages. The result of this is a vfolder. There are two</div><div class='del'>-	kinds of queries: named queries and lambda queries. More on this</div><div class='del'>-	later.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Summary file &lt;/title&gt; </div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	An external file that contains pointers to messages which are matches</div><div class='del'>-	for a named query. In addition to pointers, the summary file should</div><div class='del'>-	also contain signatures of the store for sanity checks. When the term</div><div class='del'>-	"index" is used as a verb, it means to build a summary file for a</div><div class='del'>-	given name-value pair.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Queries --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Queries&lt;/title&gt; </div><div class='del'>-    &lt;para&gt;  </div><div class='del'>-      Named queries are analogous to classical mail folders. Because named</div><div class='del'>-      queries maybe reused, summary files are kept as caches to reduce</div><div class='del'>-      the overall cost of viewing a vfolder. Summary files are superior to</div><div class='del'>-      folders in that they allow for the same messages to appear in multiple</div><div class='del'>-      vfolders without message duplications. Duplications of messages</div><div class='del'>-      defeats attempts at tagging a message with additional user information</div><div class='del'>-      like annotations. Named queries will define folders.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Lambda queries are similar to named queries except that they have no</div><div class='del'>-      name. These are created on the fly by the user to filter out or</div><div class='del'>-      include certain messages.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      All queries can be layered on top of each other. A lambda query can be </div><div class='del'>-      layered on a named query and a named query can be layered on a lambda</div><div class='del'>-      query. The possibilities are endless.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The layerings can be done as boolean operations (and, or, not). Short</div><div class='del'>-      circuiting should be used. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Examples:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-(and (author "Giao")</div><div class='del'>-  (unread))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      The (unread) query should only be evaluated on the results of (author</div><div class='del'>-      "Giao").</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-(or (author "Giao")</div><div class='del'>-  (unread))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      Both of these queries should be evaluated. Any matches are added to the</div><div class='del'>-      resulting vfolder.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Summary files --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Summary files&lt;/title&gt; </div><div class='del'>-    &lt;para&gt;    </div><div class='del'>-      Summary files are only meaningful when applied to the context of the</div><div class='del'>-      default-vfolder of a store.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Summary files should be generated for queries of the form:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-(function "constant value")</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      Summary files should never be generated for queries of the form:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-	(function (function1))</div><div class='del'>-	</div><div class='del'>-	(and (function "value")</div><div class='del'>-	(another-function "another value"))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      Given a query of the form:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-	(and (function "value")</div><div class='del'>-	(another-function "another value"))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      The system should use one summary file for (function "value") and</div><div class='del'>-      another summary file for (another-function "another value"). I will</div><div class='del'>-      call the prior form the "plain form".</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      It should be noted that the signature of the store should be based on</div><div class='del'>-      the assumption that new data may have been added to the store since</div><div class='del'>-      the application generated the summary file. Signatures generated on</div><div class='del'>-      the entirety of the store will most likely be meaningless for things</div><div class='del'>-      like POP/IMAP servers. </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Incremental Indexing --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Incremental indexing&lt;/title&gt; </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      When new messages are detected, all known queries should be evaluated</div><div class='del'>-      on the new messages. vfolders should be notified of new messages that</div><div class='del'>-      are positive matches for their queries. The indexes generated by this</div><div class='del'>-      process should be merged into the current indexes for the vfolder.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Can I have multiple stores --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Can I have multiple stores?&lt;/title&gt; </div><div class='del'>-    &lt;para&gt; </div><div class='del'>-      I don't see why not. Again, the inbox is a vfolder so you can get a</div><div class='del'>-      unified inbox consisting of all new mail sent to all your stores or</div><div class='del'>-      your can get inboxes for each store or any combination your heart</div><div class='del'>-      desire. You get your cake, eat it, and someone else cleans the dishes!</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Why all this? --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Why all this?&lt;/title&gt; </div><div class='del'>-    &lt;para&gt; </div><div class='del'>-      Consider the dynamic nature of the following query:</div><div class='del'>-      &lt;programlisting&gt;</div><div class='del'>-(and (author "Giao")</div><div class='del'>-  (sent-after (today-midnight)))</div><div class='del'>-      &lt;/programlisting&gt;</div><div class='del'>-      today-midnight would be a function that is evaluated at run-time to</div><div class='del'>-      calculate the appropriate object.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Scenarios of usage and their solutions --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Scenarios of usage and their solutions&lt;/title&gt; </div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Mesage alterations&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This is a fuzzy area that should be left to the UI to handle. Messages </div><div class='del'>-	are altered. Read status are altered when a new message is read for</div><div class='del'>-	example. How do we handle this if our query is for unread messages?</div><div class='del'>-	Upon viewing the state would change.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	One idea is to not evaluate the queries unless we're changing between</div><div class='del'>-	vfolder views. This assumes that one can only view a particular</div><div class='del'>-	vfolder at a time. For multi-vfolder viewing, a message change should</div><div class='del'>-	propagate through the vfolder system. Certain effects (as in our</div><div class='del'>-	example) would not be intuitive.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt; </div><div class='del'>-	It would not be a clean solution to make special cases but they may be </div><div class='del'>-	necessary where certain defined fields are ignored when they are</div><div class='del'>-	changed. Some combination of the above rules can be used. I don't</div><div class='del'>-	think it's an easy solution.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Message inclusion and exclusion&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Messages are included and excluded also with queries. The final query</div><div class='del'>-	will have the form of:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-	  (and (author "Giao")</div><div class='del'>-	  (criteria value)</div><div class='del'>-	  (not (criteria other-value)))</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-	Userland criterias may be a label of some sort. These may be userland</div><div class='del'>-	labels or Message-IDs. What are the performance issues involved in</div><div class='del'>-	this? With short circuiting, it's not a major problem.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;    </div><div class='del'>-	The criterias and values are determined by the UI. The vfolder</div><div class='del'>-	mechanism isn't concerned with such issues.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;   </div><div class='del'>-	Messages can be included and excluded at will. The idea is often</div><div class='del'>-	called "arbitrary inclusion/exclusion". This can be done by</div><div class='del'>-	Message-IDs or other fields. It's been noted that Message-IDs are not</div><div class='del'>-	unique. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	I propose that any given vfolder is allocated an inclusion label and an </div><div class='del'>-	exclusion label. These should be randomly generated. This should be</div><div class='del'>-	part of the vfolder description. It should be noted that the vfolder</div><div class='del'>-	description has not been drafted yet.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;   </div><div class='del'>-	The result is such that the rules for a given named query is:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-	  (and (user-query)</div><div class='del'>-	  (label inclusion-label)</div><div class='del'>-	  (not exclusion-label))</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Query scheduling&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Consider the following extremely dynamic queries:</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-	  A:</div><div class='del'>-	  (and (author "Giao")</div><div class='del'>-	  (sent-after (today-midnight)))</div><div class='del'>-	  </div><div class='del'>-	  B:</div><div class='del'>-	  (and (sent-after (today-midnight))</div><div class='del'>-	  (author "Giao"))</div><div class='del'>-	  </div><div class='del'>-	  C:</div><div class='del'>-	  (or (author "Giao")</div><div class='del'>-	  (sent-after (today-midnight)))</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-	Query A would be significantly faster because (author "Giao") is not</div><div class='del'>-	dynamic. A summary file could be generated for this query. Query B is</div><div class='del'>-	slow and can be optimized if there was a query compiler of some</div><div class='del'>-	sort. Query C demonstrates a query in which there is no good</div><div class='del'>-	optimization which can be applied. These come with a certain amount of</div><div class='del'>-	baggage.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	It seems then that for boolean 'and' operations, plain forms should be </div><div class='del'>-	moved forward and other queries should be moved such that they are</div><div class='del'>-	evaluated later. I would expect that the majority of queries would be</div><div class='del'>-	of the plain form.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-	First is that the summary file is tied to the query and the store</div><div class='del'>-	where the query originates from. Second, a hashing function for</div><div class='del'>-	strings needs to be calculated for the query so that the query and the </div><div class='del'>-	summary file can be associated. This hashing function could be similar </div><div class='del'>-	to the hashing function described in Rob Pike's "The Practice of</div><div class='del'>-	Programming". (FIXME: Stick page number here)</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Archives&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Many people are concerned that archives won't be preserved, archives</div><div class='del'>-	aren't supported, and many other archive related issues. This is the</div><div class='del'>-	short version.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;    </div><div class='del'>-	Archives are just that, archives. Archives are stores. Take your</div><div class='del'>-	vfolder, export it to a store. You are done. If you load up the store</div><div class='del'>-	again, then the default-vfolder of that store is the view of the</div><div class='del'>-	vfolder, except the query is different.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;    </div><div class='del'>-	The point to vfolder is not to do away with classical folder</div><div class='del'>-	representation but to move the queries to the front where it would</div><div class='del'>-	make data management easier for people who don't think in terms of</div><div class='del'>-	files but in terms of queries because ordinary people don't think in</div><div class='del'>-	terms of files.</div><div class='del'>-      &lt;/para&gt;    </div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Miscellany --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Miscellany&lt;/title&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Annotations&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	There should be a scheme to add annotations to messages. Common mail</div><div class='del'>-	user agents have used a tag in the message header to mark messages as</div><div class='del'>-	read/unread for example. Extending on this we have the ability to add</div><div class='del'>-	our own data to a message to add meaning to it. If we have a good</div><div class='del'>-	scheme for doing this, new possibilities are opened.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;sect3&gt;</div><div class='del'>-	&lt;title&gt;Keywords&lt;/title&gt;  </div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  When sending a message, a message could have certain keywords attached </div><div class='del'>-	  to it. While this can be done with the subject line, the subject line</div><div class='del'>-	  has a tendency to be munged by other mail applications. One popular</div><div class='del'>-	  example is the "[rR]e:" prefix. Using the subject line also breaks the </div><div class='del'>-	  "contract" with other mail user agents. Using keywords in another</div><div class='del'>-	  field in the message header allows the sender to assist the recipient</div><div class='del'>-	  in organizing data automatically. Note that the sender can only</div><div class='del'>-	  provide hints as the sender is unlikely to know the organization</div><div class='del'>-	  schemes of the recipient.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;Scope&lt;/title&gt;  </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Let us assume that we have multiple stores. Does a query work on a</div><div class='del'>-	given store? Or does it work on all stores? Or is it configurable such </div><div class='del'>-	that a query can work on a user-selected list of stores?</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Alternatives to the above --&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Alternatives to the above&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Jim Meyer (purp@selequa.com) is putting some notes on where</div><div class='del'>-      annotations needs to be located. They'll be located here as well as</div><div class='del'>-      any contributions I may have to them.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/devel-docs/query/virtual-folder-in-depth.txt b/devel-docs/query/virtual-folder-in-depth.txt<br/>deleted file mode 100644<br/>index 01718a5f05..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/devel-docs/query/virtual-folder-in-depth.txt?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>devel-docs/query/virtual-folder-in-depth.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,309 +0,0 @@</div><div class='del'>-TITLE: An in-depth look at the virtual folder mechanism</div><div class='del'>-AUTHOR: Giao Nguyen &lt;grail@cafebabe.org&gt;</div><div class='del'>-</div><div class='del'>-* introduction</div><div class='del'>-</div><div class='del'>-This document describes a different way of approaching mail</div><div class='del'>-organization and how all things are possible in this brave new</div><div class='del'>-world. This document does not describe physical storage issues nor</div><div class='del'>-interface issues.</div><div class='del'>-</div><div class='del'>-Historically mail has been organized into folders. These folders</div><div class='del'>-usually mapped to a single storage medium. The relationship between</div><div class='del'>-mail organization and storage medium was one to one. There was one</div><div class='del'>-mail organization for every storage medium. This scheme had its</div><div class='del'>-limitations.</div><div class='del'>-</div><div class='del'>-Efforts at categorizations are only meaningful at the instance that</div><div class='del'>-one categorized. To find any piece of data, regardless of how well</div><div class='del'>-it was categorized, required some amount of searching. Therefore, any</div><div class='del'>-attempts to nullify searching is doomed to fail. It's time to embrace</div><div class='del'>-searching as a way of life.</div><div class='del'>-</div><div class='del'>-These are the terms and their definitions. The example rules used are</div><div class='del'>-based on the syntax for VM (http://www.wonderworks.com/vm/) by Kyle</div><div class='del'>-Jones whose ideas form the basis for this. I'm only adding the</div><div class='del'>-existence of summary files to aid in scaling. I currently use VM and</div><div class='del'>-it's virtual-folder rules for my daily mail purposes. To date, my only </div><div class='del'>-complaints are speed (it has no caches) and for the unitiated, it's</div><div class='del'>-not very user-friendly.</div><div class='del'>-</div><div class='del'>-Comments, questions, rants, etc. should be directed at Giao Nguyen</div><div class='del'>-&lt;grail@cafebabe.org&gt; who will try to address issues in a timely</div><div class='del'>-manner.</div><div class='del'>-</div><div class='del'>-* Definitions</div><div class='del'>-</div><div class='del'>-** store </div><div class='del'>-</div><div class='del'>-A location where mail can be found. This may be a file (Berkeley</div><div class='del'>-mbox), directory (MH), IMAP server, POP3 server, Exchange server,</div><div class='del'>-Lotus Notes server, a stack of Post-Its by your monitor fed through</div><div class='del'>-some OCR system.</div><div class='del'>-</div><div class='del'>-** message </div><div class='del'>-</div><div class='del'>-An individual mail message.</div><div class='del'>-</div><div class='del'>-** vfolder </div><div class='del'>-</div><div class='del'>-A group of messages sharing some commonality. This is the result of a</div><div class='del'>-query. The vfolder maybe contained in a store, but it is not necessary</div><div class='del'>-that a store holds only one vfolder. There is always an implicit</div><div class='del'>-vfolder rule which matches all messages. A store contains the vfolder</div><div class='del'>-which is the result of the query (any). It's short for virtual folder</div><div class='del'>-or maybe view folder. I dunno.</div><div class='del'>-</div><div class='del'>-** default-vfolder </div><div class='del'>-</div><div class='del'>-The vfolder defined by (any) applied to the store. This is not the</div><div class='del'>-inbox. The inbox could easily be defined by a query. A default rule</div><div class='del'>-for the inbox could be (new) but it doesn't have to be. Mine happens</div><div class='del'>-to be (or (unread) (new)).</div><div class='del'>-</div><div class='del'>-** folder </div><div class='del'>-</div><div class='del'>-The classical mail folder approach: one message organization per</div><div class='del'>-store.</div><div class='del'>-</div><div class='del'>-** query </div><div class='del'>-</div><div class='del'>-A search for messages. The result of this is a vfolder. There are two</div><div class='del'>-kinds of queries: named queries and lambda queries. More on this</div><div class='del'>-later.</div><div class='del'>-</div><div class='del'>-** summary file </div><div class='del'>-</div><div class='del'>-An external file that contains pointers to messages which are matches</div><div class='del'>-for a named query. In addition to pointers, the summary file should</div><div class='del'>-also contain signatures of the store for sanity checks. When the term</div><div class='del'>-"index" is used as a verb, it means to build a summary file for a</div><div class='del'>-given name-value pair.</div><div class='del'>-</div><div class='del'>-* Queries</div><div class='del'>-</div><div class='del'>-Named queries are analogous to classical mail folders. Because named</div><div class='del'>-queries maybe reused, summary files are kept as caches to reduce</div><div class='del'>-the overall cost of viewing a vfolder. Summary files are superior to</div><div class='del'>-folders in that they allow for the same messages to appear in multiple</div><div class='del'>-vfolders without message duplications. Duplications of messages</div><div class='del'>-defeats attempts at tagging a message with additional user information</div><div class='del'>-like annotations. Named queries will define folders.</div><div class='del'>-</div><div class='del'>-Lambda queries are similar to named queries except that they have no</div><div class='del'>-name. These are created on the fly by the user to filter out or</div><div class='del'>-include certain messages.</div><div class='del'>-</div><div class='del'>-All queries can be layered on top of each other. A lambda query can be </div><div class='del'>-layered on a named query and a named query can be layered on a lambda</div><div class='del'>-query. The possibilities are endless.</div><div class='del'>-</div><div class='del'>-The layerings can be done as boolean operations (and, or, not). Short</div><div class='del'>-circuiting should be used. </div><div class='del'>-</div><div class='del'>-Examples:</div><div class='del'>-</div><div class='del'>-(and (author "Giao")</div><div class='del'>-     (unread))</div><div class='del'>-</div><div class='del'>-The (unread) query should only be evaluated on the results of (author</div><div class='del'>-"Giao").</div><div class='del'>-</div><div class='del'>-(or (author "Giao")</div><div class='del'>-    (unread))</div><div class='del'>-</div><div class='del'>-Both of these queries should be evaluated. Any matches are added to the</div><div class='del'>-resulting vfolder.</div><div class='del'>-</div><div class='del'>-* Summary files</div><div class='del'>-</div><div class='del'>-Summary files are only meaningful when applied to the context of the</div><div class='del'>-default-vfolder of a store.</div><div class='del'>-</div><div class='del'>-Summary files should be generated for queries of the form:</div><div class='del'>-</div><div class='del'>-(function "constant value")</div><div class='del'>-</div><div class='del'>-Summary files should never be generated for queries of the form:</div><div class='del'>-</div><div class='del'>-(function (function1))</div><div class='del'>-</div><div class='del'>-(and (function "value")</div><div class='del'>-     (another-function "another value"))</div><div class='del'>-</div><div class='del'>-Given a query of the form:</div><div class='del'>-</div><div class='del'>-(and (function "value")</div><div class='del'>-     (another-function "another value"))</div><div class='del'>-</div><div class='del'>-The system should use one summary file for (function "value") and</div><div class='del'>-another summary file for (another-function "another value"). I will</div><div class='del'>-call the prior form the "plain form".</div><div class='del'>-</div><div class='del'>-It should be noted that the signature of the store should be based on</div><div class='del'>-the assumption that new data may have been added to the store since</div><div class='del'>-the application generated the summary file. Signatures generated on</div><div class='del'>-the entirety of the store will most likely be meaningless for things</div><div class='del'>-like POP/IMAP servers. </div><div class='del'>-</div><div class='del'>-* Incremental indexing</div><div class='del'>-</div><div class='del'>-When new messages are detected, all known queries should be evaluated</div><div class='del'>-on the new messages. vfolders should be notified of new messages that</div><div class='del'>-are positive matches for their queries. The indexes generated by this</div><div class='del'>-process should be merged into the current indexes for the vfolder.</div><div class='del'>-</div><div class='del'>-* Can I have multiple stores?</div><div class='del'>-</div><div class='del'>-I don't see why not. Again, the inbox is a vfolder so you can get a</div><div class='del'>-unified inbox consisting of all new mail sent to all your stores or</div><div class='del'>-your can get inboxes for each store or any combination your heart</div><div class='del'>-desire. You get your cake, eat it, and someone else cleans the dishes!</div><div class='del'>-</div><div class='del'>-* Why all this?</div><div class='del'>-</div><div class='del'>-Consider the dynamic nature of the following query:</div><div class='del'>-</div><div class='del'>-(and (author "Giao")</div><div class='del'>-     (sent-after (today-midnight)))</div><div class='del'>-</div><div class='del'>-today-midnight would be a function that is evaluated at run-time to</div><div class='del'>-calculate the appropriate object.</div><div class='del'>-</div><div class='del'>-* Scenarios of usage and their solutions</div><div class='del'>-</div><div class='del'>-** Mesage alterations</div><div class='del'>-</div><div class='del'>-This is a fuzzy area that should be left to the UI to handle. Messages </div><div class='del'>-are altered. Read status are altered when a new message is read for</div><div class='del'>-example. How do we handle this if our query is for unread messages?</div><div class='del'>-Upon viewing the state would change.</div><div class='del'>-</div><div class='del'>-One idea is to not evaluate the queries unless we're changing between</div><div class='del'>-vfolder views. This assumes that one can only view a particular</div><div class='del'>-vfolder at a time. For multi-vfolder viewing, a message change should</div><div class='del'>-propagate through the vfolder system. Certain effects (as in our</div><div class='del'>-example) would not be intuitive.</div><div class='del'>-</div><div class='del'>-It would not be a clean solution to make special cases but they may be </div><div class='del'>-necessary where certain defined fields are ignored when they are</div><div class='del'>-changed. Some combination of the above rules can be used. I don't</div><div class='del'>-think it's an easy solution.</div><div class='del'>-</div><div class='del'>-** Message inclusion and exclusion</div><div class='del'>-</div><div class='del'>-Messages are included and excluded also with queries. The final query</div><div class='del'>-will have the form of:</div><div class='del'>-</div><div class='del'>-(and (author "Giao")</div><div class='del'>-     (criteria value)</div><div class='del'>-     (not (criteria other-value)))</div><div class='del'>-</div><div class='del'>-Userland criterias may be a label of some sort. These may be userland</div><div class='del'>-labels or Message-IDs. What are the performance issues involved in</div><div class='del'>-this? With short circuiting, it's not a major problem.</div><div class='del'>-</div><div class='del'>-The criterias and values are determined by the UI. The vfolder</div><div class='del'>-mechanism isn't concerned with such issues.</div><div class='del'>-</div><div class='del'>-Messages can be included and excluded at will. The idea is often</div><div class='del'>-called "arbitrary inclusion/exclusion". This can be done by</div><div class='del'>-Message-IDs or other fields. It's been noted that Message-IDs are not</div><div class='del'>-unique. </div><div class='del'>-</div><div class='del'>-I propose that any given vfolder is allocated an inclusion label and an </div><div class='del'>-exclusion label. These should be randomly generated. This should be</div><div class='del'>-part of the vfolder description. It should be noted that the vfolder</div><div class='del'>-description has not been drafted yet.</div><div class='del'>-</div><div class='del'>-The result is such that the rules for a given named query is:</div><div class='del'>-</div><div class='del'>-(and (user-query)</div><div class='del'>-     (label inclusion-label)</div><div class='del'>-     (not exclusion-label))</div><div class='del'>-</div><div class='del'>-** Query scheduling</div><div class='del'>-</div><div class='del'>-Consider the following extremely dynamic queries:</div><div class='del'>-</div><div class='del'>-A:</div><div class='del'>-(and (author "Giao")</div><div class='del'>-     (sent-after (today-midnight)))</div><div class='del'>-</div><div class='del'>-B:</div><div class='del'>-(and (sent-after (today-midnight))</div><div class='del'>-     (author "Giao"))</div><div class='del'>-</div><div class='del'>-C:</div><div class='del'>-(or (author "Giao")</div><div class='del'>-    (sent-after (today-midnight)))</div><div class='del'>-</div><div class='del'>-Query A would be significantly faster because (author "Giao") is not</div><div class='del'>-dynamic. A summary file could be generated for this query. Query B is</div><div class='del'>-slow and can be optimized if there was a query compiler of some</div><div class='del'>-sort. Query C demonstrates a query in which there is no good</div><div class='del'>-optimization which can be applied. These come with a certain amount of</div><div class='del'>-baggage.</div><div class='del'>-</div><div class='del'>-It seems then that for boolean 'and' operations, plain forms should be </div><div class='del'>-moved forward and other queries should be moved such that they are</div><div class='del'>-evaluated later. I would expect that the majority of queries would be</div><div class='del'>-of the plain form.</div><div class='del'>-</div><div class='del'>-First is that the summary file is tied to the query and the store</div><div class='del'>-where the query originates from. Second, a hashing function for</div><div class='del'>-strings needs to be calculated for the query so that the query and the </div><div class='del'>-summary file can be associated. This hashing function could be similar </div><div class='del'>-to the hashing function described in Rob Pike's "The Practice of</div><div class='del'>-Programming". (FIXME: Stick page number here)</div><div class='del'>-</div><div class='del'>-** Archives</div><div class='del'>-</div><div class='del'>-Many people are concerned that archives won't be preserved, archives</div><div class='del'>-aren't supported, and many other archive related issues. This is the</div><div class='del'>-short version.</div><div class='del'>-</div><div class='del'>-Archives are just that, archives. Archives are stores. Take your</div><div class='del'>-vfolder, export it to a store. You are done. If you load up the store</div><div class='del'>-again, then the default-vfolder of that store is the view of the</div><div class='del'>-vfolder, except the query is different.</div><div class='del'>-</div><div class='del'>-The point to vfolder is not to do away with classical folder</div><div class='del'>-representation but to move the queries to the front where it would</div><div class='del'>-make data management easier for people who don't think in terms of</div><div class='del'>-files but in terms of queries because ordinary people don't think in</div><div class='del'>-terms of files.</div><div class='del'>-</div><div class='del'>-* Miscellany</div><div class='del'>-</div><div class='del'>-** Annotations</div><div class='del'>-</div><div class='del'>-There should be a scheme to add annotations to messages. Common mail</div><div class='del'>-user agents have used a tag in the message header to mark messages as</div><div class='del'>-read/unread for example. Extending on this we have the ability to add</div><div class='del'>-our own data to a message to add meaning to it. If we have a good</div><div class='del'>-scheme for doing this, new possibilities are opened.</div><div class='del'>-</div><div class='del'>-*** Keywords</div><div class='del'>-</div><div class='del'>-When sending a message, a message could have certain keywords attached </div><div class='del'>-to it. While this can be done with the subject line, the subject line</div><div class='del'>-has a tendency to be munged by other mail applications. One popular</div><div class='del'>-example is the "[rR]e:" prefix. Using the subject line also breaks the </div><div class='del'>-"contract" with other mail user agents. Using keywords in another</div><div class='del'>-field in the message header allows the sender to assist the recipient</div><div class='del'>-in organizing data automatically. Note that the sender can only</div><div class='del'>-provide hints as the sender is unlikely to know the organization</div><div class='del'>-schemes of the recipient.</div><div class='del'>-</div><div class='del'>-** Scope</div><div class='del'>-</div><div class='del'>-Let us assume that we have multiple stores. Does a query work on a</div><div class='del'>-given store? Or does it work on all stores? Or is it configurable such </div><div class='del'>-that a query can work on a user-selected list of stores?</div><div class='del'>-</div><div class='del'>-* Alternatives to the above</div><div class='del'>-</div><div class='del'>-Jim Meyer &lt;purp@selequa.com&gt; is putting some notes on where</div><div class='del'>-annotations needs to be located. They'll be located here as well as</div><div class='del'>-any contributions I may have to them.</div><div class='head'>diff --git a/doc/.cvsignore b/doc/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/doc/C/.cvsignore b/doc/C/.cvsignore<br/>deleted file mode 100644<br/>index 2f4c48adbf..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,9 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-evolution-guide</div><div class='del'>-evolution-guide.junk</div><div class='del'>-evolution-guide.log</div><div class='del'>-evolution-guide.ps</div><div class='del'>-evolution-guide.dvi</div><div class='del'>-evolution-guide.tex</div><div class='del'>-fig/*.eps
\ No newline at end of file</div><div class='head'>diff --git a/doc/C/Makefile.am b/doc/C/Makefile.am<br/>deleted file mode 100644<br/>index 15f1e047b6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,59 +0,0 @@</div><div class='del'>-evolution_helpdir = $(datadir)/gnome/help/evolution/C</div><div class='del'>-</div><div class='del'>-SGML_FILES =			\</div><div class='del'>-	apx-authors.sgml	\</div><div class='del'>-	apx-bugs.sgml		\</div><div class='del'>-	apx-fdl.sgml		\</div><div class='del'>-	apx-gloss.sgml		\</div><div class='del'>-	config-prefs.sgml	\</div><div class='del'>-	config-setupassist.sgml	\</div><div class='del'>-	config-sync.sgml	\</div><div class='del'>-	evolution-guide.sgml	\</div><div class='del'>-	preface.sgml		\</div><div class='del'>-	usage-calendar.sgml	\</div><div class='del'>-	usage-contact.sgml	\</div><div class='del'>-	usage-mail.sgml		\</div><div class='del'>-	usage-mainwindow.sgml	\</div><div class='del'>-	usage-sync.sgml</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = \</div><div class='del'>-	$(SGML_FILES)</div><div class='del'>-</div><div class='del'>-all: evolution-guide</div><div class='del'>-</div><div class='del'>-evolution-guide: $(SGML_FILES)</div><div class='del'>-	-db2html evolution-guide.sgml</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	mkdir $(distdir)/evolution-guide</div><div class='del'>-	-cp evolution-guide/*.html evolution-guide/*.css $(distdir)/evolution-guide</div><div class='del'>-	mkdir $(distdir)/fig</div><div class='del'>-	-cp fig/*.png $(distdir)/fig</div><div class='del'>-	mkdir $(distdir)/evolution-guide/stylesheet-images</div><div class='del'>-	-cp evolution-guide/stylesheet-images/* $(distdir)/evolution-guide/stylesheet-images</div><div class='del'>-</div><div class='del'>-install-data-local: evolution-guide</div><div class='del'>-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)</div><div class='del'>-	-for file in $(srcdir)/evolution-guide/*.html $(srcdir)/evolution-guide/*.css; do \</div><div class='del'>-		basefile=`basename $$file`; \</div><div class='del'>-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/$$basefile; \</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/fig</div><div class='del'>-	-for file in $(srcdir)/fig/*.png; do \</div><div class='del'>-		basefile=`basename $$file`; \</div><div class='del'>-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/fig/$$basefile; \</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(evolution_helpdir)/stylesheet-images</div><div class='del'>-	-for file in $(srcdir)/evolution-guide/stylesheet-images/*; do \</div><div class='del'>-		basefile=`basename $$file`; \</div><div class='del'>-		$(INSTALL_DATA) $$file $(DESTDIR)$(evolution_helpdir)/stylesheet-images/$$basefile; \</div><div class='del'>-	done</div><div class='del'>-</div><div class='del'>-evolution.ps: evolution.sgml</div><div class='del'>-	-db2ps $&lt;</div><div class='del'>-</div><div class='del'>-evolution.rtf: evolution.sgml	</div><div class='del'>-	-db2rtf $&lt;</div><div class='head'>diff --git a/doc/C/apx-authors.sgml b/doc/C/apx-authors.sgml<br/>deleted file mode 100644<br/>index 89f0dd6bc5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/apx-authors.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/apx-authors.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +0,0 @@</div><div class='del'>-  &lt;appendix id="authors"&gt;</div><div class='del'>-    &lt;title&gt;Authors&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt; was written by:</div><div class='del'>-&lt;simplelist&gt;</div><div class='del'>-     &lt;member&gt;Seth Alves: &lt;email&gt;alves@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Anders Carlsson: &lt;email&gt;andersca@gnu.org&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Damon Chaplin: &lt;email&gt;damon@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Clifford R. Conover: &lt;email&gt;rusty@zootweb.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Miguel De Icaza: &lt;email&gt;miguel@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt; Radek Doulik: &lt;email&gt;rodo@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Arturo Espinoza: &lt;email&gt;arturo@nucleu.unam.mx&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Larry Ewing: &lt;email&gt;lewing@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Bertrand Guiheneuf: &lt;email&gt;bertrand@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Tuomas Kuosmanen: &lt;email&gt;tigert@gimp.org&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Christopher J. Lahey: &lt;email&gt;clahey@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Matthew Loper: &lt;email&gt;matt@loper.org&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Federico Mena: &lt;email&gt;federico@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Eskil Heyn Olsen: &lt;email&gt;deity@eski.dk&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Nat Friedman: &lt;email&gt;nat@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Ettore Perazzoli: &lt;email&gt;ettore@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Jeffrey Stedfast: &lt;email&gt;jeff@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Russell Steinthal: &lt;email&gt;rms39@columbia.edu&lt;/email&gt;&lt;/member&gt;     </div><div class='del'>-     &lt;member&gt;Peter Teichman: &lt;email&gt;peter@helixcode.com&lt;/email&gt;&lt;/member&gt;     </div><div class='del'>-     &lt;member&gt;Chris Toshok: &lt;email&gt;toshok@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Peter Williams: &lt;email&gt;peter@newton.cx&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Dan Winship: &lt;email&gt;danw@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-     &lt;member&gt;Michael Zucchi: &lt;email&gt;notzed@helixcode.com&lt;/email&gt;&lt;/member&gt;</div><div class='del'>-&lt;/simplelist&gt;</div><div class='del'>-and other dedicated GNOME programmers. </div><div class='del'>-&lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &lt;application&gt;Evolution&lt;/application&gt; code owes a great debt</div><div class='del'>-       to the &lt;application&gt;GNOME-pim&lt;/application&gt; and</div><div class='del'>-       &lt;application&gt;GNOME-Calendar&lt;/application&gt; applications, and to</div><div class='del'>-       &lt;application&gt;KHTMLW&lt;/application&gt;.  The developers of</div><div class='del'>-       &lt;application&gt;Evolution&lt;/application&gt; acknowledge the efforts</div><div class='del'>-       and contributions of all who worked on those projects.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      For more information please visit the</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt; &lt;ulink</div><div class='del'>-      url="http://www.helixcode.com/apps/evolution.php3"</div><div class='del'>-      type="http"&gt;Web page&lt;/ulink&gt;.  Please send all comments,</div><div class='del'>-      suggestions, and bug reports to the &lt;ulink</div><div class='del'>-      url="http://bugs.gnome.org" type="http"&gt;GNOME bug tracking</div><div class='del'>-      database&lt;/ulink&gt;. Instructions for submitting bug reports can be</div><div class='del'>-      found on-line at &lt;ulink</div><div class='del'>-      url="http://bugs.gnome.org/Reporting.html" type="http"&gt;</div><div class='del'>-      http://bugs.gnome.org/Reporting.html&lt;/ulink&gt;. You can also use</div><div class='del'>-      command &lt;command&gt;bug-buddy&lt;/command&gt; for submitting bug reports.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This manual was written by Aaron Weber</div><div class='del'>-      (&lt;email&gt;aaron@helixcode.com&lt;/email&gt;) and Kevin Breit</div><div class='del'>-      (&lt;email&gt;battery841@mypad.com&lt;/email&gt;) with the help of the</div><div class='del'>-      application programmers and the GNOME Documentation Project.</div><div class='del'>-      Please send all comments and suggestions regarding the manual to</div><div class='del'>-      the GNOME Documentation Project at</div><div class='del'>-      &lt;email&gt;docs@gnome.org&lt;/email&gt;. You can also add your comments</div><div class='del'>-      online by using &lt;ulink type="http"</div><div class='del'>-      url="http://www.gnome.org/gdp/doctable/"&gt;GNOME Documentation</div><div class='del'>-      Status Table&lt;/ulink&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;!-- For translations: uncomment this: &lt;para&gt; Latin translation</div><div class='del'>-      was done by ME (&lt;email&gt;MYNAME@MYADDRESS&lt;/email&gt;). Please send</div><div class='del'>-      all comments and suggestions regarding this translation to</div><div class='del'>-      SOMEWHERE.  &lt;/para&gt; --&gt;</div><div class='del'>-    &lt;/appendix&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/apx-bugs.sgml b/doc/C/apx-bugs.sgml<br/>deleted file mode 100644<br/>index e4a96a8155..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/apx-bugs.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/apx-bugs.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,23 +0,0 @@</div><div class='del'>- &lt;appendix id="bugs"&gt;</div><div class='del'>-   </div><div class='del'>-    &lt;title&gt;Known bugs and limitations&lt;/title&gt;</div><div class='del'>-    &lt;abstract&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     This appendix describes known bugs and limitations of</div><div class='del'>-    &lt;application&gt;Evolution&lt;/application&gt;.  Please use the GNOME</div><div class='del'>-    &lt;application&gt;Bug Report Tool&lt;/application&gt; (known as</div><div class='del'>-    &lt;command&gt;bug-buddy&lt;/command&gt; at the command line) if you find one</div><div class='del'>-    we have not listed.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;/abstract&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Evolution is still beta software, so the bug tracking is best</div><div class='del'>-      left to the bugzilla system and to the programmers.  However,</div><div class='del'>-      there are a number of limitations that will not be addressed</div><div class='del'>-      before version 1.0. The most notable are: Import of Microsoft</div><div class='del'>-      Outlook .pst files, and compatibility with the Microsoft</div><div class='del'>-      Exchange protocol.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/appendix&gt;</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/apx-fdl.sgml b/doc/C/apx-fdl.sgml<br/>deleted file mode 100644<br/>index 17a3bf3070..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/apx-fdl.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/apx-fdl.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,466 +0,0 @@</div><div class='del'>-&lt;appendix id="fdl"&gt;</div><div class='del'>-&lt;title&gt;GNU Free Documentation License&lt;/title&gt;</div><div class='del'>-&lt;!-- - GNU Project - Free Software Foundation (FSF) --&gt;</div><div class='del'>-&lt;!-- LINK REV="made" HREF="mailto:webmasters@gnu.org" --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="fdl-version"&gt;</div><div class='del'>-    &lt;title&gt;GNU Free Documentation License&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;Version 1.1, March 2000&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;blockquote&gt;</div><div class='del'>-      &lt;para&gt;Copyright (C) 2000  Free Software Foundation, Inc.</div><div class='del'>-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>-Everyone is permitted to copy and distribute verbatim copies</div><div class='del'>-of this license document, but changing it is not allowed.&lt;/para&gt;</div><div class='del'>-    &lt;/blockquote&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="fdl-preamble" label="0"&gt;</div><div class='del'>-    &lt;title&gt;PREAMBLE&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The purpose of this License is to make a manual, textbook,</div><div class='del'>-    or other written document "free" in the sense of freedom: to</div><div class='del'>-    assure everyone the effective freedom to copy and redistribute it,</div><div class='del'>-    with or without modifying it, either commercially or</div><div class='del'>-    noncommercially.  Secondarily, this License preserves for the</div><div class='del'>-    author and publisher a way to get credit for their work, while not</div><div class='del'>-    being considered responsible for modifications made by</div><div class='del'>-    others.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;This License is a kind of "copyleft", which means that</div><div class='del'>-    derivative works of the document must themselves be free in the</div><div class='del'>-    same sense.  It complements the GNU General Public License, which</div><div class='del'>-    is a copyleft license designed for free software.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;We have designed this License in order to use it for manuals</div><div class='del'>-    for free software, because free software needs free documentation:</div><div class='del'>-    a free program should come with manuals providing the same</div><div class='del'>-    freedoms that the software does.  But this License is not limited</div><div class='del'>-    to software manuals; it can be used for any textual work,</div><div class='del'>-    regardless of subject matter or whether it is published as a</div><div class='del'>-    printed book.  We recommend this License principally for works</div><div class='del'>-    whose purpose is instruction or reference.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="fdl-applicability" label="1"&gt;</div><div class='del'>-    &lt;title&gt;APPLICABILITY AND DEFINITIONS&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;This License applies to any manual or other work that</div><div class='del'>-    contains a notice placed by the copyright holder saying it can be</div><div class='del'>-    distributed under the terms of this License.  The "Document",</div><div class='del'>-    below, refers to any such manual or work.  Any member of the</div><div class='del'>-    public is a licensee, and is addressed as "you".&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;A "Modified Version" of the Document means any work</div><div class='del'>-    containing the Document or a portion of it, either copied</div><div class='del'>-    verbatim, or with modifications and/or translated into another</div><div class='del'>-    language.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;A "Secondary Section" is a named appendix or a front-matter</div><div class='del'>-    section of the Document that deals exclusively with the</div><div class='del'>-    relationship of the publishers or authors of the Document to the</div><div class='del'>-    Document's overall subject (or to related matters) and contains</div><div class='del'>-    nothing that could fall directly within that overall subject.</div><div class='del'>-    (For example, if the Document is in part a textbook of</div><div class='del'>-    mathematics, a Secondary Section may not explain any mathematics.)</div><div class='del'>-    The relationship could be a matter of historical connection with</div><div class='del'>-    the subject or with related matters, or of legal, commercial,</div><div class='del'>-    philosophical, ethical or political position regarding</div><div class='del'>-    them.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The "Invariant Sections" are certain Secondary Sections</div><div class='del'>-    whose titles are designated, as being those of Invariant Sections,</div><div class='del'>-    in the notice that says that the Document is released under this</div><div class='del'>-    License.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The "Cover Texts" are certain short passages of text that</div><div class='del'>-    are listed, as Front-Cover Texts or Back-Cover Texts, in the</div><div class='del'>-    notice that says that the Document is released under this</div><div class='del'>-    License.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;A "Transparent" copy of the Document means a</div><div class='del'>-    machine-readable copy, represented in a format whose specification</div><div class='del'>-    is available to the general public, whose contents can be viewed</div><div class='del'>-    and edited directly and straightforwardly with generic text</div><div class='del'>-    editors or (for images composed of pixels) generic paint programs</div><div class='del'>-    or (for drawings) some widely available drawing editor, and that</div><div class='del'>-    is suitable for input to text formatters or for automatic</div><div class='del'>-    translation to a variety of formats suitable for input to text</div><div class='del'>-    formatters.  A copy made in an otherwise Transparent file format</div><div class='del'>-    whose markup has been designed to thwart or discourage subsequent</div><div class='del'>-    modification by readers is not Transparent.  A copy that is not</div><div class='del'>-    "Transparent" is called "Opaque".&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;Examples of suitable formats for Transparent copies include</div><div class='del'>-    plain ASCII without markup, Texinfo input format, LaTeX input</div><div class='del'>-    format, SGML or XML using a publicly available DTD, and</div><div class='del'>-    standard-conforming simple HTML designed for human modification.</div><div class='del'>-    Opaque formats include PostScript, PDF, proprietary formats that</div><div class='del'>-    can be read and edited only by proprietary word processors, SGML</div><div class='del'>-    or XML for which the DTD and/or processing tools are not generally</div><div class='del'>-    available, and the machine-generated HTML produced by some word</div><div class='del'>-    processors for output purposes only.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The "Title Page" means, for a printed book, the title page</div><div class='del'>-    itself, plus such following pages as are needed to hold, legibly,</div><div class='del'>-    the material this License requires to appear in the title page.</div><div class='del'>-    For works in formats which do not have any title page as such,</div><div class='del'>-    "Title Page" means the text near the most prominent appearance of</div><div class='del'>-    the work's title, preceding the beginning of the body of the</div><div class='del'>-    text.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="2"&gt;</div><div class='del'>-    &lt;title&gt;VERBATIM COPYING&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;You may copy and distribute the Document in any medium,</div><div class='del'>-    either commercially or noncommercially, provided that this</div><div class='del'>-    License, the copyright notices, and the license notice saying this</div><div class='del'>-    License applies to the Document are reproduced in all copies, and</div><div class='del'>-    that you add no other conditions whatsoever to those of this</div><div class='del'>-    License.  You may not use technical measures to obstruct or</div><div class='del'>-    control the reading or further copying of the copies you make or</div><div class='del'>-    distribute.  However, you may accept compensation in exchange for</div><div class='del'>-    copies.  If you distribute a large enough number of copies you</div><div class='del'>-    must also follow the conditions in section 3.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;You may also lend copies, under the same conditions stated</div><div class='del'>-    above, and you may publicly display copies.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="3"&gt;</div><div class='del'>-    &lt;title&gt;COPYING IN QUANTITY&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;If you publish printed copies of the Document numbering more</div><div class='del'>-    than 100, and the Document's license notice requires Cover Texts,</div><div class='del'>-    you must enclose the copies in covers that carry, clearly and</div><div class='del'>-    legibly, all these Cover Texts: Front-Cover Texts on the front</div><div class='del'>-    cover, and Back-Cover Texts on the back cover.  Both covers must</div><div class='del'>-    also clearly and legibly identify you as the publisher of these</div><div class='del'>-    copies.  The front cover must present the full title with all</div><div class='del'>-    words of the title equally prominent and visible.  You may add</div><div class='del'>-    other material on the covers in addition.  Copying with changes</div><div class='del'>-    limited to the covers, as long as they preserve the title of the</div><div class='del'>-    Document and satisfy these conditions, can be treated as verbatim</div><div class='del'>-    copying in other respects.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;If the required texts for either cover are too voluminous to</div><div class='del'>-    fit legibly, you should put the first ones listed (as many as fit</div><div class='del'>-    reasonably) on the actual cover, and continue the rest onto</div><div class='del'>-    adjacent pages.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;If you publish or distribute Opaque copies of the Document</div><div class='del'>-    numbering more than 100, you must either include a</div><div class='del'>-    machine-readable Transparent copy along with each Opaque copy, or</div><div class='del'>-    state in or with each Opaque copy a publicly-accessible</div><div class='del'>-    computer-network location containing a complete Transparent copy</div><div class='del'>-    of the Document, free of added material, which the general</div><div class='del'>-    network-using public has access to download anonymously at no</div><div class='del'>-    charge using public-standard network protocols.  If you use the</div><div class='del'>-    latter option, you must take reasonably prudent steps, when you</div><div class='del'>-    begin distribution of Opaque copies in quantity, to ensure that</div><div class='del'>-    this Transparent copy will remain thus accessible at the stated</div><div class='del'>-    location until at least one year after the last time you</div><div class='del'>-    distribute an Opaque copy (directly or through your agents or</div><div class='del'>-    retailers) of that edition to the public.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;It is requested, but not required, that you contact the</div><div class='del'>-    authors of the Document well before redistributing any large</div><div class='del'>-    number of copies, to give them a chance to provide you with an</div><div class='del'>-    updated version of the Document.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="4"&gt;</div><div class='del'>-    &lt;title&gt;MODIFICATIONS&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;You may copy and distribute a Modified Version of the</div><div class='del'>-    Document under the conditions of sections 2 and 3 above, provided</div><div class='del'>-    that you release the Modified Version under precisely this</div><div class='del'>-    License, with the Modified Version filling the role of the</div><div class='del'>-    Document, thus licensing distribution and modification of the</div><div class='del'>-    Modified Version to whoever possesses a copy of it.  In addition,</div><div class='del'>-    you must do these things in the Modified Version:&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;orderedlist numeration="upperalpha"&gt;</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Use in the Title Page</div><div class='del'>-      (and on the covers, if any) a title distinct from that of the</div><div class='del'>-      Document, and from those of previous versions (which should, if</div><div class='del'>-      there were any, be listed in the History section of the</div><div class='del'>-      Document).  You may use the same title as a previous version if</div><div class='del'>-      the original publisher of that version gives permission.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;List on the Title Page,</div><div class='del'>-      as authors, one or more persons or entities responsible for</div><div class='del'>-      authorship of the modifications in the Modified Version,</div><div class='del'>-      together with at least five of the principal authors of the</div><div class='del'>-      Document (all of its principal authors, if it has less than</div><div class='del'>-      five).&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;State on the Title page</div><div class='del'>-      the name of the publisher of the Modified Version, as the</div><div class='del'>-      publisher.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Preserve all the</div><div class='del'>-      copyright notices of the Document.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Add an appropriate</div><div class='del'>-      copyright notice for your modifications adjacent to the other</div><div class='del'>-      copyright notices.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Include, immediately</div><div class='del'>-      after the copyright notices, a license notice giving the public</div><div class='del'>-      permission to use the Modified Version under the terms of this</div><div class='del'>-      License, in the form shown in the Addendum below.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Preserve in that license</div><div class='del'>-      notice the full lists of Invariant Sections and required Cover</div><div class='del'>-      Texts given in the Document's license notice.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Include an unaltered</div><div class='del'>-      copy of this License.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Preserve the section</div><div class='del'>-      entitled "History", and its title, and add to it an item stating</div><div class='del'>-      at least the title, year, new authors, and publisher of the</div><div class='del'>-      Modified Version as given on the Title Page.  If there is no</div><div class='del'>-      section entitled "History" in the Document, create one stating</div><div class='del'>-      the title, year, authors, and publisher of the Document as given</div><div class='del'>-      on its Title Page, then add an item describing the Modified</div><div class='del'>-      Version as stated in the previous sentence.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Preserve the network</div><div class='del'>-      location, if any, given in the Document for public access to a</div><div class='del'>-      Transparent copy of the Document, and likewise the network</div><div class='del'>-      locations given in the Document for previous versions it was</div><div class='del'>-      based on.  These may be placed in the "History" section.  You</div><div class='del'>-      may omit a network location for a work that was published at</div><div class='del'>-      least four years before the Document itself, or if the original</div><div class='del'>-      publisher of the version it refers to gives permission.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;In any section entitled</div><div class='del'>-      "Acknowledgements" or "Dedications", preserve the section's</div><div class='del'>-      title, and preserve in the section all the substance and tone of</div><div class='del'>-      each of the contributor acknowledgements and/or dedications</div><div class='del'>-      given therein.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Preserve all the</div><div class='del'>-      Invariant Sections of the Document, unaltered in their text and</div><div class='del'>-      in their titles.  Section numbers or the equivalent are not</div><div class='del'>-      considered part of the section titles.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Delete any section</div><div class='del'>-      entitled "Endorsements".  Such a section may not be included in</div><div class='del'>-      the Modified Version.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;&lt;para&gt;Do not retitle any</div><div class='del'>-      existing section as "Endorsements" or to conflict in title with</div><div class='del'>-      any Invariant Section.&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-    &lt;/orderedlist&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;If the Modified Version includes new front-matter sections</div><div class='del'>-    or appendices that qualify as Secondary Sections and contain no</div><div class='del'>-    material copied from the Document, you may at your option</div><div class='del'>-    designate some or all of these sections as invariant.  To do this,</div><div class='del'>-    add their titles to the list of Invariant Sections in the Modified</div><div class='del'>-    Version's license notice.  These titles must be distinct from any</div><div class='del'>-    other section titles.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;You may add a section entitled "Endorsements", provided it</div><div class='del'>-    contains nothing but endorsements of your Modified Version by</div><div class='del'>-    various parties--for example, statements of peer review or that</div><div class='del'>-    the text has been approved by an organization as the authoritative</div><div class='del'>-    definition of a standard.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;You may add a passage of up to five words as a Front-Cover</div><div class='del'>-    Text, and a passage of up to 25 words as a Back-Cover Text, to the</div><div class='del'>-    end of the list of Cover Texts in the Modified Version.  Only one</div><div class='del'>-    passage of Front-Cover Text and one of Back-Cover Text may be</div><div class='del'>-    added by (or through arrangements made by) any one entity.  If the</div><div class='del'>-    Document already includes a cover text for the same cover,</div><div class='del'>-    previously added by you or by arrangement made by the same entity</div><div class='del'>-    you are acting on behalf of, you may not add another; but you may</div><div class='del'>-    replace the old one, on explicit permission from the previous</div><div class='del'>-    publisher that added the old one.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The author(s) and publisher(s) of the Document do not by</div><div class='del'>-    this License give permission to use their names for publicity for</div><div class='del'>-    or to assert or imply endorsement of any Modified Version.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="5"&gt;</div><div class='del'>-    &lt;title&gt;COMBINING DOCUMENTS&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;You may combine the Document with other documents released</div><div class='del'>-    under this License, under the terms defined in section 4 above for</div><div class='del'>-    modified versions, provided that you include in the combination</div><div class='del'>-    all of the Invariant Sections of all of the original documents,</div><div class='del'>-    unmodified, and list them all as Invariant Sections of your</div><div class='del'>-    combined work in its license notice.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The combined work need only contain one copy of this</div><div class='del'>-    License, and multiple identical Invariant Sections may be replaced</div><div class='del'>-    with a single copy.  If there are multiple Invariant Sections with</div><div class='del'>-    the same name but different contents, make the title of each such</div><div class='del'>-    section unique by adding at the end of it, in parentheses, the</div><div class='del'>-    name of the original author or publisher of that section if known,</div><div class='del'>-    or else a unique number.  Make the same adjustment to the section</div><div class='del'>-    titles in the list of Invariant Sections in the license notice of</div><div class='del'>-    the combined work.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;In the combination, you must combine any sections entitled</div><div class='del'>-    "History" in the various original documents, forming one section</div><div class='del'>-    entitled "History"; likewise combine any sections entitled</div><div class='del'>-    "Acknowledgements", and any sections entitled "Dedications".  You</div><div class='del'>-    must delete all sections entitled "Endorsements."&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="6"&gt;</div><div class='del'>-    &lt;title&gt;COLLECTIONS OF DOCUMENTS&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;You may make a collection consisting of the Document and</div><div class='del'>-    other documents released under this License, and replace the</div><div class='del'>-    individual copies of this License in the various documents with a</div><div class='del'>-    single copy that is included in the collection, provided that you</div><div class='del'>-    follow the rules of this License for verbatim copying of each of</div><div class='del'>-    the documents in all other respects.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;You may extract a single document from such a collection,</div><div class='del'>-    and distribute it individually under this License, provided you</div><div class='del'>-    insert a copy of this License into the extracted document, and</div><div class='del'>-    follow this License in all other respects regarding verbatim</div><div class='del'>-    copying of that document.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="7"&gt;</div><div class='del'>-    &lt;title&gt;AGGREGATION WITH INDEPENDENT WORKS&lt;/title&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;A compilation of the Document or its derivatives with other</div><div class='del'>-    separate and independent documents or works, in or on a volume of</div><div class='del'>-    a storage or distribution medium, does not as a whole count as a</div><div class='del'>-    Modified Version of the Document, provided no compilation</div><div class='del'>-    copyright is claimed for the compilation.  Such a compilation is</div><div class='del'>-    called an "aggregate", and this License does not apply to the</div><div class='del'>-    other self-contained works thus compiled with the Document, on</div><div class='del'>-    account of their being thus compiled, if they are not themselves</div><div class='del'>-    derivative works of the Document.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;If the Cover Text requirement of section 3 is applicable to</div><div class='del'>-    these copies of the Document, then if the Document is less than</div><div class='del'>-    one quarter of the entire aggregate, the Document's Cover Texts</div><div class='del'>-    may be placed on covers that surround only the Document within the</div><div class='del'>-    aggregate.  Otherwise they must appear on covers around the whole</div><div class='del'>-    aggregate.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="8"&gt;</div><div class='del'>-    &lt;title&gt;TRANSLATION&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;Translation is considered a kind of modification, so you may</div><div class='del'>-    distribute translations of the Document under the terms of section</div><div class='del'>-    4.  Replacing Invariant Sections with translations requires</div><div class='del'>-    special permission from their copyright holders, but you may</div><div class='del'>-    include translations of some or all Invariant Sections in addition</div><div class='del'>-    to the original versions of these Invariant Sections.  You may</div><div class='del'>-    include a translation of this License provided that you also</div><div class='del'>-    include the original English version of this License.  In case of</div><div class='del'>-    a disagreement between the translation and the original English</div><div class='del'>-    version of this License, the original English version will</div><div class='del'>-    prevail.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="9"&gt;</div><div class='del'>-    &lt;title&gt;TERMINATION&lt;/title&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;You may not copy, modify, sublicense, or distribute the</div><div class='del'>-    Document except as expressly provided for under this License.  Any</div><div class='del'>-    other attempt to copy, modify, sublicense or distribute the</div><div class='del'>-    Document is void, and will automatically terminate your rights</div><div class='del'>-    under this License.  However, parties who have received copies, or</div><div class='del'>-    rights, from you under this License will not have their licenses</div><div class='del'>-    terminated so long as such parties remain in full</div><div class='del'>-    compliance.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label="10"&gt;</div><div class='del'>-    &lt;title&gt;FUTURE REVISIONS OF THIS LICENSE&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;The Free Software Foundation may publish new, revised</div><div class='del'>-    versions of the GNU Free Documentation License from time to time.</div><div class='del'>-    Such new versions will be similar in spirit to the present</div><div class='del'>-    version, but may differ in detail to address new problems or</div><div class='del'>-    concerns.  See &lt;ulink</div><div class='del'>-    url="http://www.gnu.org/copyleft/"&gt;http://www.gnu.org/copyleft/&lt;/ulink&gt;.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;Each version of the License is given a distinguishing</div><div class='del'>-    version number.  If the Document specifies that a particular</div><div class='del'>-    numbered version of this License "or any later version" applies to</div><div class='del'>-    it, you have the option of following the terms and conditions</div><div class='del'>-    either of that specified version or of any later version that has</div><div class='del'>-    been published (not as a draft) by the Free Software Foundation.</div><div class='del'>-    If the Document does not specify a version number of this License,</div><div class='del'>-    you may choose any version ever published (not as a draft) by the</div><div class='del'>-    Free Software Foundation.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 label=""&gt;</div><div class='del'>-    &lt;title&gt;How to use this License for your documents&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;To use this License in a document you have written, include</div><div class='del'>-    a copy of the License in the document and put the following</div><div class='del'>-    copyright and license notices just after the title page:&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;blockquote&gt;&lt;para&gt;</div><div class='del'>-      Copyright (c)  YEAR  YOUR NAME.</div><div class='del'>-      Permission is granted to copy, distribute and/or modify this document</div><div class='del'>-      under the terms of the GNU Free Documentation License, Version 1.1</div><div class='del'>-      or any later version published by the Free Software Foundation;</div><div class='del'>-      with the Invariant Sections being LIST THEIR TITLES, with the</div><div class='del'>-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.</div><div class='del'>-      A copy of the license is included in the section entitled "GNU</div><div class='del'>-      Free Documentation License".</div><div class='del'>-&lt;/para&gt;&lt;/blockquote&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;If you have no Invariant Sections, write "with no Invariant</div><div class='del'>-    Sections" instead of saying which ones are invariant.  If you have</div><div class='del'>-    no Front-Cover Texts, write "no Front-Cover Texts" instead of</div><div class='del'>-    "Front-Cover Texts being LIST"; likewise for Back-Cover</div><div class='del'>-    Texts.&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;If your document contains nontrivial examples of program</div><div class='del'>-    code, we recommend releasing these examples in parallel under your</div><div class='del'>-    choice of free software license, such as the GNU General Public</div><div class='del'>-    License, to permit their use in free software.&lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;/appendix&gt;</div><div class='del'>-&lt;!-- Keep this comment at the end of the file</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-omittag:nil</div><div class='del'>-sgml-shorttag:t</div><div class='del'>-sgml-minimize-attributes:nil</div><div class='del'>-sgml-always-quote-attributes:t</div><div class='del'>-sgml-indent-step:2</div><div class='del'>-sgml-parent-document: ("referenz.sgml" "appendix")</div><div class='del'>-sgml-exposed-tags:nil</div><div class='del'>-sgml-local-ecat-files:nil</div><div class='del'>-sgml-local-catalogs: CATALOG</div><div class='del'>-sgml-validate-command: "nsgmls -s referenz.sgml"</div><div class='del'>-ispell-skip-sgml: t</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/C/apx-gloss.sgml b/doc/C/apx-gloss.sgml<br/>deleted file mode 100644<br/>index f04b381d19..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/apx-gloss.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/apx-gloss.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,432 +0,0 @@</div><div class='del'>-&lt;glossary id="apx-gloss"&gt;</div><div class='del'>-</div><div class='del'>- &lt;title&gt;Glossary&lt;/title&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="attachment"&gt;</div><div class='del'>-  &lt;glossterm&gt;Attachment&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Any file sent along with an email.  Attachments may be embedded in</div><div class='del'>-    a message or appended to it.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;glossentry id="automatic-indexing"&gt;</div><div class='del'>-  &lt;glossterm&gt;Automatic Indexing&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     Pre-sorting procedure that allows</div><div class='del'>-     &lt;application&gt;Evolution&lt;/application&gt; to refer to data quickly.</div><div class='del'>-     It enables faster searches and decreases memory usage for</div><div class='del'>-     data displays.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="bcc"&gt;</div><div class='del'>-  &lt;glossterm&gt;Bcc (Blind Carbon Copy)&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A way of addressing a message.  Bcc is used to send a group of</div><div class='del'>-    people an e-mail, while hiding their names and addresses from each</div><div class='del'>-    other.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="cc"&gt;</div><div class='del'>-  &lt;glossterm&gt;Cc (Carbon Copy)&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Carbon-copies are used to send a 3rd party a copy of the e-mail,</div><div class='del'>-    so they an keep up to date on a conversation, without being in the</div><div class='del'>-    To: list.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="druid"&gt;</div><div class='del'>-  &lt;glossterm&gt;Druid&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A tool which guides a user through a series of steps, usually to</div><div class='del'>-    configure or set up a program.  Equivalent to "Assistant" and</div><div class='del'>-    "Wizard."</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;glossentry id="emoticon"&gt;</div><div class='del'>-  &lt;glossterm&gt;Emoticon&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     Also called "smileys," emoticons are the little sideways faces made</div><div class='del'>-     of colons and parentheses which people use to convey emotion in email.</div><div class='del'>-     Examples: :-) or ;(  .</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="evolution"&gt;</div><div class='del'>-  &lt;glossterm&gt;Evolution&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    &lt;application&gt;Evolution&lt;/application&gt; is the &lt;acronym&gt; GNOME</div><div class='del'>-    &lt;/acronym&gt; groupware application.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="execute"&gt;</div><div class='del'>-  &lt;glossterm&gt;Execute&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    To run a program.  Any file that can be run is called an</div><div class='del'>-    executable.  &lt;application&gt;Evolution&lt;/application&gt; can download</div><div class='del'>-    executable attachments, but before they can be run, the files must</div><div class='del'>-    be marked as executable with a shell or file manager.  This</div><div class='del'>-    security precaution prevents the automatic or accidental execution</div><div class='del'>-    of malicious programs. For more information on executables and file</div><div class='del'>-    permissions, see the documentation for your file manager or shell.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="filetree"&gt;</div><div class='del'>-  &lt;glossterm&gt;File Tree&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     A way of describing a group of files on a computer.  With the</div><div class='del'>-     perversity typical of computer (and especially Unix and Linux)</div><div class='del'>-     nomenclature, the top of the tree is called the root directory,</div><div class='del'>-     and denoted by &lt;systemitem&gt;&lt;filename&gt;/&lt;/filename&gt;&lt;/systemitem&gt;.</div><div class='del'>-     The rest of the "branches" spread downwards from the root.  Don't</div><div class='del'>-     confuse the root directory with the &lt;systemitem&gt;root&lt;/systemitem&gt;</div><div class='del'>-     account, or root's home directory,</div><div class='del'>-     &lt;systemitem&gt;&lt;filename&gt;/home/root&lt;/filename&gt;&lt;/systemitem&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="filter"&gt;</div><div class='del'>-  &lt;glossterm&gt;Filter&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Within &lt;application&gt;Evolution&lt;/application&gt;, a filter is a method</div><div class='del'>-    of sorting mail automatically.  You can create filters to perform</div><div class='del'>-    one or more actions on a message that meets any (or all) of a wide</div><div class='del'>-    range of criteria.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="forward"&gt;</div><div class='del'>-  &lt;glossterm&gt;Forward&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-       the user can send a third party a message</div><div class='del'>-    which was sent to the user originally.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="groupware"&gt;</div><div class='del'>- &lt;glossterm&gt;Groupware&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Groupware is a term describing an application which helps groups</div><div class='del'>-    of people work together.  Typically, a groupware application will</div><div class='del'>-    have several productivity features built into one program.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="haiku"&gt;</div><div class='del'>-  &lt;glossterm&gt;Haiku&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     A traditional Japanese form of poetry.  The poems are three lines</div><div class='del'>-     long, with first and last lines having five syllables, and the</div><div class='del'>-     second line seven syllables.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="html"&gt;</div><div class='del'>-  &lt;glossterm&gt;HTML&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Hyper-text Markup Language(&lt;acronym&gt;HTML&lt;/acronym&gt;) is a language</div><div class='del'>-    for describing page layout in electronic documents like web pages,</div><div class='del'>-    help files, and email messages.  HTML can be used in email and</div><div class='del'>-    news posts to insert images and apply text treatments.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="hot-key"&gt;</div><div class='del'>-  &lt;glossterm&gt;Hot Key&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Hot-keys are keyboard combinations used to do actions on a</div><div class='del'>-    computer instead of using the mouse to do the same action.</div><div class='del'>-    Hot-keys can speed up computer usage.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="ical"&gt;</div><div class='del'>-  &lt;glossterm&gt;iCal&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    &lt;application&gt;iCal&lt;/application&gt; is the program which</div><div class='del'>-    &lt;application&gt;Evolution&lt;/application&gt; uses to manage the calendar</div><div class='del'>-    section.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt; </div><div class='del'>-</div><div class='del'>- &lt;glossentry id="imap"&gt;</div><div class='del'>-  &lt;glossterm&gt;IMAP&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Depending upon whom you ask, IMAP stands for the Internet Mail</div><div class='del'>-    Access Protocol, or the Interim Mail Access Protocol.  Whatever it</div><div class='del'>-    stands for, it allows access to email which is typically (although</div><div class='del'>-    not always) stored remotely on a server rather than on a local</div><div class='del'>-    hard disk.  Often contrasted with &lt;glossterm&gt;POP&lt;/glossterm&gt;.</div><div class='del'>-    This will not be on the test.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="inline"&gt;</div><div class='del'>-  &lt;glossterm&gt;Inline&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     Displayed as part of a message or other document, rather than</div><div class='del'>-     attached as a separate file. Contrast with &lt;glossterm</div><div class='del'>-     linkend="attachment"&gt;Attachment&lt;/glossterm&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>- </div><div class='del'>-  &lt;glossentry id="ldap"&gt;</div><div class='del'>-   &lt;glossterm&gt;LDAP&lt;/glossterm&gt;</div><div class='del'>-   &lt;glossdef&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     LDAP, the Lightweight Directory Access Protocol, allows a client</div><div class='del'>-     to search through a large database of addresses, phone numbers,</div><div class='del'>-     and people stored on a server.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="mail-client"&gt;</div><div class='del'>-  &lt;glossterm&gt;Mail Client&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A mail client is the application with which a person reads and</div><div class='del'>-    sends e-mail.  Its counterparts are the various types of mail</div><div class='del'>-    servers, which handle user authentication and direct messages from</div><div class='del'>-    sender to recipient.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="minicard"&gt;</div><div class='del'>-  &lt;glossterm&gt;Minicard&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      A format for the display of contact data.  Similar in appearance</div><div class='del'>-      to a small business card.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt; </div><div class='del'>-</div><div class='del'>- &lt;glossentry id="nautilus"&gt;</div><div class='del'>-  &lt;glossterm&gt;Nautilus&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    &lt;application&gt;Nautilus&lt;/application&gt; is the next generation file</div><div class='del'>-    manager for &lt;acronym&gt;GNOME&lt;/acronym&gt; being written by Eazel.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="nickname"&gt;</div><div class='del'>-  &lt;glossterm&gt;Nickname&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    An alias for an e-mail address.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="pop"&gt;</div><div class='del'>-  &lt;glossterm&gt;POP&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     POP, the Post Office Protocol, is a mechanism for email</div><div class='del'>-     transport.  In contrast to IMAP, it is used only to get mail from</div><div class='del'>-     a server and store it locally on your hard disk.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="protocol"&gt;</div><div class='del'>-  &lt;glossterm&gt;Protocol&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     An agreed-upon method of communication, especially one for</div><div class='del'>-     sending particular types of information between computer systems.</div><div class='del'>-     Examples include POP (Post Office Protocol), for email, and HTTP</div><div class='del'>-     (HypterText Transfer Protocol), for web pages.</div><div class='del'>-</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="regular-expression"&gt;</div><div class='del'>-  &lt;glossterm&gt;Regular Expression&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      A regular expression, or "regex", is a way of describing a</div><div class='del'>-      string of text using metacharacters or wild-card symbols.  For</div><div class='del'>-      example, the statement &lt;userinput&gt;fly*so[a|u]p&lt;/userinput&gt; means</div><div class='del'>-      "any phrase beginning with 'fly' and ending in 'soup' or</div><div class='del'>-      'soap'".  If you searched for that expression, you'd find both</div><div class='del'>-      "fly in my soup" and "fly in my soap."  There's not room here to</div><div class='del'>-      go into depth, but if you want, have a look at the documentation</div><div class='del'>-      for the &lt;command&gt;grep&lt;/command&gt; command.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="script"&gt;</div><div class='del'>-  &lt;glossterm&gt;Script&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A program written in an interpreted (rather than compiled)</div><div class='del'>-    language.  Often used as a synonym for "macro," to denote a series</div><div class='del'>-    of pre-recorded commands or actions within an application.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="sendmail"&gt;</div><div class='del'>-  &lt;glossterm&gt;Sendmail&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      As its name implies, &lt;application&gt;sendmail&lt;/application&gt; is a</div><div class='del'>-      program which sends mail.  &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-      can use it instead of &lt;glossterm&gt;SMTP&lt;/glossterm&gt;; some people</div><div class='del'>-      prefer it because it offers more flexibility, but is more</div><div class='del'>-      difficult to set up.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="shortcut-bar"&gt;</div><div class='del'>-  &lt;glossterm&gt;Shortcut Bar&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     A portion of &lt;application&gt;Evolution&lt;/application&gt; which offers</div><div class='del'>-     users fast access to the most frequently used portions of the</div><div class='del'>-     application.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="signature"&gt;</div><div class='del'>-   &lt;glossterm&gt;Signature&lt;/glossterm&gt;</div><div class='del'>-   &lt;glossdef&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     In email terms, a signature is a piece of text placed at the end</div><div class='del'>-     of every email sent, like a hand-written signature at the bottom</div><div class='del'>-     of a written letter.  A signature can be anything from a favorite</div><div class='del'>-     quotation to a link to a web page; courtesy dictates that it be</div><div class='del'>-     fewer than four lines long.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt; </div><div class='del'>-</div><div class='del'>-  &lt;glossentry id="SMTP"&gt;</div><div class='del'>-   &lt;glossterm&gt;SMTP&lt;/glossterm&gt;</div><div class='del'>-   &lt;glossdef&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This is the most common way of transporting mail messages from</div><div class='del'>-      the client's computer (you) to the server. SMTP stands for</div><div class='del'>-      Simple Mail Transfer Protocol.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   &lt;/glossdef&gt;</div><div class='del'>-  &lt;/glossentry&gt; </div><div class='del'>-</div><div class='del'>- &lt;glossentry id="spam"&gt;</div><div class='del'>-  &lt;glossterm&gt;Spam&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    Useless, unwanted e-mail.  Spam normally comes in forms of</div><div class='del'>-    chain-letters and advertisements for unscrupulous web sites or</div><div class='del'>-    services.  Messages that are merely useless are called "opt-in</div><div class='del'>-    newsletters."</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="virus"&gt;</div><div class='del'>-  &lt;glossterm&gt;Virus&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A malicious program which inserts itself into others so that it will be </div><div class='del'>-    executed, allowing it to spread to still more programs and other computers.</div><div class='del'>-    A virus can cause substantial damage by clogging networks or disk drives, </div><div class='del'>-    deleting files, or opening security holes.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="vcard"&gt;</div><div class='del'>-  &lt;glossterm&gt;vCard&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    A file format for the exchange of contact information. When you</div><div class='del'>-    get an address card attached to an email, it's probably in vCard</div><div class='del'>-    format.  Not to be confused with &lt;glossterm</div><div class='del'>-    linkend="vfolder"&gt;vFolder&lt;/glossterm&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>- &lt;glossentry id="vfolder"&gt;</div><div class='del'>-  &lt;glossterm&gt;vFolder&lt;/glossterm&gt;</div><div class='del'>-  &lt;glossdef&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    An email organization tool. vFolders allows you to create a folder</div><div class='del'>-    that contains the results of a complex search. Folder contents are</div><div class='del'>-    are updated dynamically.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/glossdef&gt;</div><div class='del'>- &lt;/glossentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;/glossary&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/apx-gpl.sgml b/doc/C/apx-gpl.sgml<br/>deleted file mode 100644<br/>index 7c7e4cd0f7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/apx-gpl.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/apx-gpl.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,414 +0,0 @@</div><div class='del'>-&lt;appendix id="gpl"&gt;</div><div class='del'>-  &lt;title&gt;GNU GENERAL PUBLIC LICENSE&lt;/title&gt;</div><div class='del'>-  &lt;subtitle&gt;Version 2, June 1991&lt;/subtitle&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;sect1&gt;</div><div class='del'>-&lt;title&gt;Preamble&lt;/title&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-  The precise terms and conditions for copying, distribution and</div><div class='del'>-modification follow.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-	   </div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;sect1&gt;</div><div class='del'>-&lt;title&gt; GNU GENERAL PUBLIC LICENSE</div><div class='del'>-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION&lt;/title&gt;</div><div class='del'>-&lt;para&gt;	</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;	 </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'>-&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-&lt;sect1&gt;</div><div class='del'>-&lt;title&gt;NO WARRANTY&lt;/title&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-		     END OF TERMS AND CONDITIONS</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-	 &lt;title&gt;How to Apply These Terms to Your New Programs&lt;/title&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-    &amp;lt;one line to give the program's name and a brief idea of what it does.&amp;gt;</div><div class='del'>-Copyright (C) &amp;lt; year&amp;gt;  &amp;lt;name of author&amp;gt;</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-    This program is distributed in the hope that it will be useful,</div><div class='del'>-    but WITHOUT ANY WARRANTY; without even the implied warranty of</div><div class='del'>-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</div><div class='del'>-    GNU General Public License for more details.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-    You should have received a copy of the GNU General Public License</div><div class='del'>-    along with 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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-  &amp;lt;signature of Ty Coon&amp;gt;, 1 April 1989</div><div class='del'>-  Ty Coon, President of Vice</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</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='del'>-&lt;/para&gt;</div><div class='del'>-&lt;/sect1&gt;</div><div class='del'>-&lt;/appendix&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/config-prefs.sgml b/doc/C/config-prefs.sgml<br/>deleted file mode 100644<br/>index 27c1ac57db..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/config-prefs.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/config-prefs.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,647 +0,0 @@</div><div class='del'>-&lt;!-- &lt;!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt; --&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="config-prefs"&gt;</div><div class='del'>-</div><div class='del'>-      &lt;title&gt;Advanced Configuration&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Perhaps your mail server has changed names.  Perhaps you've</div><div class='del'>-        grown tired of a certain layout for your appointments.</div><div class='del'>-        Whatever the reason, you want to change your</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; settings.  This chapter</div><div class='del'>-        will tell you how to do just that.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;sect1 id="config-prefs-mail"&gt;</div><div class='del'>-         &lt;title&gt;Mail Settings&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        To change your mail settings, select &lt;menuchoice&gt;</div><div class='del'>-        &lt;guimenu&gt;Settings&lt;/guimenu&gt; &lt;guimenuitem&gt;Mail</div><div class='del'>-        configuration&lt;/guimenuitem&gt;&lt;/menuchoice&gt; in the Inbox.  This</div><div class='del'>-        will open the &lt;interface&gt;mail preferences window&lt;/interface&gt;,</div><div class='del'>-        illustrated in &lt;xref linkend="config-prefs-mail-fig"&gt;.  Mail</div><div class='del'>-        preferences are separated into several categories:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt;&lt;guilabel&gt;Identities&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-          &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-               This allows you to create and alter one or more</div><div class='del'>-               identities for your email.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guilabel&gt;Sources&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-               This tab lets you tell</div><div class='del'>-               &lt;application&gt;Evolution&lt;/application&gt; where to get the</div><div class='del'>-               mail sent to you, and how to get it.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;term&gt;&lt;guilabel&gt;Mail Transport&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-               This tab lets you tell</div><div class='del'>-               &lt;application&gt;Evolution&lt;/application&gt; how to send mail.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guilabel&gt;News Servers&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              If you would like to use</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; to read newsgroups,</div><div class='del'>-              you can specify your news server preferences here.</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guilabel&gt;Other&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              Miscellaneous mail and news settings, such as HTML</div><div class='del'>-              handling preferences, and how long</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; should wait before</div><div class='del'>-              marking message read.</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-      &lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;!-- ==============Figure===================== --&gt;</div><div class='del'>-      &lt;figure id="config-prefs-mail-fig"&gt;</div><div class='del'>-	&lt;title&gt;Mail Preferences Dialog&lt;/title&gt;</div><div class='del'>-	&lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;Setting mail preferences&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/config-mail" format="png" srccredit="Aaron Weber"&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;!-- ==============End of Figure================--&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-      &lt;sect2 id="config-prefs-mail-identity"&gt;</div><div class='del'>-      &lt;title&gt;Identity Settings&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         If you have only one email account, or send email from only</div><div class='del'>-         one address, you will only need to configure one identity. If</div><div class='del'>-         you want, however, you can have multiple identities.  This</div><div class='del'>-         can be useful if you want to keep personal and professional</div><div class='del'>-         email separate, or if you wear several hats at work.</div><div class='del'>-         </div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         To add a new identity, simply click</div><div class='del'>-         &lt;guibutton&gt;Add&lt;/guibutton&gt;. To alter an existing identity,</div><div class='del'>-         click on it in the &lt;guilabel&gt;Identity&lt;/guilabel&gt; tab of the</div><div class='del'>-         &lt;interface&gt;Preferences&lt;/interface&gt; window, and then click</div><div class='del'>-         &lt;guibutton&gt;Edit&lt;/guibutton&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         &lt;application&gt;Evolution&lt;/application&gt; will then present you</div><div class='del'>-         with a dialog box containing four fields:</div><div class='del'>-          &lt;itemizedlist&gt;</div><div class='del'>-           &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              &lt;guilabel&gt;Full Name:&lt;/guilabel&gt; by default, this is the</div><div class='del'>-              same name as the full name described in your user</div><div class='del'>-              account on your computer.  You can select another if you</div><div class='del'>-              wish.</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'>-              &lt;guilabel&gt;Email address:&lt;/guilabel&gt; Enter your email</div><div class='del'>-              address in this space.</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'>-              &lt;guilabel&gt;Organization:&lt;/guilabel&gt; If you send email as</div><div class='del'>-              a representative of a company or other organization,</div><div class='del'>-              enter its name here.</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'>-              &lt;guilabel&gt;Signature file:&lt;/guilabel&gt; You may choose a</div><div class='del'>-              small text file to be appended to every message that you</div><div class='del'>-              send.  Typically, signature files include address or</div><div class='del'>-              other contact information, or a favorite quotation.</div><div class='del'>-              It's good form to keep it to four lines at the maximum.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-mail-network"&gt;</div><div class='del'>-      &lt;title&gt;Network Settings&lt;/title&gt; </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        In order to send mail with</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt;, you need to connect to</div><div class='del'>-        your network.  To do that, you'll need to know your user name</div><div class='del'>-        and password, what sort of mail sending and receiving</div><div class='del'>-        protocols your network uses, and the names of the servers</div><div class='del'>-        you'll be using.  If you're switching from another groupware</div><div class='del'>-        or email program, you can almost certainly use the same</div><div class='del'>-        settings as you did with that program. Network-related</div><div class='del'>-        settings are in the &lt;guilabel&gt;Mail Sources&lt;/guilabel&gt; and</div><div class='del'>-        &lt;guilabel&gt;Mail Transport&lt;/guilabel&gt; tabs.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>- </div><div class='del'>-      &lt;sect3 id="config-prefs-network-sources"&gt;</div><div class='del'>-	&lt;title&gt;Mail Sources&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          The &lt;interface&gt;Mail Sources&lt;/interface&gt; tab allows you to</div><div class='del'>-          edit, add, or delete methods of retrieving mail from</div><div class='del'>-          servers.  Clicking on &lt;guibutton&gt;Add&lt;/guibutton&gt; or</div><div class='del'>-          &lt;guibutton&gt;Edit&lt;/guibutton&gt; will bring up a dialog box to</div><div class='del'>-          offer you the following options:</div><div class='del'>-           &lt;variablelist&gt;</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guilabel&gt;Mail source type:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Select from IMAP or POP servers, or Unix-style</div><div class='del'>-                  &lt;systemitem&gt;&lt;filename&gt;mbox&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-                  or &lt;systemitem&gt;&lt;filename&gt;mh&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-                  files.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt; &lt;guilabel&gt;Server:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Enter the name of the mail source server in this</div><div class='del'>-                  field. If you use an  may or may not be the same as your</div><div class='del'>-                  &lt;glossterm&gt;SMTP&lt;/glossterm&gt; server.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guilabel&gt;Username:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Enter the user name for the account you have on the</div><div class='del'>-                  server-- this should the part of your email address</div><div class='del'>-                  before the @.  If you use</div><div class='del'>-                  &lt;systemitem&gt;&lt;filename&gt;mbox&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-                  or &lt;systemitem&gt;&lt;filename&gt;mh&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-                  files as your mail source, you do not need to enter</div><div class='del'>-                  a username.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guilabel&gt;Authentication:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Tell &lt;application&gt;Evolution&lt;/application&gt; how to</div><div class='del'>-                  verify your identity with the server.  Your options</div><div class='del'>-                  vary depending upon the type of server you are</div><div class='del'>-                  using, and the ways it is configured.  Given the</div><div class='del'>-                  name of a server,</div><div class='del'>-                  &lt;application&gt;Evolution&lt;/application&gt; can detect what</div><div class='del'>-                  sorts of authentication it offers.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guilabel&gt;Test Settings&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Click this button to have</div><div class='del'>-                  &lt;application&gt;Evolution&lt;/application&gt; check to see if</div><div class='del'>-                  mail sources are configured correctly.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;/variablelist&gt;</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            If you have several mail sources, clicking &lt;guibutton&gt;Get</div><div class='del'>-            Mail&lt;/guibutton&gt; will refresh any IMAP,</div><div class='del'>-            &lt;systemitem&gt;&lt;filename&gt;mh&lt;/filename&gt;&lt;/systemitem&gt;, or</div><div class='del'>-            &lt;systemitem&gt;&lt;filename&gt;mbox&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-            listings and check and download mail from all POP servers.</div><div class='del'>-            In other words, &lt;guibutton&gt;Get Mail&lt;/guibutton&gt; gets your</div><div class='del'>-            mail, no matter how many sources you have, or what types</div><div class='del'>-            they are.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect3 id="config-prefs-mail-network-transports"&gt;</div><div class='del'>-	&lt;title&gt;Mail Transports&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           The &lt;interface&gt;Mail Transports&lt;/interface&gt; tab lets you set</div><div class='del'>-           how you will send mail.  Evolution currently supports two</div><div class='del'>-           mail transport options: &lt;guilabel&gt;SMTP&lt;/guilabel&gt;, which</div><div class='del'>-           uses a remote mail server, and</div><div class='del'>-           &lt;guilabel&gt;sendmail&lt;/guilabel&gt;, which uses the</div><div class='del'>-           &lt;application&gt;sendmail&lt;/application&gt; program on your local</div><div class='del'>-           system.  &lt;application&gt;Sendmail&lt;/application&gt; is more</div><div class='del'>-           difficult to configure, but offers more flexibility than</div><div class='del'>-           &lt;systemitem&gt;SMTP&lt;/systemitem&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-            To use &lt;guilabel&gt;SMTP&lt;/guilabel&gt;, you'll need to enter the</div><div class='del'>-            name of your SMTP server.  It may have the same name as</div><div class='del'>-            your mail source server.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-         &lt;para&gt;</div><div class='del'>-            &lt;application&gt;Evolution&lt;/application&gt; can attempt to</div><div class='del'>-            determine if you have entered a valid server name.  To</div><div class='del'>-            have it do so, click the &lt;guilabel&gt;Test</div><div class='del'>-            Settings&lt;/guilabel&gt; button.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-	&lt;/sect3&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-      &lt;sect2 id="config-prefs-network-news"&gt;          </div><div class='del'>-          &lt;title&gt;News Servers&lt;/title&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Newsgroups are so much like mailing lists that there's no</div><div class='del'>-            reason not to keep them right next to your mail.  When you</div><div class='del'>-            first select the &lt;guilabel&gt;News Servers&lt;/guilabel&gt; tab,</div><div class='del'>-            you will see a blank box with the three familiar buttons</div><div class='del'>-            on the right: &lt;guibutton&gt;Add&lt;/guibutton&gt;,</div><div class='del'>-            &lt;guibutton&gt;Edit&lt;/guibutton&gt;, and</div><div class='del'>-            &lt;guibutton&gt;Delete&lt;/guibutton&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-          &lt;para&gt;</div><div class='del'>-            Click &lt;guibutton&gt;Add&lt;/guibutton&gt; to add a news server; you</div><div class='del'>-            will be prompted for its name.  Enter the name, click</div><div class='del'>-            &lt;guibutton&gt;OK&lt;/guibutton&gt;, and you're done.  You can have</div><div class='del'>-            as many mail servers as you like, of course.  News servers</div><div class='del'>-            will appear next to your IMAP servers in the</div><div class='del'>-            &lt;interface&gt;folder bar&lt;/interface&gt;.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-     &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-     &lt;sect2 id="config-prefs-mail-other"&gt;</div><div class='del'>-	&lt;title&gt;Other Mail Preferences&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          Not everything fits neatly into categories.  This tab</div><div class='del'>-          contains some miscellaneous configurations that don't have</div><div class='del'>-          too much to do with each other.</div><div class='del'>-          &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-             &lt;varlistentry&gt;</div><div class='del'>-                &lt;term&gt; </div><div class='del'>-                   &lt;guilabel&gt;Send messages in HTML format&lt;/guilabel&gt;</div><div class='del'>-                &lt;/term&gt;</div><div class='del'>-                &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    If you check this box, you will send</div><div class='del'>-                    messages as HTML by default.  If you leave it unchecked, your</div><div class='del'>-                    messages will be sent without HTML formatting unless you select </div><div class='del'>-                    &lt;menuchoice&gt; &lt;guimenu&gt;Format&lt;/guimenu&gt; &lt;guimenuitem&gt;HTML&lt;/guimenuitem&gt;</div><div class='del'>-                    &lt;/menuchoice&gt; in the message composer.</div><div class='del'>-                    See &lt;xref linkend="usage-mail-getnsend-send-html"&gt;</div><div class='del'>-                    for more information about HTML mail.</div><div class='del'>-                &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-              &lt;/varlistentry&gt;</div><div class='del'>-             &lt;varlistentry&gt;</div><div class='del'>-                &lt;term&gt; </div><div class='del'>-                   &lt;guilabel&gt;Mark Messages as Seen After&lt;/guilabel&gt;</div><div class='del'>-                &lt;/term&gt;</div><div class='del'>-                &lt;listitem&gt;&lt;para&gt; </div><div class='del'>-                    When you click on a message,</div><div class='del'>-                    &lt;application&gt;Evolution&lt;/application&gt; will wait a</div><div class='del'>-                    moment before marking it as seen. You can set the</div><div class='del'>-                    delay, in milliseconds, here.</div><div class='del'>-                 &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-              &lt;/varlistentry&gt;</div><div class='del'>-              &lt;varlistentry&gt;</div><div class='del'>-                &lt;term&gt;</div><div class='del'>-                   &lt;guilabel&gt;Folder Format&lt;/guilabel&gt;</div><div class='del'>-                &lt;/term&gt;</div><div class='del'>-                &lt;listitem&gt; &lt;para&gt; By default,</div><div class='del'>-                   &lt;application&gt;Evolution&lt;/application&gt; saves its mail</div><div class='del'>-                   in the</div><div class='del'>-                   &lt;systemitem&gt;&lt;filename&gt;mbox&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-                   format. You can switch to the</div><div class='del'>-                   &lt;systemitem&gt;&lt;filename&gt;mh&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-                   format if you like.  Note that this is an advanced</div><div class='del'>-                   feature and may cause you to lose some messages, so</div><div class='del'>-                   you should probably make a backup of your</div><div class='del'>-                   &lt;systemitem&gt;&lt;filename&gt;evolution&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-                   directory first. In addition, it will take quite</div><div class='del'>-                   some time if you have a large mailbox.</div><div class='del'>-               &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-             &lt;/varlistentry&gt;</div><div class='del'>-           &lt;/variablelist&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="config-prefs-cal"&gt;</div><div class='del'>-       &lt;title&gt;Configuring the Calendar&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-          To set your calendar preferences, select</div><div class='del'>-          &lt;menuchoice&gt;&lt;guimenu&gt;Settings&lt;/guimenu&gt;</div><div class='del'>-          &lt;guimenuitem&gt;Calendar</div><div class='del'>-          Configuration&lt;/guimenuitem&gt;&lt;/menuchoice&gt; from the Calendar</div><div class='del'>-          view.  This will open up the</div><div class='del'>-          &lt;interface&gt;Preferences&lt;/interface&gt; window.  It contains four</div><div class='del'>-          tabs: &lt;guilabel&gt;Time display&lt;/guilabel&gt;,</div><div class='del'>-          &lt;guilabel&gt;Colors&lt;/guilabel&gt;, &lt;guilabel&gt;To Do List&lt;/guilabel&gt;</div><div class='del'>-          and &lt;guilabel&gt;Alarms&lt;/guilabel&gt;.  The &lt;interface&gt;calendar</div><div class='del'>-          preferences window&lt;/interface&gt; is illustrated in &lt;xref</div><div class='del'>-          linkend="config-prefs-cal-fig"&gt;.</div><div class='del'>-</div><div class='del'>-      &lt;!-- ==============Figure===================== --&gt;</div><div class='del'>-      &lt;figure id="config-prefs-cal-fig"&gt;</div><div class='del'>-	&lt;title&gt;Calendar Preferences Dialog&lt;/title&gt;</div><div class='del'>-	&lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;If this worked on my job as well as my calendar...&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/config-cal" format="png" srccredit="Aaron Weber"&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;!-- ==============End of Figure================--&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-cal-time"&gt;</div><div class='del'>-      &lt;title&gt;Time Display Settings&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;guilabel&gt;Time display&lt;/guilabel&gt; tab lets you set the</div><div class='del'>-        following:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Time format&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;You may choose between twelve-hour (AM/PM) and</div><div class='del'>-	      twenty-four hour time formats here by clicking the</div><div class='del'>-	      appropriate radio button.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Weeks start on&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;You can set weeks to start on Sunday or on Monday.&lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Day range&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-               &lt;para&gt;</div><div class='del'>-                 When does your work day start, and when does it end?</div><div class='del'>-                 In the day and week views,</div><div class='del'>-                 &lt;application&gt;Evolution&lt;/application&gt; displays all the</div><div class='del'>-                 hours in the range you select here, even if there are</div><div class='del'>-                 no appointments for those times.  Of course, you can</div><div class='del'>-                 still schedule an appointment outside of these hours,</div><div class='del'>-                 and if you do, the display will be extended to show</div><div class='del'>-                 it.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="config-prefs-cal-color"&gt;</div><div class='del'>-      &lt;title&gt;Calendar Colors&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;interface&gt;colors tab&lt;/interface&gt; allows you to decide</div><div class='del'>-        what color your calendar will be.  The tab consists of a</div><div class='del'>-        sample calendar on the right and a list of ten items that can</div><div class='del'>-        be colored in different ways.  If you click on the color</div><div class='del'>-        button to the right of each item, you will bring up a</div><div class='del'>-        color-selector window where you can choose to alter that</div><div class='del'>-        color.  By clicking &lt;guibutton&gt;OK&lt;/guibutton&gt; in the color</div><div class='del'>-        selection dialog, you can see the results of the color on the</div><div class='del'>-        sample calendar.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;The display elements whose color you can set are:</div><div class='del'>-</div><div class='del'>-          &lt;itemizedlist&gt;</div><div class='del'>-           &lt;listitem&gt;</div><div class='del'>-              &lt;para&gt;</div><div class='del'>-                &lt;guilabel&gt;Outline:&lt;/guilabel&gt; The lines between days</div><div class='del'>-                and at the top of the display.</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; &lt;guilabel&gt;Headings:&lt;/guilabel&gt; Text color for day</div><div class='del'>-                and month names and other headings.</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; &lt;guilabel&gt;Empty days:&lt;/guilabel&gt; This is the</div><div class='del'>-                background color for any time slots in which you have no appointments.</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;guilabel&gt;Appointments:&lt;/guilabel&gt; This is the</div><div class='del'>-                background color for any time slots in which you have appointments.</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; &lt;guilabel&gt;Highlighted day:&lt;/guilabel&gt; The</div><div class='del'>-              background color for a selected time slot.</div><div class='del'>-             &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-          </div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;         </div><div class='del'>-              &lt;guilabel&gt;Day numbers:&lt;/guilabel&gt; Text color for date numbers.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-              </div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              &lt;guilabel&gt;Current day's number:&lt;/guilabel&gt; Text color for today's 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; &lt;guilabel&gt;To-Do item that is not yet</div><div class='del'>-             due:&lt;/guilabel&gt; Text color for To-Do list items that are</div><div class='del'>-             not yet due.  (Or maybe background color? find out!)</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt; &lt;guilabel&gt;To-Do item that is due today:&lt;/guilabel&gt;</div><div class='del'>-             Text color for today's tasks.</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; &lt;guilabel&gt;To-Do item that is overdue:&lt;/guilabel&gt;</div><div class='del'>-             Text color for overdue tasks.</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'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-cal-todo"&gt;</div><div class='del'>-      &lt;title&gt;To Do List Settings&lt;/title&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       You can choose what information the To Do list displays and the</div><div class='del'>-       way it is displayed.  The two areas of the &lt;interface&gt;To Do</div><div class='del'>-       List&lt;/interface&gt; tab offer several options each:</div><div class='del'>-       &lt;variablelist&gt;</div><div class='del'>-	 &lt;varlistentry&gt;</div><div class='del'>-	   &lt;term&gt;Show on To Do List&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                This box contains three items.  If you select the</div><div class='del'>-                check boxes next to them, that information will appear</div><div class='del'>-                in the To Do list for each task it contains:</div><div class='del'>-                &lt;itemizedlist&gt;</div><div class='del'>-                  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;&lt;guilabel&gt;Due Date&lt;/guilabel&gt;&lt;/para&gt;</div><div class='del'>-                   &lt;/listitem&gt;</div><div class='del'>-                  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;&lt;guilabel&gt;Time Until Due&lt;/guilabel&gt;&lt;/para&gt;</div><div class='del'>-                   &lt;/listitem&gt;</div><div class='del'>-                  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;&lt;guilabel&gt;Priority&lt;/guilabel&gt;&lt;/para&gt;</div><div class='del'>-                   &lt;/listitem&gt;</div><div class='del'>-               &lt;/itemizedlist&gt;</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Style Options&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-               &lt;para&gt;</div><div class='del'>-                 Select among the following checkboxes to determine</div><div class='del'>-                 how your To Do list will look:</div><div class='del'>-                &lt;itemizedlist&gt;</div><div class='del'>-                  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;&lt;guilabel&gt;Highlight overdue items&lt;/guilabel&gt;&lt;/para&gt;</div><div class='del'>-                   &lt;/listitem&gt;</div><div class='del'>-                  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;&lt;guilabel&gt;Highlight items due today&lt;/guilabel&gt;&lt;/para&gt;</div><div class='del'>-                   &lt;/listitem&gt;</div><div class='del'>-                  &lt;listitem&gt;</div><div class='del'>-		    &lt;para&gt;&lt;guilabel&gt;Highlight not yet due items&lt;/guilabel&gt;&lt;/para&gt;</div><div class='del'>-                   &lt;/listitem&gt;</div><div class='del'>-               &lt;/itemizedlist&gt;                 </div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="config-prefs-cal-alarms"&gt;</div><div class='del'>-      &lt;title&gt;Alarms Settings&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;  </div><div class='del'>-        The &lt;interface&gt;alarms tab&lt;/interface&gt; enables you to select from three boxes:</div><div class='del'>-        &lt;itemizedlist&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;&lt;guilabel&gt;Beep on display alarms&lt;/guilabel&gt;: select</div><div class='del'>-	    this box to have &lt;application&gt;Evolution&lt;/application&gt; beep</div><div class='del'>-	    at you for any alarms you have set.  If you leave this box</div><div class='del'>-	    unchecked, &lt;application&gt;Evolution&lt;/application&gt; will only</div><div class='del'>-	    alert you to events by opening a dialog box. These beeps</div><div class='del'>-	    are distinct from full-fledged audio alarms.</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;&lt;guilabel&gt;Audio alarms timeout after: &lt;/guilabel&gt;</div><div class='del'>-	    Select this button to have your audio alarms stop</div><div class='del'>-	    automatically after a certain number of seconds.  &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;&lt;guilabel&gt;Enable snoozing for:&lt;/guilabel&gt; If you</div><div class='del'>-	    would like to have the option to tell</div><div class='del'>-	    &lt;application&gt;Evolution&lt;/application&gt; to repeat an alarm in</div><div class='del'>-	    a few minutes, select this button and decide how long</div><div class='del'>-	    you'd like it to wait.</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;   </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-   &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1 id="config-prefs-contact"&gt;</div><div class='del'>-      &lt;title&gt;Managing the Contact Manager&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          To set the behavior of your Contact Manager, click on the</div><div class='del'>-          &lt;guibutton&gt;Contact Manager&lt;/guibutton&gt; tab in the</div><div class='del'>-          &lt;interface&gt;Preferences&lt;/interface&gt; window.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          You can set the following options: &lt;!--insert variable list</div><div class='del'>-          here--&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-        &lt;sect2 id="config-prefs-contact-ldap-add"&gt;</div><div class='del'>-           &lt;title&gt;Adding Directory Servers&lt;/title&gt;</div><div class='del'>-           &lt;para&gt;</div><div class='del'>-              To add a new LDAP server to your available contact</div><div class='del'>-              folders, select &lt;menuchoice&gt; &lt;guimenu&gt;Actions&lt;/guimenu&gt;</div><div class='del'>-              &lt;guimenuitem&gt;New Directory Server&lt;/guimenuitem&gt;</div><div class='del'>-              &lt;/menuchoice&gt;.  This brings up a small dialog box which</div><div class='del'>-              will let you enter the following options:</div><div class='del'>-              &lt;itemizedlist&gt;</div><div class='del'>-	         &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guilabel&gt;Name&lt;/guilabel&gt; &amp;mdash; any name you choose for the server.</div><div class='del'>-                 &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-                &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guilabel&gt;Description&lt;/guilabel&gt; &amp;mdash; a longer description of the server.</div><div class='del'>-                 &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-                    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guilabel&gt;LDAP Server&lt;/guilabel&gt; &amp;mdash; the network address of the server.</div><div class='del'>-                 &lt;/para&gt;&lt;/listitem&gt; </div><div class='del'>-               </div><div class='del'>-                   &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guilabel&gt;Port Number&lt;/guilabel&gt; &amp;mdash; by default, the port number is 389.</div><div class='del'>-                 &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-                   &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guilabel&gt;Root DN&lt;/guilabel&gt; &amp;mdash; enter the root DN here.</div><div class='del'>-                 &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-             &lt;/itemizedlist&gt;</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-       &lt;/sect2&gt;</div><div class='del'>-      &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="config-prefs-general"&gt;</div><div class='del'>-    &lt;title&gt;General Preferences&lt;/title&gt; </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-          Additional configuration options will be covered here, as</div><div class='del'>-          they become available.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-    </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/config-setupassist.sgml b/doc/C/config-setupassist.sgml<br/>deleted file mode 100644<br/>index d9649f1adc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/config-setupassist.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/config-setupassist.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,214 +0,0 @@</div><div class='del'>-    &lt;chapter id="config-setupassist"&gt;</div><div class='del'>-      &lt;title&gt;Easy Setup with the Setup Assistant&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first time you try to use email, the mail setup assistant</div><div class='del'>-        will ask you for some basic information, so</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; can let you use email. If</div><div class='del'>-        you prefer more detailed configuration, or if you want to make</div><div class='del'>-        changes to an existing email setup, see &lt;xref</div><div class='del'>-        linkend="config-prefs"&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect1 id="config-setupassist-mail"&gt;</div><div class='del'>-      &lt;title&gt;Mail Setup&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The first time you try to send or receive mail with</div><div class='del'>-	&lt;application&gt;Evolution&lt;/application&gt;, the &lt;interface&gt;mail</div><div class='del'>-	setup assistant&lt;/interface&gt; will pop up to help you with your</div><div class='del'>-	email preferences.  If you don't plan to use email, or if</div><div class='del'>-	you'd rather deal with your email preferences later, click</div><div class='del'>-	&lt;guibutton&gt;Cancel&lt;/guibutton&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--  </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-Before you get it, though, you should decide where you want to</div><div class='del'>-	keep it.  Your options will vary a little depending on your</div><div class='del'>-	network setup, but they come down to storing the mail on your</div><div class='del'>-	hard disk (using &lt;glossterm linkend="pop"&gt;POP&lt;/glossterm&gt;), or</div><div class='del'>-	storing it on the network (using &lt;glossterm</div><div class='del'>-	linkend="imap"&gt;IMAP&lt;/glossterm&gt;).  If you store your mail on</div><div class='del'>-	your local hard disk, you can read it whether you're online or</div><div class='del'>-	not, but you can only read it from one computer.  If you store</div><div class='del'>-	it on the network, you can only read it when you're online,</div><div class='del'>-	but you can access it from almost any computer with a network</div><div class='del'>-	connection, even if it doesn't have</div><div class='del'>-	&lt;application&gt;Evolution&lt;/application&gt;.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        If you choose POP, you'll be putting mail in the</div><div class='del'>-        &lt;guilabel&gt;Inbox&lt;/guilabel&gt; in the &lt;guilabel&gt;Local&lt;/guilabel&gt;</div><div class='del'>-        folder.  If you choose IMAP, it's the</div><div class='del'>-        &lt;guilabel&gt;Inbox&lt;/guilabel&gt; of a folder with the same name as</div><div class='del'>-        your mail server.  That's so you can maintain several distinct</div><div class='del'>-        IMAP servers if you want.  See &lt;xref</div><div class='del'>-        linkend="config-prefs-mail"&gt; for more information about mail</div><div class='del'>-        servers.</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         The setup assistant (sometimes called a</div><div class='del'>-	 &lt;glossterm&gt;Druid&lt;/glossterm&gt;, by analogy with the "Wizards"</div><div class='del'>-	 that some other programs use) will guide you through the</div><div class='del'>-	 network configuration process.  It will ask you for some</div><div class='del'>-	 basic information; your system administrator or ISP should</div><div class='del'>-	 have the answers you'll need.  The mail setup assistant is</div><div class='del'>-	 pictured in &lt;xref linkend="usage-setup-fig"&gt;.</div><div class='del'>-</div><div class='del'>-&lt;!-- ==============Figure=================================== --&gt;</div><div class='del'>-&lt;!-- druid-pic should eventually become assistant-pic --&gt;</div><div class='del'>-</div><div class='del'>-	&lt;figure id="usage-setup-fig"&gt;</div><div class='del'>-	&lt;title&gt;Mail Setup Assistant&lt;/title&gt;</div><div class='del'>-	&lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;Evolution Main Window&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/mail-druid-pic" format="png" srccredit="Kevin Breit"&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;!-- ==============End of Figure=================================== --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  The assistant will ask you for the following information:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-          &lt;varlistentry&gt;</div><div class='del'>-               &lt;term&gt; &lt;guilabel&gt;Name:&lt;/guilabel&gt; &lt;/term&gt; &lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt;Your full name. &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-         &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt;&lt;guilabel&gt;Email address:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                 Your complete email address.</div><div class='del'>-                 &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-       &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt; &lt;guilabel&gt;Organization:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              Any organization you represent, or the company where you</div><div class='del'>-              work.  Leave this blank if you wish, or type "My own bad</div><div class='del'>-              self" so people know your opinions are yours alone.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-      &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;varlistentry&gt;</div><div class='del'>-	 &lt;term&gt;&lt;guilabel&gt;Signature File:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-          &lt;listitem&gt;</div><div class='del'>-            &lt;para&gt;</div><div class='del'>-             A text file appended to any email you send.  A signature</div><div class='del'>-             file typically consists of your name and email address,</div><div class='del'>-             or a quotation you like.  It's good form to keep your</div><div class='del'>-             "sig" on the short side: four lines is plenty. Remember,</div><div class='del'>-             this is attached to every email you send.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-         &lt;/listitem&gt;</div><div class='del'>-       &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-           &lt;term&gt; &lt;guilabel&gt;Mail source type:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; supports several</div><div class='del'>-              mail sources: &lt;glossterm&gt;POP&lt;/glossterm&gt; and</div><div class='del'>-              &lt;glossterm&gt;IMAP&lt;/glossterm&gt; servers, and UNIX-style</div><div class='del'>-              &lt;systemitem&gt;&lt;filename&gt;mbox&lt;/filename&gt;&lt;/systemitem&gt; and</div><div class='del'>-              &lt;systemitem&gt;&lt;filename&gt;mh&lt;/filename&gt;&lt;/systemitem&gt; files.</div><div class='del'>-              POP servers retrieve your mail and store it on your</div><div class='del'>-              local system so you can refer to it even when not</div><div class='del'>-              connected to a network; &lt;glossterm&gt;IMAP&lt;/glossterm&gt;</div><div class='del'>-              servers store the mail on the server so you can access</div><div class='del'>-              it from multiple locations;</div><div class='del'>-              &lt;systemitem&gt;&lt;filename&gt;mbox&lt;/filename&gt;&gt;&lt;/systemitem&gt;</div><div class='del'>-              files are used by your computer for internal mail, and</div><div class='del'>-              may be useful if you want to switch from another email</div><div class='del'>-              client such as &lt;application&gt;Spruce&lt;/application&gt; or</div><div class='del'>-              &lt;application&gt;Netscape Communicator&lt;/application&gt;.  Ask</div><div class='del'>-              your system administrator which you should use, or keep</div><div class='del'>-              guessing until one works.  You may use multiple sources</div><div class='del'>-              if you wish; see &lt;xref</div><div class='del'>-              linkend="config-prefs-mail-network"&gt; for more</div><div class='del'>-              information.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-            &lt;para&gt;</div><div class='del'>-              If you decide not to have</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; use any servers,</div><div class='del'>-              the remaining items are not relevant; you only need to</div><div class='del'>-              point to the location of the files you wish to access.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-          </div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt; &lt;guilabel&gt;Server:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              This should be the name of the server where you check</div><div class='del'>-              your mail, if you use one.  It may be the same as the</div><div class='del'>-              server where you send your outgoing mail, if you use</div><div class='del'>-              one.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-     &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guilabel&gt;Username:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-             &lt;para&gt;</div><div class='del'>-              Enter the username for your mail server account, if you</div><div class='del'>-              have one. Normally, this is the part of your email</div><div class='del'>-              address before the @ character, and</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; has selected that</div><div class='del'>-              value as the default.  If you have a different username,</div><div class='del'>-              you can enter it here.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-      &lt;/varlistentry&gt;</div><div class='del'>-     </div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt;&lt;guilabel&gt;Authentication:&lt;/guilabel&gt;&lt;/term&gt; </div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              Select the type of authentication you will use.  You can</div><div class='del'>-              click &lt;guibutton&gt;Detect supported types&lt;/guibutton&gt; to</div><div class='del'>-              find out which authentication protocols your network</div><div class='del'>-              allows.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-       &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-      &lt;varlistentry&gt; </div><div class='del'>-         &lt;term&gt;&lt;guilabel&gt;Mail Transport:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              This is the mail sending protocol you will want to use.</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; supports both SMTP</div><div class='del'>-              and &lt;application&gt;sendmail&lt;/application&gt;.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-      &lt;/varlistentry&gt;</div><div class='del'>-     &lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        To learn how to configure &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-        in greater detail, or to change preferences once you have set</div><div class='del'>-        them, see &lt;xref linkend="config-prefs"&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/config-sync.sgml b/doc/C/config-sync.sgml<br/>deleted file mode 100644<br/>index 8fcf94e3af..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/config-sync.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/config-sync.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-  &lt;chapter id="config-sync"&gt;</div><div class='del'>-     &lt;title&gt;Setting up your synchronization system&lt;/title&gt; </div><div class='del'>-     &lt;para&gt;</div><div class='del'>-        Synchronization presents you with two issues you'll need to</div><div class='del'>-        deal with.  The first one is pretty simple: you'll need to get</div><div class='del'>-        the data to move among the various devices you're using.  If</div><div class='del'>-        you've already got &lt;application&gt;Gnome-Pilot&lt;/application&gt;</div><div class='del'>-        working, then all you have to do is tell it to use the</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-        &lt;glossterm&gt;conduit&lt;/glossterm&gt;.  If you haven't used</div><div class='del'>-        &lt;application&gt;Gnome-Pilot&lt;/application&gt; before, you'll need to</div><div class='del'>-        run the GNOME &lt;application&gt;Control Center&lt;/application&gt; and go</div><div class='del'>-        through the hand-held device setup assistant.  Then you can</div><div class='del'>-        select the Evolution conduit and press the hotsync button.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If that doesn't work, jump up and down several times and swear</div><div class='del'>-        loudly.  Then make sure you've got</div><div class='del'>-        &lt;application&gt;Gnome-Pilot&lt;/application&gt; going to the right</div><div class='del'>-        device (for my serial port, it's /dev/ttys0, not the default</div><div class='del'>-        /dev/pilot) and that you have read and write permission on</div><div class='del'>-        that device.  If you don't, you'll need to be added to whatever</div><div class='del'>-        group has those permissions (probably tty).</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-        Once &lt;application&gt;Evolution&lt;/application&gt; knows how to get the</div><div class='del'>-        mail, address, and calendar data, it needs to know what to do</div><div class='del'>-        with it.  When you synchronize your local data with the data</div><div class='del'>-        on a server or handheld device, you may run into conflicts:</div><div class='del'>-        perhaps you have ended up with two cards with the same name</div><div class='del'>-        and different addresses, or old mail that has been deleted</div><div class='del'>-        from one device but not the other.  What if you want to keep</div><div class='del'>-        only the a few contacts or messages on your hand-held or your</div><div class='del'>-        laptop, but keep all the data server or your desktop machine?</div><div class='del'>-        Select the &lt;guibutton&gt;Synchronization&lt;/guibutton&gt; tab from the</div><div class='del'>-        &lt;interface&gt;Preferences&lt;/interface&gt; window to set up the</div><div class='del'>-        conflict resolution preferences.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-      &lt;para&gt; </div><div class='del'>-         You can set &lt;application&gt;Evolution&lt;/application&gt;'s</div><div class='del'>-         synchronization behavior in the following ways: </div><div class='del'>-         &lt;!-- LIST HERE --&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt; </div><div class='del'>-         &lt;warning&gt; </div><div class='del'>-	  &lt;title&gt;Data Loss Prevention&lt;/title&gt; </div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    It's always a good idea to make a backup.  If you set your</div><div class='del'>-	    synchronization behaviors wrong, you could end up deleting</div><div class='del'>-	    the messages and cards you want to keep, and keeping the</div><div class='del'>-	    ones you want to delete.  Before you change these</div><div class='del'>-	    preferences, make a backup of your the</div><div class='del'>-	    &lt;systemitem&gt;&lt;filename&gt;evolution&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-	    directory.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	&lt;/warning&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/chapter&gt;</div><div class='head'>diff --git a/doc/C/evolution-guide.sgml b/doc/C/evolution-guide.sgml<br/>deleted file mode 100644<br/>index 064bb0d305..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/evolution-guide.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/evolution-guide.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,143 +0,0 @@</div><div class='del'>-&lt;!DOCTYPE book PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"[</div><div class='del'>-</div><div class='del'>-&lt;!ENTITY PREFACE SYSTEM "preface.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-MAINWINDOW SYSTEM "usage-mainwindow.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-MAIL SYSTEM "usage-mail.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-CONTACT SYSTEM "usage-contact.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-CALENDAR SYSTEM "usage-calendar.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-SYNC SYSTEM "usage-sync.sgml"&gt;</div><div class='del'>-&lt;!ENTITY USAGE-PRINT SYSTEM "usage-print.sgml"&gt;</div><div class='del'>-&lt;!ENTITY CONFIG-SETUPASSIST SYSTEM "config-setupassist.sgml"&gt;</div><div class='del'>-&lt;!ENTITY CONFIG-PREFS SYSTEM "config-prefs.sgml"&gt;</div><div class='del'>-&lt;!ENTITY CONFIG-SYNC SYSTEM "config-sync.sgml"&gt;</div><div class='del'>-&lt;!ENTITY MENUREF SYSTEM "menuref.sgml"&gt;</div><div class='del'>-&lt;!ENTITY APX-GLOSS SYSTEM "apx-gloss.sgml"&gt;</div><div class='del'>-&lt;!ENTITY APX-BUGS SYSTEM "apx-bugs.sgml"&gt;</div><div class='del'>-&lt;!ENTITY APX-AUTHORS SYSTEM "apx-authors.sgml"&gt;</div><div class='del'>-</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- Almost every chapter is an entity.  Files, Chapter id's, and</div><div class='del'>-entity names correspond.  APX is for appendix. Note that there is no</div><div class='del'>-entity for apx-notes.sgml, which is still included in the file</div><div class='del'>-set. Reinstate the entity if and when the Notes feature is</div><div class='del'>-implemented. --&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="index"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;A User's Guide to Evolution&lt;/title&gt;</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;&lt;firstname&gt;Aaron&lt;/firstname&gt;&lt;surname&gt;Weber&lt;/surname&gt;&lt;/author&gt;</div><div class='del'>-      &lt;author&gt;&lt;firstname&gt;Kevin&lt;/firstname&gt;&lt;surname&gt;Breit&lt;/surname&gt;&lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt; Helix Code, Inc., &lt;/holder&gt;</div><div class='del'>-      &lt;holder&gt; Kevin Breit &lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;legalnotice id="legalnotice"&gt;</div><div class='del'>- </div><div class='del'>-     &lt;para&gt;</div><div class='del'>-         Permission is granted to copy, distribute and/or modify this</div><div class='del'>-         document under the terms of the &lt;ulink type="help"</div><div class='del'>-         url="gnome-help:fdl"&gt;&lt;citetitle&gt;GNU Free Documentation</div><div class='del'>-         License&lt;/citetitle&gt;&lt;/ulink&gt;, Version 1.1 or any later version</div><div class='del'>-         published by the Free Software Foundation with no Invariant</div><div class='del'>-         Sections, no Front-Cover Texts, and no Back-Cover Texts. You</div><div class='del'>-         may obtain a copy of the &lt;citetitle&gt;GNU Free Documentation</div><div class='del'>-         License&lt;/citetitle&gt; from the Free Software Foundation by</div><div class='del'>-         visiting &lt;ulink type="http" url="http://www.fsf.org"&gt;their</div><div class='del'>-         Web site&lt;/ulink&gt; or by writing to: Free Software Foundation,</div><div class='del'>-         Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,</div><div class='del'>-         USA.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         Many of the names used by companies to distinguish their</div><div class='del'>-         products and services are claimed as trademarks. Where those</div><div class='del'>-         names appear in any GNOME documentation, and those trademarks</div><div class='del'>-         are made aware to the members of the GNOME Documentation</div><div class='del'>-         Project, the names have been printed in caps or initial caps.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/legalnotice&gt;</div><div class='del'>-</div><div class='del'>-    &lt;releaseinfo&gt;</div><div class='del'>-       This is version 0.6 of the Evolution manual, describing version </div><div class='del'>-       0.6 of Evolution.  </div><div class='del'>-   &lt;/releaseinfo&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-  &amp;PREFACE;</div><div class='del'>-  </div><div class='del'>-  &lt;part id="usage"&gt;</div><div class='del'>-    &lt;title&gt;Using Evolution&lt;/title&gt;</div><div class='del'>-     &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Part one of the &lt;application&gt;Evolution&lt;/application&gt; manual</div><div class='del'>-        describes how to use &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-        for email, contact management, and appointment and task</div><div class='del'>-        scheduling.  You'll find as you go along that, as with most of</div><div class='del'>-        Linux, there's more than one way to do things, and you can</div><div class='del'>-        pick whichever method you like best.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;USAGE-MAINWINDOW;</div><div class='del'>-    &amp;USAGE-MAIL;</div><div class='del'>-    &amp;USAGE-CONTACT;</div><div class='del'>-    &amp;USAGE-CALENDAR;</div><div class='del'>-&lt;!--   &amp;USAGE-NOTES; --&gt;</div><div class='del'>-    &amp;USAGE-SYNC; </div><div class='del'>-    &amp;USAGE-PRINT;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-  &lt;part id="config"&gt;</div><div class='del'>-  &lt;title&gt;Configuring and Managing Evolution&lt;/title&gt;</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; is highly configurable.</div><div class='del'>-        Usually, when developers say that, they mean that they didn't</div><div class='del'>-        test it out thoroughly and have left it to other programmers</div><div class='del'>-        to "configure" themselves a working system.  But in the case</div><div class='del'>-        of &lt;application&gt;Evolution&lt;/application&gt;, you can expect that</div><div class='del'>-        it will work perfectly well with minimal setup hassle, and</div><div class='del'>-        that you can alter its behavior to fit your needs with just a</div><div class='del'>-        little more work.  This part of the book will describe that</div><div class='del'>-        process, from the quickest glimpse of the Setup Assistant to</div><div class='del'>-        an in-depth tour of the preferences dialogs.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;CONFIG-SETUPASSIST;</div><div class='del'>-    &amp;CONFIG-PREFS;</div><div class='del'>-    &amp;CONFIG-SYNC;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-</div><div class='del'>-  &lt;part&gt;  </div><div class='del'>-    &lt;title&gt;Comprehensive Menu reference&lt;/title&gt;</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The following reference covers all, or nearly all, of the</div><div class='del'>-        menus and menu commands that</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; has to offer you.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-    &amp;MENUREF;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>- </div><div class='del'>-  &amp;APX-GLOSS;</div><div class='del'>-  &amp;APX-BUGS;</div><div class='del'>-  &amp;APX-AUTHORS; </div><div class='del'>-&lt;/book&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/fig/calendar.png b/doc/C/fig/calendar.png<br/>deleted file mode 100644<br/>index c9703f4903..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/calendar.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/calendar.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/config-cal.png b/doc/C/fig/config-cal.png<br/>deleted file mode 100644<br/>index 25b5b68621..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/config-cal.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/config-cal.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/config-mail.png b/doc/C/fig/config-mail.png<br/>deleted file mode 100644<br/>index cd8543d94e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/config-mail.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/config-mail.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/contact-editor.png b/doc/C/fig/contact-editor.png<br/>deleted file mode 100644<br/>index 988ad2f918..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/contact-editor.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/contact-editor.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/contact.png b/doc/C/fig/contact.png<br/>deleted file mode 100644<br/>index a9ed02251a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/contact.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/contact.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/filter-assist-fig.png b/doc/C/fig/filter-assist-fig.png<br/>deleted file mode 100644<br/>index 5248e0effe..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/filter-assist-fig.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/filter-assist-fig.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/filter-new-fig.png b/doc/C/fig/filter-new-fig.png<br/>deleted file mode 100644<br/>index a8b41ca678..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/filter-new-fig.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/filter-new-fig.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/mail-composer.png b/doc/C/fig/mail-composer.png<br/>deleted file mode 100644<br/>index 22c16365b5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/mail-composer.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/mail-composer.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/mail-druid-pic.png b/doc/C/fig/mail-druid-pic.png<br/>deleted file mode 100644<br/>index f29f3e77be..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/mail-druid-pic.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/mail-druid-pic.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/mail-inbox.png b/doc/C/fig/mail-inbox.png<br/>deleted file mode 100644<br/>index b4f18640b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/mail-inbox.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/mail-inbox.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/mainwindow-pic.png b/doc/C/fig/mainwindow-pic.png<br/>deleted file mode 100644<br/>index 28bf487bf9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/mainwindow-pic.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/mainwindow-pic.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/print-dest.png b/doc/C/fig/print-dest.png<br/>deleted file mode 100644<br/>index 464705711e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/print-dest.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/print-dest.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/print-preview.png b/doc/C/fig/print-preview.png<br/>deleted file mode 100644<br/>index 7f9a8d661a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/print-preview.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/print-preview.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/fig/vfolder-createrule-fig.png b/doc/C/fig/vfolder-createrule-fig.png<br/>deleted file mode 100644<br/>index 162bebf48c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/fig/vfolder-createrule-fig.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/fig/vfolder-createrule-fig.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/doc/C/menuref.sgml b/doc/C/menuref.sgml<br/>deleted file mode 100644<br/>index 036b663b23..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/menuref.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/menuref.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1315 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>-&lt;!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="menuref"&gt;</div><div class='del'>-  &lt;title&gt;Menu Reference&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    &lt;application&gt;Evolution&lt;/application&gt;'s menus may not hold the</div><div class='del'>-    secret to happiness, they do hold every ability that</div><div class='del'>-    &lt;application&gt;Evolution&lt;/application&gt; has. This section will serve</div><div class='del'>-    as a reference for all those menus, and the capabilites that they</div><div class='del'>-    offer you.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    In addition, the editor tools for messages, appointments, and</div><div class='del'>-    contacts all have menu bars of their own. From left to right, the</div><div class='del'>-    menus available to you when you are reading mail are:</div><div class='del'>-    &lt;guimenu&gt;File&lt;/guimenu&gt;, &lt;guimenu&gt;Edit&lt;/guimenu&gt;,</div><div class='del'>-    &lt;guimenu&gt;View&lt;/guimenu&gt;, &lt;guimenu&gt;Settings&lt;/guimenu&gt;,</div><div class='del'>-    &lt;guimenu&gt;Message&lt;/guimenu&gt;, &lt;guimenu&gt;Folder&lt;/guimenu&gt;and</div><div class='del'>-    &lt;guimenu&gt;Help&lt;/guimenu&gt;.</div><div class='del'>-</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Menus in &lt;application&gt;Evolution&lt;/application&gt; are</div><div class='del'>-    context-sensitive, which means that they vary depending on what</div><div class='del'>-    you're doing.  If you're reading your mail, you'll have</div><div class='del'>-    mail-related menus; for your calendar, you'll have</div><div class='del'>-    calendar-related menu items.  Some menus, of course, like</div><div class='del'>-    &lt;guimenu&gt;Help&lt;/guimenu&gt; and &lt;guimenu&gt;File&lt;/guimenu&gt; don't much, if</div><div class='del'>-    at all, because they have more universal functions.  But you'd</div><div class='del'>-    never mark an address card as "read," or set the recurrence for an</div><div class='del'>-    email message you've recieved. depending on whether you're looking</div><div class='del'>-    at mail, contacts, or calendar information. </div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="menuref-universal"&gt;</div><div class='del'>-    &lt;title&gt;Menus that are the same everywhere&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &lt;guimenu&gt;File&lt;/guimenu&gt; and &lt;guimenu&gt;Help&lt;/guimenu&gt; menus in</div><div class='del'>-      the main &lt;application&gt;Evolution&lt;/application&gt; window do not</div><div class='del'>-      change, because they refer to universal items.  Other menus have</div><div class='del'>-      contents that change depending on context.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   </div><div class='del'>- &lt;sect2 id="menuref-universal-file"&gt;</div><div class='del'>-      &lt;title&gt;File Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guisubmenu&gt;New...&lt;/guisubmenu&gt; Submenu&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		&lt;itemizedlist&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		      &lt;guimenuitem&gt;Folder&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-		       Create a new folder. See &lt;xref </div><div class='del'>-		       linkend="usage-mainwindow-folderbar"&gt;</div><div class='del'>-		       for more information about folders.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		      &lt;guimenuitem&gt;Shortcut&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-		       Create a new Shortcut in the Shortcut Bar.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		      &lt;guimenuitem&gt;Mail Message&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-		       Compose a new mail message. Covered in</div><div class='del'>-		       &lt;xref linkend="usage-mail-getnsend-send"&gt;.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		      &lt;guimenuitem&gt;Appointment&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-		       Enter a new appointment in your calendar. See &lt;xref</div><div class='del'>-			linkend="usage-calendar-apts-basic"&gt; for more information.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		      &lt;guimenuitem&gt;Task&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-		       Enter a new to-do item in your taskpad. Covered in </div><div class='del'>-		       &lt;xref linkend="usage-calendar-todo"&gt;.</div><div class='del'>-		    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		&lt;/itemizedlist&gt;</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Go to Folder&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               View the items in a particular folder.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Create New Folder&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		 This item doesn't belong here any more.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Print Message&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		 Print the current message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Exit&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		 Quit using &lt;application&gt;Evolution&lt;/application&gt;.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-universal-help"&gt;</div><div class='del'>-      &lt;title&gt;The Help Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      &lt;variablelist&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Help Index&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Displays the table of contents for this document.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Getting Started&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              A quick look around, and a summary of the things</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; can do for you.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Using the Mailer&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              An in-depth tour of &lt;application&gt;Evolution&lt;/application&gt; Mail.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Using the Calendar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             A step-by-step guide to using the Calendar.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Using the Contact Manager&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-            Find your way around the Contact Manager.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Submit Bug Report&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             If you don't report them, they can't fix them.  Select this item to let the </div><div class='del'>-             developers know what's wrong.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;About Evolution&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Displays a window with information about the application and its authors.</div><div class='del'>-              This has the same information as &lt;xref linkend="authors"&gt;.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="menuref-mail"&gt;</div><div class='del'>-    &lt;title&gt;Mail Menus&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       &lt;application&gt;Evolution&lt;/application&gt; Mail has more specialized</div><div class='del'>-       menus, and more specialized menu items, than any other part of</div><div class='del'>-       the application.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   </div><div class='del'>-    &lt;sect2 id="menuref-mail-edit"&gt;</div><div class='del'>-      &lt;title&gt;The Edit Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This menu is currently empty.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-mail-view"&gt;</div><div class='del'>-      &lt;title&gt;The Mail View Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This menu lets you control the way</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; displays your information</div><div class='del'>-        for you.</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Show Shortcut Bar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Toggle the shortcut bar on and off with this item.             </div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Show Folder Bar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Toggle the folder bar on and off with this item. </div><div class='del'>-             See &lt;xref linkend="usage-mainwindow-folderbar"&gt; for </div><div class='del'>-             more information about the folder bar.             </div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Threaded Message List&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               This item controls whether your message list is displayed by thread </div><div class='del'>-               or by other criteria.  The default order is by date; see</div><div class='del'>-               &lt;xref linkend="usage-mail-listorder"&gt; for information about the</div><div class='del'>-               order of the message list.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-mail-tools"&gt;</div><div class='del'>-      &lt;title&gt;The Mail Settings Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-      &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Mail Filters&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Edit your mail filters here.  </div><div class='del'>-             See &lt;xref linkend="usage-mail-organize-filters"&gt;</div><div class='del'>-             for more information about mail filtering.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Virtual Folder Editor&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Create, edit, and delete Virtual Folders (&lt;glossterm&gt;vFolders&lt;/glossterm&gt;)</div><div class='del'>-               with this tool. </div><div class='del'>-              To learn about using vFolders with mail, see </div><div class='del'>-              &lt;xref linkend="usage-mail-organize-vfolders"&gt;.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Mail Configuration&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; </div><div class='del'>-               Tools for setting up all your mail account preferences.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Manage Subscriptions&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               Tools for newsgroup and IMAP folder subscriptions.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Forget Passwords&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              This item will cause &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	      to forget what your password is.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  </div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-mail-folder"&gt;</div><div class='del'>-      &lt;title&gt;The Mail Folder Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-          The items in this menu relate to </div><div class='del'>-          &lt;application&gt;Evolution&lt;/application&gt; mail folders.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-          You can:</div><div class='del'>-          &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Mark all as Read&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	      &lt;application&gt;Evolution&lt;/application&gt; keeps track of which messages </div><div class='del'>-	      you've seen;  to mark everything in a folder as read, choose this item.</div><div class='del'>-	      You can mark a single message as read by right-clicking it in the message bar.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Delete All&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	      This is a favorite item of everyone with too much junk-mail: one click, and it </div><div class='del'>-	      deletes every message in the current folder. </div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Expunge&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                 Empties the trash folder, erasing messages permanently. </div><div class='del'>-                 Once you've done this, they're gone for good.</div><div class='del'>-	       &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Configure Folder&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Use this item to set the file format in which</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; stores mail. You</div><div class='del'>-              can choose from standard UNIX-style</div><div class='del'>-              &lt;systemitem&gt;&lt;filename&gt;mbox&lt;/filename&gt;&lt;/systemitem&gt;</div><div class='del'>-              files, or the</div><div class='del'>-              &lt;systemitem&gt;&lt;filename&gt;mh&lt;/filename&gt;&lt;/systemitem&gt; format.</div><div class='del'>-              Converting large mailboxes may take a long time, and</div><div class='del'>-              it's a good idea to have a backup copy beforehand.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect2 id="menuref-mail-message"&gt;</div><div class='del'>-      &lt;title&gt;The Mail Message Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-          The items in this menu relate to</div><div class='del'>-          &lt;application&gt;Evolution&lt;/application&gt; mail messages. Most of</div><div class='del'>-          them require you to have a message selected, and are also</div><div class='del'>-          available by right-clicking on a message in the message</div><div class='del'>-          list.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-          &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Open in New Window&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Displays the selected message in a new window.</div><div class='del'>-	   &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Edit Message&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	      Open the selected message in the message composer.  You</div><div class='del'>-              can only edit a message you have written: drafts and messages in </div><div class='del'>-              the &lt;guilabel&gt;Sent&lt;/guilabel&gt; box. </div><div class='del'>-	   &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Print Message&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Displays the &lt;interface&gt;Print Preview&lt;/interface&gt; window, </div><div class='del'>-               ready for printing.</div><div class='del'>-	   &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Reply to Sender&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Opens a message composition window addressed to the</div><div class='del'>-               author of the  message.  Covered in detail in </div><div class='del'>-               &lt;xref linkend="usage-mail-getnsend-send-reply"&gt;.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Reply to All&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	        Opens a message composition window addressed to the</div><div class='del'>-                author of the  message and all known recipients.</div><div class='del'>-                Covered in detail in &lt;xref linkend="usage-mail-getnsend-send-reply"&gt;.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Forward&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Appends the body of the selected message to a new message.</div><div class='del'>-               Covered in detail in  &lt;xref linkend="usage-mail-getnsend-fwd"&gt;.               </div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Delete Message&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Marks a message for deletion.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Move Message&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Choose a folder in which to place this message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Copy Message&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Copy the selected  message to another folder.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;VFolder on Subject&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       This item, and the three that follow it, will create vFolders </div><div class='del'>-               which you may customize further or save as-is. This one will</div><div class='del'>-               create a vFolder which will display all messages that contain the </div><div class='del'>-               subject line of the selected message.                </div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;VFolder on Sender&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Creates a vFolder to hold all messages from the sender of</div><div class='del'>-               the selected message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;VFolder on Recipients&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Creates a VFolder to hold all messages addressed to the </div><div class='del'>-               recipient of the selected message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Filter on Subject&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       This item, and the three that follow it, will create Filters </div><div class='del'>-               for which you must select actions.  You may keep the criteria as </div><div class='del'>-               they are, or alter them as you wish. This one will</div><div class='del'>-               create a filter which will affect all messages that contain the </div><div class='del'>-               subject line of the selected message.                </div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Filter on Sender&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Creates a filter which affects all messages from the sender of</div><div class='del'>-               the selected message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Filter on Recipients&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Creates a filter which will affect all messages addressed to the </div><div class='del'>-               recipient of the selected message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="menuref-mail-editor"&gt;</div><div class='del'>-    &lt;title&gt;The Message Composer Menus&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The message composition window has its own set of menus:</div><div class='del'>-      &lt;guimenu&gt;File&lt;/guimenu&gt;, which controls operations on files and</div><div class='del'>-      data, &lt;guimenu&gt;Edit&lt;/guimenu&gt;, for text editing,</div><div class='del'>-      &lt;guimenu&gt;Format&lt;/guimenu&gt;, which controls the file format of</div><div class='del'>-      messages you send, &lt;guimenu&gt;View&lt;/guimenu&gt;, to set how you view</div><div class='del'>-      the message, and &lt;guimenu&gt;Insert&lt;/guimenu&gt;, which holds tools</div><div class='del'>-      for embedding files and other items in messages.  Here's what's in them:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;sect2 id="menuref-mail-editor-file"&gt;</div><div class='del'>-      &lt;title&gt;The Message Composer's File Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenu&gt;Open&lt;/guimenu&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		 Open a text file or a draft mail message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenu&gt;Save&lt;/guimenu&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		 Save a mail message as a text file.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenu&gt;Save As&lt;/guimenu&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt; </div><div class='del'>-		Choose a file name and location for</div><div class='del'>-		a message you want to save as a text file.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenu&gt;Save in Folder&lt;/guimenu&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		 Save a message as a draft, rather than </div><div class='del'>-		 as a separate text file.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenu&gt;Insert Text File&lt;/guimenu&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		   Open a text file and insert it into </div><div class='del'>-		   the current message. (FIXME: belongs under "Insert").</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	  </div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenu&gt;Send Now&lt;/guimenu&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		  Sends the message immediately.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenu&gt;Send Later&lt;/guimenu&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		  Queue </div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenu&gt;Close&lt;/guimenu&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-		 Closes the message composer.  If you have not done so, </div><div class='del'>-		 &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-		 will ask you if you want to save your message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="menuref-mail-editor-edit"&gt;</div><div class='del'>-      &lt;title&gt;The Message Composer's Edit Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-          The &lt;guimenu&gt;Edit&lt;/guimenu&gt; menu in the message composer</div><div class='del'>-          contains the following items.  Keyboard shortcuts are listed</div><div class='del'>-          next to the items in the menus themselves.</div><div class='del'>-</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Undo&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                Undoes the last action you performed.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-    	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Redo&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               If you change your mind about Undoing something, </div><div class='del'>-               you can always use this item.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Cut&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                Removes the selected text from the text entry window and </div><div class='del'>-                retains it in the system "clipboard" memory, ready for pasting.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Copy&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Copies selected text to the system clipboard without deleting it.</div><div class='del'>-              The text can then be inserted elsewhere with the </div><div class='del'>-              &lt;guimenuitem&gt;Paste&lt;/guimenuitem&gt; command.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Paste&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                Inserts the contents of the system clipboard at the </div><div class='del'>-                location of the cursor.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Find&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               Enter a phrase and find your match in your message body.</div><div class='del'>-               As with &lt;guimenuitem&gt;Find Regex&lt;/guimenuitem&gt;, </div><div class='del'>-               &lt;guimenuitem&gt;Find Again&lt;/guimenuitem&gt;, and</div><div class='del'>-               &lt;guimenuitem&gt;Replace&lt;/guimenuitem&gt;, &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-                will offer you the option to search forwards or backwards.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Find Regex&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               If you are familiar with &lt;glossterm&gt;regular expressions&lt;/glossterm&gt;,</div><div class='del'>-                often called "regexes," you can search for something more complicated, </div><div class='del'>-               using wildcards and boolean logic.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Find Again&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Repeats your last search.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Replace&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               Enter a word or phrase and the word or phrase with which you'd like</div><div class='del'>-               to replace it.  </div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Properties&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               This item brings up the Message Composer Properties Capplet, </div><div class='del'>-               a portion of the GNOME Control Center that determines the </div><div class='del'>-               key bindings for the message composer.  Help for this capplet is </div><div class='del'>-               available directly from the Control Center.</div><div class='del'>-               (FIXME: Write that help doc too) (FIXME: this is in the wrong place!)</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="menuref-mail-composer-format"&gt;</div><div class='del'>-      &lt;title&gt;The Message Composer's Format Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt; </div><div class='del'>-        The &lt;guimenu&gt;Format&lt;/guimenu&gt; menu has only one item:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;HTML&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                 Toggles HTML mode for the message composer.  When selected, </div><div class='del'>-                 the message is displayed and sent in HTML.  If you have written a </div><div class='del'>-                 message in HTML and turn HTML off, most formatting will be lost.</div><div class='del'>-                 &lt;application&gt;Evolution&lt;/application&gt; will attempt to preserve spacing</div><div class='del'>-                 and to remove formatting gracefully, however.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="menuref-mail-composer-view"&gt;</div><div class='del'>-      &lt;title&gt;The Message Composer's View Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;guimenu&gt;View&lt;/guimenu&gt; menu controls the way messages are</div><div class='del'>-        displayed, and how much of the message, its headers, and</div><div class='del'>-        attachments appear.  It contains:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Show Attachments&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; </div><div class='del'>-              Toggles the display of attachments.  When this item is selected,</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; will create a separate pane</div><div class='del'>-              of the composition window to show what attachments you are appending</div><div class='del'>-              to the message. </div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="menuref-mail-composer-insert"&gt;</div><div class='del'>-      &lt;title&gt;The Message Composer's Insert Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;guimenu&gt;Insert&lt;/guimenu&gt; menu holds tools that allow you</div><div class='del'>-        to include images, horizontal rules, and other objects</div><div class='del'>-        in the body of your message. The tools are:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Image&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; </div><div class='del'>-               This tool will prompt you to select an image file to </div><div class='del'>-               insert into your HTML message.  For text messages, this</div><div class='del'>-               is the same as attaching an image file.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Link&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; </div><div class='del'>-               Opens the &lt;interface&gt;link creation window&lt;/interface&gt;, </div><div class='del'>-               which lets you specify the URL and text description</div><div class='del'>-               for a link in your message.  This only works with HTML </div><div class='del'>-               messages.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Rule&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;    </div><div class='del'>-             Opens the&lt;interface&gt; horizontal rule creation dialog&lt;/interface&gt;, which lets you</div><div class='del'>-	     create an HTML horizontal rule.  For more information,</div><div class='del'>-	     see &lt;xref linkend="usage-mail-getnsend-send-html"&gt;.</div><div class='del'>-             This tool only works with HTML messages.</div><div class='del'>-	     &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Text File&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	       Open a text file and insert it into the current message.</div><div class='del'>-               This tool works with both plain text and HTML messages.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="menuref-cal"&gt;</div><div class='del'>-    &lt;title&gt;The Calendar Menus&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The Main window of the calendar has the same menus as the main</div><div class='del'>-      window of the mail client.  However, their contents vary in a</div><div class='del'>-      number of ways.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;sect2 id="menuref-cal-edit"&gt;</div><div class='del'>-      &lt;title&gt;The Calendar Edit Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         The contents of the Edit menu are currently so borked that I</div><div class='del'>-         refuse to document them right now. (That means FIXME). They</div><div class='del'>-         should be:</div><div class='del'>-</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Item&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Description</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Item&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Description</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Item&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Description</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="menuref-cal-view"&gt;</div><div class='del'>-      &lt;title&gt;The Calendar View Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The Calendar's &lt;guimenu&gt;View&lt;/guimenu&gt; menu contains the following items:</div><div class='del'>-</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Show Shortcut Bar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Toggle the Shortcut Bar on and off with this item.              </div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Show Folder Bar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Toggle the folder bar on and off with this item. </div><div class='del'>-             See &lt;xref linkend="usage-mainwindow-folderbar"&gt; for </div><div class='del'>-             more information about the folder bar.     </div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-		  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;View By Day&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Switch to the day view for your calendar.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;	  </div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;View Five Days&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             View five calendar days at once. </div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;	  </div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;View by Week&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Switch the calendar view to full week mode.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;View By Month&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Look at a month at a time.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-cal-settings"&gt;</div><div class='del'>-      &lt;title&gt;The Calendar Settings Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu is empty.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="menuref-cal-editor"&gt;</div><div class='del'>-    &lt;title&gt;The Appointment Editor Menus&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-    The appointment editor has its own menus, to help you use its</div><div class='del'>-    wide-ranging abilities.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;sect2 id="menuref-cal-editor-file"&gt;</div><div class='del'>-      &lt;title&gt;The Appointment Editor's File Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu contains several items, including a &lt;guisubmenu&gt;New&lt;/guisubmenu&gt; submenu</div><div class='del'>-         that is identical to that in the </div><div class='del'>-         &lt;link linkend="menuref-universal-file"&gt;main window's file menu&lt;/link&gt;.</div><div class='del'>-         Its other contents are:</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Send&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Opens a mail message with the appointment attached to it.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Save&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Save this appointment in the existing location and name. If you have not yet</div><div class='del'>-              chosen a location and name, this is the same as &lt;guimenuitem&gt;Save As&lt;/guimenuitem&gt;.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Save As&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Choose a location and name for this appointment, and save it.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Delete&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Deletes the appointment.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Move to Folder&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Chose a folder, and move the appointment into it.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Copy to Folder&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Chose a folder, and put a copy of the appointment into it.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Page Setup Submenu&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             This menu contains two items:</div><div class='del'>-                &lt;itemizedlist&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                   &lt;guimenuitem&gt;Memo Style&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-                    FIXME: What does this do?</div><div class='del'>-                   &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guimenuitem&gt;Define Print Styles&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-                    FIXME: What does this do?</div><div class='del'>-                  &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		&lt;/itemizedlist&gt;</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Print Preview&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; Shows you what your appointment will look</div><div class='del'>-	    like if you print it. See &lt;xref linkend="usage-print"&gt;</div><div class='del'>-	    for details on printing and the Print Preview function.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Print&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Prints the appointment without preview.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Properties&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             FIXME: What does this do?</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Close&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Close the appointment editor window.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-cal-editor-edit"&gt;</div><div class='del'>-      &lt;title&gt;The Appointment Editor's Edit Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         FIXME: this menu is copied and pasted entirely from somewhere</div><div class='del'>-         else.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-cal-editor-view"&gt;</div><div class='del'>-      &lt;title&gt;The Appointment Editor's View Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu allows you to look at different appointments, and</div><div class='del'>-         set the way you look at them, without having to move back to</div><div class='del'>-         the &lt;interface&gt;Main Window&lt;/interface&gt;. It contains:</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guisubmenu&gt;Previous&lt;/guisubmenu&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               The items in this submenu will take you to appointments</div><div class='del'>-               prior to the current one. (FIXME: describe).</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guisubmenu&gt;Next&lt;/guisubmenu&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               The items in this submenu will take you to appointments</div><div class='del'>-               scheduled to occur after the current one. (FIXME: describe).</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Calendar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               FIXME: What does this item do?</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guisubmenu&gt;Toolbars&lt;/guisubmenu&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             The &lt;guisubmenu&gt;Toolbars&lt;/guisubmenu&gt; submenu </div><div class='del'>-             allows you to choose which toolbars</div><div class='del'>-             are displayed in the </div><div class='del'>-             &lt;interface&gt;Appointment Editor&lt;/interface&gt;. They are:</div><div class='del'>-             &lt;itemizedlist&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guimenuitem&gt;Standard&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-                    Toggle the standard toolbar on and off.</div><div class='del'>-                   &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guimenuitem&gt;Formatting&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-                    Toggle the formatting toolbar on and off.</div><div class='del'>-                   &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                    &lt;guimenuitem&gt;Customize&lt;/guimenuitem&gt; &amp;mdash;</div><div class='del'>-                    Select the contents of the formatting and standard toolbars.</div><div class='del'>-                   &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		&lt;/itemizedlist&gt;</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-cal-editor-insert"&gt;</div><div class='del'>-      &lt;title&gt;The Appointment Editor's Insert Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This menu contains: (FIXME: Insert Content Here)</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;File&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Choose a file to append to your appointment or appointment request.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Item&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             FIXME: ?</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Object&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             FIXME: ?</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-cal-editor-format"&gt;</div><div class='del'>-      &lt;title&gt;The Appointment Editor's Format Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu contains two items, neither of which</div><div class='del'>-         have any functionality yet:</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Font&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             FIXME: ?</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Paragraph&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             FIXME: ?</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-cal-editor-tools"&gt;</div><div class='del'>-      &lt;title&gt;The Appointment Editor's Tools Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu contains four items, including the</div><div class='del'>-         &lt;guisubmenu&gt;Forms&lt;/guisubmenu&gt; submenu, which allows you to</div><div class='del'>-         alter calendar forms and create your own entries.  None of</div><div class='del'>-         this works yet, though.</div><div class='del'>-</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Spelling&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Checks the spelling of your calendar entry.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Check Names&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; Checks the names listed here against</div><div class='del'>-	    those in your address book.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Address Book&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             FIXME: ?</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guisubmenu&gt;Forms&lt;/guisubmenu&gt; Submenu&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               The Forms submenu lets you alter the</div><div class='del'>-	       appearance of Calendar Forms. </div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-cal-editor-actions"&gt;</div><div class='del'>-      &lt;title&gt;The Appointment Editor's Actions Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This menu contains:</div><div class='del'>-</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Schedule Meeting&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Brings up the &lt;interface&gt;Meeting Invitation&lt;/interface&gt; window, </div><div class='del'>-              described in &lt;xref linkend="usage-calendar-apts"&gt;.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Cancel Invitation&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Cancels the event, notifying all attendees.  You may be prompted </div><div class='del'>-              to specify an invitation message.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Forward as vCalendar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Opens the message composer with the current event attached.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Forward as Text&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Opens the message composer with a text description of the current</div><div class='del'>-              event included in the message body.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-cal-editor-help"&gt;</div><div class='del'>-      &lt;title&gt;The Appointment Editor's File Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu is empty.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1&gt;</div><div class='del'>-    &lt;title&gt;Contact Manager Menus&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     The contact manager has six menus: &lt;guimenu&gt;File&lt;/guimenu&gt;,</div><div class='del'>-     &lt;guimenu&gt;Edit&lt;/guimenu&gt;, &lt;guimenu&gt;View&lt;/guimenu&gt;,</div><div class='del'>-     &lt;guimenu&gt;Setting&lt;/guimenu&gt;s, &lt;guimenu&gt;Tools&lt;/guimenu&gt;, and</div><div class='del'>-     &lt;guimenu&gt;Help&lt;/guimenu&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-contact-edit"&gt;</div><div class='del'>-      &lt;title&gt;Contact Manager Edit Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu is empty.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="menuref-contact-view"&gt;</div><div class='del'>-      &lt;title&gt;Contact Manager View Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This menu contains the following items:</div><div class='del'>-</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Show Shortcut Bar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Toggle the Shortcut Bar on and off with this item.              </div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Show Folder Bar&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Toggle the folder bar on and off with this item. </div><div class='del'>-             See &lt;xref linkend="usage-mainwindow-folderbar"&gt; for </div><div class='del'>-             more information about the folder bar.     </div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-		  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;As Table&lt;/guimenuitem&gt; / &lt;guimenuitem&gt;As Minicards&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             View your contacts as a table.  </div><div class='del'>-             When in table-view mode, this menu item reads </div><div class='del'>-             &lt;guimenuitem&gt;As Minicards&lt;/guimenuitem&gt;, and changes the view</div><div class='del'>-             back to the minicard format.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;	  </div><div class='del'>-	&lt;/variablelist&gt;      </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-   &lt;sect2 id="menuref-contact-tools"&gt;</div><div class='del'>-      &lt;title&gt;Contact Manager Tools Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu contains one item:</div><div class='del'>-</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;Search for</div><div class='del'>-	    Contacts&lt;/guimenuitem&gt;&lt;/term&gt; &lt;listitem&gt;&lt;para&gt; Brings up</div><div class='del'>-	    the in-depth search window. &lt;xref</div><div class='del'>-	    linkend="contact-search"&gt; describes how to use this</div><div class='del'>-	    feature.  &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-            &lt;/varlistentry&gt;</div><div class='del'>-        &lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   &lt;sect2 id="menuref-contact-actions"&gt;</div><div class='del'>-      &lt;title&gt;Contact Manager Tools Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu contains only one item:</div><div class='del'>-</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guimenuitem&gt;New Directory Server&lt;/guimenuitem&gt;&lt;/term&gt; &lt;listitem&gt;&lt;para&gt; Brings up</div><div class='del'>-	    the in-depth search window. &lt;xref</div><div class='del'>-	    linkend="config-prefs-contact-ldap-add"&gt; describes how to use this</div><div class='del'>-	    feature.  &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-            &lt;/varlistentry&gt;</div><div class='del'>-        &lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="menuref-contact-editor"&gt;</div><div class='del'>-    &lt;title&gt;The Contact Editor Menus&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       This window has only one menu: the file menu.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   </div><div class='del'>-   &lt;sect2 id="menuref-contact-editor-file"&gt;</div><div class='del'>-      &lt;title&gt;Contact Editor File Menu&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         This menu contains five items:</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Save&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             </div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;	</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Save As&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Allows you to save the contact as an external </div><div class='del'>-              file in the &lt;glossterm linkend="vcard"&gt;VCard&lt;/glossterm&gt; format. </div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;	</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Print&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Prints the current contact.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;	</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Delete&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Deletes the current contact.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;	</div><div class='del'>-</div><div class='del'>-  </div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guimenuitem&gt;Close&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Closes the Contact Editor without saving.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;	</div><div class='del'>-</div><div class='del'>-	&lt;/variablelist&gt;  </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  </div><div class='del'>-</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/preface.sgml b/doc/C/preface.sgml<br/>deleted file mode 100644<br/>index 2987dd7988..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/preface.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/preface.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,427 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>-&lt;!DOCTYPE preface PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-  &lt;preface id="introduction"&gt;</div><div class='del'>-&lt;!-- =============Introduction ============================= --&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt; </div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="what"&gt; </div><div class='del'>-      &lt;title&gt;What is Evolution, and What Can It Do for Me?&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Information is useless unless it's organized and accessible;</div><div class='del'>-        it's hardly even worth the name if you can't look at it and be</div><div class='del'>-        &lt;emphasis&gt;informed&lt;/emphasis&gt;.</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt;'s goal is to make the</div><div class='del'>-        tasks of storing, organizing, and retrieving information</div><div class='del'>-        easier, so you can work and communicate with others.  That is,</div><div class='del'>-        it's a highly evolved &lt;glossterm</div><div class='del'>-        linkend="groupware"&gt;groupware&lt;/glossterm&gt; program, an integral</div><div class='del'>-        part of the Internet-connected desktop. On the inside, it's a</div><div class='del'>-        powerful database; on the outside, it's a tool to help you get</div><div class='del'>-        your work done.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Because it's part of the GNOME project,</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; is free software.  The</div><div class='del'>-        program and its source code are released under the terms of</div><div class='del'>-        the &lt;ulink type="help" url="gnome-help:gpl"&gt;&lt;citetitle&gt;GNU</div><div class='del'>-        Public License (GPL)&lt;/citetitle&gt;&lt;/ulink&gt;, and the</div><div class='del'>-        documentation falls under the &lt;ulink type="help"</div><div class='del'>-        url="gnome-help:fdl"&gt;&lt;citetitle&gt;Free Documentation</div><div class='del'>-        License&lt;/citetitle&gt;&lt;/ulink&gt; (FDL). For more information about</div><div class='del'>-        the GPL and the FDL, visit the Free Software Foundation's</div><div class='del'>-        website at &lt;ulink</div><div class='del'>-        url="http://www.fsf.org"&gt;http://www.fsf.org&lt;/ulink&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;note&gt;</div><div class='del'>-           &lt;title&gt;This is a preview release&lt;/title&gt;</div><div class='del'>-           &lt;para&gt;</div><div class='del'>-             &lt;application&gt;Evolution&lt;/application&gt; is not complete, and</div><div class='del'>-             still has a lot of flaws.  Please help improve it by</div><div class='del'>-             letting us know about them.  You should do this by</div><div class='del'>-             submitting bug reports with the GNOME &lt;application&gt;Bug</div><div class='del'>-             Report Tool&lt;/application&gt; (known as</div><div class='del'>-             &lt;command&gt;bug-buddy&lt;/command&gt; at the command line).</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-        &lt;/note&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; can help you work in a</div><div class='del'>-        group, by handling email, address and other contact</div><div class='del'>-        information, and one or more calendars.  It can do that on one</div><div class='del'>-        or several computers, connected directly or over a network,</div><div class='del'>-        for one person or for large groups.</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; can handle almost all</div><div class='del'>-        your communications and information management tasks with the</div><div class='del'>-        power and flexibility of the GNOME desktop environment.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;application&gt;Evolution&lt;/application&gt; project has four</div><div class='del'>-        central goals:</div><div class='del'>-</div><div class='del'>-        &lt;itemizedlist&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-             The application must be &lt;emphasis&gt;both powerful and easy</div><div class='del'>-             to use&lt;/emphasis&gt;. That means a familiar and intuitive</div><div class='del'>-             interface that users can customize to their liking, and</div><div class='del'>-             the development of shortcuts for complex tasks.</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'>-              &lt;application&gt;Evolution&lt;/application&gt; must meet and</div><div class='del'>-              exceed the standards set by other groupware products.</div><div class='del'>-              It must include support for major network &lt;glossterm</div><div class='del'>-              linkend="protocol"&gt;protocols&lt;/glossterm&gt; so that it can</div><div class='del'>-              integrate seamlessly with existing hardware and network</div><div class='del'>-              environments.</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'>-               The project must support open standards and be open to</div><div class='del'>-               expansion, so that it can become a development platform</div><div class='del'>-               as well as an application.  From the simplest scripting</div><div class='del'>-               to the most complex network and component programming,</div><div class='del'>-               &lt;application&gt;Evolution&lt;/application&gt; must offer</div><div class='del'>-               developers an environment for cutting-edge application</div><div class='del'>-               development.</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'>-               Data must be safe: &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-               must not lose mail, corrupt mailbox files or other</div><div class='del'>-               data, execute arbitrary &lt;glossterm linkend="script"&gt;scripts&lt;/glossterm&gt;,</div><div class='del'>-               or delete files from your hard disk.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; is designed to make most</div><div class='del'>-        daily tasks faster.  For example, it takes only one or two</div><div class='del'>-        clicks to enter an appointment or an address card sent to you</div><div class='del'>-        by email, or to send email to a contact or appointment.</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; makes displays faster and</div><div class='del'>-        more efficient, so searches are faster and memory usage is</div><div class='del'>-        lower.  People who get lots of mail will appreciate advanced</div><div class='del'>-        features like &lt;link</div><div class='del'>-        linkend="usage-mail-organize-vFolders"&gt;vFolders&lt;/link&gt;, which</div><div class='del'>-        let you save searches as though they were ordinary mail</div><div class='del'>-        folders.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="aboutbook"&gt;</div><div class='del'>-      &lt;title&gt;About This Book&lt;/title&gt;</div><div class='del'>-    &lt;!-- ************** FOLLOWING PARAGRAPH FOR DRAFT ONLY ************* --&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This version of the &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-        User's Guide is a &lt;emphasis&gt;draft&lt;/emphasis&gt;. It describes</div><div class='del'>-        version 0.6 of the software.  It is missing huge</div><div class='del'>-        chunks of information, and many of the features it describes</div><div class='del'>-        are unimplemented.  All the content is subject to change,</div><div class='del'>-        especially if you help.  Please send comments on the guide to</div><div class='del'>-        &lt;email&gt;aaron@helixcode.com&lt;/email&gt;. If you would like to work</div><div class='del'>-        on the guide please contact me or see the GNOME Documentation</div><div class='del'>-        project &lt;ulink</div><div class='del'>-        url="http://developer.gnome.org/projects/gdp"&gt;web</div><div class='del'>-        site&lt;/ulink&gt;.  This paragraph will be removed in later</div><div class='del'>-        versions of the manual.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;!-- ************* END DRAFT ONLY PARAGRAPH ************** --&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This book is divided into two parts, with several</div><div class='del'>-        appendices. The first part is a &lt;link linkend="usage"&gt;guided</div><div class='del'>-        tour&lt;/link&gt;&amp;mdash; it will explain how to use</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt;.  If you are new to</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; or to groupware in</div><div class='del'>-        general, this is the section for you. The second section,</div><div class='del'>-        covering &lt;link linkend="config"&gt;configuration&lt;/link&gt;, is</div><div class='del'>-        targeted at more advanced users, but anyone who wants to</div><div class='del'>-        change the way &lt;application&gt;Evolution&lt;/application&gt; looks or</div><div class='del'>-        acts can benefit from reading it.  In addition, there is a</div><div class='del'>-        comprehensive &lt;link linkend="menuref"&gt;menu</div><div class='del'>-        reference&lt;/link&gt; which describes nearly every capability that</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; has to offer.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;formalpara&gt;</div><div class='del'>-        &lt;title&gt;Typographical conventions&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          Some kinds of words are marked off with special typography:</div><div class='del'>-          &lt;simplelist&gt;</div><div class='del'>-	    &lt;member&gt;&lt;application&gt;Applications&lt;/application&gt;&lt;/member&gt;</div><div class='del'>-	    &lt;member&gt;&lt;command&gt;Commands&lt;/command&gt; typed at the command line&lt;/member&gt;</div><div class='del'>-	    &lt;member&gt;&lt;guilabel&gt;Labels&lt;/guilabel&gt; for interface items&lt;/member&gt;</div><div class='del'>-</div><div class='del'>-            &lt;member&gt; Menu selections look like this:</div><div class='del'>-                       &lt;menuchoice&gt;</div><div class='del'>-                          &lt;guimenu&gt;Menu&lt;/guimenu&gt;</div><div class='del'>-                          &lt;guisubmenu&gt;Submenu&lt;/guisubmenu&gt; </div><div class='del'>-                          &lt;guimenuitem&gt;Menu Item&lt;/guimenuitem&gt;</div><div class='del'>-                     &lt;/menuchoice&gt;</div><div class='del'>-            &lt;/member&gt;</div><div class='del'>-	    &lt;member&gt;&lt;guibutton&gt;Buttons&lt;/guibutton&gt; you can</div><div class='del'>-            click&lt;/member&gt; &lt;member&gt;&lt;userinput&gt;Anything you type</div><div class='del'>-            in&lt;/userinput&gt;&lt;/member&gt; &lt;member&gt;&lt;computeroutput&gt;Text</div><div class='del'>-            output from a computer&lt;/computeroutput&gt;&lt;/member&gt;</div><div class='del'>-            &lt;member&gt;&lt;glossterm linkend="apx-gloss"&gt;Words&lt;/glossterm&gt;</div><div class='del'>-            that are defined in the &lt;xref linkend="apx-gloss"&gt;.&lt;/member&gt;</div><div class='del'>-	  &lt;/simplelist&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/formalpara&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="commontasks"&gt;</div><div class='del'>-    &lt;title&gt;Quick Reference for Common Tasks&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        You might want to get a copy of this section and tape it to</div><div class='del'>-        the wall next to your computer: it's a very short summary of</div><div class='del'>-        most of the things you'll want to do with</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt;, and pointers to the</div><div class='del'>-        sections of the book where you'll find more in-depth</div><div class='del'>-        description of those tasks.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;sect2 id="quickref-newthings"&gt;</div><div class='del'>-      &lt;title&gt;Opening or Creating Anything&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         Here are the keyboard shortcuts and menu items you're most</div><div class='del'>-         likely to use: (Please note that the shortcuts listed are</div><div class='del'>-         probably wrong at this point).</div><div class='del'>-         </div><div class='del'>-          &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Create a new folder&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                &lt;menuchoice&gt;&lt;guimenu&gt;File&lt;/guimenu&gt;&lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-                &lt;guimenuitem&gt;Folder&lt;/guimenuitem&gt;&lt;/menuchoice&gt; or</div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;Ctrl&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;Shift &lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;F&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Create a new Shortcut in the Evolution Bar&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;       </div><div class='del'>-                  &lt;menuchoice&gt;&lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-		  &lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-		  &lt;guimenuitem&gt;Evolution Bar Shortcut&lt;/guimenuitem&gt; &lt;/menuchoice&gt; or </div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;Ctrl&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;Shift&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;S&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Create a new email message:&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                Use</div><div class='del'>-                &lt;menuchoice&gt;&lt;guimenu&gt;File&lt;/guimenu&gt;&lt;guisubmenu&gt;New&lt;/guisubmenu&gt;&lt;guimenuitem&gt;Mail</div><div class='del'>-                Message&lt;/guimenuitem&gt;  &lt;/menuchoice&gt; or </div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;Ctrl&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;Shift &lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;M&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Create a new Appointment&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;       </div><div class='del'>-                  &lt;menuchoice&gt;&lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-		  &lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-		  &lt;guimenuitem&gt;Appointment&lt;/guimenuitem&gt; &lt;/menuchoice&gt;  or </div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;Ctrl&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;Shift&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;A&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Create a new Task&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;       </div><div class='del'>-                  &lt;menuchoice&gt;&lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-		  &lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-		  &lt;guimenuitem&gt;Task&lt;/guimenuitem&gt;  &lt;/menuchoice&gt; or </div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;Ctrl&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;Shift&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;T&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Enter a new Contact&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;       </div><div class='del'>-                  &lt;menuchoice&gt;&lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-		  &lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-		  &lt;guimenuitem&gt;Contact&lt;/guimenuitem&gt; &lt;/menuchoice&gt;  or </div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;Ctrl&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;Shift&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;C&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt; </div><div class='del'>-    &lt;sect2 id="quickref-mail"&gt;</div><div class='del'>-      &lt;title&gt;Mail Tasks&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Here are the most frequent email tasks, and shortcuts for navigating your mailbox with the keyboard instead of the mouse:</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Check Mail&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                Click &lt;guibutton&gt;Get Mail&lt;/guibutton&gt; in the toolbar, or press </div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-          &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Reply to a Message&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                Select the message to which you want to reply, and</div><div class='del'>-                click &lt;guibutton&gt;Reply&lt;/guibutton&gt; in the</div><div class='del'>-                toolbar, or press</div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  </div><div class='del'>-          &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Forward a Message&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                Select the message you want to forward, and</div><div class='del'>-                click &lt;guibutton&gt;Forward&lt;/guibutton&gt; in the</div><div class='del'>-                toolbar, or press</div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;FIXME&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-          &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Open a Message in a New Window&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                Double-click the message you want to view, or press</div><div class='del'>-                &lt;keycombo action="simul"&gt;</div><div class='del'>-		  &lt;keycap&gt;Ctrl&lt;/keycap&gt;</div><div class='del'>-		  &lt;keycap&gt;O&lt;/keycap&gt;</div><div class='del'>-                &lt;/keycombo&gt;</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-          &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;Create Filters and vFolders&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                You can create filters and vFolders based on specific</div><div class='del'>-                message attributes by right-clicking on a message or</div><div class='del'>-                by selecting &lt;menuchoice&gt; &lt;guimenu&gt;Tools&lt;/guimenu&gt;</div><div class='del'>-                &lt;guimenuitem&gt;Mail Filters&lt;/guimenuitem&gt; &lt;/menuchoice&gt;</div><div class='del'>-                or &lt;menuchoice&gt; &lt;guimenu&gt;Tools&lt;/guimenu&gt;</div><div class='del'>-                &lt;guimenuitem&gt;vFolder Editor&lt;/guimenuitem&gt;</div><div class='del'>-                &lt;/menuchoice&gt;.  Filters are discussed in &lt;xref</div><div class='del'>-                linkend="usage-mail-organize-filters"&gt;, and vFolders</div><div class='del'>-                in &lt;xref linkend="usage-mail-organize-vfolders"&gt;.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-      &lt;sect2 id="quickref-cal"&gt;</div><div class='del'>-        &lt;title&gt;Calendar&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-      &lt;sect2 id="quickref-contact"&gt;</div><div class='del'>-        &lt;title&gt;Contact Manager&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-  &lt;/preface&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/usage-calendar.sgml b/doc/C/usage-calendar.sgml<br/>deleted file mode 100644<br/>index 72f278a424..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/usage-calendar.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/usage-calendar.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,367 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>-&lt;!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="usage-calendar"&gt;</div><div class='del'>-  &lt;title&gt;The Evolution Calendar&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    To begin using the calendar, select</div><div class='del'>-    &lt;guibutton&gt;Calendar&lt;/guibutton&gt; from the &lt;interface&gt;shortcut</div><div class='del'>-    bar&lt;/interface&gt;.  By default, the calendar starts showing today's</div><div class='del'>-    schedule on a grey and white ruled background.  At the upper</div><div class='del'>-    right, there's a monthly calendar you can use to switch days.</div><div class='del'>-    Below that, there's a &lt;guilabel&gt;TaskPad&lt;/guilabel&gt;, where you can</div><div class='del'>-    keep a sort of glorified to-do list that's not linked to your</div><div class='del'>-    calendar.  The calendar's daily view is shown in &lt;xref</div><div class='del'>-    linkend="usage-calendar-fig"&gt;.</div><div class='del'>-</div><div class='del'>-   &lt;!-- ============== Figure ============================= --&gt;</div><div class='del'>-    &lt;figure id="usage-calendar-fig"&gt;</div><div class='del'>-      &lt;title&gt;Evolution Calendar View&lt;/title&gt;</div><div class='del'>-      &lt;screenshot&gt;</div><div class='del'>-	&lt;screeninfo&gt;Evolution Contact Manager Window&lt;/screeninfo&gt;</div><div class='del'>-	&lt;graphic fileref="fig/calendar" format="png" srccredit="Aaron Weber"&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;!-- ============== End of Figure ============================= --&gt; </div><div class='del'>-</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-    &lt;sect1 id ="usage-calendar-view"&gt; </div><div class='del'>-    &lt;title&gt;Ways of Looking at your Calendar&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       You can view your calendar by the day, by the week, by the</div><div class='del'>-       month, or by the year; press the calendar-shaped buttons on the</div><div class='del'>-       right side of the toolbar to switch between views.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       To view yesterday's appointments, &amp;mdash;last week's, if you're in</div><div class='del'>-       the weekly view, and last month's for the monthly view&amp;mdash; click</div><div class='del'>-       the &lt;guibutton&gt;Prev&lt;/guibutton&gt; button.  For tomorrow, next week,</div><div class='del'>-       or next month, click &lt;guibutton&gt;Next&lt;/guibutton&gt;, and of course,</div><div class='del'>-       click &lt;guibutton&gt;Today&lt;/guibutton&gt; for today.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       To visit a specific date's calendar entries, click</div><div class='del'>-       &lt;guibutton&gt;Go To&lt;/guibutton&gt; and select the date in the dialog</div><div class='del'>-       box that appears.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ############### FIXME FIXME FIXME ############</div><div class='del'>-Feature not yet implemented, and may not be implemented due to</div><div class='del'>-lack of time, resources, and interest.</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       In addition, &lt;application&gt;Evolution&lt;/application&gt; supports</div><div class='del'>-       Hebrew, Muslim, and other calendar formats.  To switch to a</div><div class='del'>-       different calendar format, choose</div><div class='del'>-       &lt;guimenuitem&gt;GUIMENUITEM&lt;/guimenuitem&gt; from the</div><div class='del'>-       &lt;guimenu&gt;GUIMENU&lt;/guimenu&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-################  END FIXME AREA   ##################   --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="usage-calendar-apts"&gt;</div><div class='del'>-    &lt;title&gt;Scheduling With the Evolution Calendar&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       The &lt;application&gt;Evolution&lt;/application&gt; calendar allows you to</div><div class='del'>-       schedule events for yourself or a group of people.  It can</div><div class='del'>-       handle events that repeat, event lengths from ten minutes to</div><div class='del'>-       multiple days, and events that have a date but no specific</div><div class='del'>-       time.  Of course, you can also set event reminders and alarms</div><div class='del'>-       so that you don't forget about everything you've just put into</div><div class='del'>-       your calendar. From office or family to office</div><div class='del'>-       &lt;emphasis&gt;and&lt;/emphasis&gt; family,</div><div class='del'>-       &lt;application&gt;Evolution&lt;/application&gt; can handle the schedule.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;sect2 id="usage-calendar-apts-basic"&gt;</div><div class='del'>-      &lt;title&gt;Creating events&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	To create a new calendar event, select</div><div class='del'>-        &lt;menuchoice&gt;</div><div class='del'>-	  &lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-	  &lt;guisubmenu&gt;New&lt;/guisubmenu&gt; </div><div class='del'>-	  &lt;guimenuitem&gt;Appointment&lt;/guimenuitem&gt;</div><div class='del'>-	&lt;/menuchoice&gt;</div><div class='del'>-	or click the &lt;guibutton&gt;New&lt;/guibutton&gt; button on the left end</div><div class='del'>-	of the toolbar. The &lt;interface&gt;New Appointment&lt;/interface&gt;</div><div class='del'>-	dialog will pop up with the usual menu bar, tool bar, and</div><div class='del'>-	window full of choices for you.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;tip id="new-appointment-shortcut"&gt;</div><div class='del'>-        &lt;title&gt;Shortcut&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-           If you don't need to enter more information than the date</div><div class='del'>-           and time of the appointment, you just click in any blank</div><div class='del'>-           space in the calendar and start typing. You can enter other</div><div class='del'>-           information later with the appointment editor.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/tip&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Your event must have a starting and ending date &amp;mdash; by</div><div class='del'>-        default, today &amp;mdash; but you can choose whether to give it</div><div class='del'>-        starting and ending times or to mark it as an &lt;guilabel&gt;All</div><div class='del'>-        day event&lt;/guilabel&gt;. An &lt;guilabel&gt;All day event&lt;/guilabel&gt;</div><div class='del'>-        appears at the top of a day's event list rather than inside</div><div class='del'>-        it.  That makes it easy to have events that overlap and fit</div><div class='del'>-        inside each other.  For example, a conference might be an all</div><div class='del'>-        day event, and the meetings at the conference would be timed</div><div class='del'>-        events.  Of course, events with specific starting and ending</div><div class='del'>-        times can also overlap.  When they do they're displayed as</div><div class='del'>-        multiple columns in the day view of the calendar.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;note&gt;</div><div class='del'>-       &lt;title&gt;Doing Two Things At Once&lt;/title&gt;</div><div class='del'>-         &lt;para&gt;</div><div class='del'>-           If you create calendar events that overlap,</div><div class='del'>-           &lt;application&gt;Evolution&lt;/application&gt; will display them side</div><div class='del'>-           by side in your calendar.  However,</div><div class='del'>-           &lt;application&gt;Evolution&lt;/application&gt; cannot help you do</div><div class='del'>-           multiple things at once.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-      &lt;/note&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         You can have as many as four different</div><div class='del'>-         &lt;guilabel&gt;Alarms&lt;/guilabel&gt;, any time prior to the event</div><div class='del'>-         you've scheduled.  You can have one alarm of each type:</div><div class='del'>-         &lt;variablelist&gt;</div><div class='del'>-           &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Display&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	        A window will pop up on your screen to remind you of</div><div class='del'>-	        your event.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt; </div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Audio&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	        Choose this to have your computer deliver a sound</div><div class='del'>-	        alarm.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Program&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	        Select this if you would like some additional application</div><div class='del'>-	        to run as a reminder.  You can enter its name in the</div><div class='del'>-	        text field, or find it with the</div><div class='del'>-	        &lt;guibutton&gt;Browse&lt;/guibutton&gt; button.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Mail&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	         &lt;application&gt;Evolution&lt;/application&gt; will send an</div><div class='del'>-	         email reminder to the address you enter into the text</div><div class='del'>-	         field.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-	    </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         &lt;guilabel&gt;Classification&lt;/guilabel&gt; is a little more</div><div class='del'>-         complicated, and only applies to calendars on a</div><div class='del'>-         network. &lt;guilabel&gt;Public&lt;/guilabel&gt; is the default category,</div><div class='del'>-         and a public event can be viewed by anyone on the calendar</div><div class='del'>-         sharing network.  &lt;guilabel&gt;Private&lt;/guilabel&gt; denotes one</div><div class='del'>-         level of security, and &lt;guilabel&gt;Confidential&lt;/guilabel&gt; a</div><div class='del'>-         higher level.  &lt;!-- FIXME --&gt; Exact determinations and implementations of</div><div class='del'>-         this feature have yet to be determined. &lt;!-- FIXME --&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;guilabel&gt;Recurrence&lt;/guilabel&gt; tab lets you describe</div><div class='del'>-        repetition in events ranging from once every day up to once</div><div class='del'>-        every 100 years.  You can then choose a time when repetition</div><div class='del'>-        will stop, and, under &lt;guilabel&gt;Exceptions&lt;/guilabel&gt;, pick</div><div class='del'>-        individual days when the event will &lt;emphasis&gt;not&lt;/emphasis&gt;</div><div class='del'>-        recur.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Once you're done with all those settings, click on the disk</div><div class='del'>-	icon in the toolbar.  That will save the event and close the</div><div class='del'>-	event editor window. If you want, you can alter an event</div><div class='del'>-	summary in the calendar view by clicking on it and typing. You</div><div class='del'>-	can change other settings by right-clicking on the event in</div><div class='del'>-	the and then choosing &lt;guimenuitem&gt;Edit this Appointment&lt;/guimenuitem&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ############UNIMPLEMENTED FEATURES ###################</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-calendar-apts-group"&gt;</div><div class='del'>-      &lt;title&gt;Appointments for Groups&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	If you have your calendar set up to work with other</div><div class='del'>-	calendars over a network, you can see when others are</div><div class='del'>-	available to meet with you. </div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;note&gt;</div><div class='del'>-	&lt;title&gt;Unimplemented Feature&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;This feature is not yet implemented.&lt;/para&gt;</div><div class='del'>-      &lt;/note&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	In addition, you can use &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	to mark a meeting request on another person's calendar.  To do</div><div class='del'>-	it, click &lt;guibutton&gt;New&lt;/guibutton&gt; in the calendar toolbar,</div><div class='del'>-	or select &lt;menuchoice&gt; &lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-	&lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-	&lt;guimenuitem&gt;Appointment&lt;/guimenuitem&gt; &lt;/menuchoice&gt; to bring</div><div class='del'>-	up the &lt;interface&gt;new event&lt;/interface&gt; window.  Then describe</div><div class='del'>-	the event as you would any other.  Before you click</div><div class='del'>-	&lt;guibutton&gt;OK&lt;/guibutton&gt;, (INSERT DESCRIPTION HERE...).</div><div class='del'>-	&lt;application&gt;Evolution&lt;/application&gt; will automatically send</div><div class='del'>-	email to each person on the request list, notifying of the</div><div class='del'>-	time and date of the meeting you have requested with them.  In</div><div class='del'>-	addition, it will mark the event on your calendar and on</div><div class='del'>-	theirs as tentative, rather than a confirmed, event.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	To mark a tentative event as confirmed, click once on the</div><div class='del'>-	event in the &lt;interface&gt;calendar view&lt;/interface&gt; to select</div><div class='del'>-	it, and then choose &lt;guimenuitem&gt;Event</div><div class='del'>-	Properties&lt;/guimenuitem&gt; from the &lt;guimenu&gt;Settings&lt;/guimenu&gt;</div><div class='del'>-	menu.  In the &lt;interface&gt;Event Properties&lt;/interface&gt; dialog</div><div class='del'>-	window, click the "tentative" button to De-select the</div><div class='del'>-	event.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-calendar-apts-privs"&gt;</div><div class='del'>-      &lt;title&gt;Scheduling privileges&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	There are several levels of scheduling privileges.  You</div><div class='del'>-	can set whether people can see your calendar, whether they</div><div class='del'>-	can request meetings or appointments, and whether they can</div><div class='del'>-	create appointments.  This section may have to be deleted,</div><div class='del'>-	because I don't know if we are going to support privileges</div><div class='del'>-	at all.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>- ########## END UNIMPLEMENTED FEATURESET ############ --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="usage-calendar-todo"&gt;</div><div class='del'>-   &lt;title&gt;The Task Pad&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       The Task Pad, located in the lower right corner of the</div><div class='del'>-       calendar, lets you keep a list of tasks separate from your</div><div class='del'>-       calendar events.  Tasks are colored and sorted by priority and</div><div class='del'>-       due-date (see &lt;xref linkend="config-prefs"&gt; for more</div><div class='del'>-       information), and are included with calendar data during</div><div class='del'>-       synchronization with a hand-held device.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       To record a new task, click the &lt;guibutton&gt;Add&lt;/guibutton&gt;</div><div class='del'>-       button below the list.  &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-       will pop up a small window with five items in it:</div><div class='del'>-     </div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt; &lt;guilabel&gt;Summary:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-            &lt;para&gt;</div><div class='del'>-              The description you enter here will appear in the To Do</div><div class='del'>-              list itself.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt; &lt;guilabel&gt;Due Date:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-            Decide when this item is</div><div class='del'>-            due.  You can either type in a date and time, or select one from</div><div class='del'>-            the &lt;guibutton&gt;Calendar&lt;/guibutton&gt; and time drop-down menus.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guilabel&gt;Priority:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-             Select a level of importance from 1 (most important) to 9</div><div class='del'>-              (least important).</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt; </div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt; &lt;guilabel&gt;Item Comments:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              If you wish, you can keep a more detailed description of</div><div class='del'>-              the item here.</div><div class='del'>-            &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-      &lt;/variablelist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       Once you've added a task to your to-do list, its summary</div><div class='del'>-       appears in the &lt;guilabel&gt;Summary&lt;/guilabel&gt; section of the</div><div class='del'>-       calendar window.  To view or edit a detailed description of an</div><div class='del'>-       item, double-click on it, or select it and click</div><div class='del'>-       &lt;guibutton&gt;Edit&lt;/guibutton&gt;.  You can delete items by selecting</div><div class='del'>-       them and clicking on the &lt;guibutton&gt;Delete&lt;/guibutton&gt; button.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="usage-calendar-multiple"&gt;</div><div class='del'>-    &lt;title&gt;Multiple Calendars&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       &lt;application&gt;Evolution&lt;/application&gt; permits you to have and</div><div class='del'>-       maintain multiple calendars.  This is useful if you maintain</div><div class='del'>-       schedules for other people, if you are responsible for resource</div><div class='del'>-       or room allocation, or if you have multiple personalities.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-   </div><div class='del'>-    &lt;example&gt;</div><div class='del'>-      &lt;title&gt;Keeping Multiple Calendars&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Keelyn. the office manager for a small company, has one</div><div class='del'>-        calendar for her own schedule.  On the local network, she</div><div class='del'>-        maintains one for the conference room, so people know when</div><div class='del'>-        they can schedule meetings.  Next to that, she maintains a</div><div class='del'>-        calendar that reflects when consultants are going to be on</div><div class='del'>-        site, and another that keeps track of when the Red Sox are</div><div class='del'>-        playing.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/example&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      To create a new calendar, select </div><div class='del'>-      &lt;menuchoice&gt;</div><div class='del'>-	&lt;guimenu&gt;File&lt;/guimenu&gt; &lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-	&lt;guimenuitem&gt;Calendar&lt;/guimenuitem&gt;</div><div class='del'>-      &lt;/menuchoice&gt;.</div><div class='del'>-       You can place the calendar in any calendar folder and access it</div><div class='del'>-       from the folder view.  Alarms, configuration, and display for</div><div class='del'>-       each calendar are separate from each other.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/usage-contact.sgml b/doc/C/usage-contact.sgml<br/>deleted file mode 100644<br/>index 21630cacb3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/usage-contact.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/usage-contact.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,617 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>-&lt;!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="usage-contact"&gt;</div><div class='del'>-  &lt;title&gt;The Evolution Contact Manager&lt;/title&gt;</div><div class='del'>-  &lt;abstract&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &lt;application&gt;Evolution&lt;/application&gt; contact manager can</div><div class='del'>-      handle all of the functions of an address book, phone book, or</div><div class='del'>-      Rolodex.  Of course, it's a lot easier to update</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt; than it is to change an</div><div class='del'>-      actual paper book. &lt;application&gt;Evolution&lt;/application&gt; also</div><div class='del'>-      allows easy synchronization with hand-held and remote devices.</div><div class='del'>-      Since &lt;application&gt;Evolution&lt;/application&gt; supports most major</div><div class='del'>-      network protocols, including &lt;glossterm linkend="ldap"&gt;LDAP&lt;/glossterm&gt;, it can</div><div class='del'>-      fit into almost any existing network.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Another advantage of the &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-      address book is its integration with the rest of the</div><div class='del'>-      application.  That means that when you look for someone's</div><div class='del'>-      address, you can also see a history of appointments with that</div><div class='del'>-      person.  Or, you can get an e-mail with contact information in</div><div class='del'>-      it and create a new address card on the spot.  In addition,</div><div class='del'>-      searches and folders and all work in the same way they do in the</div><div class='del'>-      other components, so you don't have to learn another system for</div><div class='del'>-      similar tasks.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This chapter will cover using the</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt; contact manager to organize</div><div class='del'>-      any amount of contact information, share addresses over a</div><div class='del'>-      network, and several ways to save time with everyday tasks.  To</div><div class='del'>-      learn about configuring the contact manager, see &lt;xref</div><div class='del'>-      linkend="config-prefs-contact"&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/abstract&gt;</div><div class='del'>-  &lt;sect1 id="usage-contact-basic"&gt;</div><div class='del'>-    &lt;title&gt;Getting Started With the Contact Manager&lt;/title&gt;	</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       To open up your address book, click on</div><div class='del'>-       &lt;guibutton&gt;Contacts&lt;/guibutton&gt; in the shortcut bar, or select</div><div class='del'>-       one of your contacts folders from the folder bar.  &lt;xref</div><div class='del'>-       linkend="usage-contact-fig"&gt; shows the Contact Manager in all</div><div class='del'>-       its organizational glory.  By default, the contact manager</div><div class='del'>-       shows all your cards in alphabetical order, in a &lt;glossterm</div><div class='del'>-       linkend="minicard"&gt;minicard&lt;/glossterm&gt; format.  You can select</div><div class='del'>-       other views from the &lt;guimenu&gt;View&lt;/guimenu&gt; menu, and adjust</div><div class='del'>-       the width of the columns by clicking and dragging the grey</div><div class='del'>-       column dividers.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    &lt;figure id="usage-contact-fig"&gt;</div><div class='del'>-      &lt;title&gt;Evolution Contact Manager&lt;/title&gt;</div><div class='del'>-      &lt;screenshot&gt;</div><div class='del'>-	&lt;screeninfo&gt;Evolution Contact Manager Window&lt;/screeninfo&gt;</div><div class='del'>-	&lt;graphic fileref="fig/contact" format="png" srccredit="Aaron Weber"&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'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       The toolbar for the address book is quite simple:</div><div class='del'>-       &lt;itemizedlist&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-           Press &lt;guibutton&gt;New&lt;/guibutton&gt; for a new contact.</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-           &lt;guibutton&gt;Find&lt;/guibutton&gt; brings up an in-depth search window.</div><div class='del'>-         &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;</div><div class='del'>-	    Press &lt;guibutton&gt;Print&lt;/guibutton&gt; to print one or more cards.</div><div class='del'>-	&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-           &lt;guibutton&gt;Delete&lt;/guibutton&gt; deletes a selected card.</div><div class='del'>-        &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt; &lt;guibutton&gt;View All&lt;/guibutton&gt; Displays all</div><div class='del'>-           the address information in the folder.  Use this button to</div><div class='del'>-           refresh the display for a network folder, or to switch from</div><div class='del'>-           viewing the results of a search and see the whole contents.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-        &lt;listitem&gt;&lt;para&gt; &lt;guibutton&gt;Stop&lt;/guibutton&gt; Stop loading</div><div class='del'>-           contact data from the network.  This button is only</div><div class='del'>-           relevant if you are looking at contact information on a</div><div class='del'>-           network.  &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       The rest of the contact manager is taken up by the display of</div><div class='del'>-       your contact information.  You can view that display as a table</div><div class='del'>-       or as a list of cards&amp;mdash; switch views in the</div><div class='del'>-       &lt;guimenu&gt;View&lt;/guimenu&gt; menu &amp;mdash; and move through them</div><div class='del'>-       alphabetically with the buttons and the scrollbar at the right</div><div class='del'>-       of the window. Of course, if you have more than a few people</div><div class='del'>-       listed, you'll want some way of finding them more quickly,</div><div class='del'>-       which is why there's a search feature.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="contact-search"&gt;</div><div class='del'>-      &lt;title&gt;Searching for Contacts&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	   Between &lt;guilabel&gt;Delete&lt;/guilabel&gt; and &lt;guilabel&gt;View</div><div class='del'>-    	   All&lt;/guilabel&gt; is &lt;guilabel&gt;Quick Search&lt;/guilabel&gt;. To use</div><div class='del'>-    	   it, just type in one or more words you're looking for and</div><div class='del'>-    	   hit &lt;keycap&gt;Enter&lt;/keycap&gt;.</div><div class='del'>-    	   &lt;application&gt;Evolution&lt;/application&gt; will search through</div><div class='del'>-    	   the contents of every displayed card to find one that</div><div class='del'>-    	   matches. That means that you can refine searches by doing several in</div><div class='del'>-    	   succession.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	   If there are no matches, the card display will be blank. When</div><div class='del'>-	   you'd like to see all the cards again, press &lt;guilabel&gt;Show</div><div class='del'>-	   All&lt;/guilabel&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;example id="contact-quicksearch-ex"&gt;</div><div class='del'>-	&lt;title&gt;Refining a Quick Search&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	    Tom comes back from lunch and finds a note on his keyboard:</div><div class='del'>-	    "Curtis in sales called for you, but he didn't leave a number,</div><div class='del'>-	    and I forgot to write down the name of the company he works</div><div class='del'>-	    for. He said it was important, though." Tom is not at all</div><div class='del'>-	    annoyed.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-	 &lt;para&gt;</div><div class='del'>-	    He opens his contacts folder, and runs a quick search for</div><div class='del'>-	    "Curtis;" there are eighteen different people with that name</div><div class='del'>-	    in the file. He then enters "Sales," and</div><div class='del'>-	    &lt;application&gt;Evolution&lt;/application&gt; narrows it down to the</div><div class='del'>-	    right Curtis. He only becomes annoyed when he discovers that</div><div class='del'>-	    the call was not actually important.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-      &lt;/example&gt;</div><div class='del'>-    </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        If you prefer to perform a more complex search, press</div><div class='del'>-        &lt;guibutton&gt;Find&lt;/guibutton&gt; or choose</div><div class='del'>-        &lt;menuchoice&gt;&lt;guimenu&gt;Tools&lt;/guimenu&gt;&lt;guimenuitem&gt;Search for</div><div class='del'>-        Contact&lt;/guimenuitem&gt;&lt;/menuchoice&gt;. This will open the in-depth search window, which</div><div class='del'>-        lets you use multiple search criteria in the same way that</div><div class='del'>-        email filters and &lt;glossterm linkend="vfolder"&gt;vFolders&lt;/glossterm&gt; do..</div><div class='del'>-      &lt;/para&gt;    </div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Click &lt;guibutton&gt;Add Criterion&lt;/guibutton&gt; to increase the</div><div class='del'>-        number of criteria you'd like to use in the search, and</div><div class='del'>-        &lt;guibutton&gt;Remove Criterion&lt;/guibutton&gt; to remove one from the</div><div class='del'>-        bottom of the list.  Your criteria may be a searchs within the</div><div class='del'>-        &lt;guilabel&gt;Name&lt;/guilabel&gt; or &lt;guilabel&gt;Email&lt;/guilabel&gt;</div><div class='del'>-        fields; alternately you can choose to search through all the</div><div class='del'>-        fields with a regular expression.  Then, you can select all</div><div class='del'>-        the familiar requirements like &lt;guilabel&gt;Begins</div><div class='del'>-        With&lt;/guilabel&gt; and &lt;guilabel&gt;Does Not Contain&lt;/guilabel&gt;,</div><div class='del'>-        decide whether to match &lt;guilabel&gt;All&lt;/guilabel&gt; or</div><div class='del'>-        &lt;guilabel&gt;Any&lt;/guilabel&gt; of your criteria, and press</div><div class='del'>-        &lt;guibutton&gt;Search&lt;/guibutton&gt; to set it all off.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="usage-contact-cards"&gt;</div><div class='del'>-    &lt;title&gt;Destroy, Create, and Change: The Contact Editor&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       To delete a card, click on it once to select it, then press the</div><div class='del'>-       &lt;guibutton&gt;Delete Card&lt;/guibutton&gt; button.  If you have</div><div class='del'>-       multiple cards selected, you'll delete multiple cards.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       Adding or changing cards is slightly more complicated.  Any</div><div class='del'>-       time you add information to the contact manager, whether it's</div><div class='del'>-       an old card you're editing or a new card you're just adding to</div><div class='del'>-       your address book, you'll use the contact editor.  To change a</div><div class='del'>-       card that already exists, just double click it to open the</div><div class='del'>-       contact editor window with all the current information already</div><div class='del'>-       filled in.  If you want to create a new one, clicking the</div><div class='del'>-       &lt;guibutton&gt;New Card&lt;/guibutton&gt; button will open up that same</div><div class='del'>-       window, but with empty fields instead of full ones.  Either</div><div class='del'>-       way, it's the same tool for quite similar tasks, and you'll</div><div class='del'>-       find that it's pretty flexible and can store quite a lot more</div><div class='del'>-       than you'd think would fit onto a file card.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The contact editor window has two tabs,</div><div class='del'>-    	&lt;guilabel&gt;General&lt;/guilabel&gt;, for basic contact information,</div><div class='del'>-    	and &lt;guilabel&gt;Details&lt;/guilabel&gt;, for a more specific</div><div class='del'>-    	description of the person.  In addition, it contains a</div><div class='del'>-    	&lt;guimenu&gt;File&lt;/guimenu&gt; menu, covered in &lt;xref</div><div class='del'>-    	linkend="menuref-contact-editor"&gt;, and a toolbar with three</div><div class='del'>-    	items: &lt;guilabel&gt;Save and Close&lt;/guilabel&gt;,</div><div class='del'>-    	&lt;guilabel&gt;Print&lt;/guilabel&gt;, and &lt;guilabel&gt;Delete&lt;/guilabel&gt;.</div><div class='del'>-    	After that, however, it gets slightly more complicated, as you</div><div class='del'>-    	can see in &lt;xref linkend="usage-contact-editor-fig"&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;figure id="usage-contact-editor-fig"&gt;</div><div class='del'>-	  &lt;title&gt;Evolution Contact Editor&lt;/title&gt;</div><div class='del'>-	  &lt;screenshot&gt;</div><div class='del'>-	    &lt;screeninfo&gt;Evolution Contact Editor&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/contact-editor" format="png" srccredit="Aaron Weber"&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'>-      </div><div class='del'>-      &lt;para&gt; The &lt;guilabel&gt;General&lt;/guilabel&gt; tab contains no less</div><div class='del'>-        than seven sections, each with an icon: a face, for name and</div><div class='del'>-        company; a telephone for phone numbers; an envelope for email</div><div class='del'>-        address; a globe for web page address; a house for postal</div><div class='del'>-        address; a file folder for contacts, and a briefcase for</div><div class='del'>-        categories.  You can guess what sort of information belongs in</div><div class='del'>-        fields like &lt;guilabel&gt;Job Title&lt;/guilabel&gt; and &lt;guilabel&gt;Web</div><div class='del'>-        page address&lt;/guilabel&gt;, but there are several parts of the</div><div class='del'>-        window that are a little more interesting.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-     &lt;variablelist&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;Full Name&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-              The &lt;guilabel&gt;Full Name&lt;/guilabel&gt; field has two</div><div class='del'>-              major features:</div><div class='del'>-              &lt;itemizedlist&gt;</div><div class='del'>-		&lt;listitem&gt;</div><div class='del'>-		  &lt;para&gt;</div><div class='del'>-                    You can enter a name into the &lt;guibutton&gt;Full</div><div class='del'>-                    Name&lt;/guibutton&gt; field, but you can also click the</div><div class='del'>-                    &lt;guibutton&gt;Full Name&lt;/guibutton&gt; button to bring</div><div class='del'>-                    up a small dialog box with a few text boxes</div><div class='del'>-                    &lt;variablelist&gt;</div><div class='del'>-		      &lt;varlistentry&gt;</div><div class='del'>-			&lt;term&gt;&lt;guilabel&gt;Title: &lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-			&lt;listitem&gt; &lt;para&gt;</div><div class='del'>-	                  Enter an honorific or select one from the menu.</div><div class='del'>-	                &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		      &lt;/varlistentry&gt;</div><div class='del'>-		      &lt;varlistentry&gt;</div><div class='del'>-			&lt;term&gt;&lt;guilabel&gt;First: &lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-			&lt;listitem&gt; &lt;para&gt;</div><div class='del'>-		             The person's first, or given, name.</div><div class='del'>-			 &lt;/para&gt;&lt;/listitem&gt; </div><div class='del'>-		      &lt;/varlistentry&gt;</div><div class='del'>-		      &lt;varlistentry&gt;</div><div class='del'>-			&lt;term&gt;&lt;guilabel&gt;Middle: &lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-			&lt;listitem&gt; &lt;para&gt;</div><div class='del'>-			  The middle name or initial, if any, goes here.</div><div class='del'>-			&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		      &lt;/varlistentry&gt;</div><div class='del'>-		      &lt;varlistentry&gt;</div><div class='del'>-			&lt;term&gt;&lt;guilabel&gt;Last: &lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-			&lt;listitem&gt; &lt;para&gt;</div><div class='del'>-			   The last name (surname) belongs here.</div><div class='del'>-			 &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		      &lt;/varlistentry&gt;</div><div class='del'>-		      &lt;varlistentry&gt;</div><div class='del'>-			&lt;term&gt;&lt;guilabel&gt;Suffix: &lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-			&lt;listitem&gt; &lt;para&gt;</div><div class='del'>-			   Suffixes such as "Jr." or "III" can go here. </div><div class='del'>-			&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		      &lt;/varlistentry&gt;</div><div class='del'>-		    &lt;/variablelist&gt;</div><div class='del'>-                   &lt;/para&gt;</div><div class='del'>-		&lt;/listitem&gt;</div><div class='del'>-	        &lt;listitem&gt;</div><div class='del'>-		  &lt;para&gt;</div><div class='del'>-                    The &lt;guilabel&gt;Full Name&lt;/guilabel&gt; field also</div><div class='del'>-                    interacts with the &lt;guilabel&gt;File As&lt;/guilabel&gt;</div><div class='del'>-                    box to help you organize your contacts.</div><div class='del'>-                  &lt;/para&gt;</div><div class='del'>-                  &lt;para&gt;</div><div class='del'>-                    To see how it works, type a name in the</div><div class='del'>-                    &lt;guilabel&gt;Full Name&lt;/guilabel&gt; field:</div><div class='del'>-                    &lt;userinput&gt;Eva Lucianne Tester&lt;/userinput&gt;.</div><div class='del'>-                    You'll notice that the &lt;guilabel&gt;File</div><div class='del'>-                    As&lt;/guilabel&gt; field also fills up, but in reverse:</div><div class='del'>-                    &lt;computeroutput&gt;Tester, Eva&lt;/computeroutput&gt;.</div><div class='del'>-                    You can pick &lt;computeroutput&gt;Eva</div><div class='del'>-                    Tester&lt;/computeroutput&gt; from the drop-down, or</div><div class='del'>-                    type in your own, such as &lt;userinput&gt;Lucianne</div><div class='del'>-                    Tester, Eva&lt;/userinput&gt;.</div><div class='del'>-                 &lt;/para&gt;</div><div class='del'>-		  &lt;tip&gt;</div><div class='del'>-		    &lt;title&gt;Filing Suggestion&lt;/title&gt;</div><div class='del'>-		   </div><div class='del'>-		    &lt;para&gt;</div><div class='del'>-                      Don't enter something entirely different from</div><div class='del'>-                      the actual name, since you might forget that</div><div class='del'>-                      you've filed Eva's information under "F" for</div><div class='del'>-                      "Fictitious Helix Code Employee."</div><div class='del'>-                    &lt;/para&gt;</div><div class='del'>-		  &lt;/tip&gt;</div><div class='del'>-		&lt;/listitem&gt;</div><div class='del'>-	      &lt;/itemizedlist&gt;</div><div class='del'>-             &lt;/para&gt;</div><div class='del'>-           &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt;Multiple Values for Fields&lt;/term&gt;</div><div class='del'>-            &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-                If you click on the small arrow buttons next to the</div><div class='del'>-                &lt;guilabel&gt;Primary Email&lt;/guilabel&gt; field, you can also</div><div class='del'>-                choose &lt;guilabel&gt;Email 2&lt;/guilabel&gt; and</div><div class='del'>-                &lt;guilabel&gt;Email 3&lt;/guilabel&gt;.  Although the contact</div><div class='del'>-                editor will only display one of those at any given</div><div class='del'>-                time, &lt;application&gt;Evolution&lt;/application&gt; will</div><div class='del'>-                remember them all.  The arrow buttons next to the</div><div class='del'>-                telephone and postal address fields work in the same</div><div class='del'>-                way.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-          &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-      &lt;/variablelist&gt;</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-      The last item in the &lt;guilabel&gt;General&lt;/guilabel&gt; tab is the</div><div class='del'>-       &lt;guilabel&gt;Categories&lt;/guilabel&gt; organization tool.  That's</div><div class='del'>-       really its own topic; for information on that, read &lt;xref</div><div class='del'>-       linkend="usage-contact-organize"&gt;.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-       The &lt;guilabel&gt;Details&lt;/guilabel&gt; tab is, fortunately, much more</div><div class='del'>-       simple: three sections, all of which are more or less obvious:</div><div class='del'>-       the briefcase next to the details about the contact's</div><div class='del'>-       professional life; the face next to the details about their</div><div class='del'>-       personal life; the globe next to a big blank space you can use</div><div class='del'>-       for anything and everything else you'd like to note about them.</div><div class='del'>-       If you ever wanted to have that uncanny knack for remembering</div><div class='del'>-       obscure details like the date of someone's anniversary (perhaps</div><div class='del'>-       your own) this is the answer.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!--- ############# This section isn't implemented yet either:</div><div class='del'>-    &lt;sect2&gt;</div><div class='del'>-      &lt;title&gt;&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        &lt;tip&gt;</div><div class='del'>-	  &lt;title&gt;Contact Shortcuts&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            You can add cards from within an email message or calendar</div><div class='del'>-            appointment.  While looking at an email, right-click on</div><div class='del'>-            any email address or message, and choose</div><div class='del'>-            &lt;guimenuitem&gt;Create Card for this Address&lt;/guimenuitem&gt; or</div><div class='del'>-            &lt;guimenuitem&gt;Create Card for this Sender&lt;/guimenuitem&gt;</div><div class='del'>-            from the menu.  While looking at a calendar appointment,</div><div class='del'>-            right-click any email address, and choose</div><div class='del'>-            &lt;guimenuitem&gt;Create Card for this Address&lt;/guimenuitem&gt;.</div><div class='del'>-            (NOTE that feature may change!  unimplemented!)</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'>-      &lt;para&gt;</div><div class='del'>-        You can move cards around just as you would move email</div><div class='del'>-        messages: dragging and dropping works, as does right-clicking</div><div class='del'>-        and choosing &lt;guimenuitem&gt;Move&lt;/guimenuitem&gt; from the menu</div><div class='del'>-        that appears.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-############### SHORTCUT SECTION COMMENTED OUT FOR NOW --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="usage-contact-organize"&gt;</div><div class='del'>-    &lt;title&gt;Organizing your Contact Manager&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       Organizing your contact manager is a lot like organizing your</div><div class='del'>-       mail.  You can have folders and searches the same way you can</div><div class='del'>-       with mail, but the contact manager does not allow vFolders.  It</div><div class='del'>-       does, however, allow each card to fall under several</div><div class='del'>-       categories, and allow you to create your own categories.  To</div><div class='del'>-       learn about categories, read &lt;xref</div><div class='del'>-       linkend="usage-contact-organize-group-category"&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Another useful &lt;application&gt;Evolution&lt;/application&gt; feature is</div><div class='del'>-      its ability to recognize when people live or work together.  If</div><div class='del'>-      several people in your contact manager share an address, and you</div><div class='del'>-      change the address for one of them,</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt; will ask you if you wish to</div><div class='del'>-      change the address for all of them, or just for one.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-contact-organize-group"&gt;</div><div class='del'>-      &lt;title&gt;Groups of contacts&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         &lt;application&gt;Evolution&lt;/application&gt; offers two ways for you</div><div class='del'>-         to organize your cards.  The first way is to use folders;</div><div class='del'>-         this works the same way that mail folders do.  For more</div><div class='del'>-         flexibility, you can also mark contacts as members of</div><div class='del'>-         different categories.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect3 id="usage-contact-organize-group-folder"&gt;</div><div class='del'>-	&lt;title&gt;Grouping with Folders&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	   The simplest way to group address cards is to use folders.</div><div class='del'>-	   By default, cards start in the</div><div class='del'>-	   &lt;guilabel&gt;Contacts&lt;/guilabel&gt; folder.  If you've read &lt;xref</div><div class='del'>-	   linkend="usage-mainwindow"&gt; then you already know that you</div><div class='del'>-	   can create a new folder by selecting </div><div class='del'>-           &lt;menuchoice&gt;</div><div class='del'>-           &lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-	   &lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-	   &lt;guimenuitem&gt;Folder&lt;/guimenuitem&gt;</div><div class='del'>-           &lt;/menuchoice&gt;</div><div class='del'>-           and that you can put new folders anywhere you like. Just</div><div class='del'>-	   like with mail, cards must be in a card folder, and no card</div><div class='del'>-	   can be in two places at once.  If you want more</div><div class='del'>-	   flexibility, try &lt;xref</div><div class='del'>-	   linkend="usage-contact-organize-group-category"&gt;.</div><div class='del'>-	 &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          To put a card into a folder, just drag it there from the</div><div class='del'>-          folder view.  Remember that contact cards can only go in</div><div class='del'>-          contact folders, just like mail can only go in mail folders,</div><div class='del'>-          and calendars in calendar folders.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;sect3 id="usage-contact-organize-group-category"&gt;</div><div class='del'>-	&lt;title&gt;Grouping with Categories&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           The other way to group cards is to mark them as belonging</div><div class='del'>-           to different categories.  The difference between folders</div><div class='del'>-           and categories is that folders contain cards, but category</div><div class='del'>-           membership is a property of each card.  That means that you</div><div class='del'>-           can mark a card as being in several categories or no</div><div class='del'>-           category at all.  For example, I put my friend Matthew's</div><div class='del'>-           card in the "Business" category, because he works with me,</div><div class='del'>-           the "Friends" category, because he's also my friend, and</div><div class='del'>-           the "Frequent" category, because I call him all the time</div><div class='del'>-           and can never remember his phone number.  </div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           To mark a card as belonging to a category, click the</div><div class='del'>-           &lt;guibutton&gt;Categories&lt;/guibutton&gt; button at the lower</div><div class='del'>-           right.  From the dialog box that appears, you can check as</div><div class='del'>-           many or as few categories as you like.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           Then, you can refer to all the cards in that category by:</div><div class='del'>-           &lt;!-- FIXME --&gt; Waiting for Evolution to support the</div><div class='del'>-           operation.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;!-- FIXME: Feature Not Implemented</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-</div><div class='del'>-           If the master list of categories doesn't suit you, you can</div><div class='del'>-           add your own.  Just enter the new category's name in the</div><div class='del'>-           text box, then click &lt;guibutton&gt;Categories&lt;/guibutton&gt; and</div><div class='del'>-           choose &lt;guilabel&gt;Add to Master List&lt;/guilabel&gt; in the</div><div class='del'>-           window that appears. </div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-       --&gt;</div><div class='del'>-</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;sect1 id="usage-contact-sharing"&gt;</div><div class='del'>-    &lt;title&gt;Sharing your Cards&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       If you keep your cards on a network using an</div><div class='del'>-       &lt;glossterm linkend="ldap"&gt;LDAP&lt;/glossterm&gt; server, you can share access to</div><div class='del'>-       them.  Actually, the server software takes care of that, and</div><div class='del'>-       also determines who is allowed to see and change them.  This is</div><div class='del'>-       the sort of feature you'll want to use if your company has a</div><div class='del'>-       list of vendors and clients that needs constant updating.  If</div><div class='del'>-       you also share your calendars, people can avoid duplicating</div><div class='del'>-       work and keep up to date on developments within their work-group</div><div class='del'>-       or across the entire company.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-     &lt;example id="usage-contact-sharing-ex"&gt;</div><div class='del'>-	&lt;title&gt;Sharing Address Cards and Calendar Data&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Ray wants to schedule a meeting with Company X, so he</div><div class='del'>-	    checks the network for the Company X address card so he</div><div class='del'>-	    knows whom to call there.  Since his company also shares</div><div class='del'>-	    calendars, he then learns that his co-worker Deanna has</div><div class='del'>-	    already scheduled a meeting with Company X next Thursday.</div><div class='del'>-	    He can either go to the meeting himself or ask Deanna to</div><div class='del'>-	    discuss his concerns for him.  Either way, he avoids</div><div class='del'>-	    scheduling an extra meeting with Company X.</div><div class='del'>-	 &lt;/para&gt;</div><div class='del'>-      &lt;/example&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       Of course, you don't want to share all of your cards&amp;mdash; why</div><div class='del'>-       overload the network with a list of babysitters, or tell</div><div class='del'>-       everyone in the office you're talking to new job prospects?  If</div><div class='del'>-       you keep cards on your own computer, you can decide which items</div><div class='del'>-       you want to make accessible to others.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       To learn how to add a remote directory to your available</div><div class='del'>-       contact folders, see &lt;xref linkend="config-prefs-contact"&gt;.</div><div class='del'>-       Once you have a connection, the network contacts folder or</div><div class='del'>-       folders will appear inside the &lt;guilabel&gt;External</div><div class='del'>-       Directories&lt;/guilabel&gt; folder in the folder bar, and will work</div><div class='del'>-       exactly like a local folder of cards, with the following</div><div class='del'>-       exceptions:</div><div class='del'>-       &lt;itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              They are only available when you are connected to the network.  If </div><div class='del'>-              you use a laptop or have a modem connection, you may wish to copy or cache</div><div class='del'>-              the network directory and then synchronize your copy with the networked version</div><div class='del'>-              periodically.</div><div class='del'>-          &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              To prevent excess network traffic,</div><div class='del'>-              &lt;application&gt;Evolution&lt;/application&gt; will not normally</div><div class='del'>-              load the contents of LDAP folders immediately upon</div><div class='del'>-              opening.  You must click &lt;guilabel&gt;Display</div><div class='del'>-              All&lt;/guilabel&gt; before LDAP folder cards will be loaded</div><div class='del'>-              from the network. You can change this behavior in the</div><div class='del'>-              &lt;interface&gt;Contact Preferences&lt;/interface&gt; window.</div><div class='del'>-          &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Your ability to view, change, add or delete</div><div class='del'>-              contacts depends on the settings of the LDAP server.</div><div class='del'>-              For example, you may read all the entries in the public</div><div class='del'>-              Netcenter directory (available by default in the</div><div class='del'>-              &lt;guilabel&gt;External Directories&lt;/guilabel&gt; folder), but</div><div class='del'>-              you may not change or delete any of them.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-       &lt;/itemizedlist&gt;</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="usage-contact-automate"&gt;</div><div class='del'>-    &lt;title&gt;Contact Manager Tools&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       The contact manager works with</div><div class='del'>-       &lt;application&gt;Evolution&lt;/application&gt; mail and the calendar to</div><div class='del'>-       help you add new address cards quickly.  However, it can also</div><div class='del'>-       manage mailing lists.  There are more tools planned, and when</div><div class='del'>-       they arrive, &lt;!-- FIXME --&gt; they will be described in this</div><div class='del'>-       section.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="contact-automation-basic"&gt;</div><div class='del'>-      &lt;title&gt;Send me a Card: Adding New Cards Quickly&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	As noted before, when you get information about a person in</div><div class='del'>-	the mail or in a calendar entry, you can add it to an address</div><div class='del'>-	card.  To do so, right click on any email address or email</div><div class='del'>-	message, and select &lt;guimenuitem&gt;Add Address</div><div class='del'>-	Card&lt;/guimenuitem&gt; from the menu that appears.  Of course,</div><div class='del'>-	&lt;application&gt; Evolution&lt;/application&gt; also adds cards from a</div><div class='del'>-	hand-held device during HotSync operation.  For more</div><div class='del'>-	information about that, see &lt;xref linkend="usage-sync"&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="contact-automation-lists"&gt;</div><div class='del'>-      &lt;title&gt;Managing a Mailing list&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	 You already know that when you are writing an email, you can</div><div class='del'>-	 address it to one or more people, and that</div><div class='del'>-	 &lt;application&gt;Evolution&lt;/application&gt; will fill in addresses</div><div class='del'>-	 from your contact manager's address cards if you let it.  In</div><div class='del'>-	 addition to that, you can send email to everyone in a</div><div class='del'>-	 particular group.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>- &lt;!-- FIXME this feature not yet implemented  --&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         Future versions of &lt;application&gt;Evolution&lt;/application&gt; will</div><div class='del'>-	 allow you to you export a group of cards to a spreadsheet,</div><div class='del'>-	 database, or word processor so you can print address labels</div><div class='del'>-	 or prepare large postal mailings.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-&lt;!--</div><div class='del'>-    &lt;sect2 id="usage-contact-automation-extra"&gt;</div><div class='del'>-      &lt;title&gt;Map It!&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	 Need a map or directions? Click</div><div class='del'>-	 &lt;guibutton&gt;MapIt&lt;/guibutton&gt; from within the contact</div><div class='del'>-	 manager, and &lt;application&gt;Evolution&lt;/application&gt; will</div><div class='del'>-	 map the address for you online.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-&lt;/chapter&gt; </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/usage-mail.sgml b/doc/C/usage-mail.sgml<br/>deleted file mode 100644<br/>index 6aafdaa492..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/usage-mail.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/usage-mail.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1382 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>-&lt;!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-&lt;chapter id="usage-mail"&gt; </div><div class='del'>-  &lt;title&gt;Evolution Mail&lt;/title&gt;</div><div class='del'>-  &lt;abstract&gt;</div><div class='del'>-    &lt;title&gt; An Overview of the Evolution Mailer&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       &lt;application&gt;Evolution&lt;/application&gt; email is like other email</div><div class='del'>-       programs in all the ways you would hope:</div><div class='del'>-     &lt;itemizedlist&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-	 &lt;para&gt;</div><div class='del'>-	   It can sort and organize your mail in a wide variety of ways with</div><div class='del'>-	   folders, searches, and filters.</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'>-	  It can send and receive mail in HTML or as plain text, and</div><div class='del'>-	  supports file attachments.</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'>-	   It supports multiple mail sources, including &lt;glossterm</div><div class='del'>-	   linkend="imap"&gt;IMAP&lt;/glossterm&gt;, &lt;glossterm</div><div class='del'>-	   linkend="pop"&gt;POP3&lt;/glossterm&gt;, local</div><div class='del'>-	   &lt;systemitem&gt;&lt;filename&gt;mbox&lt;/filename&gt;&lt;/systemitem&gt; and</div><div class='del'>-	   &lt;systemitem&gt;&lt;filename&gt;mh&lt;/filename&gt;&lt;/systemitem&gt; files, and</div><div class='del'>-	   even NNTP messages (newsgroups), which aren't technically</div><div class='del'>-	   email.</div><div class='del'>-	 &lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      However, &lt;application&gt;Evolution&lt;/application&gt; has some important</div><div class='del'>-      differences.  First, it's built to handle very large amounts of</div><div class='del'>-      mail without slowing down or crashing.  Both the &lt;link</div><div class='del'>-      linkend="usage-mail-organize-filters"&gt;filtering&lt;/link&gt; and &lt;link</div><div class='del'>-      linkend="usage-mail-organize-search"&gt;searching&lt;/link&gt; functions</div><div class='del'>-      were built for speed and efficiency on gargantuan mail</div><div class='del'>-      volumes. There's also the &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-      &lt;link linkend="usage-mail-organize-vFolders"&gt;vFolder&lt;/link&gt;, an</div><div class='del'>-      advanced organizational feature not found in other mail clients.</div><div class='del'>-      If you get a lot of mail, or if you keep every message you get</div><div class='del'>-      in case you need to refer to it later, you'll find that feature</div><div class='del'>-      especially useful.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/abstract&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="usage-mail-getnsend"&gt;</div><div class='del'>-    &lt;title&gt;Reading, Getting and Sending Mail&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-mail-getnsend-read"&gt;</div><div class='del'>-      &lt;title&gt;Reading Mail&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-       You can start reading email by clicking</div><div class='del'>-       &lt;guibutton&gt;Inbox&lt;/guibutton&gt; in the shortcut bar.  By</div><div class='del'>-       default, the &lt;interface&gt;Inbox&lt;/interface&gt; is open when you</div><div class='del'>-       start &lt;application&gt;Evolution&lt;/application&gt;, and the first</div><div class='del'>-       time you see your Inbox, there's a message in it from Helix</div><div class='del'>-       Code welcoming you to the application.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	&lt;guilabel&gt;Inbox&lt;/guilabel&gt;, should look like the one in &lt;xref</div><div class='del'>-	linkend="usage-mail-intro-fig"&gt;, which has a message from</div><div class='del'>-	Helix Code. The message summary appears at the top, in the</div><div class='del'>-	&lt;interface&gt;message list&lt;/interface&gt;.  The message itself is</div><div class='del'>-	displayed below that, in the &lt;interface&gt;view pane&lt;/interface&gt;.</div><div class='del'>-	If you find the &lt;interface&gt;view pane&lt;/interface&gt; too small,</div><div class='del'>-	you can double-click on the message in the &lt;interface&gt;message</div><div class='del'>-	list&lt;/interface&gt; to have it open in a new window.  Just like</div><div class='del'>-	with folders, you can right-click on messages in the message</div><div class='del'>-	list and get a menu of possible actions.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-</div><div class='del'>- &lt;!-- ==============Figure=================================== --&gt;</div><div class='del'>- </div><div class='del'>-      &lt;figure id="usage-mail-intro-fig"&gt;</div><div class='del'>-	  &lt;title&gt;Evolution Mail&lt;/title&gt;</div><div class='del'>-	  &lt;screenshot&gt;</div><div class='del'>-	    &lt;screeninfo&gt;Inbox&lt;/screeninfo&gt;</div><div class='del'>-	    &lt;graphic fileref="fig/mail-pic" format="png" srccredit="Aaron Weber"&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;!-- ==============End of Figure============================== --&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         Most of the mail-related actions you'll want to perform are</div><div class='del'>-         listed in the &lt;guimenu&gt;Message&lt;/guimenu&gt; menu in the menu</div><div class='del'>-         bar.  The most frequently used ones, like</div><div class='del'>-         &lt;guimenuitem&gt;Reply&lt;/guimenuitem&gt; and</div><div class='del'>-         &lt;guimenuitem&gt;Forward&lt;/guimenuitem&gt;, also appear as buttons in</div><div class='del'>-         the toolbar, and almost all of them are duplicated in the</div><div class='del'>-         right-click menu and as keyboard shortcuts, which tend to be</div><div class='del'>-         faster once you get the hang of them.  You can choose</div><div class='del'>-         whichever way you like best; the idea is that the software</div><div class='del'>-         should work the way you want, rather than making you work the</div><div class='del'>-         way the it does.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect3 id="usage-mail-listorder"&gt;</div><div class='del'>-	&lt;title&gt;Sorting the message list&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          One of the ways &lt;application&gt;Evolution&lt;/application&gt; lets</div><div class='del'>-          you choose the way you work is the way it lets you sort your</div><div class='del'>-          message lists.  To sort by sender, subject, or date, click</div><div class='del'>-          on the bars with those labels at the top of the message</div><div class='del'>-          list.  If you click twice, you'll sort them in reverse</div><div class='del'>-          order.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-          You can also choose a threaded message view. Select</div><div class='del'>-          &lt;menuchoice&gt; &lt;guimenu&gt;View&lt;/guimenu&gt;</div><div class='del'>-          &lt;guimenuitem&gt;Threaded&lt;/guimenuitem&gt; &lt;/menuchoice&gt; to turn</div><div class='del'>-          the threaded view on or off.  If the option selected,</div><div class='del'>-          &lt;application&gt;Evolution&lt;/application&gt; will attempt to</div><div class='del'>-          associate related messages by using message ID numbers and</div><div class='del'>-          the &lt;systemitem&gt;References&lt;/systemitem&gt;,</div><div class='del'>-          &lt;systemitem&gt;In-Reply-To&lt;/systemitem&gt;, and</div><div class='del'>-          &lt;systemitem&gt;Subject&lt;/systemitem&gt; message headers.  Messages</div><div class='del'>-          which are related are then placed next to each other, so</div><div class='del'>-          that it's easier to follow the thread of a conversation from</div><div class='del'>-          message to message.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-delete"&gt;</div><div class='del'>-        &lt;title&gt;Deleting Mail&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Once you've read your mail, you may want to get rid of</div><div class='del'>-          it. To mark a message for deletion, select it in the the</div><div class='del'>-          &lt;interface&gt;message list&lt;/interface&gt; by clicking on it once.</div><div class='del'>-          Then click on the &lt;guibutton&gt;Delete&lt;/guibutton&gt; button in</div><div class='del'>-          the tool bar.  The message now has a line through it,</div><div class='del'>-          because you've marked it for deletion.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          If you really want to get rid of it, choose</div><div class='del'>-          &lt;guimenuitem&gt;Expunge&lt;/guimenuitem&gt; from the</div><div class='del'>-          &lt;guimenu&gt;Folder&lt;/guimenu&gt; menu.  That will delete it</div><div class='del'>-          permanently. If you want to keep it, click</div><div class='del'>-          &lt;guibutton&gt;Delete&lt;/guibutton&gt; again, and it will no longer</div><div class='del'>-          be marked as deleted.  At some point in the future, this</div><div class='del'>-          feature will change to something a little less</div><div class='del'>-          counter-intuitive.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-mail-getnsend-get"&gt;</div><div class='del'>-      &lt;title&gt;Checking Mail&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Now that you've had a look around the</div><div class='del'>-	&lt;interface&gt;Inbox&lt;/interface&gt;, it's time to check for new mail.</div><div class='del'>-	Click &lt;guibutton&gt;Get mail&lt;/guibutton&gt; in the toolbar to check</div><div class='del'>-	your mail.  If it's the first time you've done so, the</div><div class='del'>-	&lt;interface&gt;mail setup assistant&lt;/interface&gt; will ask you for</div><div class='del'>-	the information it needs to check your mail (see &lt;xref</div><div class='del'>-	linkend="config-setupassist"&gt; for more information). </div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-        Then, you need to enter your email</div><div class='del'>-        password. &lt;application&gt;Evolution&lt;/application&gt; will remember</div><div class='del'>-        the password until you quit the application or until you</div><div class='del'>-        select &lt;menuchoice&gt; &lt;guimenu&gt;Settings&lt;/guimenu&gt;</div><div class='del'>-        &lt;guimenuitem&gt;Forget Passwords&lt;/guimenuitem&gt; &lt;/menuchoice&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Once it's validated the password,</div><div class='del'>-	&lt;application&gt;Evolution&lt;/application&gt; will check your mail.</div><div class='del'>-	New mail will appear in the local &lt;interface&gt;Inbox&lt;/interface&gt;</div><div class='del'>-	if you're using a &lt;glossterm&gt;POP&lt;/glossterm&gt; account, and in</div><div class='del'>-	your &lt;glossterm&gt;IMAP&lt;/glossterm&gt; folders if you use IMAP.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-   </div><div class='del'>-     &lt;note id="badmailsettings"&gt;</div><div class='del'>-     &lt;title&gt;Can't Check Mail?&lt;/title&gt; </div><div class='del'>-     &lt;para&gt;</div><div class='del'>-	If you get an error message instead of mail, you probably need</div><div class='del'>-	to change your network settings.  To learn how to do that,</div><div class='del'>-	have a look at &lt;xref linkend="config-prefs-mail-network"&gt;, or</div><div class='del'>-	ask your system administrator.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/note&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-get-news"&gt;</div><div class='del'>-         &lt;title&gt;Using Evolution for News &lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         Newsgroups are so similar to email there's no reason not to</div><div class='del'>-         read them side by side.  If you want to do that, add a news</div><div class='del'>-         source to your configuration (see &lt;xref</div><div class='del'>-         linkend="config-prefs-network-news"&gt;). The news server will</div><div class='del'>-         appear as a remote server, and will look quite similar to an</div><div class='del'>-         IMAP folder.  When you click &lt;guibutton&gt;Get Mail&lt;/guibutton&gt;,</div><div class='del'>-         &lt;application&gt;Evolution&lt;/application&gt; will also check for news</div><div class='del'>-         messages.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;/sect3&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-get-attach"&gt;</div><div class='del'>-	&lt;title&gt;Attachments and HTML Mail&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  If someone sends you an &lt;glossterm&gt;attachment&lt;/glossterm&gt;, a</div><div class='del'>-	  file attached to an email,</div><div class='del'>-	  &lt;application&gt;Evolution&lt;/application&gt; will display the file</div><div class='del'>-	  at the bottom of the message to which it's attached.  Text,</div><div class='del'>-	  HTML, and most images will be displayed within the message</div><div class='del'>-	  itself.  For other files,</div><div class='del'>-	  &lt;application&gt;Evolution&lt;/application&gt; will provide a link and</div><div class='del'>-	  icon at the end of the message.  Click on that, and</div><div class='del'>-	  &lt;application&gt;Evolution&lt;/application&gt; will ask you where you</div><div class='del'>-	  want to put the file.  Once you've chosen a location and</div><div class='del'>-	  saved the file, you can open, move, copy, or execute it just</div><div class='del'>-	  like any other, using &lt;application&gt;Nautilus&lt;/application&gt; or</div><div class='del'>-	  your favorite shell or file manager.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          As usual, there's a shortcut here: right-click on the link,</div><div class='del'>-	  and choose an application for the file: you can send an</div><div class='del'>-	  image straight to the &lt;application&gt;GIMP&lt;/application&gt;, or a</div><div class='del'>-	  spredsheet straight to &lt;application&gt;Gnumeric&lt;/application&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	   &lt;application&gt;Evolution&lt;/application&gt; can also display</div><div class='del'>-	   HTML-formatted mail, complete with graphics.  HTML</div><div class='del'>-	   formatting will display automatically, although you can</div><div class='del'>-	   turn it off if you prefer.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-mail-getnsend-send"&gt;</div><div class='del'>-      &lt;title&gt;Writing and Sending Mail&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	 You can start writing a new email message by selecting</div><div class='del'>-	 &lt;menuchoice&gt; &lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-	 &lt;guisubmenu&gt;New&lt;/guisubmenu&gt; &lt;guimenuitem&gt;</div><div class='del'>-	 Mail&lt;/guimenuitem&gt;&lt;/menuchoice&gt;, or by pressing the</div><div class='del'>-	 &lt;guibutton&gt;Compose&lt;/guibutton&gt; button in the Inbox toolbar.</div><div class='del'>-	 When you do so, the &lt;interface&gt;New Message&lt;/interface&gt; window</div><div class='del'>-	 will open, as shown in &lt;xref</div><div class='del'>-	 linkend="usage-mail-newmsg-fig"&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--   ==============Figure=================================== --&gt;</div><div class='del'>-      &lt;figure id="usage-mail-newmsg-fig"&gt;</div><div class='del'>-	&lt;title&gt;New Message Window&lt;/title&gt;</div><div class='del'>-	&lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;Evolution Main Window&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/newmsg-pic" format="png" srccredit="Kevin Breit"&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;!-- ==============End of Figure=================================== --&gt;</div><div class='del'>-</div><div class='del'>- &lt;!-- Check the alignment of the following paragraph in the PS and</div><div class='del'>- HTML output: it's indented for no good reason --&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	 Enter an address in the &lt;guilabel&gt;To:&lt;/guilabel&gt; field, a</div><div class='del'>-	 subject in the &lt;guilabel&gt;Subject:&lt;/guilabel&gt; and a message in</div><div class='del'>-	 the big empty box at the bottom of the window, and press</div><div class='del'>-	 &lt;guibutton&gt;Send&lt;/guibutton&gt;.  That's easy, although it can</div><div class='del'>-	 get a little more complicated if you want.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-send-delay"&gt;</div><div class='del'>-	&lt;title&gt;Saving Messages for Later&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	   Evolution will send mail immediately unless you tell it to</div><div class='del'>-	   do otherwise by selecting &lt;menuchoice&gt;</div><div class='del'>-	   &lt;guimenu&gt;File&lt;/guimenu&gt; &lt;guimenuitem&gt;Send</div><div class='del'>-	   Later&lt;/guimenuitem&gt;&lt;/menuchoice&gt;.  That will add messages</div><div class='del'>-	   to the &lt;guilabel&gt;Outbox&lt;/guilabel&gt; queue.  Then, when you</div><div class='del'>-	   press &lt;guibutton&gt;Send&lt;/guibutton&gt; in another message, or</div><div class='del'>-	   &lt;guibutton&gt;Get Mail&lt;/guibutton&gt; in the main mail window,</div><div class='del'>-	   all your unsent messages will go out at once.  I like to</div><div class='del'>-	   use "Send Later" because it gives me a chance to change my</div><div class='del'>-	   mind about a message before it goes out.  That way, I don't</div><div class='del'>-	   send anything I'll regret the next day.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	   To learn more about how you can specify message queue and</div><div class='del'>-	   filter behavior, see &lt;xref linkend="config-prefs-mail"&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           You can also choose to save messages as drafts or as text</div><div class='del'>-           files.  Choose</div><div class='del'>-           &lt;menuchoice&gt;</div><div class='del'>-             &lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-             &lt;guimenuitem&gt;Save&lt;/guimenuitem&gt;</div><div class='del'>-	  &lt;/menuchoice&gt;</div><div class='del'>-          or &lt;guimenuitem&gt;Save As&lt;/guimenuitem&gt; to save your message</div><div class='del'>-          as a text file. If you prefer to keep your message in a</div><div class='del'>-          folder (the &lt;guilabel&gt;Drafts&lt;/guilabel&gt; folder would be the</div><div class='del'>-          obvious place), you can select &lt;menuchoice&gt;</div><div class='del'>-          &lt;guimenu&gt;File&lt;/guimenu&gt; &lt;guimenuitem&gt;Save In</div><div class='del'>-          Folder&lt;/guimenuitem&gt; &lt;/menuchoice&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-send-compose"&gt;</div><div class='del'>-        &lt;title&gt;Advanced Mail Composition&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  You can probably guess the purpose of the buttons labelled</div><div class='del'>-	  &lt;guibutton&gt;Cut&lt;/guibutton&gt;, &lt;guibutton&gt;Copy&lt;/guibutton&gt;,</div><div class='del'>-	  &lt;guibutton&gt;Paste&lt;/guibutton&gt;, &lt;guibutton&gt;Undo&lt;/guibutton&gt;</div><div class='del'>-	  and &lt;guibutton&gt;Redo&lt;/guibutton&gt;, but there's a bit more to</div><div class='del'>-	  sending mail that's less obvious.  In the next few sections,</div><div class='del'>-	  you'll see how &lt;application&gt;Evolution&lt;/application&gt; handles</div><div class='del'>-	  additional features, including large recipient lists,</div><div class='del'>-	  attachments, and forwarding.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;sect4 id="usage-mail-getnsend-send-attach"&gt;</div><div class='del'>-	&lt;title&gt;Attachments&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	    If you want to attach a file to your email message, you</div><div class='del'>-	    can drag it from your desktop into the message window, or</div><div class='del'>-	    click the button in the toolbar with a paper clip on it,</div><div class='del'>-	    labelled &lt;guibutton&gt;Attach&lt;/guibutton&gt;.  If you click the</div><div class='del'>-	    &lt;guibutton&gt;Attach&lt;/guibutton&gt; button,</div><div class='del'>-	    &lt;application&gt;Evolution&lt;/application&gt; will open a file</div><div class='del'>-	    selection dialog box, to ask you which file you want to</div><div class='del'>-	    send.  Select the file and click &lt;guilabel&gt;OK&lt;/guilabel&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-            To see what files you've attached to the message you're</div><div class='del'>-            composing, select &lt;menuchoice&gt; &lt;guimenu&gt;View&lt;/guimenu&gt;</div><div class='del'>-            &lt;guimenuitem&gt;Show Attachments&lt;/guimenuitem&gt; &lt;/menuchoice&gt;;</div><div class='del'>-            to hide them again, choose &lt;guimenuitem&gt;Hide</div><div class='del'>-            Attachments&lt;/guimenuitem&gt;.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-            When you send the message, a copy of the attached file</div><div class='del'>-	    will go with it.  Be aware that big attachments can take a</div><div class='del'>-	    long time to download.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	&lt;/sect4&gt;</div><div class='del'>-        &lt;sect4 id="usage-mail-getnsend-send-to-types"&gt;</div><div class='del'>-         &lt;title&gt;Types of Recipients&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	    &lt;application&gt;Evolution&lt;/application&gt;, like all email</div><div class='del'>-	    programs (at least, all the ones in current use)</div><div class='del'>-	    recognizes three types of addressee: primary recipients,</div><div class='del'>-	    secondary recipients, and hidden ("blind") recipients.</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-         &lt;para&gt;</div><div class='del'>-	    The simplest way to direct a message is to put the email</div><div class='del'>-            address or addresses in the &lt;guilabel&gt;To:&lt;/guilabel&gt;</div><div class='del'>-            field, which denotes primary recipients.  However, it's</div><div class='del'>-            considered bad form to have more than a few email</div><div class='del'>-            addresses in this section.  If you are sending mail to</div><div class='del'>-            more than one or two people, consider the</div><div class='del'>-            &lt;guilabel&gt;Cc:&lt;/guilabel&gt; field.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Hearkening back to the dark ages when people used</div><div class='del'>-	    typewriters and there were no copy machines, "Cc" stands</div><div class='del'>-	    for "Carbon Copy."  Use it whenever you want to share a</div><div class='del'>-	    message you've written to someone else.</div><div class='del'>-	    &lt;example id="ex-mail-cc"&gt;</div><div class='del'>-	      &lt;title&gt;Using the Cc: field&lt;/title&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	         When Susan sends an email to a client, she puts her</div><div class='del'>-	         co-worker, Tim, in the in the</div><div class='del'>-	         &lt;guilabel&gt;Cc:&lt;/guilabel&gt; field, so that he know</div><div class='del'>-	         what's going on.  The client can see that Tim also</div><div class='del'>-	         received the message, and knows that he can talk to</div><div class='del'>-	         Tim about the message as well.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/example&gt;</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    If you have a large number of recipients, or if you want</div><div class='del'>-	    to send mail to several people without sharing the</div><div class='del'>-	    recipient list, you should use</div><div class='del'>-	    &lt;guilabel&gt;Bcc:&lt;/guilabel&gt;. "Bcc" stands for "Blind Carbon</div><div class='del'>-	    Copy", and means that people you put in the</div><div class='del'>-	    &lt;guilabel&gt;Bcc:&lt;/guilabel&gt; field get the message, but</div><div class='del'>-	    nobody else sees their email address.  They will still see</div><div class='del'>-	    the list of addresses from the &lt;guilabel&gt;To:&lt;/guilabel&gt;</div><div class='del'>-	    and &lt;guilabel&gt;Cc:&lt;/guilabel&gt; fields, though.</div><div class='del'>-</div><div class='del'>-	    &lt;example id="ex-mail-bcc"&gt;</div><div class='del'>-	      &lt;title&gt;Using the Bcc: field&lt;/title&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	         Tim is sending an email announcement to all of his</div><div class='del'>-	         company's clients, some of whom are in competition</div><div class='del'>-	         with each other, and all of whom value their</div><div class='del'>-	         privacy. He needs to use the</div><div class='del'>-	         &lt;guilabel&gt;Bcc:&lt;/guilabel&gt; field here.  If he puts</div><div class='del'>-	         every address from his address book's "Clients"</div><div class='del'>-	         category into the &lt;guilabel&gt;To:&lt;/guilabel&gt; or</div><div class='del'>-	         &lt;guilabel&gt;Cc:&lt;/guilabel&gt; fields, he'll make the</div><div class='del'>-	         company's &lt;emphasis&gt;entire&lt;/emphasis&gt; client list</div><div class='del'>-	         public.  Don't assume it won't happen to you!</div><div class='del'>-	     &lt;/para&gt;</div><div class='del'>-	    &lt;/example&gt;</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/sect4&gt;</div><div class='del'>-</div><div class='del'>-        &lt;sect4 id="usage-mail-getnsend-send-to"&gt;</div><div class='del'>-	&lt;title&gt;Choosing Recipients Quickly&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  If you have created address cards in the contact manager,</div><div class='del'>-	  you can also enter nicknames or other portions of address</div><div class='del'>-	  data, and &lt;application&gt;Evolution&lt;/application&gt; will complete</div><div class='del'>-	  the address for you. &lt;!-- (INSERT description of UI for this</div><div class='del'>-	  feature, once it is decided upon). --&gt; If you enter a name</div><div class='del'>-	  or nickname that can go with more than one card, Evolution</div><div class='del'>-	  will open a dialog box to ask you which person you meant.</div><div class='del'>-	  &lt;!-- (NOT YET) Also, &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	  will add a domain to any unqualified addresses.  By default,</div><div class='del'>-	  this is your domain, but you can choose which one mail</div><div class='del'>-	  preferences dialog. --&gt;</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            Alternately, you can click on the</div><div class='del'>-            &lt;guibutton&gt;To:&lt;/guibutton&gt;, &lt;guibutton&gt;Cc:&lt;/guibutton&gt;, or</div><div class='del'>-            &lt;guibutton&gt;Bcc:&lt;/guibutton&gt; buttons to get a list &amp;mdash;</div><div class='del'>-            potentially a very long one &amp;mdash; of the email addresses</div><div class='del'>-            in your contact manager.  Select addresses and click on</div><div class='del'>-            the arrows to move them into the appropriate address</div><div class='del'>-            columns.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            For more information about using email together with the</div><div class='del'>-	    contact manager and the calendar, see &lt;xref</div><div class='del'>-	    linkend="usage-contact-automate"&gt; and &lt;xref</div><div class='del'>-	    linkend="usage-calendar-apts"&gt;.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-        &lt;/sect4&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-      </div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-send-reply"&gt;</div><div class='del'>-	&lt;title&gt;Replying to Messages&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	   To reply to a message, press the</div><div class='del'>-	   &lt;guibutton&gt;Reply&lt;/guibutton&gt; button while it is selected,</div><div class='del'>-	   or choose &lt;guimenuitem&gt;Reply to Sender&lt;/guimenuitem&gt; from</div><div class='del'>-	   the message's right-click menu.  That will open</div><div class='del'>-	   &lt;interface&gt;message composer&lt;/interface&gt;.  The</div><div class='del'>-	   &lt;guilabel&gt;To:&lt;/guilabel&gt; and &lt;guilabel&gt;Subject&lt;/guilabel&gt;</div><div class='del'>-	   fields will already be filled, although you can alter them</div><div class='del'>-	   if you wish.  In addition, the full text of the old message</div><div class='del'>-	   is inserted into the new message, either in italics (for</div><div class='del'>-	   HTML display) or with the &amp;gt; character (in plain text</div><div class='del'>-	   mode) before each line, to indicate that it's part of the</div><div class='del'>-	   previous message.  People often intersperse their message</div><div class='del'>-	   with the quoted material as shown in &lt;xref</div><div class='del'>-	   linkend="usage-mail-getnsend-reply-fig"&gt;.</div><div class='del'>-</div><div class='del'>-&lt;!-- note that this figure should have a reply mail ready to send,</div><div class='del'>-with quoted materials and the relevant replies interspersed--&gt;</div><div class='del'>- &lt;!-- ==============Figure=================================== --&gt;</div><div class='del'>-       &lt;figure id="usage-mail-getnsend-reply-fig"&gt;</div><div class='del'>-	 &lt;title&gt;Reply Message Window&lt;/title&gt;</div><div class='del'>-	 &lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;Evolution Main Window&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/replymsg" format="png" srccredit="Aaron Weber"&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;!-- ==============End of Figure=================================== --&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  If you're reading a message with several recipients, you may</div><div class='del'>-	   wish to use &lt;guibutton&gt;Reply to All&lt;/guibutton&gt; instead of</div><div class='del'>-	   &lt;guibutton&gt;Reply&lt;/guibutton&gt;.  If there are large numbers</div><div class='del'>-	   of people in the &lt;guilabel&gt;Cc:&lt;/guilabel&gt; or</div><div class='del'>-	   &lt;guilabel&gt;To:&lt;/guilabel&gt; fields, this can save substantial</div><div class='del'>-	   amounts of time.  But be careful, and always make sure you</div><div class='del'>-	   know who is getting a message: one address could be a</div><div class='del'>-	   mailing list with thousands of subscribers.</div><div class='del'>-	  &lt;example&gt;</div><div class='del'>-	    &lt;title&gt;Using the Reply to All feature&lt;/title&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      Susan sends an email to a client, and sends copies to</div><div class='del'>-	      Tim and to an internal company mailing list of</div><div class='del'>-	      co-workers.  If Tim wants to make a comment to all of</div><div class='del'>-	      them, he uses &lt;guibutton&gt;Reply to All&lt;/guibutton&gt;, but</div><div class='del'>-	      if he just wants to tell Susan that he agrees with her,</div><div class='del'>-              he uses &lt;guibutton&gt;Reply&lt;/guibutton&gt;.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/example&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-send-find"&gt;</div><div class='del'>-        &lt;title&gt;Searching and Replacing with the Composer&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           You're probably familiar with search and replace features,</div><div class='del'>-           and if you come from a Linux or Unix background, you</div><div class='del'>-           probably know what &lt;guimenuitem&gt;Find Regex&lt;/guimenuitem&gt;</div><div class='del'>-           does.  If you aren't among the lucky who already know,</div><div class='del'>-           here's a quick rundown of an important section of the</div><div class='del'>-           &lt;guimenu&gt;Edit&lt;/guimenu&gt; menu.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           &lt;variablelist&gt;</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenuitem&gt;Find&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt; Enter a word or phrase, and</div><div class='del'>-	      &lt;application&gt;Evolution&lt;/application&gt; will find it</div><div class='del'>-              in your message.</div><div class='del'>-	      &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	    </div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenuitem&gt;Find Regex&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Perform a search for a &lt;glossterm</div><div class='del'>-                  linkend="regular-expression"&gt;regular</div><div class='del'>-                  expression&lt;/glossterm&gt;, or "regex."</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-             &lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;&lt;guimenuitem&gt;Find Again&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                   Select this item to repeat the last search you performed.</div><div class='del'>-              &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	       &lt;term&gt;&lt;guimenuitem&gt;Replace&lt;/guimenuitem&gt;&lt;/term&gt;</div><div class='del'>-	       &lt;listitem&gt;&lt;para&gt; </div><div class='del'>-                 Find a word or phrase, and replace it with</div><div class='del'>-	         something else.  </div><div class='del'>-               &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;/variablelist&gt;</div><div class='del'>-        &lt;/para&gt;  </div><div class='del'>-	&lt;para&gt;</div><div class='del'>-            For all of these items, you have two additional choices.</div><div class='del'>-            First, you can choose whether to &lt;guilabel&gt;Search</div><div class='del'>-            Backwards&lt;/guilabel&gt;, which will perform the search</div><div class='del'>-            starting wherever your cursor is, and moving back towards</div><div class='del'>-            the beginning of the document (normally, it goes the other</div><div class='del'>-            way).  Then, you can decide whether to have your search be</div><div class='del'>-            &lt;guilabel&gt;Case Sensitive&lt;/guilabel&gt;, meaning should it pay</div><div class='del'>-            attention to the case of letters when locating a match.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-send-html"&gt;</div><div class='del'>-	&lt;title&gt;Embellish your email with HTML&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-            You can't normally use text treatments or pictures in</div><div class='del'>-            emails, which is why you've probably seen people use far</div><div class='del'>-            too many exclamation points for emphasis or use &lt;glossterm</div><div class='del'>-            linkend="emoticon"&gt;emoticons&lt;/glossterm&gt; to convey their</div><div class='del'>-            feelings.  However, most of the newer email programs can</div><div class='del'>-            include and display images and text treatments as well as</div><div class='del'>-            basic alignment and paragraph formatting. They do this</div><div class='del'>-            with &lt;glossterm linkend="html"&gt;HTML&lt;/glossterm&gt;, just like</div><div class='del'>-            web sites do.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;note&gt;</div><div class='del'>-	  &lt;title&gt;HTML Mail is not a Default Setting&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Some people do not have HTML-capable mail clients, or</div><div class='del'>-	    prefer not to receive HTML-enhanced mail because it is</div><div class='del'>-	    slower to download and display.  &lt;emphasis&gt;Some&lt;/emphasis&gt;</div><div class='del'>-	    people refer to HTML mail as "the root of all evil" and</div><div class='del'>-	    get very angry if you send them HTML mail, which is why</div><div class='del'>-	    &lt;application&gt;Evolution&lt;/application&gt; sends plain text</div><div class='del'>-	    unless you explicitly ask for HTML.  To send HTML mail,</div><div class='del'>-	    you will need to select &lt;menuchoice&gt;</div><div class='del'>-	    &lt;guimenu&gt;Format&lt;/guimenu&gt; &lt;guimenuitem&gt;</div><div class='del'>-	    HTML&lt;/guimenuitem&gt;&lt;/menuchoice&gt;.  Alternately, you can set</div><div class='del'>-	    your default mail format preferences in the mail</div><div class='del'>-	    configuration dialog.  See &lt;xref</div><div class='del'>-	    linkend="config-prefs-mail-other"&gt; for more information.</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	&lt;/note&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           HTML formatting tools are located just above the</div><div class='del'>-	   composition frame, and in the &lt;guimenu&gt;Insert&lt;/guimenu&gt; and</div><div class='del'>-	   &lt;guimenu&gt;Format&lt;/guimenu&gt; menus.  Your message text will</div><div class='del'>-	   appear formatted in the composer window, and the message</div><div class='del'>-	   will be sent as HTML.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-            The icons in the toolbar are explained in tool-tips, which</div><div class='del'>-            appear when you hold your mouse over the buttons.  The</div><div class='del'>-            buttons fall into four categories:</div><div class='del'>-            &lt;variablelist&gt;</div><div class='del'>-             &lt;varlistentry&gt;</div><div class='del'>-             &lt;term&gt;Headers and lists&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Choose &lt;guilabel&gt;Normal&lt;/guilabel&gt; for a default</div><div class='del'>-                  text style, or &lt;guilabel&gt;Header 1&lt;/guilabel&gt; through</div><div class='del'>-                  &lt;guilabel&gt;Header 6&lt;/guilabel&gt; for varying sizes of</div><div class='del'>-                  header from large (1) to tiny (6).  You can also</div><div class='del'>-                  select &lt;guilabel&gt;pre&lt;/guilabel&gt; for preformatted</div><div class='del'>-                  text blocks, and three types of &lt;guilabel&gt;List</div><div class='del'>-                  Item&lt;/guilabel&gt;.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-           &lt;/varlistentry&gt;</div><div class='del'>-           &lt;varlistentry&gt;</div><div class='del'>-             &lt;term&gt;Text style&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  Use these buttons to determine the way your letters</div><div class='del'>-                  look.  If you have text selected, the style will</div><div class='del'>-                  apply to the selected text.  If you do not have text</div><div class='del'>-                  selected, the style will apply to whatever you type</div><div class='del'>-                  next.  The buttons are:</div><div class='del'>-                  &lt;itemizedlist mark="none"&gt;      </div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;Push &lt;guibutton&gt;B&lt;/guibutton&gt; for bold text&lt;/para&gt;&lt;/listitem&gt;   </div><div class='del'>-                  &lt;listitem&gt;&lt;para&gt;Push &lt;guibutton&gt;I&lt;/guibutton&gt; for italics&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;Push &lt;guibutton&gt;U&lt;/guibutton&gt; to underline&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-		  &lt;listitem&gt;&lt;para&gt;Push &lt;guibutton&gt;S&lt;/guibutton&gt; for a strikethrough.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-                 &lt;/itemizedlist&gt;</div><div class='del'>-               &lt;/para&gt;               </div><div class='del'>-	      &lt;/listitem&gt;    </div><div class='del'>-	    &lt;/varlistentry&gt;</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;Alignment&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                   Located next to the text style buttons,</div><div class='del'>-                   these three paragraph icons should be familiar to</div><div class='del'>-                   users of most word processing software.  The</div><div class='del'>-                   leftmost button will make your text left-justified,</div><div class='del'>-                   the center button, centered, and the right hand</div><div class='del'>-                   button, right-justified.</div><div class='del'>-                &lt;/para&gt;</div><div class='del'>-	      &lt;/listitem&gt;</div><div class='del'>-	      &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;Indentation rules&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  The button with the arrow pointing left will reduce</div><div class='del'>-                  a paragraph's indentation, and the right arrow will</div><div class='del'>-                  increase its indentation.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	    &lt;varlistentry&gt;</div><div class='del'>-	      &lt;term&gt;Color Selection&lt;/term&gt;</div><div class='del'>-	      &lt;listitem&gt;</div><div class='del'>-		&lt;para&gt;</div><div class='del'>-                  At the far right is the color section tool.  You can</div><div class='del'>-                  choose from several colors by clicking on the arrow,</div><div class='del'>-                  or create your own custom color by clicking on the</div><div class='del'>-                  color box itself.  If you have text selected, the</div><div class='del'>-                  color will apply to the selected text.  If you do</div><div class='del'>-                  not have text selected, the color will apply to</div><div class='del'>-                  whatever you type next.</div><div class='del'>-               &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;/variablelist&gt;</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-           There are three tools that you can find only in the</div><div class='del'>-           &lt;guimenu&gt;Insert&lt;/guimenu&gt; menu.</div><div class='del'>-           &lt;variablelist&gt;</div><div class='del'>-             &lt;varlistentry&gt;</div><div class='del'>-               &lt;term&gt;&lt;guimenuitem&gt;Insert Link&lt;/guimenuitem&gt;:&lt;/term&gt;</div><div class='del'>-	       &lt;listitem&gt;</div><div class='del'>-	        &lt;para&gt;</div><div class='del'>-                  Use this tool to put hyperlinks in your HTML</div><div class='del'>-                  messages.  When you select it,</div><div class='del'>-                  &lt;application&gt;Evolution&lt;/application&gt; will prompt you</div><div class='del'>-                  for the &lt;guilabel&gt;Text&lt;/guilabel&gt; that will appear,</div><div class='del'>-                  and the &lt;guilabel&gt;Link&lt;/guilabel&gt;, where you should</div><div class='del'>-                  enter the actual web address (URL).</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-          &lt;/varlistentry&gt;</div><div class='del'>-          &lt;varlistentry&gt;</div><div class='del'>-            &lt;term&gt; &lt;guimenuitem&gt;Insert Image&lt;/guimenuitem&gt;:&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-               &lt;guimenuitem&gt;Insert Image&lt;/guimenuitem&gt;: Select this item to</div><div class='del'>-               embed an image into your email, as was done in the welcome</div><div class='del'>-               message.  Images will appear at the location of the</div><div class='del'>-               cursor.</div><div class='del'>-              &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-           &lt;/varlistentry&gt;</div><div class='del'>-          &lt;varlistentry&gt;</div><div class='del'>-             &lt;term&gt;&lt;guimenuitem&gt;Insert Rule&lt;/guimenuitem&gt;:&lt;/term&gt;</div><div class='del'>-             &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               This will insert a horizontal line, or rule, into your document.</div><div class='del'>-               You'll be presented with a dialog box which gives you</div><div class='del'>-               the choice of size, percentage of screen, shading, and</div><div class='del'>-               alignment; if you leave everything at the default</div><div class='del'>-               values you'll get a thin black rule all the way across</div><div class='del'>-               the screen.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;/variablelist&gt;</div><div class='del'>-          &lt;/para&gt;</div><div class='del'>-	  &lt;note&gt;</div><div class='del'>-	    &lt;title&gt;A Technical note on HTML Tags&lt;/title&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      The composer is a WYSIWYG (What You See Is What You Get)</div><div class='del'>-	      editor for HTML. That means that if you enter HTML</div><div class='del'>-	      directly into the composer&amp;mdash; say, &lt;markup</div><div class='del'>-	      role="html"&gt;&amp;lt;B&amp;gt;Bold Text&amp;lt;/B&amp;gt&lt;/markup&gt;, the</div><div class='del'>-	      the composer will assume you meant exactly that string</div><div class='del'>-	      of characters, and not "make this text bold," as an HTML</div><div class='del'>-	      composition tool or text editor would.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	&lt;/note&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-   </div><div class='del'>-</div><div class='del'>-&lt;!-- Function not implemented, </div><div class='del'>-possibly never will be due to security evil. --&gt;</div><div class='del'>-&lt;!--</div><div class='del'>-	&lt;sect3 id="usage-mail-getnsend-send-live"&gt;</div><div class='del'>-	  &lt;title&gt;Live Documents&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	    Later versions of &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	    will allow you to enliven your email with almost any</div><div class='del'>-	    sort of document, and even with entire</div><div class='del'>-	    applications. At this point, however, this feature has not </div><div class='del'>-	    yet been implemented.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/sect3&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-fwd"&gt;</div><div class='del'>-	&lt;title&gt;Forwarding Mail&lt;/title&gt;      </div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  The post office forwards your mail for you when you change</div><div class='del'>-	  addresses, and you can forward mail when you get a letter by</div><div class='del'>-	  mistake.  The email &lt;guilabel&gt;Forward&lt;/guilabel&gt; button</div><div class='del'>-	  works in much the same way.  It's particularly useful if you</div><div class='del'>-	  have received a message and you think someone else would</div><div class='del'>-	  like to see it.  You can forward a message as an attachment</div><div class='del'>-	  to a new message (this is the default) or</div><div class='del'>-	  you can send it &lt;glossterm linkend="inline"&gt;inline&lt;/glossterm&gt; as a quoted</div><div class='del'>-	  portion of the message you are sending.  Attachment</div><div class='del'>-	  forwarding is best if you want to send the full, unaltered</div><div class='del'>-	  message on to someone else.  Inline forwarding is best if</div><div class='del'>-	  you want to send portions of a message, or if you have a</div><div class='del'>-	  large number of comments on different sections of the</div><div class='del'>-	  message you are forwarding.  Remember to note from whom the</div><div class='del'>-	  message came, and where, if at all, you have removed or</div><div class='del'>-	  altered content.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  To forward a message you are reading, press</div><div class='del'>-	  &lt;guibutton&gt;Forward&lt;/guibutton&gt; on the toolbar, or select</div><div class='del'>-	  &lt;menuchoice&gt; &lt;guimenu&gt;Message&lt;/guimenu&gt;</div><div class='del'>-	  &lt;guimenuitem&gt;Forward&lt;/guimenuitem&gt; &lt;/menuchoice&gt;.  If you</div><div class='del'>-	  prefer to forward the message &lt;glossterm linkend="inline"&gt;inline&lt;/glossterm&gt;</div><div class='del'>-	  instead of attached, select &lt;menuchoice&gt;</div><div class='del'>-	  &lt;guimenu&gt;Message&lt;/guimenu&gt; &lt;guimenuitem&gt;Forward</div><div class='del'>-	  Inline&lt;/guimenuitem&gt; &lt;/menuchoice&gt; from the menu.  Choose an</div><div class='del'>-	  addressee as you would when sending a new message; the</div><div class='del'>-	  subject will already be entered, but you can alter it.</div><div class='del'>-	  Enter your comments on the message in the</div><div class='del'>-	  &lt;interface&gt;composition frame&lt;/interface&gt;, and press</div><div class='del'>-	  &lt;guibutton&gt;Send&lt;/guibutton&gt;.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-      &lt;sect3 id="usage-mail-getnsend-ettiquette"&gt;</div><div class='del'>-	&lt;title&gt;Seven Tips for Email Usage&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  I started with ten, but four were "Don't send</div><div class='del'>-	  &lt;glossterm linkend="spam"&gt;spam&lt;/glossterm&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'>-		 Don't send spam or forward chain mail.  If you must,</div><div class='del'>-		 watch out for hoaxes and urban legends, and make sure</div><div class='del'>-		 the message doesn't have multiple layers of</div><div class='del'>-		 greater-than signs, (&amp;gt;) indicating multiple layers</div><div class='del'>-		 of careless inline forwarding.</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'>-		Always begin and close with a salutation. Say</div><div class='del'>-		"please" and "thank you", just like you do in real</div><div class='del'>-		life. You can keep your pleasantries short, but be pleasant!</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'>-		ALL CAPS MEANS YOU'RE SHOUTING! Don't write a whole</div><div class='del'>-		message in capital letters.  It hurts people's ears.</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'>-		 Never write anything in email you wouldn't say in</div><div class='del'>-		 public.  Old messages have a nasty habit of</div><div class='del'>-		 resurfacing when you least expect.</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'>-	       Check your spelling and use complete sentences.</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'>-		Don't send nasty emails (flames).  If you get one,</div><div class='del'>-		don't write back.</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'>-		 When you reply or forward, include just enough of</div><div class='del'>-		 the previous message to provide context: not too</div><div class='del'>-		 much, not too little.</div><div class='del'>-	       &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/itemizedlist&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-	&lt;para&gt; Happy mailing! &lt;/para&gt;</div><div class='del'>-      &lt;/sect3&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="usage-mail-organize"&gt;</div><div class='del'>-    &lt;title&gt;Organizing Your Mail&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Even if you only get a few email messages a day, you probably</div><div class='del'>-      want to sort and organize them.  When you get a hundred a day</div><div class='del'>-      and you want to refer to a message you received six weeks ago,</div><div class='del'>-      you &lt;emphasis&gt;need&lt;/emphasis&gt; to sort and organize them.</div><div class='del'>-      Fortunately, &lt;application&gt;Evolution&lt;/application&gt; has the tools</div><div class='del'>-      to help you do it.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-mail-organize-folders"&gt;</div><div class='del'>-      &lt;title&gt;Getting Organized with Folders&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&lt;application&gt;Evolution&lt;/application&gt; keeps mail, as well as</div><div class='del'>-	address cards and calendars, in folders.  You start out with a</div><div class='del'>-	few, like &lt;guilabel&gt;Inbox&lt;/guilabel&gt;,</div><div class='del'>-	&lt;guilabel&gt;Outbox&lt;/guilabel&gt;, and &lt;guilabel&gt;Drafts&lt;/guilabel&gt;,</div><div class='del'>-	but you can create as many as you like.  Create new folders by</div><div class='del'>-	selecting &lt;guisubmenu&gt;New&lt;/guisubmenu&gt; and then</div><div class='del'>-	&lt;guimenuitem&gt;Folder&lt;/guimenuitem&gt; from the</div><div class='del'>-	&lt;guimenu&gt;File&lt;/guimenu&gt; menu.</div><div class='del'>-	&lt;application&gt;Evolution&lt;/application&gt; will as you for the name</div><div class='del'>-	and the type of the folder, and will provide you with a folder</div><div class='del'>-	tree so you can pick where it goes.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        When you click &lt;guibutton&gt;OK&lt;/guibutton&gt;, your new folder will</div><div class='del'>-	appear in the &lt;interface&gt;folder view&lt;/interface&gt;.  You can</div><div class='del'>-	then put messages in it by dragging and dropping them, or by</div><div class='del'>-	using the &lt;guibutton&gt;Move&lt;/guibutton&gt; button in the toolbar.</div><div class='del'>-	If you create a filter with the &lt;interface&gt;filter</div><div class='del'>-	assistant&lt;/interface&gt;, you can have mail moved to your folder</div><div class='del'>-	automatically.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;    </div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-mail-organize-search"&gt;</div><div class='del'>-      &lt;title&gt;Searching for Messages&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Most mail clients can search through your messages for you,</div><div class='del'>-	but &lt;application&gt;Evolution&lt;/application&gt; does it faster.  You</div><div class='del'>-	can search through just the message subjects, just the message</div><div class='del'>-	body, or both body and subject.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	To start searching, enter a word or phrase in the text area</div><div class='del'>-	right below the toolbar, and choose a search type:</div><div class='del'>-	&lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Body or subject contains:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	        This will search message subjects and the messages</div><div class='del'>-	        themselves for the word or phrase you've entered in</div><div class='del'>-	        the search field.</div><div class='del'>-   	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt; &lt;guilabel&gt;Body contains:&lt;/guilabel&gt; &lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	        This will search only in message text, not the subject</div><div class='del'>-	        lines.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Subject contains:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	        This will show you messages where the search text is</div><div class='del'>-	        in the subject line.  It will not search in the</div><div class='del'>-	        message body.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Body does not contain:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	        This finds every email message that does not have the</div><div class='del'>-	        search text in the message body.  It will still show</div><div class='del'>-	        messages that have the search text in the subject</div><div class='del'>-	        line, if it is not also in the body.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Subject does not contain:&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	      &lt;para&gt;</div><div class='del'>-	        This finds every mail whose subject does not contain</div><div class='del'>-	        the search text.</div><div class='del'>-	      &lt;/para&gt;</div><div class='del'>-	    &lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-</div><div class='del'>-        Then, press &lt;keycap&gt;Enter&lt;/keycap&gt;.</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; will show your search</div><div class='del'>-        results in the message list.</div><div class='del'>-</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-mail-organize-filters"&gt;</div><div class='del'>-      &lt;title&gt;Staying organized: Mail Filters in Evolution&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        I once worked in the mail room of a large company, where my</div><div class='del'>-        job was to bundle, sort, and distribute mail to the various</div><div class='del'>-        mail boxes and desks throughout the building.  Filters do that</div><div class='del'>-        same job with email, but they lose much less mail than I did.</div><div class='del'>-        In addition, you can have multiple filters performing multiple</div><div class='del'>-        actions that may effect the same message in several ways.  For</div><div class='del'>-        example, your filters could put copies of one message into</div><div class='del'>-        multiple folders, or keep a copy and send one to another</div><div class='del'>-        person as well.  Which is to say, it's quite a bit more</div><div class='del'>-        flexible than an actual person with a pile of envelopes.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Most often, you'll want to have</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt; put mail into different</div><div class='del'>-        folders, but you can have it do almost anything you like.</div><div class='del'>-        People who subscribe to multiple mailing lists, or who often</div><div class='del'>-        need to refer to messages they have sent, find filters</div><div class='del'>-        especially helpful to separate personal from list-related</div><div class='del'>-        mail, but they're good for anybody who gets more than a few</div><div class='del'>-        messages a day.  To create a filter, open the</div><div class='del'>-        &lt;interface&gt;filter assistant&lt;/interface&gt; by selecting</div><div class='del'>-	&lt;menuchoice&gt;</div><div class='del'>-	  &lt;guimenu&gt;Tools&lt;/guimenu&gt; </div><div class='del'>-          &lt;guimenuitem&gt;Mail Filters&lt;/guimenuitem&gt;</div><div class='del'>-        &lt;/menuchoice&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-            </div><div class='del'>-       &lt;figure id="usage-mail-filters-fig-assist"&gt;</div><div class='del'>-	 &lt;title&gt;The Filter Assistant&lt;/title&gt;</div><div class='del'>-	 &lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;The Filter Assistant&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/filter-assist-fig" format="png" srccredit="Aaron Weber"&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'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        The &lt;interface&gt;filter assistant&lt;/interface&gt; window contains a</div><div class='del'>-        list of your current filters, sorted by the order in which</div><div class='del'>-        they will be performed.  From the drop-down box at the top of</div><div class='del'>-        the window, choose &lt;guilabel&gt;Incoming&lt;/guilabel&gt; to display</div><div class='del'>-        those filters which are performed on incoming mail, and</div><div class='del'>-        &lt;guilabel&gt;On Demand&lt;/guilabel&gt; for those which are performed</div><div class='del'>-        only when you want.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         The &lt;interface&gt;filter assistant&lt;/interface&gt; also has a set of</div><div class='del'>-         buttons:</div><div class='del'>-        &lt;itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-           &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-            &lt;guibutton&gt;Add&lt;/guibutton&gt; &amp;mdash; Create a new filter.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-           &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-            &lt;guibutton&gt;Edit&lt;/guibutton&gt; &amp;mdash; Edit an existing filter.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-           &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-            &lt;guibutton&gt;Delete&lt;/guibutton&gt; &amp;mdash; Delete the selected filter.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-           &lt;listitem&gt;&lt;para&gt; &lt;guibutton&gt;Up&lt;/guibutton&gt; &amp;mdash; Move the</div><div class='del'>-            selected filter up in the list, so it will be performed</div><div class='del'>-            sooner.  &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-           &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-            &lt;guibutton&gt;Down&lt;/guibutton&gt; &amp;mdash;  Move the selected filter down </div><div class='del'>-             in the list, so it will be performed later.</div><div class='del'>-           &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-        If you don't have any filters set up, the only one of those</div><div class='del'>-        buttons you can click is &lt;guibutton&gt;Add&lt;/guibutton&gt;.  When you</div><div class='del'>-        do that, (or when you click &lt;guibutton&gt;Edit&lt;/guibutton&gt; with a</div><div class='del'>-        filter selected), the &lt;interface&gt;Add Rule&lt;/interface&gt; window</div><div class='del'>-        appears.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        That window, shown in &lt;xref</div><div class='del'>-        linkend="usage-mail-filters-fig-new"&gt;, is where you'll</div><div class='del'>-        actually create your filtering rule.  </div><div class='del'>-</div><div class='del'>-       &lt;figure id="usage-mail-filters-fig-new"&gt;</div><div class='del'>-	 &lt;title&gt;Creating a new Filter&lt;/title&gt;</div><div class='del'>-	 &lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;Creating a new Filter&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/filter-new-fig" format="png" srccredit="Aaron Weber"&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'>-        Enter a name for your filter in the &lt;guilabel&gt;Rule</div><div class='del'>-        Name&lt;/guilabel&gt; field, and then begin choosing criteria.</div><div class='del'>-        Choose how many criteria you'd like by pressing &lt;guibutton&gt;Add</div><div class='del'>-        Criterion&lt;/guibutton&gt; and &lt;guibutton&gt;Remove</div><div class='del'>-        Criterion&lt;/guibutton&gt;.  If you have multiple criteria, you</div><div class='del'>-        should then decide whether to have the filter do its job only</div><div class='del'>-        &lt;guilabel&gt;if all criteria are met&lt;/guilabel&gt;, or &lt;guilabel&gt;if</div><div class='del'>-        any criteria are met&lt;/guilabel&gt;.</div><div class='del'>-     &lt;/para&gt;</div><div class='del'>-     &lt;para&gt;</div><div class='del'>-        For each of your filter criteria, you must first select what</div><div class='del'>-        part of the message you want the filter to look at:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Sender&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                The author of the message.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Recipients&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               The recipients of the message.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Subject&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                The subject line of the message.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Specific Header&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; The filter can look at any header you</div><div class='del'>-	    want, even obscure or custom ones like X-Bonus or</div><div class='del'>-	    X-Archive. Enter the header name, and what you'd like to</div><div class='del'>-	    match inside it.  &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Message Body&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                The actual text of the message.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Expression&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; Enter a &lt;glossterm</div><div class='del'>-	    linkend="regular-expression"&gt;regular</div><div class='del'>-	    expression&lt;/glossterm&gt;, and</div><div class='del'>-	    &lt;application&gt;Evolution&lt;/application&gt; will search the</div><div class='del'>-	    entire message, headers and all, to match it for you.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Date Sent&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                You can filter messages by when they were sent: First,</div><div class='del'>-                choose how you'd like to match the time&amp;mdash;</div><div class='del'>-                &lt;guilabel&gt;before&lt;/guilabel&gt;,</div><div class='del'>-                &lt;guilabel&gt;after&lt;/guilabel&gt; and so forth.  Then, choose</div><div class='del'>-                the time. The filter compare the message's time-stamp</div><div class='del'>-                to the system clock when the filter is run, or to a</div><div class='del'>-                specific time and date you choose from a calendar.</div><div class='del'>-                You can even have it look for messages within a range</div><div class='del'>-                of time relative to the filter.  For example, you could have</div><div class='del'>-                the filter catch all messages sent less</div><div class='del'>-                than a week before the filter is run.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Date Recieved&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                This works the same way as the &lt;guilabel&gt;Date Sent&lt;/guilabel&gt; </div><div class='del'>-                option, except that it compares the time you got the message </div><div class='del'>-                with the dates you specify.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Priority&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               Emails have a standard priority range from -3 (least</div><div class='del'>-               important) to 3 (most important). If you can persuade</div><div class='del'>-               your friends and co-workers to use the priority levels  </div><div class='del'>-               honestly, you can filter with them as well.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-        Now, tell it what to do with those messages.  If you want multiple</div><div class='del'>-        actions, click &lt;guibutton&gt;Add Action&lt;/guibutton&gt;; if you want fewer,</div><div class='del'>-        click &lt;guibutton&gt;Remove Action&lt;/guibutton&gt;.  And choose again:</div><div class='del'>-        &lt;variablelist&gt;</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Move to Folder&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-               If you select this item, &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-               will put the messages into a folder you specify.  Click the </div><div class='del'>-               &lt;guibutton&gt;&amp;lt;click here to select a folder&amp;gt;&lt;/guibutton&gt; button</div><div class='del'>-               to select a folder. </div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Forward to Address&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                Select this, enter an address, and the addressee will</div><div class='del'>-                get a copy of the message.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Delete&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                Marks the message for deletion.  You can still get the message</div><div class='del'>-                back, at least until you &lt;guimenuitem&gt;Expunge&lt;/guimenuitem&gt; your</div><div class='del'>-                mail yourself.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Stop Processing&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; Select this if you want to tell all other</div><div class='del'>-	    filters to ignore this message.  If multiple filters copy</div><div class='del'>-	    the message to a different folders, you'll have multiple</div><div class='del'>-	    copies of the message.  &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Assign Color&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-                Select this item, and &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-                will mark the message with whatever color you please.</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	  &lt;varlistentry&gt;</div><div class='del'>-	    &lt;term&gt;&lt;guilabel&gt;Assign Score&lt;/guilabel&gt;&lt;/term&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt; Priority numbers alone don't work, so you</div><div class='del'>-	    can score emails on the same scale. Then, you can tell</div><div class='del'>-	    which ones you want to read, or have scored messages</div><div class='del'>-	    moved, copied, or colored in a subsequent filter.</div><div class='del'>-	    &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	&lt;/variablelist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        You're done.  Click &lt;guibutton&gt;OK&lt;/guibutton&gt; to use this</div><div class='del'>-        filter, or &lt;guibutton&gt;Cancel&lt;/guibutton&gt; to close the window</div><div class='del'>-        without saving any changes.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-   &lt;!-- FIXME: This needs to be in there.  But the feature is temporarily</div><div class='del'>-         disabled and I don't know how it will be reimplemented.</div><div class='del'>-</div><div class='del'>-	  &lt;itemizedlist&gt;</div><div class='del'>-	    &lt;listitem&gt;</div><div class='del'>-	       &lt;para&gt;</div><div class='del'>-		 &lt;guilabel&gt;When mail arrives:&lt;/guilabel&gt; Select</div><div class='del'>-		 this option to have messages filtered as they</div><div class='del'>-		 arrive.</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'>-		 &lt;guilabel&gt;When mail is sent:&lt;/guilabel&gt; Select</div><div class='del'>-		 this option to filter your outgoing mail.  You</div><div class='del'>-		 can use this feature to keep your</div><div class='del'>-		 &lt;interface&gt;Outbox&lt;/interface&gt; as organized as</div><div class='del'>-		 your &lt;interface&gt;Inbox&lt;/interface&gt;.</div><div class='del'>-	     &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/itemizedlist&gt;</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    --&gt;</div><div class='del'>-</div><div class='del'>-      &lt;note&gt;</div><div class='del'>-	&lt;title&gt;Two Notable Filter Features&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  &lt;itemizedlist&gt;</div><div class='del'>-	    &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Incoming email that your filters don't move goes into the Inbox; </div><div class='del'>-              outgoing mail that they don't move ends up in the Sent folder.</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;&lt;para&gt;If you move a folder, your filters</div><div class='del'>-	    will follow it.  &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	  &lt;/itemizedlist&gt;</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/note&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="usage-mail-organize-vFolders"&gt;</div><div class='del'>-      &lt;title&gt;Getting Really Organized with Virtual Folders&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	If filters aren't flexible enough for you, or you find</div><div class='del'>-	yourself performing the same search again and again, consider</div><div class='del'>-	a virtual folder. Virtual folders, or vFolders, are an</div><div class='del'>-	advanced way of viewing your email messages within</div><div class='del'>-	&lt;application&gt;Evolution&lt;/application&gt;.  If you get a lot of</div><div class='del'>-	mail or often forget where you put messages, vFolders can help</div><div class='del'>-	you stay on top of things.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	A vFolder is really a hybrid of all the other organizational</div><div class='del'>-	tools: it looks like a folder, it acts like a search, and you</div><div class='del'>-	set it up like a filter.  In other words, while a conventional</div><div class='del'>-	folder actually contains messages, a vFolder is a view of</div><div class='del'>-	messages that may be in several different folders.  The</div><div class='del'>-	messages it contains are determined on the fly using a set of</div><div class='del'>-	criteria you choose in advance.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	As messages that meet the vFolder criteria arrive or are</div><div class='del'>-	deleted, &lt;application&gt;Evolution&lt;/application&gt; will</div><div class='del'>-	automatically place them in and and remove them from the</div><div class='del'>-	vFolder contents list.  When you delete a message, it gets</div><div class='del'>-	erased from the folder in which it actually exists, as well as</div><div class='del'>-	any vFolders which display it.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Imagine a business trying to keep track of mail from hundreds</div><div class='del'>-	of vendors and clients, or a university with overlapping and</div><div class='del'>-	changing groups of faculty, staff, administrators and</div><div class='del'>-	students.  The more mail you need to organize, the less you</div><div class='del'>-	can afford the sort of confusion that stems from an</div><div class='del'>-	organizational system that's not flexible enough.  vFolders</div><div class='del'>-	make for better organization because they can accept</div><div class='del'>-	overlapping groups in a way that regular folders and filing</div><div class='del'>-	systems can't.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;example id="usage-mail-organize-vFolders-ex"&gt;</div><div class='del'>-	&lt;title&gt;Using Folders, Searches, and vFolders&lt;/title&gt;</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	   To organize my mail box, I set up a vFolder for emails from</div><div class='del'>-	   my friend and co-worker Anna.  I have another one for</div><div class='del'>-	   messages from anybody at work that have "Evolution" in the</div><div class='del'>-	   subject line, so I can keep a record of what people from</div><div class='del'>-	   work send me about &lt;application&gt;Evolution&lt;/application&gt;.</div><div class='del'>-	   If Anna sends a message about a picnic on Saturday, it only</div><div class='del'>-	   shows up in the "Anna" folder. When Anna sends me mail</div><div class='del'>-	   about the user interface for</div><div class='del'>-	   &lt;application&gt;Evolution&lt;/application&gt;, I can see that</div><div class='del'>-	   message both in the "Anna" vFolder and in the "Internal</div><div class='del'>-	   Evolution Discussion" vFolder.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/example&gt;</div><div class='del'>-</div><div class='del'>-	&lt;!--  (INSERT SCREENSHOT HERE: vFolders in action) --&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	 To create a vFolder, select &lt;menuchoice&gt;</div><div class='del'>-	 &lt;guimenu&gt;Tools&lt;/guimenu&gt; &lt;guimenuitem&gt;vFolder</div><div class='del'>-	 Editor&lt;/guimenuitem&gt; &lt;/menuchoice&gt;.  This will bring up a</div><div class='del'>-	 dialog box that looks suspiciously like the filter window</div><div class='del'>-	 (for more information on filters, see &lt;xref</div><div class='del'>-	 linkend="usage-mail-organize-filters"&gt;), and which</div><div class='del'>-	 presents you with a list of vFolders you have previously</div><div class='del'>-	 created. If you have created any vFolders, they are listed</div><div class='del'>-	 here, and you can select, edit or remove them if you wish.</div><div class='del'>-	 If you have not created any, there will be only one available</div><div class='del'>-	 option: click &lt;guibutton&gt;Add&lt;/guibutton&gt; to add a new</div><div class='del'>-	 vFolder.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	 You can enter a name for your vFolder in the</div><div class='del'>-	 &lt;guilabel&gt;Name&lt;/guilabel&gt;.  Then, tell</div><div class='del'>-	 &lt;application&gt;Evolution&lt;/application&gt; what messages to look</div><div class='del'>-	 for.  This process is exactly like filter creation: decide</div><div class='del'>-	 between &lt;guilabel&gt;Match all parts&lt;/guilabel&gt; and</div><div class='del'>-	 &lt;guilabel&gt;Match any part&lt;/guilabel&gt;, then choose what part of</div><div class='del'>-	 the message to look in, what sort of matching to perform, and</div><div class='del'>-	 specify exactly what it is that you want to find, be it a</div><div class='del'>-	 line of text, a score, a regular expression, or a particular date or</div><div class='del'>-	 range of dates.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         The second part, however, is slightly different.  In the</div><div class='del'>-         section of the window labelled &lt;guilabel&gt;vFolder Sources</div><div class='del'>-         &lt;/guilabel&gt; is a list of folders in which</div><div class='del'>-         &lt;application&gt;Evolution&lt;/application&gt; will search for the</div><div class='del'>-         contents of your vFolder.  Click &lt;guibutton&gt;Add&lt;/guibutton&gt;</div><div class='del'>-         to add a folder, or &lt;guibutton&gt;Remove&lt;/guibutton&gt; to remove</div><div class='del'>-         one.  That way, you can have your vFolder search in</div><div class='del'>-         newsgroups, or just in one of your mailboxes, or just in a</div><div class='del'>-         select few folders you've already screened with filters.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-        The vFolder creation window is shown in &lt;xref</div><div class='del'>-	linkend="usage-mail-vfolder-fig-createrule"&gt;</div><div class='del'>-</div><div class='del'>-       &lt;figure id="usage-mail-vfolder-fig-createrule"&gt;</div><div class='del'>-	 &lt;title&gt;Selecting a vFolder Rule&lt;/title&gt;</div><div class='del'>-	 &lt;screenshot&gt;</div><div class='del'>-	  &lt;screeninfo&gt;Creating a vFolder Rule&lt;/screeninfo&gt;</div><div class='del'>-	  &lt;graphic fileref="fig/vfolder-createrule-fig" format="png" srccredit="Aaron Weber"&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;/sect2&gt;</div><div class='del'>-    &lt;sect2 id="usage-mail-subscriptions"&gt;</div><div class='del'>-      &lt;title&gt;Subscription Management&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-         &lt;application&gt;Evolution&lt;/application&gt; lets you handle your</div><div class='del'>-         IMAP and newsgroup subscriptions with the same tool: the</div><div class='del'>-         subscriptions manager.  To start using it, choose</div><div class='del'>-         &lt;menuchoice&gt; &lt;guimenu&gt;Settings&lt;/guimenu&gt; &lt;guimenuitem&gt;Manage</div><div class='del'>-         Subscriptions&lt;/guimenuitem&gt; &lt;/menuchoice&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/usage-mainwindow.sgml b/doc/C/usage-mainwindow.sgml<br/>deleted file mode 100644<br/>index c6a252ac78..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/usage-mainwindow.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/usage-mainwindow.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,424 +0,0 @@</div><div class='del'>-&lt;!--</div><div class='del'>- &lt;!DOCTYPE Chapter PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN"&gt;</div><div class='del'>---&gt;</div><div class='del'>-&lt;chapter id="usage-mainwindow"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;title&gt;The Main Window: Evolution Basics&lt;/title&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-     Start &lt;application&gt;Evolution&lt;/application&gt; by selecting</div><div class='del'>-     &lt;menuchoice&gt;&lt;guimenu&gt;Main Panel Menu&lt;/guimenu&gt;</div><div class='del'>-     &lt;guisubmenu&gt;Applications&lt;/guisubmenu&gt;</div><div class='del'>-     &lt;guimenuitem&gt;Evolution&lt;/guimenuitem&gt;&lt;/menuchoice&gt; or by typing</div><div class='del'>-     &lt;command&gt;evolution&lt;/command&gt; at the command line.  The first time</div><div class='del'>-     you run the program, it will create a directory called</div><div class='del'>-     &lt;filename&gt;evolution&lt;/filename&gt; in your home directory, where it</div><div class='del'>-     will keep all your &lt;application&gt;Evolution&lt;/application&gt;-related</div><div class='del'>-     files.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     After &lt;application&gt;Evolution&lt;/application&gt; starts</div><div class='del'>-     up, you will see the &lt;interface&gt;main window&lt;/interface&gt;, with the</div><div class='del'>-     &lt;interface&gt;Inbox&lt;/interface&gt; open.  It should look a lot like the</div><div class='del'>-     picture in &lt;xref linkend="usage-mainwindow-fig"&gt;. On the left of</div><div class='del'>-     the &lt;interface&gt;main window&lt;/interface&gt; is the &lt;interface&gt;shortcut</div><div class='del'>-     bar&lt;/interface&gt;, with several buttons in it.  Just underneath the</div><div class='del'>-     title bar is a series of menus in the &lt;interface&gt;menu</div><div class='del'>-     bar&lt;/interface&gt;, and below that, the &lt;interface&gt;tool</div><div class='del'>-     bar&lt;/interface&gt; with buttons for different functions. The largest</div><div class='del'>-     part of the &lt;interface&gt;main window&lt;/interface&gt; is taken up by the</div><div class='del'>-     actual &lt;interface&gt;Inbox&lt;/interface&gt;, where messages are listed</div><div class='del'>-     and displayed.  If you're running the program for the first time,</div><div class='del'>-     you'll have just one message: a welcome from Helix Code.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ==============Figure=================================== --&gt;</div><div class='del'>-    &lt;figure id="usage-mainwindow-fig"&gt;</div><div class='del'>-    &lt;title&gt;Evolution Main Window and Inbox&lt;/title&gt;</div><div class='del'>-    &lt;screenshot&gt;</div><div class='del'>-      &lt;screeninfo&gt;Evolution Main Window&lt;/screeninfo&gt;</div><div class='del'>-      &lt;graphic fileref="fig/mainwindow-pic" format="png" srccredit="Kevin Breit"&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;!-- ==============End of Figure=================================== --&gt;</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-    &lt;note&gt;</div><div class='del'>-      &lt;title&gt;The Way Evolution Looks&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The appearance of both &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	and &lt;application&gt;GNOME&lt;/application&gt; is very easy to</div><div class='del'>-	customize, so your screen might not look like this picture.</div><div class='del'>-	You might decide to have &lt;application&gt;Evolution&lt;/application&gt;</div><div class='del'>-	start with the calendar and a folder bar, or with the contact</div><div class='del'>-	manager occupying the entire window.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/note&gt;</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-  </div><div class='del'>-  &lt;sect1 id="usage-mainwindow-shortcutbar"&gt;</div><div class='del'>-    &lt;title&gt;The Shortcut Bar&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-        &lt;application&gt;Evolution&lt;/application&gt;'s most important job is</div><div class='del'>-        to give you access to your information and help you use it</div><div class='del'>-        quickly.  One way it does that is through the</div><div class='del'>-        &lt;interface&gt;shortcut bar&lt;/interface&gt;, the column on the left</div><div class='del'>-        hand side of the main window.  The large buttons with names</div><div class='del'>-        like &lt;guilabel&gt;Inbox&lt;/guilabel&gt; and</div><div class='del'>-        &lt;guilabel&gt;Contacts&lt;/guilabel&gt; are the shortcuts, and you can</div><div class='del'>-        select different groups of shortcuts by clicking the</div><div class='del'>-        rectangular group buttons.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       The shortcut group buttons are &lt;guibutton&gt;Evolution</div><div class='del'>-       Shortcuts&lt;/guibutton&gt; and &lt;guibutton&gt;Internet</div><div class='del'>-       Directories&lt;/guibutton&gt;.  When you click on them, they'll slide</div><div class='del'>-       up and down to give you access to different sorts of shortcuts.</div><div class='del'>-       When you first start &lt;application&gt;Evolution&lt;/application&gt;, you</div><div class='del'>-       are looking at the &lt;guilabel&gt;Evolution Shortcuts&lt;/guilabel&gt;</div><div class='del'>-       category.  If you click &lt;guilabel&gt;Internet</div><div class='del'>-       Directories&lt;/guilabel&gt;, it will slide up and you'll see buttons</div><div class='del'>-       for the &lt;guilabel&gt;Bigfoot&lt;/guilabel&gt; and</div><div class='del'>-       &lt;guilabel&gt;Netcenter&lt;/guilabel&gt; directories, as well as any</div><div class='del'>-       others you or your system administrator might have added. You</div><div class='del'>-       can add more groups by right-clicking on the background of the</div><div class='del'>-       shortcut bar and selecting &lt;guimenuitem&gt;Menu</div><div class='del'>-       Group&lt;/guimenuitem&gt;.  Internet directories behave a lot like</div><div class='del'>-       the local contact manager, which is covered in &lt;xref</div><div class='del'>-       linkend="usage-contact"&gt;.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       Take a look at the &lt;guilabel&gt;Evolution Shortcuts&lt;/guilabel&gt;</div><div class='del'>-       again.  The shortcut buttons in that category are:</div><div class='del'>-</div><div class='del'>-      &lt;variablelist&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--  NOT IMPLEMENTED! </div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	&lt;term&gt; &lt;guibutton&gt;Today:&lt;/guibutton&gt;&lt;/term&gt;</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	This will bring up a summary of any new messages you've</div><div class='del'>-	received, along with the tasks and appointments you have</div><div class='del'>-	lined up for today.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-      &lt;/varlistentry&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt; &lt;guibutton&gt;Inbox:&lt;/guibutton&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      The Inbox will show you all of your email.  Your Inbox</div><div class='del'>-	      is also where you can access Evolution's tools to</div><div class='del'>-	      filter, sort, organize, and search your mail.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guibutton&gt;Calendar:&lt;/guibutton&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      The Calendar can store your appointments and To do lists</div><div class='del'>-	      for you.  Connected to a network, you can use it to keep</div><div class='del'>-	      a group of people on schedule and up to date.</div><div class='del'>-	    &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt;&lt;guibutton&gt;Contacts:&lt;/guibutton&gt;&lt;/term&gt;</div><div class='del'>-	  &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	      The Contact Manager holds your addresses, phone numbers,</div><div class='del'>-	      and contact information.  Like calendar information,</div><div class='del'>-	      contact data can be synchronized with hand-held devices</div><div class='del'>-	      and shared over a network.</div><div class='del'>-	   &lt;/para&gt;</div><div class='del'>-	  &lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- NOT IMPLEMENTED YET</div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	     The &lt;guibutton&gt;Tasks:&lt;/guibutton&gt; tool combines a "to</div><div class='del'>-	     do" list with reminders to help you keep track of</div><div class='del'>-	     daily events.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-      &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-	&lt;varlistentry&gt;</div><div class='del'>-	  &lt;term&gt; &lt;guibutton&gt;Notes:&lt;/guibutton&gt;&lt;/term&gt;</div><div class='del'>-	&lt;listitem&gt;</div><div class='del'>-	  &lt;para&gt; The note pad is your catch-all tool: use it to take</div><div class='del'>-	    messages from phone conversations, keep small things</div><div class='del'>-	    organized, write &lt;glossterm linkend="haiku"&gt;haiku&lt;/glossterm&gt;, or whatever</div><div class='del'>-	    you like. This feature is not yet implemented, but will be</div><div class='del'>-	    soon. See &lt;xref linkend="usage-notes"&gt; for more</div><div class='del'>-	    information.</div><div class='del'>-	  &lt;/para&gt;</div><div class='del'>-	&lt;/listitem&gt;</div><div class='del'>-	&lt;/varlistentry&gt;</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='del'>-      &lt;/variablelist&gt;</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      If you don't like the shortcut bar, you can use the menu bar, or</div><div class='del'>-      keyboard shortcuts, also called &lt;glossterm linkend="hot-key"&gt;hot keys&lt;/glossterm&gt;.</div><div class='del'>-      They're shown next to their equivalent menu items in the menu</div><div class='del'>-      bar. You can also set your own hot keys for functions that don't</div><div class='del'>-      have any; this is covered in &lt;xref linkend="config"&gt;.  If you're</div><div class='del'>-      using the keyboard shortcuts you may also want to hide the</div><div class='del'>-      &lt;interface&gt;shortcut bar&lt;/interface&gt; by selecting &lt;menuchoice&gt;</div><div class='del'>-      &lt;guimenu&gt;View&lt;/guimenu&gt; &lt;guimenuitem&gt;Show Shortcut</div><div class='del'>-      Bar&lt;/guimenuitem&gt; &lt;/menuchoice&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;tip&gt;</div><div class='del'>-       &lt;title&gt;Shortcut Bar Tricks&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         To remove a shortcut from the shortcut bar, right-click on it</div><div class='del'>-         and select &lt;guimenuitem&gt;Remove&lt;/guimenuitem&gt;.  To add one,</div><div class='del'>-         select &lt;menuchoice&gt; &lt;guimenu&gt;File&lt;/guimenu&gt;</div><div class='del'>-         &lt;guisubmenu&gt;New&lt;/guisubmenu&gt; &lt;guimenuitem&gt;Evolution Bar</div><div class='del'>-         Shortcut&lt;/guimenuitem&gt; &lt;/menuchoice&gt;. &lt;/para&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         To change the way the shortcut bar looks, right-click in an</div><div class='del'>-         empty space on the shortcut bar.  From the menu that appears,</div><div class='del'>-         you can select icon sizes.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-    &lt;/tip&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="usage-mainwindow-folderbar"&gt;</div><div class='del'>-    &lt;title&gt;The Folder Bar&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &lt;interface&gt;folder bar&lt;/interface&gt; is a more comprehensive</div><div class='del'>-      way to view the information you've stored with</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt;. It displays all your</div><div class='del'>-      appointments, address cards, and email in a tree that's a lot</div><div class='del'>-      like a &lt;glossterm linkend="filetree"&gt;file</div><div class='del'>-      tree&lt;/glossterm&gt;&amp;mdash; it starts small at the top, and branches</div><div class='del'>-      downwards. On most computers, there will be three folders at the</div><div class='del'>-      base.  At the top are your &lt;guilabel&gt;vFolders&lt;/guilabel&gt;, or</div><div class='del'>-      virtual folders, discussed in &lt;xref</div><div class='del'>-      linkend="usage-mail-organize-vfolders"&gt;.  After that come any</div><div class='del'>-      &lt;glossterm linkend="imap"&gt;IMAP&lt;/glossterm&gt; mail folders you</div><div class='del'>-      might have available to you over your network.  The next folder</div><div class='del'>-      is called &lt;guilabel&gt;External Directories&lt;/guilabel&gt;, and holds</div><div class='del'>-      &lt;glossterm linkend="ldap"&gt;LDAP&lt;/glossterm&gt; contact directories</div><div class='del'>-      stored on a network.  The most important one is probably</div><div class='del'>-      &lt;guilabel&gt;Local&lt;/guilabel&gt;, which you can use to access all the</div><div class='del'>-      data that's stored on your computer.  If you click on the plus</div><div class='del'>-      sign plus sign next to the &lt;guilabel&gt;Local&lt;/guilabel&gt; folder,</div><div class='del'>-      you'll see the contents:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-	 &lt;listitem&gt;</div><div class='del'>-	    &lt;para&gt;</div><div class='del'>-	     &lt;guilabel&gt;Calendar&lt;/guilabel&gt;, for appointments and</div><div class='del'>-	     event listings.</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'>-	    &lt;guilabel&gt;Contacts&lt;/guilabel&gt;, for address cards.</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'>-	  &lt;guilabel&gt;Directories&lt;/guilabel&gt;, for Internet contact directories.</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'>-	     &lt;guilabel&gt;Inbox&lt;/guilabel&gt;, for incoming mail.</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'>-	    &lt;guilabel&gt;Outbox&lt;/guilabel&gt;, which is for drafts of</div><div class='del'>-	    messages and mail that's already been sent.</div><div class='del'>-	   &lt;/para&gt;</div><div class='del'>-	 &lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;tip id="foldertips"&gt;</div><div class='del'>-    &lt;title&gt;Navigating without the Folder Bar&lt;/title&gt;</div><div class='del'>-       &lt;para&gt;</div><div class='del'>-         You don't need the folder bar or the shortcut bar to move</div><div class='del'>-         around the main window. You can use &lt;keycap&gt;Tab&lt;/keycap&gt; to</div><div class='del'>-         switch from one part of the window to another, and the folder</div><div class='del'>-         menu on the right side of the window just below the toolbar</div><div class='del'>-         to move about the folder tree.</div><div class='del'>-       &lt;/para&gt;</div><div class='del'>-     &lt;/tip&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       To create a new folder, select &lt;menuchoice&gt;</div><div class='del'>-       &lt;guimenu&gt;File&lt;/guimenu&gt; &lt;guisubmenu&gt;New&lt;/guisubmenu&gt;</div><div class='del'>-       &lt;guimenuitem&gt;Folder&lt;/guimenuitem&gt;&lt;/menuchoice&gt;.  You'll be asked where you want to</div><div class='del'>-       put it, and what kind of folder it should be.  You can choose</div><div class='del'>-       from three types: &lt;guilabel&gt;Mail&lt;/guilabel&gt;, for storing mail,</div><div class='del'>-       &lt;guilabel&gt;Calendar&lt;/guilabel&gt; for storing calendars, and</div><div class='del'>-       &lt;guilabel&gt;Contacts&lt;/guilabel&gt; for storing contacts.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-       &lt;note&gt;</div><div class='del'>-	  &lt;title&gt;Folders Have Limits&lt;/title&gt;</div><div class='del'>-	  &lt;para&gt;</div><div class='del'>-	      You can always place a folder inside other folders,</div><div class='del'>-	      regardless of folder type.  However, calendars,</div><div class='del'>-	      contacts, and mail can't go into the same</div><div class='del'>-	      folder. Calendars have to go in calendar folders, mail</div><div class='del'>-	      in mail folders, and contacts in contact folders.</div><div class='del'>-           &lt;/para&gt;</div><div class='del'>-	&lt;/note&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Right-clicking will bring up a menu for just about anything</div><div class='del'>-      in GNOME, and &lt;application&gt;Evolution&lt;/application&gt; is no</div><div class='del'>-      exception.  If you right-click on a folder, you'll have a</div><div class='del'>-      menu with the following options:</div><div class='del'>-      &lt;itemizedlist&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;&lt;guimenuitem&gt;View&lt;/guimenuitem&gt;, to view a message.&lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;&lt;guimenuitem&gt;Something else&lt;/guimenuitem&gt;, for another purpose. &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-	&lt;listitem&gt;&lt;para&gt;&lt;guimenuitem&gt;Something else&lt;/guimenuitem&gt;, for another purpose. &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-      &lt;/itemizedlist&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;tip&gt;</div><div class='del'>-     &lt;title&gt;Context-Sensitive Help&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	GNOME 2.0 will support context-sensitive help, which means you</div><div class='del'>-	can almost always get help on an item by right-clicking it.</div><div class='del'>-	If you're not sure what something is, or don't know what you</div><div class='del'>-	can do with it, choosing &lt;guimenuitem&gt;Help&lt;/guimenuitem&gt; from</div><div class='del'>-	the right-click menu is a good way to find out.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/tip&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Any time new information arrives in a folder, that folder label</div><div class='del'>-      is displayed in bold text.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      To delete a folder, right-click it and select</div><div class='del'>-      &lt;guimenuitem&gt;Delete&lt;/guimenuitem&gt; from the menu that pops up.</div><div class='del'>-      To change the order of folders, or put one inside another, use</div><div class='del'>-      drag-and-drop.  To move individual</div><div class='del'>-      messages, appointments, and address cards between folders, you</div><div class='del'>-      can do the same thing: drag them where you want them, and</div><div class='del'>-      they'll go.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-  &lt;sect1 id="usage-mainwindow-menubar"&gt;</div><div class='del'>-    &lt;title&gt;The Menu Bar&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &lt;interface&gt;menu bar&lt;/interface&gt;'s contents will always</div><div class='del'>-      provide all the possible actions for any given view of your</div><div class='del'>-      data.  That means that, depending on the context, menu bar items</div><div class='del'>-      will change.  If you're looking at your Inbox, most of the menu</div><div class='del'>-      items will relate to mail; some will relate to other components</div><div class='del'>-      of &lt;application&gt;Evolution&lt;/application&gt; and some, especially</div><div class='del'>-      those in the &lt;guimenu&gt;File Menu&lt;/guimenu&gt; will relate to the</div><div class='del'>-      application as a whole. The contents of the menu bar are</div><div class='del'>-      described in &lt;xref linkend="menuref"&gt;.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      &lt;variablelist&gt;</div><div class='del'>-        &lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt; &lt;guimenu&gt;File&lt;/guimenu&gt; Menu&lt;/term&gt;</div><div class='del'>-</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt; </div><div class='del'>-            Anything even related to a file or to the operations</div><div class='del'>-            of the application generally  falls under this</div><div class='del'>-            menu: creating things, saving them to disk, </div><div class='del'>-            printing them, and quitting the program itself.  </div><div class='del'>-</div><div class='del'>-            &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt; &lt;guimenu&gt;Edit&lt;/guimenu&gt; Menu &lt;/term&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-              Although it doesn't contain anything at first,</div><div class='del'>-              the &lt;guimenu&gt;Edit&lt;/guimenu&gt; menu fills up with </div><div class='del'>-              useful tools that help you edit text and move it around.</div><div class='del'>-          &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt; &lt;guimenu&gt;View&lt;/guimenu&gt; Menu &lt;/term&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-            This menu lets you decide how &lt;application&gt;Evolution&lt;/application&gt; </div><div class='del'>-            should look. Some of the features control the appearance of </div><div class='del'>-            &lt;application&gt;Evolution&lt;/application&gt; as a whole, and others </div><div class='del'>-            the way a particular kind of information appears.</div><div class='del'>-          &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-        &lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt; &lt;guimenu&gt;Settings&lt;/guimenu&gt; Menu &lt;/term&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt; Tools for configuring, changing, and</div><div class='del'>-          setting up go here.  For mail, that means things like</div><div class='del'>-          &lt;guimenuitem&gt;Mail Configuration&lt;/guimenuitem&gt; and the</div><div class='del'>-          &lt;guimenuitem&gt;vFolder Editor&lt;/guimenuitem&gt;.  For the</div><div class='del'>-          &lt;interface&gt;Calendar&lt;/interface&gt; and the &lt;interface&gt;Contact</div><div class='del'>-          Manager&lt;/interface&gt;, it's color, network, and layout</div><div class='del'>-          configuration. &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;/varlistentry&gt;</div><div class='del'>-</div><div class='del'>-       &lt;varlistentry&gt;</div><div class='del'>-          &lt;term&gt; &lt;guimenu&gt;Help&lt;/guimenu&gt; Menu&lt;/term&gt;</div><div class='del'>-          &lt;listitem&gt;&lt;para&gt;</div><div class='del'>-             Select among these items to open the </div><div class='del'>-             &lt;application&gt;Help Browser&lt;/application&gt; </div><div class='del'>-             and read the &lt;application&gt;Evolution&lt;/application&gt; manual.</div><div class='del'>-          &lt;/para&gt;&lt;/listitem&gt;</div><div class='del'>-        &lt;/varlistentry&gt;</div><div class='del'>-      &lt;/variablelist&gt;</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     Other menus, like &lt;guilabel&gt;Folder&lt;/guilabel&gt;,</div><div class='del'>-     &lt;guilabel&gt;Message&lt;/guilabel&gt;, and &lt;guilabel&gt;Actions&lt;/guilabel&gt;,</div><div class='del'>-     appear only occasionally.  &lt;guilabel&gt;Message&lt;/guilabel&gt; and</div><div class='del'>-     &lt;guilabel&gt;Folder&lt;/guilabel&gt;, for example, have commands that only</div><div class='del'>-     relate to email, so they're only available when you're looking at</div><div class='del'>-     email.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-      Once you've familiarized yourself with the &lt;interface&gt;main</div><div class='del'>-      window&lt;/interface&gt; you can start doing things with it.  We'll</div><div class='del'>-      start with your email inbox, since you've got a letter waiting</div><div class='del'>-      for you already.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/usage-notes.sgml b/doc/C/usage-notes.sgml<br/>deleted file mode 100644<br/>index 1ff2283128..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/usage-notes.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/usage-notes.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,49 +0,0 @@</div><div class='del'>-&lt;chapter id="usage-notes"&gt;</div><div class='del'>-  &lt;title&gt;Evolution Notes&lt;/title&gt;</div><div class='del'>-  &lt;abstract&gt;</div><div class='del'>-    &lt;title&gt; An Overview of the Evolution Notes&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      In the dark ages before email was invented, there were little</div><div class='del'>-      scraps of people which people used for short-term information</div><div class='del'>-      storage.  These scraps of paper were called notes.  Now, notes</div><div class='del'>-      are an almost necessary part of our lives, albeit in electronic</div><div class='del'>-      form.  It only makes sense, then, that</div><div class='del'>-      &lt;application&gt;Evolution&lt;/application&gt; will eventually have a</div><div class='del'>-      Notes feature.  &lt;application&gt;Evolution&lt;/application&gt; can help</div><div class='del'>-      you take notes in the following ways:</div><div class='del'>-     &lt;itemizedlist&gt;</div><div class='del'>-       &lt;listitem&gt;</div><div class='del'>-         &lt;para&gt;</div><div class='del'>-           Take down phone numbers, take school notes, take phone</div><div class='del'>-	   messages, or even write poetry.</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'>-           Color code notes to organize them, or just to</div><div class='del'>-           make them look good.</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'>-           Turn a note into an email or a text file.</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'>-           Write &lt;glossterm&gt;Haiku&lt;/glossterm&gt;</div><div class='del'>-         &lt;/para&gt;</div><div class='del'>-       &lt;/listitem&gt;</div><div class='del'>-     &lt;/itemizedlist&gt;</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     You can start writing notes by clicking</div><div class='del'>-     &lt;guibutton&gt;Notes&lt;/guibutton&gt; in the shortcut bar.  Of course,</div><div class='del'>-     it's not there yet. But when it is, it'll take you to the</div><div class='del'>-     notepad.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-  &lt;/abstract&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/C/usage-print.sgml b/doc/C/usage-print.sgml<br/>deleted file mode 100644<br/>index 1af298eb42..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/usage-print.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/usage-print.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,92 +0,0 @@</div><div class='del'>-&lt;chapter id="usage-print"&gt;</div><div class='del'>-&lt;title&gt;Printing with Evolution&lt;/title&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-  This is a very short chapter, because printing with</div><div class='del'>-  &lt;application&gt;Evolution&lt;/application&gt; is not a complex task.  Like</div><div class='del'>-  most GNOME applications, &lt;application&gt;Evolution&lt;/application&gt; uses</div><div class='del'>-  the gnome-print system, so if you've used any other GNOME</div><div class='del'>-  application to print, you should be able to print from</div><div class='del'>-  &lt;application&gt;Evolution&lt;/application&gt; immediately.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-  Whether you're printing a message, a calendar page, or a selection</div><div class='del'>-  of address cards, you can choose to print directly to a printer, or</div><div class='del'>-  save the print output to a postscript file.  You can also use the</div><div class='del'>-  preview feature to see how your printed output will look.</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="printpreview"&gt;</div><div class='del'>-    &lt;title&gt;Print Preview&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &lt;guibutton&gt;Print Preview&lt;/guibutton&gt;, appears both as a button</div><div class='del'>-      in the printing dialog and as an item in the</div><div class='del'>-      &lt;guimenu&gt;File&lt;/guimenu&gt; menu.  In both places, it does the same</div><div class='del'>-      thing: it opens a new window that displays an image of the current</div><div class='del'>-      message, calendar, appointment, or address card.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      That window allows you to select which pages you want to see,</div><div class='del'>-      and how close you'd like to look at them.  Zoom in or out, fit</div><div class='del'>-      the page to the window (&lt;guibutton&gt;Fit&lt;/guibutton&gt;) or match the</div><div class='del'>-      width of the page and the window (&lt;guibutton&gt;Fit</div><div class='del'>-      Width&lt;/guibutton&gt;).  If you're satisfied with the way it looks,</div><div class='del'>-      click &lt;guibutton&gt;Print&lt;/guibutton&gt; to send your document on its way.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>- &lt;!-- ==============Figure=================================== --&gt;</div><div class='del'>- </div><div class='del'>-      &lt;figure id="print-preview"&gt;</div><div class='del'>-	  &lt;title&gt;Print Preview&lt;/title&gt;</div><div class='del'>-	  &lt;screenshot&gt;</div><div class='del'>-	    &lt;screeninfo&gt;Print Preview&lt;/screeninfo&gt;</div><div class='del'>-	    &lt;graphic fileref="fig/print-preview" format="png" srccredit="Aaron Weber"&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;!-- ==============End of Figure============================== --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="print-destination"&gt;</div><div class='del'>-    &lt;title&gt;File or Printer?&lt;/title&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-       The printer selection window, shown in &lt;xref</div><div class='del'>-       linkend="print-dest"&gt;, lets you choose the format for</div><div class='del'>-       printing&amp;mdash; at this time, only &lt;guilabel&gt;Generic</div><div class='del'>-       Postscript&lt;/guilabel&gt; is available&amp;mdash; and whether to print</div><div class='del'>-       to a file or to an actual printer.  If you choose a printer,</div><div class='del'>-       you'll be asked for the printer command (probably</div><div class='del'>-       &lt;guilabel&gt;lpr&lt;/guilabel&gt;) which your system uses.  If you</div><div class='del'>-       choose to print to a file, you'll need to decide upon a</div><div class='del'>-       filename.  And of course, you'll want to choose a number of</div><div class='del'>-       copies, and whether to collate them.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>- &lt;!-- ==============Figure=================================== --&gt;</div><div class='del'>- </div><div class='del'>-      &lt;figure id="print-dest"&gt;</div><div class='del'>-	  &lt;title&gt;Choosing a Printer&lt;/title&gt;</div><div class='del'>-	  &lt;screenshot&gt;</div><div class='del'>-	    &lt;screeninfo&gt;Choosing a Printer&lt;/screeninfo&gt;</div><div class='del'>-	    &lt;graphic fileref="fig/print-dest" format="png" srccredit="Aaron Weber"&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;!-- ==============End of Figure============================== --&gt;</div><div class='del'>-</div><div class='del'>-   &lt;para&gt;</div><div class='del'>-     If you're printing a message that's more than one page, you'll</div><div class='del'>-     have the option of choosing which pages to print.  If you're</div><div class='del'>-     printing a calendar entry, you can decide what range of dates to</div><div class='del'>-     print.  And, if you're printing contact cards, you can decide</div><div class='del'>-     whether to print only the selected cards, or all of them.</div><div class='del'>-   &lt;/para&gt;</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      When you're ready, click &lt;guibutton&gt;Print&lt;/guibutton&gt; to print,</div><div class='del'>-      &lt;guibutton&gt;Preview&lt;/guibutton&gt; to have a look (or another look)</div><div class='del'>-      at the preview, or &lt;guibutton&gt;Cancel&lt;/guibutton&gt; to cancel the</div><div class='del'>-      whole deal.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/chapter&gt;</div><div class='head'>diff --git a/doc/C/usage-sync.sgml b/doc/C/usage-sync.sgml<br/>deleted file mode 100644<br/>index a6b53e9526..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/C/usage-sync.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/C/usage-sync.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,20 +0,0 @@</div><div class='del'>-</div><div class='del'>-    &lt;chapter id="usage-sync"&gt;</div><div class='del'>-      &lt;title&gt;Synchronizing with a Hand-held Device&lt;/title&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        This chapter covers is how to synchronize data </div><div class='del'>-        installed and configured.  If you need information on how to</div><div class='del'>-        set up a synchronization system, consult &lt;xref</div><div class='del'>-        linkend="config-sync"&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-      &lt;sect1 id="hotsync"&gt;</div><div class='del'>-        &lt;title&gt;Using HotSync&lt;/title&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-          Put your hand-held device on its cradle and press the</div><div class='del'>-          HotSync button.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-         No, really.  That's all there is to it.</div><div class='del'>-        &lt;/para&gt;</div><div class='del'>-       &lt;/sect1&gt;</div><div class='del'>-    &lt;/chapter&gt;
\ No newline at end of file</div><div class='head'>diff --git a/doc/COPYING-DOCS b/doc/COPYING-DOCS<br/>deleted file mode 100644<br/>index b42936beb3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/COPYING-DOCS?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/COPYING-DOCS</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,355 +0,0 @@</div><div class='del'>-		GNU Free Documentation License</div><div class='del'>-		   Version 1.1, March 2000</div><div class='del'>-</div><div class='del'>- Copyright (C) 2000  Free Software Foundation, Inc.</div><div class='del'>-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA</div><div class='del'>- Everyone is permitted to copy and distribute verbatim copies</div><div class='del'>- of this license document, but changing it is not allowed.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-0. PREAMBLE</div><div class='del'>-</div><div class='del'>-The purpose of this License is to make a manual, textbook, or other</div><div class='del'>-written document "free" in the sense of freedom: to assure everyone</div><div class='del'>-the effective freedom to copy and redistribute it, with or without</div><div class='del'>-modifying it, either commercially or noncommercially.  Secondarily,</div><div class='del'>-this License preserves for the author and publisher a way to get</div><div class='del'>-credit for their work, while not being considered responsible for</div><div class='del'>-modifications made by others.</div><div class='del'>-</div><div class='del'>-This License is a kind of "copyleft", which means that derivative</div><div class='del'>-works of the document must themselves be free in the same sense.  It</div><div class='del'>-complements the GNU General Public License, which is a copyleft</div><div class='del'>-license designed for free software.</div><div class='del'>-</div><div class='del'>-We have designed this License in order to use it for manuals for free</div><div class='del'>-software, because free software needs free documentation: a free</div><div class='del'>-program should come with manuals providing the same freedoms that the</div><div class='del'>-software does.  But this License is not limited to software manuals;</div><div class='del'>-it can be used for any textual work, regardless of subject matter or</div><div class='del'>-whether it is published as a printed book.  We recommend this License</div><div class='del'>-principally for works whose purpose is instruction or reference.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-1. APPLICABILITY AND DEFINITIONS</div><div class='del'>-</div><div class='del'>-This License applies to any manual or other work that contains a</div><div class='del'>-notice placed by the copyright holder saying it can be distributed</div><div class='del'>-under the terms of this License.  The "Document", below, refers to any</div><div class='del'>-such manual or work.  Any member of the public is a licensee, and is</div><div class='del'>-addressed as "you".</div><div class='del'>-</div><div class='del'>-A "Modified Version" of the Document means any work containing the</div><div class='del'>-Document or a portion of it, either copied verbatim, or with</div><div class='del'>-modifications and/or translated into another language.</div><div class='del'>-</div><div class='del'>-A "Secondary Section" is a named appendix or a front-matter section of</div><div class='del'>-the Document that deals exclusively with the relationship of the</div><div class='del'>-publishers or authors of the Document to the Document's overall subject</div><div class='del'>-(or to related matters) and contains nothing that could fall directly</div><div class='del'>-within that overall subject.  (For example, if the Document is in part a</div><div class='del'>-textbook of mathematics, a Secondary Section may not explain any</div><div class='del'>-mathematics.)  The relationship could be a matter of historical</div><div class='del'>-connection with the subject or with related matters, or of legal,</div><div class='del'>-commercial, philosophical, ethical or political position regarding</div><div class='del'>-them.</div><div class='del'>-</div><div class='del'>-The "Invariant Sections" are certain Secondary Sections whose titles</div><div class='del'>-are designated, as being those of Invariant Sections, in the notice</div><div class='del'>-that says that the Document is released under this License.</div><div class='del'>-</div><div class='del'>-The "Cover Texts" are certain short passages of text that are listed,</div><div class='del'>-as Front-Cover Texts or Back-Cover Texts, in the notice that says that</div><div class='del'>-the Document is released under this License.</div><div class='del'>-</div><div class='del'>-A "Transparent" copy of the Document means a machine-readable copy,</div><div class='del'>-represented in a format whose specification is available to the</div><div class='del'>-general public, whose contents can be viewed and edited directly and</div><div class='del'>-straightforwardly with generic text editors or (for images composed of</div><div class='del'>-pixels) generic paint programs or (for drawings) some widely available</div><div class='del'>-drawing editor, and that is suitable for input to text formatters or</div><div class='del'>-for automatic translation to a variety of formats suitable for input</div><div class='del'>-to text formatters.  A copy made in an otherwise Transparent file</div><div class='del'>-format whose markup has been designed to thwart or discourage</div><div class='del'>-subsequent modification by readers is not Transparent.  A copy that is</div><div class='del'>-not "Transparent" is called "Opaque".</div><div class='del'>-</div><div class='del'>-Examples of suitable formats for Transparent copies include plain</div><div class='del'>-ASCII without markup, Texinfo input format, LaTeX input format, SGML</div><div class='del'>-or XML using a publicly available DTD, and standard-conforming simple</div><div class='del'>-HTML designed for human modification.  Opaque formats include</div><div class='del'>-PostScript, PDF, proprietary formats that can be read and edited only</div><div class='del'>-by proprietary word processors, SGML or XML for which the DTD and/or</div><div class='del'>-processing tools are not generally available, and the</div><div class='del'>-machine-generated HTML produced by some word processors for output</div><div class='del'>-purposes only.</div><div class='del'>-</div><div class='del'>-The "Title Page" means, for a printed book, the title page itself,</div><div class='del'>-plus such following pages as are needed to hold, legibly, the material</div><div class='del'>-this License requires to appear in the title page.  For works in</div><div class='del'>-formats which do not have any title page as such, "Title Page" means</div><div class='del'>-the text near the most prominent appearance of the work's title,</div><div class='del'>-preceding the beginning of the body of the text.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-2. VERBATIM COPYING</div><div class='del'>-</div><div class='del'>-You may copy and distribute the Document in any medium, either</div><div class='del'>-commercially or noncommercially, provided that this License, the</div><div class='del'>-copyright notices, and the license notice saying this License applies</div><div class='del'>-to the Document are reproduced in all copies, and that you add no other</div><div class='del'>-conditions whatsoever to those of this License.  You may not use</div><div class='del'>-technical measures to obstruct or control the reading or further</div><div class='del'>-copying of the copies you make or distribute.  However, you may accept</div><div class='del'>-compensation in exchange for copies.  If you distribute a large enough</div><div class='del'>-number of copies you must also follow the conditions in section 3.</div><div class='del'>-</div><div class='del'>-You may also lend copies, under the same conditions stated above, and</div><div class='del'>-you may publicly display copies.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-3. COPYING IN QUANTITY</div><div class='del'>-</div><div class='del'>-If you publish printed copies of the Document numbering more than 100,</div><div class='del'>-and the Document's license notice requires Cover Texts, you must enclose</div><div class='del'>-the copies in covers that carry, clearly and legibly, all these Cover</div><div class='del'>-Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on</div><div class='del'>-the back cover.  Both covers must also clearly and legibly identify</div><div class='del'>-you as the publisher of these copies.  The front cover must present</div><div class='del'>-the full title with all words of the title equally prominent and</div><div class='del'>-visible.  You may add other material on the covers in addition.</div><div class='del'>-Copying with changes limited to the covers, as long as they preserve</div><div class='del'>-the title of the Document and satisfy these conditions, can be treated</div><div class='del'>-as verbatim copying in other respects.</div><div class='del'>-</div><div class='del'>-If the required texts for either cover are too voluminous to fit</div><div class='del'>-legibly, you should put the first ones listed (as many as fit</div><div class='del'>-reasonably) on the actual cover, and continue the rest onto adjacent</div><div class='del'>-pages.</div><div class='del'>-</div><div class='del'>-If you publish or distribute Opaque copies of the Document numbering</div><div class='del'>-more than 100, you must either include a machine-readable Transparent</div><div class='del'>-copy along with each Opaque copy, or state in or with each Opaque copy</div><div class='del'>-a publicly-accessible computer-network location containing a complete</div><div class='del'>-Transparent copy of the Document, free of added material, which the</div><div class='del'>-general network-using public has access to download anonymously at no</div><div class='del'>-charge using public-standard network protocols.  If you use the latter</div><div class='del'>-option, you must take reasonably prudent steps, when you begin</div><div class='del'>-distribution of Opaque copies in quantity, to ensure that this</div><div class='del'>-Transparent copy will remain thus accessible at the stated location</div><div class='del'>-until at least one year after the last time you distribute an Opaque</div><div class='del'>-copy (directly or through your agents or retailers) of that edition to</div><div class='del'>-the public.</div><div class='del'>-</div><div class='del'>-It is requested, but not required, that you contact the authors of the</div><div class='del'>-Document well before redistributing any large number of copies, to give</div><div class='del'>-them a chance to provide you with an updated version of the Document.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-4. MODIFICATIONS</div><div class='del'>-</div><div class='del'>-You may copy and distribute a Modified Version of the Document under</div><div class='del'>-the conditions of sections 2 and 3 above, provided that you release</div><div class='del'>-the Modified Version under precisely this License, with the Modified</div><div class='del'>-Version filling the role of the Document, thus licensing distribution</div><div class='del'>-and modification of the Modified Version to whoever possesses a copy</div><div class='del'>-of it.  In addition, you must do these things in the Modified Version:</div><div class='del'>-</div><div class='del'>-A. Use in the Title Page (and on the covers, if any) a title distinct</div><div class='del'>-   from that of the Document, and from those of previous versions</div><div class='del'>-   (which should, if there were any, be listed in the History section</div><div class='del'>-   of the Document).  You may use the same title as a previous version</div><div class='del'>-   if the original publisher of that version gives permission.</div><div class='del'>-B. List on the Title Page, as authors, one or more persons or entities</div><div class='del'>-   responsible for authorship of the modifications in the Modified</div><div class='del'>-   Version, together with at least five of the principal authors of the</div><div class='del'>-   Document (all of its principal authors, if it has less than five).</div><div class='del'>-C. State on the Title page the name of the publisher of the</div><div class='del'>-   Modified Version, as the publisher.</div><div class='del'>-D. Preserve all the copyright notices of the Document.</div><div class='del'>-E. Add an appropriate copyright notice for your modifications</div><div class='del'>-   adjacent to the other copyright notices.</div><div class='del'>-F. Include, immediately after the copyright notices, a license notice</div><div class='del'>-   giving the public permission to use the Modified Version under the</div><div class='del'>-   terms of this License, in the form shown in the Addendum below.</div><div class='del'>-G. Preserve in that license notice the full lists of Invariant Sections</div><div class='del'>-   and required Cover Texts given in the Document's license notice.</div><div class='del'>-H. Include an unaltered copy of this License.</div><div class='del'>-I. Preserve the section entitled "History", and its title, and add to</div><div class='del'>-   it an item stating at least the title, year, new authors, and</div><div class='del'>-   publisher of the Modified Version as given on the Title Page.  If</div><div class='del'>-   there is no section entitled "History" in the Document, create one</div><div class='del'>-   stating the title, year, authors, and publisher of the Document as</div><div class='del'>-   given on its Title Page, then add an item describing the Modified</div><div class='del'>-   Version as stated in the previous sentence.</div><div class='del'>-J. Preserve the network location, if any, given in the Document for</div><div class='del'>-   public access to a Transparent copy of the Document, and likewise</div><div class='del'>-   the network locations given in the Document for previous versions</div><div class='del'>-   it was based on.  These may be placed in the "History" section.</div><div class='del'>-   You may omit a network location for a work that was published at</div><div class='del'>-   least four years before the Document itself, or if the original</div><div class='del'>-   publisher of the version it refers to gives permission.</div><div class='del'>-K. In any section entitled "Acknowledgements" or "Dedications",</div><div class='del'>-   preserve the section's title, and preserve in the section all the</div><div class='del'>-   substance and tone of each of the contributor acknowledgements</div><div class='del'>-   and/or dedications given therein.</div><div class='del'>-L. Preserve all the Invariant Sections of the Document,</div><div class='del'>-   unaltered in their text and in their titles.  Section numbers</div><div class='del'>-   or the equivalent are not considered part of the section titles.</div><div class='del'>-M. Delete any section entitled "Endorsements".  Such a section</div><div class='del'>-   may not be included in the Modified Version.</div><div class='del'>-N. Do not retitle any existing section as "Endorsements"</div><div class='del'>-   or to conflict in title with any Invariant Section.</div><div class='del'>-</div><div class='del'>-If the Modified Version includes new front-matter sections or</div><div class='del'>-appendices that qualify as Secondary Sections and contain no material</div><div class='del'>-copied from the Document, you may at your option designate some or all</div><div class='del'>-of these sections as invariant.  To do this, add their titles to the</div><div class='del'>-list of Invariant Sections in the Modified Version's license notice.</div><div class='del'>-These titles must be distinct from any other section titles.</div><div class='del'>-</div><div class='del'>-You may add a section entitled "Endorsements", provided it contains</div><div class='del'>-nothing but endorsements of your Modified Version by various</div><div class='del'>-parties--for example, statements of peer review or that the text has</div><div class='del'>-been approved by an organization as the authoritative definition of a</div><div class='del'>-standard.</div><div class='del'>-</div><div class='del'>-You may add a passage of up to five words as a Front-Cover Text, and a</div><div class='del'>-passage of up to 25 words as a Back-Cover Text, to the end of the list</div><div class='del'>-of Cover Texts in the Modified Version.  Only one passage of</div><div class='del'>-Front-Cover Text and one of Back-Cover Text may be added by (or</div><div class='del'>-through arrangements made by) any one entity.  If the Document already</div><div class='del'>-includes a cover text for the same cover, previously added by you or</div><div class='del'>-by arrangement made by the same entity you are acting on behalf of,</div><div class='del'>-you may not add another; but you may replace the old one, on explicit</div><div class='del'>-permission from the previous publisher that added the old one.</div><div class='del'>-</div><div class='del'>-The author(s) and publisher(s) of the Document do not by this License</div><div class='del'>-give permission to use their names for publicity for or to assert or</div><div class='del'>-imply endorsement of any Modified Version.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-5. COMBINING DOCUMENTS</div><div class='del'>-</div><div class='del'>-You may combine the Document with other documents released under this</div><div class='del'>-License, under the terms defined in section 4 above for modified</div><div class='del'>-versions, provided that you include in the combination all of the</div><div class='del'>-Invariant Sections of all of the original documents, unmodified, and</div><div class='del'>-list them all as Invariant Sections of your combined work in its</div><div class='del'>-license notice.</div><div class='del'>-</div><div class='del'>-The combined work need only contain one copy of this License, and</div><div class='del'>-multiple identical Invariant Sections may be replaced with a single</div><div class='del'>-copy.  If there are multiple Invariant Sections with the same name but</div><div class='del'>-different contents, make the title of each such section unique by</div><div class='del'>-adding at the end of it, in parentheses, the name of the original</div><div class='del'>-author or publisher of that section if known, or else a unique number.</div><div class='del'>-Make the same adjustment to the section titles in the list of</div><div class='del'>-Invariant Sections in the license notice of the combined work.</div><div class='del'>-</div><div class='del'>-In the combination, you must combine any sections entitled "History"</div><div class='del'>-in the various original documents, forming one section entitled</div><div class='del'>-"History"; likewise combine any sections entitled "Acknowledgements",</div><div class='del'>-and any sections entitled "Dedications".  You must delete all sections</div><div class='del'>-entitled "Endorsements."</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-6. COLLECTIONS OF DOCUMENTS</div><div class='del'>-</div><div class='del'>-You may make a collection consisting of the Document and other documents</div><div class='del'>-released under this License, and replace the individual copies of this</div><div class='del'>-License in the various documents with a single copy that is included in</div><div class='del'>-the collection, provided that you follow the rules of this License for</div><div class='del'>-verbatim copying of each of the documents in all other respects.</div><div class='del'>-</div><div class='del'>-You may extract a single document from such a collection, and distribute</div><div class='del'>-it individually under this License, provided you insert a copy of this</div><div class='del'>-License into the extracted document, and follow this License in all</div><div class='del'>-other respects regarding verbatim copying of that document.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-7. AGGREGATION WITH INDEPENDENT WORKS</div><div class='del'>-</div><div class='del'>-A compilation of the Document or its derivatives with other separate</div><div class='del'>-and independent documents or works, in or on a volume of a storage or</div><div class='del'>-distribution medium, does not as a whole count as a Modified Version</div><div class='del'>-of the Document, provided no compilation copyright is claimed for the</div><div class='del'>-compilation.  Such a compilation is called an "aggregate", and this</div><div class='del'>-License does not apply to the other self-contained works thus compiled</div><div class='del'>-with the Document, on account of their being thus compiled, if they</div><div class='del'>-are not themselves derivative works of the Document.</div><div class='del'>-</div><div class='del'>-If the Cover Text requirement of section 3 is applicable to these</div><div class='del'>-copies of the Document, then if the Document is less than one quarter</div><div class='del'>-of the entire aggregate, the Document's Cover Texts may be placed on</div><div class='del'>-covers that surround only the Document within the aggregate.</div><div class='del'>-Otherwise they must appear on covers around the whole aggregate.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-8. TRANSLATION</div><div class='del'>-</div><div class='del'>-Translation is considered a kind of modification, so you may</div><div class='del'>-distribute translations of the Document under the terms of section 4.</div><div class='del'>-Replacing Invariant Sections with translations requires special</div><div class='del'>-permission from their copyright holders, but you may include</div><div class='del'>-translations of some or all Invariant Sections in addition to the</div><div class='del'>-original versions of these Invariant Sections.  You may include a</div><div class='del'>-translation of this License provided that you also include the</div><div class='del'>-original English version of this License.  In case of a disagreement</div><div class='del'>-between the translation and the original English version of this</div><div class='del'>-License, the original English version will prevail.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-9. TERMINATION</div><div class='del'>-</div><div class='del'>-You may not copy, modify, sublicense, or distribute the Document except</div><div class='del'>-as expressly provided for under this License.  Any other attempt to</div><div class='del'>-copy, modify, sublicense or distribute the Document is void, and will</div><div class='del'>-automatically terminate your rights under this License.  However,</div><div class='del'>-parties who have received copies, or rights, from you under this</div><div class='del'>-License will not have their licenses terminated so long as such</div><div class='del'>-parties remain in full compliance.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-10. FUTURE REVISIONS OF THIS LICENSE</div><div class='del'>-</div><div class='del'>-The Free Software Foundation may publish new, revised versions</div><div class='del'>-of the GNU Free Documentation License from time to time.  Such new</div><div class='del'>-versions will be similar in spirit to the present version, but may</div><div class='del'>-differ in detail to address new problems or concerns.  See</div><div class='del'>-http://www.gnu.org/copyleft/.</div><div class='del'>-</div><div class='del'>-Each version of the License is given a distinguishing version number.</div><div class='del'>-If the Document specifies that a particular numbered version of this</div><div class='del'>-License "or any later version" applies to it, you have the option of</div><div class='del'>-following the terms and conditions either of that specified version or</div><div class='del'>-of any later version that has been published (not as a draft) by the</div><div class='del'>-Free Software Foundation.  If the Document does not specify a version</div><div class='del'>-number of this License, you may choose any version ever published (not</div><div class='del'>-as a draft) by the Free Software Foundation.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-ADDENDUM: How to use this License for your documents</div><div class='del'>-</div><div class='del'>-To use this License in a document you have written, include a copy of</div><div class='del'>-the License in the document and put the following copyright and</div><div class='del'>-license notices just after the title page:</div><div class='del'>-</div><div class='del'>-      Copyright (c)  YEAR  YOUR NAME.</div><div class='del'>-      Permission is granted to copy, distribute and/or modify this document</div><div class='del'>-      under the terms of the GNU Free Documentation License, Version 1.1</div><div class='del'>-      or any later version published by the Free Software Foundation;</div><div class='del'>-      with the Invariant Sections being LIST THEIR TITLES, with the</div><div class='del'>-      Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.</div><div class='del'>-      A copy of the license is included in the section entitled "GNU</div><div class='del'>-      Free Documentation License".</div><div class='del'>-</div><div class='del'>-If you have no Invariant Sections, write "with no Invariant Sections"</div><div class='del'>-instead of saying which ones are invariant.  If you have no</div><div class='del'>-Front-Cover Texts, write "no Front-Cover Texts" instead of</div><div class='del'>-"Front-Cover Texts being LIST"; likewise for Back-Cover Texts.</div><div class='del'>-</div><div class='del'>-If your document contains nontrivial examples of program code, we</div><div class='del'>-recommend releasing these examples in parallel under your choice of</div><div class='del'>-free software license, such as the GNU General Public License,</div><div class='del'>-to permit their use in free software.</div><div class='head'>diff --git a/doc/Camel-Classes b/doc/Camel-Classes<br/>deleted file mode 100644<br/>index 93aec087dd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/Camel-Classes?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/Camel-Classes</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-CamelException</div><div class='del'>-CamelProvider</div><div class='del'>-CamelThreadProxy</div><div class='del'>-CamelURL</div><div class='del'>-GtkObject</div><div class='del'>- + CamelObject</div><div class='del'>-   + CamelAddress</div><div class='del'>-   |  + CamelInternetAddress</div><div class='del'>-   |  ` CamelNewsAddress</div><div class='del'>-   + CamelDataWrapper</div><div class='del'>-   | + CamelMedium</div><div class='del'>-   | |  ` CamelMimePart</div><div class='del'>-   | |     ` CamelMimeMessage</div><div class='del'>-   | ` CamelMultipart</div><div class='del'>-   + CamelFolder</div><div class='del'>-   |  ` CamelFolderPtProxy</div><div class='del'>-   + CamelFolderSearch</div><div class='del'>-   + CamelFolderSummary</div><div class='del'>-   + CamelMimeFilter</div><div class='del'>-   |  + CamelMimeFilterBasic</div><div class='del'>-   |  + CamelMimeFilterCharset</div><div class='del'>-   |  + CamelMimeFilterIndex</div><div class='del'>-   |  ` CamelMimeFilterSave</div><div class='del'>-   + CamelService</div><div class='del'>-   |  + CamelStore</div><div class='del'>-   |  ` CamelTransport</div><div class='del'>-   + CamelSession</div><div class='del'>-   + CamelStream</div><div class='del'>-   |  + CamelSeekableStream</div><div class='del'>-   |  |  + CamelSeekableSubstream</div><div class='del'>-   |  |  + CamelStreamFs</div><div class='del'>-   |  |  ` CamelStreamMem</div><div class='del'>-   |  + CamelStreamBuffer</div><div class='del'>-   |  ` CamelStreamFilter</div><div class='del'>-   ` CamelThreadProxy
\ No newline at end of file</div><div class='head'>diff --git a/doc/ChangeLog b/doc/ChangeLog<br/>deleted file mode 100644<br/>index 3b2a5968d3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,587 +0,0 @@</div><div class='del'>-</div><div class='del'>-2000-11-01  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Fixed validation errors.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Fixed HTML, style stuff.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Stylistic overhaul.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Fixed groups in shortcut bar, fixed</div><div class='del'>-	folder navigation tips.	</div><div class='del'>-</div><div class='del'>-2000-10-31  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Minor stylistic revisions.</div><div class='del'>-</div><div class='del'>-2000-10-30  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* COPYING-DOCS: New file. This is the official place to put the</div><div class='del'>-	FDL now.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-11-01  Radek Doulik  &lt;rodo@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Keybindings: added composer keybindings description</div><div class='del'>-</div><div class='del'>-2000-10-25  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml:  Actions -&gt; New Directory Server added.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml:  Actions -&gt; New Directory Server added.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Actions -&gt; New Directory Server added.</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Added mail Settings-&gt;Manage Subscriptions menu.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Subscriptions section added. Quite</div><div class='del'>-	incomplete, though.</div><div class='del'>-</div><div class='del'>-2000-10-11  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Re-checked validity of all files. Made</div><div class='del'>-	minor changes to menuref.sgml, usage-mail.sgml, usage-print.sgml to</div><div class='del'>-	bring up to spec.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Redid Filter &amp; Vfolder to match the new &amp;</div><div class='del'>-	improved functionality.</div><div class='del'>-</div><div class='del'>-	* C/fig/*: Re-did remaining screenshots.</div><div class='del'>-</div><div class='del'>-2000-10-10  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* C/usage-print.sgml: New file, describing printing and print-preview.</div><div class='del'>-</div><div class='del'>-	* C/fig/print-preview.png: New file.</div><div class='del'>-</div><div class='del'>-	* C/fig/print-dest.png: New file.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Added usage-print entity.</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Fixed calendar menu stuff.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: No more "Actions" menu, other assorted</div><div class='del'>-	menu-related changes.</div><div class='del'>-</div><div class='del'>-2000-10-06  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/fig/ * replaced a whole bunch of screenshots.</div><div class='del'>-</div><div class='del'>-2000-10-05  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Described Search features.</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Contact Manager menus fixed.</div><div class='del'>-</div><div class='del'>-2000-10-04  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Fixed glossterms.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Fixed glossterms, filenames, spellchecked.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added "Inline," "VCard".</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Fixed glossterms, filenames. Spellchecked.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Fixed glossterms, filenames. Spellchecked.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: New Legalnotice. Removed FDL and GPL, </div><div class='del'>-	  which are now included as part of the gnome-help package.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Spellcheck. Fixed some wording, and</div><div class='del'>-	responded to clahey's suggestions-- notably, commented out the</div><div class='del'>-	"add to master list" category feature.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Spellcheck. Fixed wording, event overlap</div><div class='del'>-        description.</div><div class='del'>-	</div><div class='del'>-	* C/evolution-guide.sgml: Spellcheck. Commented out Notes</div><div class='del'>-	entities.</div><div class='del'>-</div><div class='del'>-	* C/usage-notes.sgml: Spellchecked, then decided to comment out</div><div class='del'>-	this file/chapter and all references to it, since it's unlikely to</div><div class='del'>-	be implemented any time soon.</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: Spellcheck. Other minor updates. May</div><div class='del'>-	  need more work in the near future.</div><div class='del'>-</div><div class='del'>-	* C/usage-sync.sgml: Now it's really short. And spelled correctly.</div><div class='del'>-</div><div class='del'>-2000-10-03  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Mostly spelling. Still needs major</div><div class='del'>-	alteration.</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: s/Appintment/Appointment, fixed small errors,</div><div class='del'>-	ran spellcheck. Still needs lots of work, since many menus have</div><div class='del'>-	changed.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added Virus, Protocol, fixed vFolder,</div><div class='del'>-	spellchecked.</div><div class='del'>-</div><div class='del'>-2000-09-26  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml:  Added sendmail and SMTP.</div><div class='del'>-</div><div class='del'>-2000-09-22  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/menuref.sgml: Changed to reflect new menu layout.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Changed to reflect new menu layout. Again.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Stop and Display All features.</div><div class='del'>-</div><div class='del'>-2000-09-21  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Switched to the "official" FSF markup.</div><div class='del'>-	  I will have to make changes to the markup-- adding ids, etc, or</div><div class='del'>-	  switch to another version of the markup. Pending discussion by</div><div class='del'>-	  GDP.</div><div class='del'>-</div><div class='del'>-	* C/apx-authors.sgml: Changed Matt Loper's email address to</div><div class='del'>-	loper.org; added Jeff Stedfast and Peter Williams to authors list,</div><div class='del'>-	realphebetized.	</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Revision to reflect current options labelling.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Changes to part intros.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Spelling and menu fixes.  Will need more work tomorrow.</div><div class='del'>-	</div><div class='del'>-2000-09-20  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Fixed sig stuff here and in setupassist.</div><div class='del'>-</div><div class='del'>-	* C/config-sync.sgml: Fixed description of conduit usage.</div><div class='del'>-</div><div class='del'>-2000-09-18  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Spelling fixes, etc.</div><div class='del'>-</div><div class='del'>-=======</div><div class='del'>-2000-09-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am: Fixed to install the stylesheet-images as well.</div><div class='del'>-</div><div class='del'>-&gt;&gt;&gt;&gt;&gt;&gt;&gt; 1.26</div><div class='del'>-2000-09-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/fig/ New files: contact-editor.png, mail-composer.png,</div><div class='del'>-	filter-assist-fig.png, mail-inbox.png</div><div class='del'>-</div><div class='del'>-2000-09-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Redid "soft" intro stuff.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Accidentally broke docs, now valid.</div><div class='del'>-</div><div class='del'>-2000-09-06  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Editing, proofing.</div><div class='del'>-</div><div class='del'>-2000-09-05  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Grammar, links, screenshots.</div><div class='del'>-</div><div class='del'>-	* fig/* Re-took most screenshots.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Filters, proofing.</div><div class='del'>-</div><div class='del'>-2000-09-01  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Added coverage of news, clarified POP/IMAP</div><div class='del'>-	distinction (there's a theme to these four log entries here).</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added coverage of news.</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: Revised mail sources content for</div><div class='del'>-	IMAP/POP stuff.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added IMAP and POP.</div><div class='del'>-</div><div class='del'>-2000-08-31  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added regular expressions to glossary.</div><div class='del'>-	Explanation should be removed from other portions of the book now.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Revisions, minor.</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: Now named menuref.sgml, to reflect its new</div><div class='del'>-	status as a part.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Structural alterations: Menuref is now a</div><div class='del'>-	part, not an appendix.</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: Added contextual menus for mail.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Added "quickref and pointers" sections. Props to</div><div class='del'>-	  O'Reilly for the copy of Outlook in a Nutshell which gave me the</div><div class='del'>-	  idea.</div><div class='del'>-</div><div class='del'>-2000-08-30  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Minor fixes.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Corrected grammar, added glossterms, described</div><div class='del'>-	menuref.</div><div class='del'>-</div><div class='del'>-2000-08-25  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Redid filter and vFolder assistant</div><div class='del'>-	descriptions.</div><div class='del'>-</div><div class='del'>-	* C/fig/filter-new-fig.png: Replaced with new assistant pic.</div><div class='del'>-</div><div class='del'>-	* C/fig/filter-assist-fig.png: New file, showing only assistant.</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	* C/apx-menuref.sgml: Finished message composer and calendar</div><div class='del'>-	editor menus. Looked at Contact Editor menus and decided to</div><div class='del'>-	document those features after implementation.</div><div class='del'>-</div><div class='del'>-2000-08-24  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: Message Composer File and Edit menus.</div><div class='del'>-</div><div class='del'>-2000-08-23  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: Added editor sections.</div><div class='del'>-	</div><div class='del'>-	* C/evolution-guide.sgml: Included Menu Reference Appendix.</div><div class='del'>-</div><div class='del'>-2000-08-22  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Minor markup changes.</div><div class='del'>-</div><div class='del'>-	* C/apx-menuref.sgml: New File. Menu Reference. Still needs much</div><div class='del'>-	work, but not bad for an evening.</div><div class='del'>-</div><div class='del'>-2000-08-21  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Kevin's diff applied, with minor changes.	</div><div class='del'>-</div><div class='del'>-2000-08-09  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Fixed bugs in validation. Went home to</div><div class='del'>-	sleep.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Redid menubar description.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Added coverage of folder config, requested</div><div class='del'>-	that feature be transferred to config section. Switched to</div><div class='del'>-	variablelist in "Other" config section.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added coverage of right-click on messages,</div><div class='del'>-	threaded-view.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: Right-click on folder menu reinstated.</div><div class='del'>-</div><div class='del'>-2000-08-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Added news server coverage.  Other config</div><div class='del'>-	proofing changes.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-08-05  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/apx-gpl.sgml: New file.  Contains contents of "COPYING",</div><div class='del'>-	but marked up (probably not very well, but valid) as docbook</div><div class='del'>-	(SGML).</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Subtle change to the legal notice:</div><div class='del'>-	distinguished manual license from software license. Linked to</div><div class='del'>-	apx-gpl.sgml above.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: I redid all the usage files.</div><div class='del'>-</div><div class='del'>-2000-07-21  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Added password remembering/forgetting feature.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: Mostly moved to variablelists, a few</div><div class='del'>-	language changes.</div><div class='del'>-</div><div class='del'>-	* C/config-setupassist.sgml: Minor changes to formatting, wording.</div><div class='del'>-</div><div class='del'>-	* C/usage-notes.sgml: Changed trademark references, other minor</div><div class='del'>-	changes.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Minor fixes, added additional calendar</div><div class='del'>-	section, removed references to unimplemented features. Spellcheck,</div><div class='del'>-	prep for 0.3 release. </div><div class='del'>-	</div><div class='del'>-2000-07-19  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: lots of minor fixes to language. added</div><div class='del'>-	desc. of clahey's cool button-address thing.</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: fixed itemizedlists, ch. to shortcut</div><div class='del'>-	bar &amp; folder descs, removed refs to trash.</div><div class='del'>-</div><div class='del'>-2000-07-18  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Altered category addition stuff, plus</div><div class='del'>-	suggestions from Kevin.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Added ldap and signature definitions (from</div><div class='del'>-	Kevin).</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Move to variablelists from itemizedlists.</div><div class='del'>-</div><div class='del'>-2000-07-14  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: moved to variablelists from itemizedlists</div><div class='del'>-	* C/usage-calendar.sgml: moved to variablelists from itemizedlists</div><div class='del'>-</div><div class='del'>-2000-06-29  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: Minor fixes.</div><div class='del'>-</div><div class='del'>-	* C/usage-notes.sgml: New File for feature that is yet to come.</div><div class='del'>-	* C/evolution-guide.sgml: Added entity for notes chapter.</div><div class='del'>-	* C/usage-mainwindow.sgml: Un-commented references to notes section.</div><div class='del'>-	</div><div class='del'>-	* C/apx-authors.sgml: Removed dcm from author list.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Added to-do list features.</div><div class='del'>-</div><div class='del'>-2000-06-28  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: commented out future features; redid</div><div class='del'>-	contact editor stuff.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: Removed "live doc" and added "minicard"</div><div class='del'>-</div><div class='del'>-2000-06-27  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/devel-action.sgml: Removed file.</div><div class='del'>-	* C/devel-script.sgml: Same.</div><div class='del'>-	* C/devel-component.sgml: Same.</div><div class='del'>-	* C/preface.sgml: Removed references to devel section.</div><div class='del'>-	* C/evolution-guide.sgml: Removed references to devel section.</div><div class='del'>-</div><div class='del'>-2000-06-23  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: Made moderate to major stylistic updates</div><div class='del'>-	to this, apx-gloss.sgml, and to all files beginning with "usage,"</div><div class='del'>-	especially wrt HTML mail.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-2000-06-15  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Category stuff improved.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Now covers how to add an event properly.</div><div class='del'>-</div><div class='del'>-2000-07-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (SUBDIRS): Added the devel directory.</div><div class='del'>-</div><div class='del'>-2000-06-28  Peter Williams  &lt;peterw@curious-george.helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am (SGML_FILES): Don't depend on the newly-removed</div><div class='del'>-	devel-*.sgml files.</div><div class='del'>-</div><div class='del'>-2000-06-16  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/.cvsignore: added evolution-guide and evolution-guide.junk</div><div class='del'>-	so we don't get the '? doc/C/evolution-guide' messages each time we</div><div class='del'>-	do a cvs update.</div><div class='del'>-</div><div class='del'>-2000-06-14  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: added sect on menubar, other minor changes.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Improved filter and vfolder</div><div class='del'>-	description, and some minor changes from me and Kevin.</div><div class='del'>-</div><div class='del'>-2000-06-07  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: finished adding calendar prefs. screenshots.</div><div class='del'>-	* C/fig/config-cal.png: new file (screenshot for above)</div><div class='del'>-	* C/fig/config-mail.png: same</div><div class='del'>-	</div><div class='del'>-2000-06-05  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: Incorporated chgs from Kevin.</div><div class='del'>-	</div><div class='del'>-	* C/config-prefs.sgml: began total overhaul of structure and added</div><div class='del'>-	content reflecting new prefs items.  needs LOTS more work.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: changed some references to id's in the </div><div class='del'>-	config-prefs section.	</div><div class='del'>-</div><div class='del'>-	* C/fig/config-mail.png: changed filename from config-prefs.png</div><div class='del'>-</div><div class='del'>-2000-06-01  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: filename was wrong, altered.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: improved filter instructions, vFolder</div><div class='del'>-	instructions.  still need work though.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: added screenshot.</div><div class='del'>-</div><div class='del'>-	* C/usage-calendar.sgml: added screenshot.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: added screenshots, and now describes the</div><div class='del'>-	actual prefs dialogs.</div><div class='del'>-</div><div class='del'>-	* C/fig/config-camel.png: new (screenshot) file</div><div class='del'>-	* C/fig/filter-druid.png: same</div><div class='del'>-	* C/fig/vfolder-druid.png: same</div><div class='del'>-	* C/fig/calendar.png: same</div><div class='del'>-	* C/fig/contact.png: same</div><div class='del'>-	* C/fig/vfolder-createrule-fig.png: same</div><div class='del'>-	* C/fig/filter-new-fig.png: same</div><div class='del'>-	* C/fig/config-camel.png: same</div><div class='del'>-</div><div class='del'>-2000-06-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: recurse into the C directory</div><div class='del'>-</div><div class='del'>-	* C/Makefile.am: Rules to build and install the docs. Mostly</div><div class='del'>-	stolen from gnomecal. Only works if you have GDP stuff</div><div class='del'>-	(http://www.gnome.org/gdp/) set up on your machine, but won't make</div><div class='del'>-	the build fail if you don't.</div><div class='del'>-</div><div class='del'>-2000-05-29  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: incorporated kevins notes.</div><div class='del'>-	* C/usage-mainwindow.sgml: incorporated kevins notes.</div><div class='del'>-</div><div class='del'>-2000-05-27  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: added Kevin Breit to author and</div><div class='del'>-	copyright.</div><div class='del'>-</div><div class='del'>-	* C/apx-authors.sgml: Put app authors in a simplelist.</div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: Removed USAGE-SETUP insertion, added xref to send</div><div class='del'>-        users to config-setupassist chapter. This and the following changes </div><div class='del'>-	take setup druid coverage out of usage </div><div class='del'>-	section and put it in config section. </div><div class='del'>-	* C/config-setupassist.sgml: Added mail druid coverage from</div><div class='del'>-	usage-setup.sgml.</div><div class='del'>-	* C/usage-setup.sgml: Removed file. contents in</div><div class='del'>-	config-setupassist.sgml.  </div><div class='del'>-	* C/evolution-guide.sgml: Removed</div><div class='del'>-	USAGE-SETUP entity (and file usage-setup.sgml.)</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-2000-05-26  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/fig/mainwindow-pic.png: new file</div><div class='del'>-	* C/fig/mail-druid-pic.png: new file</div><div class='del'>-	* C/fig: New directory, for figure graphics.</div><div class='del'>-</div><div class='del'>-	* C/apx-gloss.sgml: new file. glossary. thx. to kevin from chicago.</div><div class='del'>-	</div><div class='del'>-	* C/usage-setup.sgml: More accurate description of druid, and</div><div class='del'>-	moved to mail section-- see usage-mail.sgml entry.  This is a new</div><div class='del'>-	location for this entity, and it may move more later.</div><div class='del'>-	</div><div class='del'>-</div><div class='del'>-	* C/usage-mainwindow.sgml: altered description of starting</div><div class='del'>-	evolution. added screenshot for main-window picture. </div><div class='del'>-</div><div class='del'>-	* C/usage-mail.sgml: added screenshots, added coverage of setup</div><div class='del'>-	druid and put it into get-and-send section, which is probably not</div><div class='del'>-	where it should stay.  Also started filter druid coverage and</div><div class='del'>-	clarified examples, esp. in Bcc: section.</div><div class='del'>-</div><div class='del'>-	* C/usage-contact.sgml: Clarified examples.</div><div class='del'>-</div><div class='del'>-	* C/preface.sgml: rewording of "what is" and "about book" sections.</div><div class='del'>-</div><div class='del'>-	* C/evolution-guide.sgml: added glossary entity APX-GLOSS, altered</div><div class='del'>-	phrasing in part intros, changed order of Setup-assistant section.</div><div class='del'>-</div><div class='del'>-	* C/config-prefs.sgml: changed wording, removed ref. to re-running</div><div class='del'>-	setup assistant.</div><div class='del'>-</div><div class='del'>-2000-05-18  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evo_book_0.1.sgml: removed.	</div><div class='del'>-</div><div class='del'>-	* C/apx-authors.sgml: new file.</div><div class='del'>-	* C/apx-bugs.sgml: same.</div><div class='del'>-	* C/apx-fdl.sgml: same.</div><div class='del'>-	* C/config-prefs.sgml: same.</div><div class='del'>-	* C/config-setupassist.sgml: same.</div><div class='del'>-	* C/config-sync.sgml: same.</div><div class='del'>-	* C/devel-action.sgml: same.</div><div class='del'>-	* C/devel-component.sgml: same.</div><div class='del'>-	* C/devel-script.sgml: same.</div><div class='del'>-	* C/evolution-guide.sgml: same.</div><div class='del'>-	* C/preface.sgml: same.</div><div class='del'>-	* C/usage-calendar.sgml: same.</div><div class='del'>-	* C/usage-contact.sgml: same.</div><div class='del'>-	* C/usage-mail.sgml: same.</div><div class='del'>-	* C/usage-mainwindow.sgml: same.</div><div class='del'>-	* C/usage-setup.sgml: same.</div><div class='del'>-	* C/usage-sync.sgml: same.</div><div class='del'>-</div><div class='del'>-2000-05-07  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Camel-Classes: sync</div><div class='del'>-</div><div class='del'>-2000-04-16  Aaron Weber  &lt;aaron@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* C/evo_book_0.1.sgml: new file (doc sgml)</div><div class='del'>-	</div><div class='del'>-	* C/ : New directory for doc sgml &amp; graphics</div><div class='del'>-</div><div class='del'>-2000-03-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* white-papers/widgets/e-table.sgml: Added Miguel to the author</div><div class='del'>-	list for ETable.</div><div class='del'>-</div><div class='del'>-2000-03-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* white-papers/widgets/, white-papers/widgets/e-table.sgml: New</div><div class='del'>-	doc for the ETable widget.</div><div class='del'>-</div><div class='del'>-	* ChangeLog: Created a ChangeLog file for the docs file and</div><div class='del'>-	integrated the individual ChangeLogs.</div><div class='del'>-</div><div class='del'>-2000-03-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ibex.sgml: Ibex white paper</div><div class='del'>-</div><div class='del'>-2000-02-29  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.sgml: Sections for the calendar user agent and the</div><div class='del'>-	calendar client library.</div><div class='del'>-</div><div class='del'>-2000-02-29  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.sgml: Reorg a bit more, make the &lt;PRE&gt; section narrower,</div><div class='del'>-	add more references to graphics (the graphics themselves are</div><div class='del'>-	still in beta), add a section on CamelStream.</div><div class='del'>-</div><div class='del'>-2000-02-28  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.sgml: Section for the personal calendar server.</div><div class='del'>-</div><div class='del'>-2000-02-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.sgml: add Bertrand to authors, edit his additions</div><div class='del'>-</div><div class='del'>-2000-02-28  bertrand  &lt;bertrand@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.sgml: add a blurb about camel offering</div><div class='del'>-	uniform interface. needs style and grammar corrections. </div><div class='del'>-	Talk about virtual folders.</div><div class='del'>-	Talk about lightweight messages</div><div class='del'>-	Talk about IMAP. </div><div class='del'>-</div><div class='del'>-2000-02-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* camel.sgml: Beginnings of a Camel white paper</div><div class='del'>-</div><div class='del'>-2000-02-25  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar.sgml: New file for the Evolution calendaring white paper.</div><div class='head'>diff --git a/doc/Design b/doc/Design<br/>deleted file mode 100644<br/>index 7b7cf6f821..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/Design?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/Design</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,201 +0,0 @@</div><div class='del'>-</div><div class='del'>-The Evolution Project specification</div><div class='del'>-Miguel de Icaza.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-* Introduction</div><div class='del'>-</div><div class='del'>-	Evolution is a project aiming at providing the free software</div><div class='del'>-	community with a professional, high-quality tool for managing</div><div class='del'>-	mail, appointments, tasks and other personal information</div><div class='del'>-	tools.  </div><div class='del'>-</div><div class='del'>-	We want to make Evolution a system that addresses our needs</div><div class='del'>-	(the free software development community) and we believe that</div><div class='del'>-	by addressing our needs, we will provide a system that will</div><div class='del'>-	scale in the years to come for other users that are just</div><div class='del'>-	starting to use computers and the internet.</div><div class='del'>-</div><div class='del'>-	The main objectives of Evolution are to provide these powerful</div><div class='del'>-	features, and to make the user interface as pretty and</div><div class='del'>-	polished as possible.</div><div class='del'>-</div><div class='del'>-	Evolution is a GNOME application and a number of auxiliary</div><div class='del'>-	CORBA servers that act as the storage backends. </div><div class='del'>-</div><div class='del'>-	Evolution will copy the best user interface bits and the best</div><div class='del'>-	ideas and features found on contemporary groupware systems.</div><div class='del'>-</div><div class='del'>-* Evolution internals.</div><div class='del'>-</div><div class='del'>-	Evolution can store its information locally (files for mail,</div><div class='del'>-	calendar and address book) or on a remote server (imap/pop,</div><div class='del'>-	cap, ldap).  </div><div class='del'>-</div><div class='del'>-	Given the importance of syncing in this modern PDA world,</div><div class='del'>-	the Evolution GUI acts as a client to the data repository.</div><div class='del'>-	The data repository is a GUI-less CORBA server called Wombat.</div><div class='del'>-</div><div class='del'>-	Wombat provides a unified access system to the calendar and</div><div class='del'>-	addressbook data (doing mail is a bit hard, so we are leaving</div><div class='del'>-	this as a TODO item for now).</div><div class='del'>-</div><div class='del'>-	Wombat's CORBA interfaces are notifier-based.  This means that</div><div class='del'>-	CORBA requests sent to Wombat do not return values</div><div class='del'>-	inmediately, but rather than for Wombat requests the user has</div><div class='del'>-	to provide a CORBA object that will be notified of what</div><div class='del'>-	happened.</div><div class='del'>-</div><div class='del'>-	Yes, that sounds hairy.  It is actually pretty simple.  It</div><div class='del'>-	basically means that you submit requests to Wombat, and a</div><div class='del'>-	callback is invoked in your code when the request has been</div><div class='del'>-	carried away. </div><div class='del'>-</div><div class='del'>-	This enables a Palm to sync to the repository without having</div><div class='del'>-	the GUI for Evolution running.  It also means that volunteers</div><div class='del'>-	will be able to write text-based and web-based versions of</div><div class='del'>-	Evolution (not me though :-).</div><div class='del'>-</div><div class='del'>-* Evolution as a platform</div><div class='del'>-</div><div class='del'>-	Evolution is more than a client for managing the above</div><div class='del'>-	information: Evolution is a platform for building groupware</div><div class='del'>-	applications that use the above components to get their work done.</div><div class='del'>-</div><div class='del'>-	To achieve this Evolution is designed to be scriptable, and it</div><div class='del'>-	exports its internals trough CORBA/Bonobo.  It is implemented</div><div class='del'>-	as a collection of Bonobo containers and Bonobo components.</div><div class='del'>-</div><div class='del'>-	There is a clean separation between the views (the user</div><div class='del'>-	interface) and the model (the view).  The views that we are</div><div class='del'>-	writing are GNOME based, and they talk to the Wombat CORBA</div><div class='del'>-	server.</div><div class='del'>-</div><div class='del'>-	Wombat takes care of notifications to the various clients for</div><div class='del'>-	the data. </div><div class='del'>-</div><div class='del'>-* The overall organization</div><div class='del'>-</div><div class='del'>-	A bar similar to outlook provides shortcuts for accessing the</div><div class='del'>-	various resources managed by Evolution: mail folders,</div><div class='del'>-	contacts, tasks, journal entries, notes, messages and other</div><div class='del'>-	user-defined destinations. </div><div class='del'>-</div><div class='del'>-* User interface widgets</div><div class='del'>-</div><div class='del'>-** The ETable package</div><div class='del'>-</div><div class='del'>-	This package provides a way of displaying and editing tables.</div><div class='del'>-</div><div class='del'>-	Tables are displayed based on a TableColumn definition that</div><div class='del'>-	defines the layout used for the display.  Table Columns can be</div><div class='del'>-	nested, and the package does grouping of information displayed</div><div class='del'>-	according to the criteria defined there.</div><div class='del'>-</div><div class='del'>-	This is used in multiple places troughout evolution: it is</div><div class='del'>-	used for the Mail summary display, for the TODO display and</div><div class='del'>-	TODO new data entry and for the address book.</div><div class='del'>-</div><div class='del'>-	Nesting in the address book can be performed on various</div><div class='del'>-	fields.  For example, a first level of nesting could be</div><div class='del'>-	"Company" and a second level would be "Country" the result is</div><div class='del'>-	a 2-level tree that can be collapsed expanded and contains the</div><div class='del'>-	information sorted/grouped by those two criteria.</div><div class='del'>-</div><div class='del'>-	The user interface for this will be copied from Outlook: the</div><div class='del'>-	possibility of adding and removing fields with drag and drop</div><div class='del'>-	as well as grouping using drag and drop.</div><div class='del'>-</div><div class='del'>-* The Mail system</div><div class='del'>-</div><div class='del'>-** The Mail sources</div><div class='del'>-</div><div class='del'>-	The mail system will support 4 sources of mail:</div><div class='del'>-</div><div class='del'>-		POP3 (transfer to a local file).</div><div class='del'>-		IMAP</div><div class='del'>-		Local mbox format in $MAIL.</div><div class='del'>-		Local mbox format that have other delivery points.</div><div class='del'>-</div><div class='del'>-	On top of that, it will be possible to browse existing mbox</div><div class='del'>-	archives (and possibly other formats in the future, like</div><div class='del'>-	Mailbox and Maildir).</div><div class='del'>-</div><div class='del'>-** Storing the mail</div><div class='del'>-</div><div class='del'>-	Mail that gets incorporated into the system is stored in mbox</div><div class='del'>-	format, and summary files are provided for quick access to the</div><div class='del'>-	files.  No modifications to the file on disk is performed (I</div><div class='del'>-	am not quite sure about this, perhaps we want to add the</div><div class='del'>-	status flags and some method for adding metadata to the mail).</div><div class='del'>-</div><div class='del'>-	Summary files are rebuilt on demand or rebuild if the mbox</div><div class='del'>-	file and the summary file have got out of sync.</div><div class='del'>-</div><div class='del'>-	A Metadata system that will enable us to attach information to</div><div class='del'>-	a message will have to be designed and implemented (enabling</div><div class='del'>-	users to add annotations to mails, and special keywords and</div><div class='del'>-	flags in a per-message fashion).</div><div class='del'>-</div><div class='del'>-** Folders</div><div class='del'>-</div><div class='del'>-	Michael Zucchi is working on a system that will let users</div><div class='del'>-	easily define rules for splitting their incoming mail into</div><div class='del'>-	physical folders.  </div><div class='del'>-</div><div class='del'>-	A further refinement to Folders are Virtual Folders.  This</div><div class='del'>-	basically provides a powerful search and viewing facility for</div><div class='del'>-	mail.  It works like this: when a mail is "incorporated" into</div><div class='del'>-	Evolution it is scanned and indexed.</div><div class='del'>-</div><div class='del'>-	Then users can enter queries into Evolution that will search</div><div class='del'>-	the entire database of messages.	</div><div class='del'>-</div><div class='del'>-** Virtual folders</div><div class='del'>-</div><div class='del'>-	Virtual folders will enable users to read/browse their mail in</div><div class='del'>-	new ways: by specifying search criterias, these folders will</div><div class='del'>-	contain messages that match the criteria given.  </div><div class='del'>-</div><div class='del'>-	There is more information about this in the libcamel</div><div class='del'>-	directory. </div><div class='del'>-</div><div class='del'>-	We will index all headers from a message, and possible the</div><div class='del'>-	contents of messages and keep those on a separate file, to</div><div class='del'>-	enable users to query their mail database.</div><div class='del'>-</div><div class='del'>-** Mail summary display</div><div class='del'>-</div><div class='del'>-	The summary will be displayed using the ETable package, to</div><div class='del'>-	enable users to add a number of sorting criteria and various</div><div class='del'>-	display methods for the summary view.</div><div class='del'>-</div><div class='del'>-	The Outlook methods for displaying will be present on the</div><div class='del'>-	system.</div><div class='del'>-</div><div class='del'>-	Message threading will be supported in Evolution.</div><div class='del'>-</div><div class='del'>-** Message display engine</div><div class='del'>-</div><div class='del'>-	We are going to be using a combination of</div><div class='del'>-	libcamel/limime/libjamie to parse messages and render them</div><div class='del'>-	into an HTML buffer.</div><div class='del'>-</div><div class='del'>-* The HTML engine</div><div class='del'>-</div><div class='del'>-	The GtkHTML engine will be used to display messages, and will</div><div class='del'>-	be extended to support a number of features that we require:</div><div class='del'>-	internal handling of characters will be based on Unicode</div><div class='del'>-</div><div class='del'>-* The message composer</div><div class='del'>-</div><div class='del'>-	Regular features found in composers will be added: connecting</div><div class='del'>-	the composer to the address book, support for drag and drop</div><div class='del'>-	for including attachments, editing the message, archiving</div><div class='del'>-	drafts and archiving messages sent.</div><div class='del'>-</div><div class='del'>-	Ettore has been working on adding editing support to the</div><div class='del'>-	GtkHTML and he is working currently on a Bonobo component that</div><div class='del'>-	will provide a ready-to-use Bonobo control for embedding into</div><div class='del'>-	other applications.</div><div class='del'>-</div><div class='head'>diff --git a/doc/Keybindings b/doc/Keybindings<br/>deleted file mode 100644<br/>index f232802110..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/Keybindings?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/Keybindings</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,13 +0,0 @@</div><div class='del'>-* Keybindings for the mailer</div><div class='del'>-</div><div class='del'>-	Delete key: 	Deletes message, moves forward.</div><div class='del'>-	</div><div class='del'>-* Keybindings for the composer</div><div class='del'>-</div><div class='del'>-	Control-s:		Saves message to file.</div><div class='del'>-	Control-w:		Closes composer window.</div><div class='del'>-	Control-Return: 	Sends message now.</div><div class='del'>-</div><div class='del'>-	F6:			Opens find dialog.</div><div class='del'>-	F7:			Opens replace dialog.</div><div class='del'>-</div><div class='head'>diff --git a/doc/Makefile.am b/doc/Makefile.am<br/>deleted file mode 100644<br/>index 7b5420fee8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1 +0,0 @@</div><div class='del'>-SUBDIRS = C devel</div><div class='head'>diff --git a/doc/devel/.cvsignore b/doc/devel/.cvsignore<br/>deleted file mode 100644<br/>index c24a54fbcc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-html</div><div class='del'>-evolution-devel-guide.html</div><div class='head'>diff --git a/doc/devel/ChangeLog b/doc/devel/ChangeLog<br/>deleted file mode 100644<br/>index 555db7d161..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,40 +0,0 @@</div><div class='del'>-2000-09-15  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Made the toplevel &lt;book&gt; id be</div><div class='del'>-	"index".</div><div class='del'>-</div><div class='del'>-2000-08-14  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-util/*: Integrated the cal-util library into the</div><div class='del'>-	documentation framework.</div><div class='del'>-</div><div class='del'>-	* calendar/Makefile.am (SUBDIRS): Added the cal-util directory.</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: Added entities for the cal-util stuff.</div><div class='del'>-	Added entity for libical.</div><div class='del'>-</div><div class='del'>-	* calendar/reference.sgml: Added the cal-util reference entries.</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/evolution-cal-client-sections.txt: Updated</div><div class='del'>-	for new API.</div><div class='del'>-</div><div class='del'>-2000-08-09  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (maintainer-clean-local): Don't depend</div><div class='del'>-	on 'clean'; this messes up maintainer-clean.</div><div class='del'>-</div><div class='del'>-2000-07-17  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* calendar/cal-client/tmpl/cal-client.sgml: Populated.</div><div class='del'>-</div><div class='del'>-	* evolution-devel-guide.sgml: New &lt;book&gt; toplevel for the</div><div class='del'>-	Evolution Developer's Guide.</div><div class='del'>-</div><div class='del'>-	* calendar/evolution-calendar.sgml: New &lt;part&gt; for the calendar</div><div class='del'>-	developer's documentation.</div><div class='del'>-</div><div class='del'>-	* calendar/architecture.sgml: New &lt;chapter&gt; for the calendar</div><div class='del'>-	architecture.</div><div class='del'>-</div><div class='del'>-	* calendar/reference.sgml: New &lt;reference&gt; for the calendar API</div><div class='del'>-	reference.</div><div class='head'>diff --git a/doc/devel/Makefile.am b/doc/devel/Makefile.am<br/>deleted file mode 100644<br/>index 0d3cec5a1c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,64 +0,0 @@</div><div class='del'>-SUBDIRS = calendar</div><div class='del'>-</div><div class='del'>-# The name of the module.</div><div class='del'>-DOC_MODULE=evolution-devel-guide</div><div class='del'>-</div><div class='del'>-# The top-level SGML file.</div><div class='del'>-DOC_MAIN_SGML_FILE=evolution-devel-guide.sgml</div><div class='del'>-</div><div class='del'>-HTML_DIR=$(datadir)/gnome/html</div><div class='del'>-</div><div class='del'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-evolution_devel_guidedir = $(HTML_DIR)</div><div class='del'>-evolution_devel_guide_DATA =			\</div><div class='del'>-	evolution-devel-guide.html</div><div class='del'>-</div><div class='del'>-content_files =					\</div><div class='del'>-	evolution-devel-guide.sgml</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 					\</div><div class='del'>-	$(evolution_devel_guide_DATA)		\</div><div class='del'>-	$(content_files)</div><div class='del'>-</div><div class='del'>-if ENABLE_GTK_DOC</div><div class='del'>-evolution-devel-guide.html: html/book1.html</div><div class='del'>-	-cd $(srcdir) &amp;&amp; cp html/book1.html evolution-devel-guide.html</div><div class='del'>-else</div><div class='del'>-evolution-devel-guide.html:</div><div class='del'>-endif</div><div class='del'>-</div><div class='del'>-html/book1.html: $(content-files)</div><div class='del'>-	$(MAKE) html</div><div class='del'>-</div><div class='del'>-html:</div><div class='del'>-	test -d $(srcdir)/html || mkdir $(srcdir)/html</div><div class='del'>-	-cd $(srcdir)/html &amp;&amp; gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak *.signals *-unused.txt</div><div class='del'>-</div><div class='del'>-maintainer-clean-local:</div><div class='del'>-	cd $(srcdir) &amp;&amp; rm -rf html</div><div class='del'>-</div><div class='del'>-install-data-local:</div><div class='del'>-	$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)</div><div class='del'>-	(installfiles=`echo $(srcdir)/html/*.html`; \</div><div class='del'>-	if test "$$installfiles" = '$(srcdir)/html/*.html'; \</div><div class='del'>-	then echo '-- Nothing to install' ; \</div><div class='del'>-	else \</div><div class='del'>-	  for i in $$installfiles; do \</div><div class='del'>-	    echo '-- Installing '$$i ; \</div><div class='del'>-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	  done; \</div><div class='del'>-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \</div><div class='del'>-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \</div><div class='del'>-	  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'>-	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html</div><div class='del'>-</div><div class='del'>-.PHONY: html</div><div class='head'>diff --git a/doc/devel/calendar/.cvsignore b/doc/devel/calendar/.cvsignore<br/>deleted file mode 100644<br/>index 282522db03..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/doc/devel/calendar/Makefile.am b/doc/devel/calendar/Makefile.am<br/>deleted file mode 100644<br/>index 2220e1d59b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-SUBDIRS = cal-client cal-util</div><div class='del'>-</div><div class='del'>-EXTRA_DIST =				\</div><div class='del'>-	architecture.sgml		\</div><div class='del'>-	evolution-calendar.sgml		\</div><div class='del'>-	reference.sgml</div><div class='head'>diff --git a/doc/devel/calendar/architecture.sgml b/doc/devel/calendar/architecture.sgml<br/>deleted file mode 100644<br/>index 08e4c82b35..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/architecture.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/architecture.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,94 +0,0 @@</div><div class='del'>-  &lt;chapter id="calendar-architecture"&gt;</div><div class='del'>-    &lt;title&gt;Architecture of the Calendar&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This chapter gives an overview of the Evolution Calendar</div><div class='del'>-      architecture.  It describes the model/view split of the calendar</div><div class='del'>-      into a personal calendar server, or PCS, and the GUI clients</div><div class='del'>-      that appear inside the Evolution shell.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;!-- Model/View Separation --&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1 id="calendar-model-view"&gt;</div><div class='del'>-      &lt;title&gt;Model/View Separation&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Like other base components in Evolution, the calendar</div><div class='del'>-	separates the data model from the views or clients.  This is</div><div class='del'>-	done so that multiple clients can access the same calendar</div><div class='del'>-	data in an orderly fashion and without clashes.  For example,</div><div class='del'>-	the user may be running a graphical calendar client.  If he</div><div class='del'>-	then wants to synchronize his calendar with a handheld device,</div><div class='del'>-	then the corresponding synchronization program (e.g. a conduit</div><div class='del'>-	for the &lt;application&gt;gnome-pilot&lt;/application&gt; package) will</div><div class='del'>-	also need to access the calendar storage.  It is important</div><div class='del'>-	that both the GUI client and the synchronization program keep</div><div class='del'>-	a consistent view of the calendar at all times, otherwise one</div><div class='del'>-	of them will be left in an inconsistent state if the</div><div class='del'>-	calendar's data changes unexpectedly.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Evolution puts the calendar storage in a daemon called the</div><div class='del'>-	Wombat and completely separates it from clients who wants to</div><div class='del'>-	access calendar data.  This part of the Wombat is called the</div><div class='del'>-	personal calendar server, or &amp;PCS;.  Clients must contact the</div><div class='del'>-	&amp;PCS; and ask it to open an existing calendar or create a new</div><div class='del'>-	one.  When a calendar component object (e.g. an appointment or</div><div class='del'>-	to-do item) changes in the &amp;PCS; it will notify all the</div><div class='del'>-	clients that are using the component's parent calendar.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-    &lt;!-- Personal Calendar Server --&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect1&gt;</div><div class='del'>-      &lt;title&gt;Personal Calendar Server&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The personal calendar server, or &amp;PCS;, provides centralized</div><div class='del'>-	management and storage of a user's personal calendar.</div><div class='del'>-	Multiple clients can connect to the &amp;PCS; simultaneously to</div><div class='del'>-	query and modify the user's calendar in a synchronized</div><div class='del'>-	fashion.  The main features of the &amp;PCS; are as follows:</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;formalpara&gt;</div><div class='del'>-	&lt;title&gt;Storage&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  The &amp;PCS; is responsible for loading and saving calendars.</div><div class='del'>-	  Centralizing the loading and saving functionality allows</div><div class='del'>-	  multiple clients to use the same calendar at the same time</div><div class='del'>-	  without having to worry about each other.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-      &lt;formalpara&gt;</div><div class='del'>-	&lt;title&gt;Basic Queries&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  The &amp;PCS; provides functions to do basic queries on a</div><div class='del'>-	  calendar, for example, a client can ask the server for a</div><div class='del'>-	  list of all the appointments in the calendar, or for all the</div><div class='del'>-	  data for a specific appointment.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-      &lt;formalpara&gt;</div><div class='del'>-	&lt;title&gt;Recurrence and Alarm Queries&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  </div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/formalpara&gt;</div><div class='del'>-    &lt;/sect1&gt;</div><div class='del'>-  &lt;/chapter&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/.cvsignore b/doc/devel/calendar/cal-client/.cvsignore<br/>deleted file mode 100644<br/>index 0842a93f7a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-sgml</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/Makefile.am b/doc/devel/calendar/cal-client/Makefile.am<br/>deleted file mode 100644<br/>index 44d43639a8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,76 +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=evolution-cal-client</div><div class='del'>-</div><div class='del'>-# The top-level SGML file.</div><div class='del'>-DOC_MAIN_SGML_FILE=evolution-cal-client.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=$(EVOLUTION_DIR)/calendar/cal-client</div><div class='del'>-</div><div class='del'>-CFLAGS ="						\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)			\</div><div class='del'>-	"</div><div class='del'>-</div><div class='del'>-LDFLAGS="								\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)					\</div><div class='del'>-	$(top_builddir)/calendar/cal-client/.libs/libcal-client.a	\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical.a			\</div><div class='del'>-	$(top_builddir)/libversit/.libs/libversit.al			\</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'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-tmpl_sources =					\</div><div class='del'>-	tmpl/cal-client.sgml			\</div><div class='del'>-	tmpl/evolution-cal-client-unused.sgml</div><div class='del'>-</div><div class='del'>-evolution_cal_client_docdir = $(HTML_DIR)</div><div class='del'>-evolution_cal_client_doc_DATA =			\</div><div class='del'>-	evolution-cal-client.hierarchy		\</div><div class='del'>-	evolution-cal-client.types		\</div><div class='del'>-	evolution-cal-client-decl.txt		\</div><div class='del'>-	evolution-cal-client-sections.txt</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 					\</div><div class='del'>-	$(evolution_cal_client_doc_DATA)</div><div class='del'>-</div><div class='del'>-sgml/evolution-cal-client-doc.bottom: $(tmpl_sources)</div><div class='del'>-	$(MAKE) sgml</div><div class='del'>-</div><div class='del'>-scan:</div><div class='del'>-	-(cd $(srcdir) \</div><div class='del'>-	&amp;&amp; env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \</div><div class='del'>-		 gtkdoc-scanobj --module=$(DOC_MODULE) \</div><div class='del'>-	&amp;&amp; gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="cal-listener.h evolution-calendar.h" )</div><div class='del'>-</div><div class='del'>-templates: scan</div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-mktmpl --module=$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-sgml:</div><div class='del'>-	cd $(srcdir) \</div><div class='del'>-	&amp;&amp; gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak *.signals *-unused.txt</div><div class='del'>-</div><div class='del'>-maintainer-clean-local: clean</div><div class='del'>-	cd $(srcdir) &amp;&amp; rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	mkdir $(distdir)/sgml</div><div class='del'>-	mkdir $(distdir)/tmpl</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'>-.PHONY : sgml templates scan</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt b/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt<br/>deleted file mode 100644<br/>index 0574d70678..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client-decl.txt?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/evolution-cal-client-decl.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,132 +0,0 @@</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT_TYPE&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT_TYPE            (cal_client_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT(obj)            (GTK_CHECK_CAST ((obj), CAL_CLIENT_TYPE, CalClient))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define CAL_CLIENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_TYPE, CalClientClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_CLIENT&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_CLIENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_CLIENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClient&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClientClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalClientLoadStatus&lt;/NAME&gt;</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'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalClientGetStatus&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_CLIENT_GET_SUCCESS,</div><div class='del'>-	CAL_CLIENT_GET_NOT_FOUND,</div><div class='del'>-	CAL_CLIENT_GET_SYNTAX_ERROR</div><div class='del'>-} CalClientGetStatus;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalClient&lt;/NAME&gt;</div><div class='del'>-struct CalClient {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	gpointer priv;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_construct&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClient  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClient  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_load_calendar&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, const char *str_uri</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_create_calendar&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, const char *str_uri</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_n_objects&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClientGetStatus  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client,const char *uid,CalComponent **comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_uid_by_pilot_id&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalClientGetStatus  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client,unsigned long pilot_id,char **uid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_update_pilot_id&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, char *uid,unsigned long pilot_id,unsigned long pilot_status</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_uids&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_objects_in_range&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type,time_t start, time_t end</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_generate_instances&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalObjType type,time_t start, time_t end,CalRecurInstanceFn cb, gpointer cb_data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_alarms_in_range&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GList  *&lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, time_t start, time_t end</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_get_alarms_for_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, const char *uid,time_t start, time_t end,GList **alarms</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_update_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_client_remove_object&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalClient *client, const char *uid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt b/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt<br/>deleted file mode 100644<br/>index c37b223247..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client-sections.txt?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/evolution-cal-client-sections.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-&lt;INCLUDE&gt;cal-client/cal-client.h&lt;/INCLUDE&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-client&lt;/FILE&gt;</div><div class='del'>-CAL_CLIENT</div><div class='del'>-&lt;TITLE&gt;CalClient&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-CalClientLoadStatus</div><div class='del'>-CalClientGetStatus</div><div class='del'>-cal_client_new</div><div class='del'>-cal_client_load_calendar</div><div class='del'>-cal_client_create_calendar</div><div class='del'>-cal_client_get_n_objects</div><div class='del'>-cal_client_get_object</div><div class='del'>-cal_client_get_objects_in_range</div><div class='del'>-cal_client_generate_instances</div><div class='del'>-cal_client_get_uid_by_pilot_id</div><div class='del'>-cal_client_update_pilot_id</div><div class='del'>-cal_client_get_uids</div><div class='del'>-cal_client_get_alarms_in_range</div><div class='del'>-cal_client_get_alarms_for_object</div><div class='del'>-cal_client_update_object</div><div class='del'>-cal_client_remove_object</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-</div><div class='del'>-CAL_CLIENT_TYPE</div><div class='del'>-IS_CAL_CLIENT</div><div class='del'>-CAL_CLIENT_CLASS</div><div class='del'>-IS_CAL_CLIENT_CLASS</div><div class='del'>-cal_client_get_type</div><div class='del'>-cal_client_construct</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-CalClient</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.args b/doc/devel/calendar/cal-client/evolution-cal-client.args<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client.args?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/evolution-cal-client.args</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy b/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy<br/>deleted file mode 100644<br/>index 88efa3e673..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client.hierarchy?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/evolution-cal-client.hierarchy</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-GtkObject</div><div class='del'>-  CalClient</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.signals b/doc/devel/calendar/cal-client/evolution-cal-client.signals<br/>deleted file mode 100644<br/>index 97e360b6a2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client.signals?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/evolution-cal-client.signals</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-&lt;SIGNAL&gt;</div><div class='del'>-&lt;NAME&gt;CalClient::cal-loaded&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void&lt;/RETURNS&gt;</div><div class='del'>-CalClient *calclient</div><div class='del'>-GtkEnum  arg1</div><div class='del'>-&lt;/SIGNAL&gt;</div><div class='del'>-</div><div class='del'>-&lt;SIGNAL&gt;</div><div class='del'>-&lt;NAME&gt;CalClient::obj-updated&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void&lt;/RETURNS&gt;</div><div class='del'>-CalClient *calclient</div><div class='del'>-GtkString  arg1</div><div class='del'>-&lt;/SIGNAL&gt;</div><div class='del'>-</div><div class='del'>-&lt;SIGNAL&gt;</div><div class='del'>-&lt;NAME&gt;CalClient::obj-removed&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void&lt;/RETURNS&gt;</div><div class='del'>-CalClient *calclient</div><div class='del'>-GtkString  arg1</div><div class='del'>-&lt;/SIGNAL&gt;</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/evolution-cal-client.types b/doc/devel/calendar/cal-client/evolution-cal-client.types<br/>deleted file mode 100644<br/>index 84d65a6637..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/evolution-cal-client.types?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/evolution-cal-client.types</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;cal-client/cal-client.h&gt;</div><div class='del'>-</div><div class='del'>-cal_client_get_type</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/tmpl/cal-client.sgml b/doc/devel/calendar/cal-client/tmpl/cal-client.sgml<br/>deleted file mode 100644<br/>index 06469ff3ee..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/tmpl/cal-client.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/tmpl/cal-client.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,294 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CalClient</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-GTK+ object for communication with personal calendar server.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    The #CalClient object provides a nice GTK+ wrapper for the CORBA</div><div class='del'>-    interfaces that are used to communicate between calendar clients</div><div class='del'>-    and the personal calendar server in the user's Wombat daemon.  The</div><div class='del'>-    CORBA interfaces transfer calendar components in RFC 2445 text</div><div class='del'>-    format; the #CalClient object automatically converts these into</div><div class='del'>-    #CalComponent structures that are easier to handle.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    After a #CalClient object is created with cal_client_new(), it</div><div class='del'>-    should be asked to send a request to the personal calendar server</div><div class='del'>-    to load or create a calendar based on its URI.  The server will</div><div class='del'>-    asynchronously notify the client about completion of the request,</div><div class='del'>-    and will return an appropriate result code; this should be noted</div><div class='del'>-    by the client with the &lt;link</div><div class='del'>-    linkend="CalClient--cal-loaded"&gt;cal_loaded&lt;/link&gt; signal.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    When a client asks the server to update or delete a calendar</div><div class='del'>-    component from the storage, the server will do so and then notify</div><div class='del'>-    all the clients about the update or removal.  This is the core of</div><div class='del'>-    the model/view split between calendar clients and the storage in</div><div class='del'>-    the personal calendar server.  Clients should watch the &lt;link</div><div class='del'>-    linkend="calclient-obj-updated"&gt;obj_updated&lt;/link&gt; and &lt;link</div><div class='del'>-    linkend="calclient-obj-removed"&gt;obj_removed&lt;/link&gt; signals on the</div><div class='del'>-    CalClient objects they create so that they can be notified about</div><div class='del'>-    changes in the storage.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    #CalComponent</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO CAL_CLIENT ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Casts a #GtkObject to a #CalClient.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A GTK+ object.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalClientLoadStatus ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    These values describe the status of a calendar load or create</div><div class='del'>-    request.  After asking a calendar factory to load or create a</div><div class='del'>-    calendar, the provided listener will get notification about the</div><div class='del'>-    result in asynchronous fashion.  Such notification is represented</div><div class='del'>-    by one of these enumeration values.  For values other than</div><div class='del'>-    #CAL_CLIENT_LOAD_SUCCESS, the #CalClient object will not accept</div><div class='del'>-    any other operations on the calendar and it should just be</div><div class='del'>-    destroyed.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_CLIENT_LOAD_SUCCESS: Indicates a successful load or create</div><div class='del'>-  operation; the corresponding calendar is ready for use.</div><div class='del'>-@CAL_CLIENT_LOAD_ERROR: Indicates an error while loading or creating</div><div class='del'>-  the calendar.</div><div class='del'>-@CAL_CLIENT_LOAD_IN_USE: Indicates that a create request failed</div><div class='del'>-  because the specified calendar was already being used by another</div><div class='del'>-  client.</div><div class='del'>-@CAL_CLIENT_LOAD_METHOD_NOT_SUPPORTED: Indicates an error due to</div><div class='del'>-  trying to load a calendar for which a backend type is not present.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalClientGetStatus ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    These values describe the result of the cal_client_get_object()</div><div class='del'>-    function.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_CLIENT_GET_SUCCESS: Indicates a successful get operation.</div><div class='del'>-@CAL_CLIENT_GET_NOT_FOUND: Indicates that the requested object was</div><div class='del'>-  not found.</div><div class='del'>-@CAL_CLIENT_GET_SYNTAX_ERROR: Indicates a syntax error when parsing</div><div class='del'>-  the requested object.  This could indicate a bug in the calendar</div><div class='del'>-  client libraries or in the Wombat server.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_load_calendar ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@str_uri: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_create_calendar ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@str_uri: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_n_objects ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_object ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@uid: </div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@ico: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_objects_in_range ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_generate_instances ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@cb: </div><div class='del'>-@cb_data: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_uid_by_pilot_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@pilot_id: </div><div class='del'>-@uid: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_update_pilot_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@uid: </div><div class='del'>-@pilot_id: </div><div class='del'>-@pilot_status: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_uids ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@type: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_alarms_in_range ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_alarms_for_object ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@uid: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@alarms: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_update_object ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@ico: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_remove_object ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@uid: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::cal-loaded ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This signal is emitted some time after the calendar clients sends</div><div class='del'>-    a load or create request to the personal calendar server.  The</div><div class='del'>-    server will notify the client asynchronously of the completion of</div><div class='del'>-    the request.  The @status parameter indicates the status of the</div><div class='del'>-    request.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@client: Calendar client which received the notification.</div><div class='del'>-@status: Status of the request.  See the description of</div><div class='del'>-  #CalClientLoadStatus for more details.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::obj-updated ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This signal is emitted when the calendar clients receives</div><div class='del'>-    notification of a calendar component's data being changed in the</div><div class='del'>-    personal calendar server.  Graphical clients may want to get the</div><div class='del'>-    new version of the object and update their display, for example.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@client: Calendar client which received the notification.</div><div class='del'>-@uid: Unique identifier of the calendar component that changed in the</div><div class='del'>-  personal calendar server's storage.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SIGNAL CalClient::obj-removed ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This signal is emitted when the calendar client receives</div><div class='del'>-    notification for a calendar component being removed from the</div><div class='del'>-    storage in the personal calendar server.  Graphical clients may</div><div class='del'>-    want to delete the corresponding object from their display, for</div><div class='del'>-    example.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@calclient: the object which received the signal.</div><div class='del'>-@arg1: </div><div class='del'>-&lt;!-- # Unused Parameters # --&gt;</div><div class='del'>-@client: Calendar client which received the notification.</div><div class='del'>-@uid: Unique identifier of the calendar component that was removed</div><div class='del'>-  from the personal calendar server's storage.</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml b/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml<br/>deleted file mode 100644<br/>index 5576dbd57f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-client/tmpl/evolution-cal-client-unused.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-&lt;!-- ##### FUNCTION cal_client_get_events_in_range ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@client: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/.cvsignore b/doc/devel/calendar/cal-util/.cvsignore<br/>deleted file mode 100644<br/>index 0842a93f7a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-sgml</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/Makefile.am b/doc/devel/calendar/cal-util/Makefile.am<br/>deleted file mode 100644<br/>index 8861aa03cb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,75 +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=evolution-cal-util</div><div class='del'>-</div><div class='del'>-# The top-level SGML file.</div><div class='del'>-DOC_MAIN_SGML_FILE=evolution-cal-util.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=$(EVOLUTION_DIR)/calendar/cal-util</div><div class='del'>-</div><div class='del'>-CFLAGS ="						\</div><div class='del'>-	-I$(top_srcdir)/calendar			\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-	-I$(top_builddir)/libical/src/libical		\</div><div class='del'>-	-I$(top_srcdir)/libical/src/libical		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_CFLAGS)			\</div><div class='del'>-	"</div><div class='del'>-</div><div class='del'>-LDFLAGS="								\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)					\</div><div class='del'>-	$(top_builddir)/calendar/cal-util/.libs/libcal-util.a		\</div><div class='del'>-	$(top_builddir)/libical/src/libical/libical.a			\</div><div class='del'>-	$(top_builddir)/libversit/.libs/libversit.al			\</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'>-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-tmpl_sources =					\</div><div class='del'>-	tmpl/cal-util.sgml			\</div><div class='del'>-	tmpl/evolution-cal-util-unused.sgml</div><div class='del'>-</div><div class='del'>-evolution_cal_util_docdir = $(HTML_DIR)</div><div class='del'>-evolution_cal_util_doc_DATA =			\</div><div class='del'>-	evolution-cal-util.hierarchy		\</div><div class='del'>-	evolution-cal-util.types		\</div><div class='del'>-	evolution-cal-util-decl.txt		\</div><div class='del'>-	evolution-cal-util-sections.txt</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = 					\</div><div class='del'>-	$(evolution_cal_util_doc_DATA)</div><div class='del'>-</div><div class='del'>-sgml/evolution-cal-util-doc.bottom: $(tmpl_sources)</div><div class='del'>-	$(MAKE) sgml</div><div class='del'>-</div><div class='del'>-scan:</div><div class='del'>-	-(cd $(srcdir) \</div><div class='del'>-	&amp;&amp; env CFLAGS=$(CFLAGS) LDFLAGS=$(LDFLAGS) \</div><div class='del'>-		 gtkdoc-scanobj --module=$(DOC_MODULE) \</div><div class='del'>-	&amp;&amp; gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="calobj.h icalendar-save.h icalendar.h" )</div><div class='del'>-</div><div class='del'>-templates: scan</div><div class='del'>-	cd $(srcdir) &amp;&amp; gtkdoc-mktmpl --module=$(DOC_MODULE)</div><div class='del'>-</div><div class='del'>-sgml:</div><div class='del'>-	cd $(srcdir) \</div><div class='del'>-	&amp;&amp; gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR)</div><div class='del'>-</div><div class='del'>-clean-local:</div><div class='del'>-	rm -f *~ *.bak *.signals *-unused.txt</div><div class='del'>-</div><div class='del'>-maintainer-clean-local: clean</div><div class='del'>-	cd $(srcdir) &amp;&amp; rm -rf sgml $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt</div><div class='del'>-</div><div class='del'>-dist-hook:</div><div class='del'>-	mkdir $(distdir)/sgml</div><div class='del'>-	mkdir $(distdir)/tmpl</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'>-.PHONY : sgml templates scan</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt b/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt<br/>deleted file mode 100644<br/>index eb108b868f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util-decl.txt?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/evolution-cal-util-decl.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,852 +0,0 @@</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_COMPONENT_TYPE&lt;/NAME&gt;</div><div class='del'>-#define CAL_COMPONENT_TYPE            (cal_component_get_type ())</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_COMPONENT&lt;/NAME&gt;</div><div class='del'>-#define CAL_COMPONENT(obj)            (GTK_CHECK_CAST ((obj), CAL_COMPONENT_TYPE, CalComponent))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;CAL_COMPONENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define CAL_COMPONENT_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), CAL_COMPONENT_TYPE,	\</div><div class='del'>-				       CalComponentClass))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_COMPONENT&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_COMPONENT(obj)         (GTK_CHECK_TYPE ((obj), CAL_COMPONENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;MACRO&gt;</div><div class='del'>-&lt;NAME&gt;IS_CAL_COMPONENT_CLASS&lt;/NAME&gt;</div><div class='del'>-#define IS_CAL_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_COMPONENT_TYPE))</div><div class='del'>-&lt;/MACRO&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentVType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_NO_TYPE,</div><div class='del'>-	CAL_COMPONENT_EVENT,</div><div class='del'>-	CAL_COMPONENT_TODO,</div><div class='del'>-	CAL_COMPONENT_JOURNAL,</div><div class='del'>-	CAL_COMPONENT_FREEBUSY,</div><div class='del'>-	CAL_COMPONENT_TIMEZONE</div><div class='del'>-} CalComponentVType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentField&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_FIELD_CATEGORIES,		/* concatenation of the categories list */</div><div class='del'>-	CAL_COMPONENT_FIELD_CLASSIFICATION,</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPLETED,</div><div class='del'>-	CAL_COMPONENT_FIELD_DTEND,</div><div class='del'>-	CAL_COMPONENT_FIELD_DTSTART,</div><div class='del'>-	CAL_COMPONENT_FIELD_DUE,</div><div class='del'>-	CAL_COMPONENT_FIELD_GEO,</div><div class='del'>-	CAL_COMPONENT_FIELD_PERCENT,</div><div class='del'>-	CAL_COMPONENT_FIELD_PRIORITY,</div><div class='del'>-	CAL_COMPONENT_FIELD_SUMMARY,</div><div class='del'>-	CAL_COMPONENT_FIELD_TRANSPARENCY,</div><div class='del'>-	CAL_COMPONENT_FIELD_URL,</div><div class='del'>-	CAL_COMPONENT_FIELD_HAS_ALARMS,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_ICON,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_COMPLETE,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_RECURRING,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_OVERDUE,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_COLOR,		/* not a real field */</div><div class='del'>-	CAL_COMPONENT_FIELD_NUM_FIELDS</div><div class='del'>-} CalComponentField;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentClassification&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_CLASS_NONE,</div><div class='del'>-	CAL_COMPONENT_CLASS_PUBLIC,</div><div class='del'>-	CAL_COMPONENT_CLASS_PRIVATE,</div><div class='del'>-	CAL_COMPONENT_CLASS_CONFIDENTIAL,</div><div class='del'>-	CAL_COMPONENT_CLASS_UNKNOWN</div><div class='del'>-} CalComponentClassification;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentDateTime&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Actual date/time value */</div><div class='del'>-	struct icaltimetype *value;</div><div class='del'>-</div><div class='del'>-	/* Timezone ID */</div><div class='del'>-	const char *tzid;</div><div class='del'>-} CalComponentDateTime;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentPeriodType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_PERIOD_DATETIME,</div><div class='del'>-	CAL_COMPONENT_PERIOD_DURATION</div><div class='del'>-} CalComponentPeriodType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentPeriod&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentPeriodType type;</div><div class='del'>-</div><div class='del'>-	struct icaltimetype start;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct icaltimetype end;</div><div class='del'>-		struct icaldurationtype duration;</div><div class='del'>-	} u;</div><div class='del'>-} CalComponentPeriod;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentText&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	/* Description string */</div><div class='del'>-	const char *value;</div><div class='del'>-</div><div class='del'>-	/* Alternate representation URI */</div><div class='del'>-	const char *altrep;</div><div class='del'>-} CalComponentText;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentTransparency&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_TRANSP_NONE,</div><div class='del'>-	CAL_COMPONENT_TRANSP_TRANSPARENT,</div><div class='del'>-	CAL_COMPONENT_TRANSP_OPAQUE,</div><div class='del'>-	CAL_COMPONENT_TRANSP_UNKNOWN</div><div class='del'>-} CalComponentTransparency;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentAlarm&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponent&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentClass&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentPrivate&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalComponent&lt;/NAME&gt;</div><div class='del'>-struct CalComponent {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	/* Private data */</div><div class='del'>-	CalComponentPrivate *priv;</div><div class='del'>-};</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_type&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;GtkType  &lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_gen_uid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_new&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponent  *&lt;/RETURNS&gt;</div><div class='del'>-void</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_clone&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponent  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_new_vtype&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentVType type</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_icalcomponent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, icalcomponent *icalcomp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_icalcomponent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;icalcomponent  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_vtype&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponentVType  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_as_string&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_commit_sequence&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_uid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char **uid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_uid&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char *uid</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_categories_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **categ_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_categories_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *categ_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_classification&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentClassification *classif</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_classification&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentClassification classif</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_comment_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_comment_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_completed&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype **t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_completed&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_created&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype **t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_created&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_description_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_description_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_dtend&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_dtend&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_dtstamp&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_dtstamp&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_dtstart&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_dtstart&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_due&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_due&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_exdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **exdate_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_exdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *exdate_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_exrule_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_exrule_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_geo&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icalgeotype **geo</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_geo&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icalgeotype *geo</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_last_modified&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype **t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_last_modified&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_percent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int **percent</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_percent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int *percent</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_priority&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int **priority</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_priority&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int *priority</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_rdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **period_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_rdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *period_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_rdates&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_rrule_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList **recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_rrule_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, GSList *recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_has_rrules&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_sequence&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int **sequence</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_sequence&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, int *sequence</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_summary&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentText *summary</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_summary&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentText *summary</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_transparency&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentTransparency *transp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_transparency&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, CalComponentTransparency transp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_url&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char **url</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_url&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, const char *url</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_pilot_id&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, unsigned long *pilot_id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_pilot_id&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, unsigned long pilot_id</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_pilot_status&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, unsigned long *pilot_status</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_set_pilot_status&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp, unsigned long pilot_status</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_categories_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *categ_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_datetime&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentDateTime *dt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_exdate_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *exdate_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_geo&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-struct icalgeotype *geo</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_icaltimetype&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-struct icaltimetype *t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_percent&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-int *percent</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_priority&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-int *priority</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_period_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *period_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_recur_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *recur_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_sequence&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-int *sequence</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_free_text_list&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GSList *text_list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentAlarmAction&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_ALARM_NONE,</div><div class='del'>-	CAL_COMPONENT_ALARM_AUDIO,</div><div class='del'>-	CAL_COMPONENT_ALARM_DISPLAY,</div><div class='del'>-	CAL_COMPONENT_ALARM_EMAIL,</div><div class='del'>-	CAL_COMPONENT_ALARM_PROCEDURE,</div><div class='del'>-	CAL_COMPONENT_ALARM_UNKNOWN</div><div class='del'>-} CalComponentAlarmAction;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentAlarmTriggerType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_ALARM_TRIGGER_RELATIVE,</div><div class='del'>-	CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE</div><div class='del'>-} CalComponentAlarmTriggerType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentAlarmTriggerRelated&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_START,</div><div class='del'>-	CAL_COMPONENT_ALARM_TRIGGER_RELATED_END</div><div class='del'>-} CalComponentAlarmTriggerRelated;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalComponentAlarmTrigger&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	CalComponentAlarmTriggerType type;</div><div class='del'>-</div><div class='del'>-	union {</div><div class='del'>-		struct {</div><div class='del'>-			struct icaldurationtype duration;</div><div class='del'>-			CalComponentAlarmTriggerRelated related;</div><div class='del'>-		} relative;</div><div class='del'>-</div><div class='del'>-		struct icaltimetype absolute;</div><div class='del'>-	} u;</div><div class='del'>-} CalComponentAlarmTrigger;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_first_alarm&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponentAlarm  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_get_next_alarm&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalComponentAlarm  *&lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_get_action&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalComponentAlarmAction *action</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_set_action&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalComponentAlarmAction action</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_get_trigger&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalComponentAlarmTrigger **trigger</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_set_trigger&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarm *alarm, CalComponentAlarmTrigger *trigger</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_component_alarm_free_trigger&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalComponentAlarmTrigger *trigger</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalRecurType&lt;/NAME&gt;</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'>-} CalRecurType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalRecurrence&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	CalRecurType   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'>-} CalRecurrence;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalObjTime&lt;/NAME&gt;</div><div class='del'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;STRUCT&gt;</div><div class='del'>-&lt;NAME&gt;CalObjTime&lt;/NAME&gt;</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'>-&lt;/STRUCT&gt;</div><div class='del'>-&lt;USER_FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;CalRecurInstanceFn&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;gboolean &lt;/RETURNS&gt;</div><div class='del'>-CalComponent *comp,</div><div class='del'>-					 time_t        instance_start,</div><div class='del'>-					 time_t        instace_end,</div><div class='del'>-					 gpointer      data</div><div class='del'>-&lt;/USER_FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_recur_generate_instances&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void 	&lt;/RETURNS&gt;</div><div class='del'>-CalComponent		*comp,time_t			 start,time_t			 end,CalRecurInstanceFn	 cb,gpointer                cb_data</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_recur_from_icalrecurrencetype&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;CalRecurrence  *&lt;/RETURNS&gt;</div><div class='del'>-struct icalrecurrencetype *ir</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_recur_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-CalRecurrence *r</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalObjInstance&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	char *uid;			/* UID of the object */</div><div class='del'>-	time_t start;			/* Start time of instance */</div><div class='del'>-	time_t end;			/* End time of instance */</div><div class='del'>-} CalObjInstance;</div><div class='del'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_obj_instance_list_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GList *list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;TYPEDEF&gt;</div><div class='del'>-&lt;NAME&gt;CalAlarmInstance&lt;/NAME&gt;</div><div class='del'>-typedef struct {</div><div class='del'>-	char *uid;			/* UID of object */</div><div class='del'>-#if 0</div><div class='del'>-	enum AlarmType type;		/* Type of alarm */</div><div class='del'>-#endif</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'>-&lt;/TYPEDEF&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_alarm_instance_list_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GList *list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;ENUM&gt;</div><div class='del'>-&lt;NAME&gt;CalObjType&lt;/NAME&gt;</div><div class='del'>-typedef enum {</div><div class='del'>-	CALOBJ_TYPE_EVENT   = 1 &lt;&lt; 0,</div><div class='del'>-	CALOBJ_TYPE_TODO    = 1 &lt;&lt; 1,</div><div class='del'>-	CALOBJ_TYPE_JOURNAL = 1 &lt;&lt; 2,</div><div class='del'>-	CALOBJ_TYPE_ANY     = 0x07</div><div class='del'>-} CalObjType;</div><div class='del'>-&lt;/ENUM&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;cal_obj_uid_list_free&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-GList *list</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_from_icaltimetype&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-struct icaltimetype itt</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_from_isodate&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-char *str</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_from_start_duration&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t start, char *duration</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;isodate_from_time_t&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char    *&lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;get_time_t_hour&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;isodiff_to_secs&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-char *str</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;isodiff_from_secs&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char    *&lt;/RETURNS&gt;</div><div class='del'>-int secs</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_minutes&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t time, int minutes</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_day&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t time, int days</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_week&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t time, int weeks</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_month&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t time, int months</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_add_year&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t time, int years</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;format_simple_hour&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;char  *&lt;/RETURNS&gt;</div><div class='del'>-int hour, int use_am_pm</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_days_in_month&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;int  &lt;/RETURNS&gt;</div><div class='del'>-int year, int month</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_from_day&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-int year, int month, int day</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_hour&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t, int hour</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_year_begin&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_year_end&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_month_begin&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_month_end&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_week_begin&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_week_end&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_begin&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;time_day_end&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;parse_date&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;time_t  &lt;/RETURNS&gt;</div><div class='del'>-char *str</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='del'>-&lt;FUNCTION&gt;</div><div class='del'>-&lt;NAME&gt;print_time_t&lt;/NAME&gt;</div><div class='del'>-&lt;RETURNS&gt;void  &lt;/RETURNS&gt;</div><div class='del'>-time_t t</div><div class='del'>-&lt;/FUNCTION&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt b/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt<br/>deleted file mode 100644<br/>index cd928fc7e3..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util-sections.txt?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/evolution-cal-util-sections.txt</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,166 +0,0 @@</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-component&lt;/FILE&gt;</div><div class='del'>-CAL_COMPONENT</div><div class='del'>-&lt;TITLE&gt;CalComponent&lt;/TITLE&gt;</div><div class='del'>-</div><div class='del'>-CalComponentVType</div><div class='del'>-CalComponentField</div><div class='del'>-CalComponentClassification</div><div class='del'>-CalComponentDateTime</div><div class='del'>-CalComponentPeriodType</div><div class='del'>-CalComponentPeriod</div><div class='del'>-CalComponentText</div><div class='del'>-CalComponentTransparency</div><div class='del'>-CalComponentAlarm</div><div class='del'>-CalComponentPrivate</div><div class='del'>-</div><div class='del'>-cal_component_gen_uid</div><div class='del'>-cal_component_new</div><div class='del'>-cal_component_clone</div><div class='del'>-cal_component_set_new_vtype</div><div class='del'>-cal_component_set_icalcomponent</div><div class='del'>-cal_component_get_icalcomponent</div><div class='del'>-cal_component_get_vtype</div><div class='del'>-cal_component_get_as_string</div><div class='del'>-cal_component_commit_sequence</div><div class='del'>-cal_component_get_uid</div><div class='del'>-cal_component_set_uid</div><div class='del'>-cal_component_get_categories_list</div><div class='del'>-cal_component_set_categories_list</div><div class='del'>-cal_component_get_classification</div><div class='del'>-cal_component_set_classification</div><div class='del'>-cal_component_get_comment_list</div><div class='del'>-cal_component_set_comment_list</div><div class='del'>-cal_component_get_completed</div><div class='del'>-cal_component_set_completed</div><div class='del'>-cal_component_get_created</div><div class='del'>-cal_component_set_created</div><div class='del'>-cal_component_get_description_list</div><div class='del'>-cal_component_set_description_list</div><div class='del'>-cal_component_get_dtend</div><div class='del'>-cal_component_set_dtend</div><div class='del'>-cal_component_get_dtstamp</div><div class='del'>-cal_component_set_dtstamp</div><div class='del'>-cal_component_get_dtstart</div><div class='del'>-cal_component_set_dtstart</div><div class='del'>-cal_component_get_due</div><div class='del'>-cal_component_set_due</div><div class='del'>-cal_component_get_exdate_list</div><div class='del'>-cal_component_set_exdate_list</div><div class='del'>-cal_component_get_exrule_list</div><div class='del'>-cal_component_set_exrule_list</div><div class='del'>-cal_component_get_geo</div><div class='del'>-cal_component_set_geo</div><div class='del'>-cal_component_get_last_modified</div><div class='del'>-cal_component_set_last_modified</div><div class='del'>-cal_component_get_percent</div><div class='del'>-cal_component_set_percent</div><div class='del'>-cal_component_get_priority</div><div class='del'>-cal_component_set_priority</div><div class='del'>-cal_component_get_rdate_list</div><div class='del'>-cal_component_set_rdate_list</div><div class='del'>-cal_component_has_rdates</div><div class='del'>-cal_component_get_rrule_list</div><div class='del'>-cal_component_set_rrule_list</div><div class='del'>-cal_component_has_rrules</div><div class='del'>-cal_component_get_sequence</div><div class='del'>-cal_component_set_sequence</div><div class='del'>-cal_component_get_summary</div><div class='del'>-cal_component_set_summary</div><div class='del'>-cal_component_get_transparency</div><div class='del'>-cal_component_set_transparency</div><div class='del'>-cal_component_get_url</div><div class='del'>-cal_component_set_url</div><div class='del'>-cal_component_get_pilot_id</div><div class='del'>-cal_component_set_pilot_id</div><div class='del'>-cal_component_get_pilot_status</div><div class='del'>-cal_component_set_pilot_status</div><div class='del'>-</div><div class='del'>-cal_component_free_categories_list</div><div class='del'>-cal_component_free_datetime</div><div class='del'>-cal_component_free_exdate_list</div><div class='del'>-cal_component_free_geo</div><div class='del'>-cal_component_free_icaltimetype</div><div class='del'>-cal_component_free_percent</div><div class='del'>-cal_component_free_priority</div><div class='del'>-cal_component_free_period_list</div><div class='del'>-cal_component_free_recur_list</div><div class='del'>-cal_component_free_sequence</div><div class='del'>-cal_component_free_text_list</div><div class='del'>-</div><div class='del'>-CalComponentAlarmAction</div><div class='del'>-CalComponentAlarmTriggerType</div><div class='del'>-CalComponentAlarmTriggerRelated</div><div class='del'>-CalComponentAlarmTrigger</div><div class='del'>-</div><div class='del'>-cal_component_get_first_alarm</div><div class='del'>-cal_component_get_next_alarm</div><div class='del'>-cal_component_alarm_free</div><div class='del'>-cal_component_alarm_get_action</div><div class='del'>-cal_component_alarm_set_action</div><div class='del'>-cal_component_alarm_get_trigger</div><div class='del'>-cal_component_alarm_set_trigger</div><div class='del'>-cal_component_alarm_free_trigger</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Standard&gt;</div><div class='del'>-CAL_COMPONENT_TYPE</div><div class='del'>-CAL_COMPONENT_CLASS</div><div class='del'>-IS_CAL_COMPONENT</div><div class='del'>-IS_CAL_COMPONENT_CLASS</div><div class='del'>-cal_component_get_type</div><div class='del'>-</div><div class='del'>-&lt;SUBSECTION Private&gt;</div><div class='del'>-CalComponent</div><div class='del'>-</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-recur&lt;/FILE&gt;</div><div class='del'>-CalRecurType</div><div class='del'>-CalRecurrence</div><div class='del'>-CalObjTime</div><div class='del'>-CalRecurInstanceFn</div><div class='del'>-cal_recur_generate_instances</div><div class='del'>-cal_recur_from_icalrecurrencetype</div><div class='del'>-cal_recur_free</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;cal-util&lt;/FILE&gt;</div><div class='del'>-CalObjInstance</div><div class='del'>-cal_obj_instance_list_free</div><div class='del'>-CalAlarmInstance</div><div class='del'>-cal_alarm_instance_list_free</div><div class='del'>-CalObjType</div><div class='del'>-cal_obj_uid_list_free</div><div class='del'>-&lt;/SECTION&gt;</div><div class='del'>-</div><div class='del'>-&lt;SECTION&gt;</div><div class='del'>-&lt;FILE&gt;timeutil&lt;/FILE&gt;</div><div class='del'>-time_from_icaltimetype</div><div class='del'>-time_from_isodate</div><div class='del'>-time_from_start_duration</div><div class='del'>-isodate_from_time_t</div><div class='del'>-get_time_t_hour</div><div class='del'>-isodiff_to_secs</div><div class='del'>-isodiff_from_secs</div><div class='del'>-time_add_minutes</div><div class='del'>-time_add_day</div><div class='del'>-time_add_week</div><div class='del'>-time_add_month</div><div class='del'>-time_add_year</div><div class='del'>-format_simple_hour</div><div class='del'>-time_days_in_month</div><div class='del'>-time_from_day</div><div class='del'>-time_day_hour</div><div class='del'>-time_year_begin</div><div class='del'>-time_year_end</div><div class='del'>-time_month_begin</div><div class='del'>-time_month_end</div><div class='del'>-time_week_begin</div><div class='del'>-time_week_end</div><div class='del'>-time_day_begin</div><div class='del'>-time_day_end</div><div class='del'>-parse_date</div><div class='del'>-print_time_t</div><div class='del'>-&lt;/SECTION&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.args b/doc/devel/calendar/cal-util/evolution-cal-util.args<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util.args?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/evolution-cal-util.args</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy b/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy<br/>deleted file mode 100644<br/>index cc235653f2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util.hierarchy?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/evolution-cal-util.hierarchy</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-GtkObject</div><div class='del'>-  CalComponent</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.signals b/doc/devel/calendar/cal-util/evolution-cal-util.signals<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util.signals?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/evolution-cal-util.signals</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/evolution-cal-util.types b/doc/devel/calendar/cal-util/evolution-cal-util.types<br/>deleted file mode 100644<br/>index 52b2d9bf90..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/evolution-cal-util.types?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/evolution-cal-util.types</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,4 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;cal-util/cal-component.h&gt;</div><div class='del'>-</div><div class='del'>-cal_component_get_type</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/cal-component.sgml b/doc/devel/calendar/cal-util/tmpl/cal-component.sgml<br/>deleted file mode 100644<br/>index 2f800e583f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/cal-component.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/tmpl/cal-component.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,934 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-CalComponent</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-RFC 2445 iCalendar component object.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    The #CalComponent object provides a wrapper over the &amp;libical;</div><div class='del'>-    functions for manipulating calendar components.  #CalComponent</div><div class='del'>-    presents a GTK+-like interface to calendar components according to</div><div class='del'>-    RFC 2445.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    While &amp;libical; supports almost all of the features of the</div><div class='del'>-    iCalendar RFCs, applications are normally not interested in all</div><div class='del'>-    the mindless gunk that is there.  Still, applications should do</div><div class='del'>-    their best not to drop extension fields from calendar components</div><div class='del'>-    or any other extra information they do not support (including</div><div class='del'>-    standard fields they are not interested in).  The #CalComponent</div><div class='del'>-    object provides a wrapper over</div><div class='del'>-    &lt;structname&gt;icalcomponent&lt;/structname&gt; structures from &amp;libical;</div><div class='del'>-    so that no information in them will be lost even if the</div><div class='del'>-    application is not designed to handle it.  Also, #CalComponent</div><div class='del'>-    provides a higher-level API to many of the &amp;libical; operations so</div><div class='del'>-    as to make it less painful to deal with iCalendar components.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    A #CalComponent object starts out empty.  It must be initialized</div><div class='del'>-    from an existing &lt;structname&gt;icalcomponent&lt;/structname&gt; structure</div><div class='del'>-    by using the cal_component_set_icalcomponent() function, or from a</div><div class='del'>-    completely new data by specifying the desired component type to</div><div class='del'>-    the cal_component_set_new_vtype() function.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    #CalComponent will create an internal map of the properties in the</div><div class='del'>-    &lt;structname&gt;icalcomponent&lt;/structname&gt; structure and then allow</div><div class='del'>-    random access to them via the #CalComponent API functions;</div><div class='del'>-    normally the &amp;libical; API would have to be used by creating many</div><div class='del'>-    iterators and other unpleasant constructs.  #CalComponent keeps</div><div class='del'>-    handles to the properties it scanned from the</div><div class='del'>-    &lt;structname&gt;icalcomponent&lt;/structname&gt; and will let the parent</div><div class='del'>-    application modify them at any time without having to do any</div><div class='del'>-    iteration.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Eventually a #CalComponent may be turned into the RFC 2445 string</div><div class='del'>-    representation of an iCalendar component by using the</div><div class='del'>-    cal_component_get_as_string() function.  Applications can then</div><div class='del'>-    transfer this interoperable</div><div class='del'>-    &lt;footnote&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	&amp;ldquo;Interoperable.&amp;rdquo;  Heavens, I love that word.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/footnote&gt;</div><div class='del'>-    string to other programs that deal with iCalendar.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### MACRO CAL_COMPONENT ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Casts a #GtkObject to a #CalComponent.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@obj: A GTK+ object.</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentVType ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Calendar component types as defined by RFC 2445.  These values can</div><div class='del'>-    be used to create a new calendar component by passing them to the</div><div class='del'>-    cal_component_set_new_vtype() function.  They are also the return</div><div class='del'>-    value of the cal_component_get_vtype() function.  The only time</div><div class='del'>-    the @CAL_COMPONENT_NO_TYPE value is used is when querying the</div><div class='del'>-    vtype of an uninitialized #CalComponent.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_NO_TYPE: Returned from cal_component_get_vtype() to</div><div class='del'>-  indicate an uninitialized #CalComponent object.</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_EVENT: Indicates a VEVENT component.</div><div class='del'>-@CAL_COMPONENT_TODO: Indicates a VTODO component.</div><div class='del'>-@CAL_COMPONENT_JOURNAL: Indicates a VJOURNAL component.</div><div class='del'>-@CAL_COMPONENT_FREEBUSY: Indicates a VFREEBUSY component.</div><div class='del'>-@CAL_COMPONENT_TIMEZONE: Indicates a VTIMEZOME component.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentField ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    These values are used as identifiers for #ETable columns.  These</div><div class='del'>-    are used by the calendar GUI code in Evolution.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_FIELD_CATEGORIES: Component's list of categories.</div><div class='del'>-@CAL_COMPONENT_FIELD_CLASSIFICATION: Component's classification.</div><div class='del'>-@CAL_COMPONENT_FIELD_COMPLETED: Component's completion date.</div><div class='del'>-@CAL_COMPONENT_FIELD_DTEND: Component's ending date.</div><div class='del'>-@CAL_COMPONENT_FIELD_DTSTART: Component's starting date.</div><div class='del'>-@CAL_COMPONENT_FIELD_DUE: Component's due date.</div><div class='del'>-@CAL_COMPONENT_FIELD_GEO: Component's geographical position.</div><div class='del'>-@CAL_COMPONENT_FIELD_PERCENT: Component's percent completed value.</div><div class='del'>-@CAL_COMPONENT_FIELD_PRIORITY: Component's priority.</div><div class='del'>-@CAL_COMPONENT_FIELD_SUMMARY: Component's summary.</div><div class='del'>-@CAL_COMPONENT_FIELD_TRANSPARENCY: Component's transparency value.</div><div class='del'>-@CAL_COMPONENT_FIELD_URL: Component's URL.</div><div class='del'>-@CAL_COMPONENT_FIELD_HAS_ALARMS: Whether the component has any alarms.</div><div class='del'>-@CAL_COMPONENT_FIELD_ICON: Which icon to use for the component.</div><div class='del'>-@CAL_COMPONENT_FIELD_COMPLETE: Whether the component has been completed.</div><div class='del'>-@CAL_COMPONENT_FIELD_RECURRING: Whether the component has any recurrences.</div><div class='del'>-@CAL_COMPONENT_FIELD_OVERDUE: Whether the component is overdue.</div><div class='del'>-@CAL_COMPONENT_FIELD_COLOR: Which color to use for the component.</div><div class='del'>-@CAL_COMPONENT_FIELD_NUM_FIELDS: Total number of enumerated fields.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentClassification ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Values for the access classification property of a calendar</div><div class='del'>-    component.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_CLASS_NONE: Indicates that no access classification has</div><div class='del'>-    been set for the corresponding component.</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_CLASS_PUBLIC: Public access.</div><div class='del'>-@CAL_COMPONENT_CLASS_PRIVATE: Private access.</div><div class='del'>-@CAL_COMPONENT_CLASS_CONFIDENTIAL: Confidential access.</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_CLASS_UNKNOWN: Unknown access classification value,</div><div class='del'>-  used when &amp;libical; returns something #CalComponent does not know</div><div class='del'>-  about.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentDateTime ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This structure defines a date and time value.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentPeriodType ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    Defines how a period of time is specified.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_PERIOD_DATETIME: Indicates that the period is specified</div><div class='del'>-  by starting and ending date/time values.</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_PERIOD_DURATION: Indicates that the period is specified</div><div class='del'>-  as a starding date/time and a duration value.</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentPeriod ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This structure defines a period of time.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentText ##### --&gt;</div><div class='del'>-  &lt;para&gt;</div><div class='del'>-    This structure defines the value of a text property that may have</div><div class='del'>-    an alternate representation parameter.</div><div class='del'>-  &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentTransparency ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_TRANSP_NONE: </div><div class='del'>-@CAL_COMPONENT_TRANSP_TRANSPARENT: </div><div class='del'>-@CAL_COMPONENT_TRANSP_OPAQUE: </div><div class='del'>-@CAL_COMPONENT_TRANSP_UNKNOWN: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CalComponentAlarm ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CalComponentPrivate ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_gen_uid ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_new ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_clone ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_new_vtype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@type: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_icalcomponent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@icalcomp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_icalcomponent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_vtype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_as_string ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_commit_sequence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_uid ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@uid: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_uid ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@uid: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_categories_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@categ_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_categories_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@categ_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_classification ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@classif: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_classification ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@classif: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_comment_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_comment_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_completed ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_completed ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_created ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_created ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_description_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_description_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_dtend ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_dtend ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_dtstamp ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_dtstamp ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_dtstart ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_dtstart ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_due ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_due ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_exdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@exdate_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_exdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@exdate_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_exrule_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_exrule_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_geo ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@geo: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_geo ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@geo: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_last_modified ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_last_modified ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_percent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@percent: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_percent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@percent: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_priority ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@priority: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_priority ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@priority: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_rdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@period_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_rdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@period_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_rdates ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_rrule_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_rrule_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_has_rrules ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_sequence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@sequence: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_sequence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@sequence: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_summary ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@summary: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_summary ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@summary: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_transparency ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@transp: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_transparency ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@transp: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_url ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@url: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_url ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@url: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_pilot_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@pilot_id: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_pilot_id ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@pilot_id: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_pilot_status ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@pilot_status: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_set_pilot_status ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@pilot_status: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_categories_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@categ_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_datetime ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@dt: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_exdate_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@exdate_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_geo ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@geo: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_icaltimetype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_percent ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@percent: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_priority ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@priority: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_period_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@period_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_recur_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@recur_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_sequence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@sequence: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_free_text_list ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@text_list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentAlarmAction ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_ALARM_NONE: </div><div class='del'>-@CAL_COMPONENT_ALARM_AUDIO: </div><div class='del'>-@CAL_COMPONENT_ALARM_DISPLAY: </div><div class='del'>-@CAL_COMPONENT_ALARM_EMAIL: </div><div class='del'>-@CAL_COMPONENT_ALARM_PROCEDURE: </div><div class='del'>-@CAL_COMPONENT_ALARM_UNKNOWN: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentAlarmTriggerType ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_ALARM_TRIGGER_RELATIVE: </div><div class='del'>-@CAL_COMPONENT_ALARM_TRIGGER_ABSOLUTE: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalComponentAlarmTriggerRelated ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_START: </div><div class='del'>-@CAL_COMPONENT_ALARM_TRIGGER_RELATED_END: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalComponentAlarmTrigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_first_alarm ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_get_next_alarm ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_get_action ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@action: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_set_action ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@action: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_get_trigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@trigger: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_set_trigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@alarm: </div><div class='del'>-@trigger: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_component_alarm_free_trigger ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@trigger: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../../../evolution-devel-guide.sgml" "book" "refsect2" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml b/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml<br/>deleted file mode 100644<br/>index 703f8b2b85..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/cal-recur.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/tmpl/cal-recur.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,88 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-cal-recur</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalRecurType ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CAL_RECUR_YEARLY: </div><div class='del'>-@CAL_RECUR_MONTHLY: </div><div class='del'>-@CAL_RECUR_WEEKLY: </div><div class='del'>-@CAL_RECUR_DAILY: </div><div class='del'>-@CAL_RECUR_HOURLY: </div><div class='del'>-@CAL_RECUR_MINUTELY: </div><div class='del'>-@CAL_RECUR_SECONDLY: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalRecurrence ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### STRUCT CalObjTime ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@year: </div><div class='del'>-@month: </div><div class='del'>-@day: </div><div class='del'>-@hour: </div><div class='del'>-@minute: </div><div class='del'>-@second: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### USER_FUNCTION CalRecurInstanceFn ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@instance_start: </div><div class='del'>-@instace_end: </div><div class='del'>-@data: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_recur_generate_instances ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@comp: </div><div class='del'>-@start: </div><div class='del'>-@end: </div><div class='del'>-@cb: </div><div class='del'>-@cb_data: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_recur_from_icalrecurrencetype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@ir: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_recur_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@r: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/cal-util.sgml b/doc/devel/calendar/cal-util/tmpl/cal-util.sgml<br/>deleted file mode 100644<br/>index bc349a377f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/cal-util.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/tmpl/cal-util.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-Miscellaneous utilities</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalObjInstance ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_obj_instance_list_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### TYPEDEF CalAlarmInstance ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_alarm_instance_list_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@list: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### ENUM CalObjType ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@CALOBJ_TYPE_EVENT: </div><div class='del'>-@CALOBJ_TYPE_TODO: </div><div class='del'>-@CALOBJ_TYPE_JOURNAL: </div><div class='del'>-@CALOBJ_TYPE_ANY: </div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION cal_obj_uid_list_free ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@list: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml b/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml<br/>deleted file mode 100644<br/>index e69de29bb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/tmpl/evolution-cal-util-unused.sgml</a><br/>+++ /dev/null</div><div class='head'>diff --git a/doc/devel/calendar/cal-util/tmpl/timeutil.sgml b/doc/devel/calendar/cal-util/tmpl/timeutil.sgml<br/>deleted file mode 100644<br/>index 3b62fbba3f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/cal-util/tmpl/timeutil.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/cal-util/tmpl/timeutil.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,260 +0,0 @@</div><div class='del'>-&lt;!-- ##### SECTION Title ##### --&gt;</div><div class='del'>-timeutil</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Short_Description ##### --&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION Long_Description ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### SECTION See_Also ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_from_icaltimetype ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@itt: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_from_isodate ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@str: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_from_start_duration ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@start: </div><div class='del'>-@duration: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION isodate_from_time_t ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION get_time_t_hour ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION isodiff_to_secs ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@str: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION isodiff_from_secs ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@secs: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_minutes ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@minutes: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_day ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@days: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_week ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@weeks: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_month ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@months: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_add_year ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@time: </div><div class='del'>-@years: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION format_simple_hour ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@hour: </div><div class='del'>-@use_am_pm: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_days_in_month ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@year: </div><div class='del'>-@month: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_from_day ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@year: </div><div class='del'>-@month: </div><div class='del'>-@day: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_day_hour ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@hour: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_year_begin ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_year_end ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_month_begin ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_month_end ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_week_begin ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_week_end ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_day_begin ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION time_day_end ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION parse_date ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@str: </div><div class='del'>-@Returns: </div><div class='del'>-</div><div class='del'>-</div><div class='del'>-&lt;!-- ##### FUNCTION print_time_t ##### --&gt;</div><div class='del'>-&lt;para&gt;</div><div class='del'>-</div><div class='del'>-&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-@t: </div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/doc/devel/calendar/evolution-calendar.sgml b/doc/devel/calendar/evolution-calendar.sgml<br/>deleted file mode 100644<br/>index f3936d9bbc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/evolution-calendar.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/evolution-calendar.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-  &lt;part&gt;</div><div class='del'>-    &lt;docinfo&gt;</div><div class='del'>-      &lt;authorgroup&gt;</div><div class='del'>-	&lt;author&gt;</div><div class='del'>-	  &lt;firstname&gt;Federico&lt;/firstname&gt;</div><div class='del'>-	  &lt;surname&gt;Mena Quintero&lt;/surname&gt;</div><div class='del'>-	  &lt;affiliation&gt;</div><div class='del'>-	    &lt;address&gt;</div><div class='del'>-	      &lt;email&gt;federico@helixcode.com&lt;/email&gt;</div><div class='del'>-	    &lt;/address&gt;</div><div class='del'>-	  &lt;/affiliation&gt;</div><div class='del'>-	&lt;/author&gt;</div><div class='del'>-      &lt;/authorgroup&gt;</div><div class='del'>-    &lt;/docinfo&gt;</div><div class='del'>-</div><div class='del'>-    &lt;title&gt;Developing Applications for the Evolution Calendar&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part of the Evolution Developer's Guide describes how to</div><div class='del'>-	write applications for the Evolution Calendar by using its</div><div class='del'>-	public interfaces.  The Evolution Calendar exports its</div><div class='del'>-	functionality through a number of interfaces, including CORBA,</div><div class='del'>-	GTK+ wrappers for Bonobo objects, and other utility libraries.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	You should read this part of the Evolution Developer's guide</div><div class='del'>-	if you intend to write client applications that use the</div><div class='del'>-	functionality of the Evolution Calendar.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part does not describe the internal interfaces of the</div><div class='del'>-	Evolution Calendar; for that you should read the Evolution</div><div class='del'>-	Internals Guide.  You should only need to read that guide if</div><div class='del'>-	you are interested in the way the calendar works internally or</div><div class='del'>-	if you want to make changes directly to the Evolution Calendar</div><div class='del'>-	code.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;calendar-architecture;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "book" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/calendar/public-reference.sgml b/doc/devel/calendar/public-reference.sgml<br/>deleted file mode 100644<br/>index f8aa6e848d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/public-reference.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/public-reference.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-  &lt;reference&gt;</div><div class='del'>-    &lt;title&gt;Calendar Public API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part presents the class and function reference for the</div><div class='del'>-	public APIs of the different components of the Evolution</div><div class='del'>-	Calendar.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;CalClient;</div><div class='del'>-    &amp;CalComponent;</div><div class='del'>-    &amp;cal-util;</div><div class='del'>-    &amp;cal-recur;</div><div class='del'>-    &amp;timeutil;</div><div class='del'>-  &lt;/reference&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/calendar/reference.sgml b/doc/devel/calendar/reference.sgml<br/>deleted file mode 100644<br/>index f8aa6e848d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/calendar/reference.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/calendar/reference.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,24 +0,0 @@</div><div class='del'>-  &lt;reference&gt;</div><div class='del'>-    &lt;title&gt;Calendar Public API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part presents the class and function reference for the</div><div class='del'>-	public APIs of the different components of the Evolution</div><div class='del'>-	Calendar.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;CalClient;</div><div class='del'>-    &amp;CalComponent;</div><div class='del'>-    &amp;cal-util;</div><div class='del'>-    &amp;cal-recur;</div><div class='del'>-    &amp;timeutil;</div><div class='del'>-  &lt;/reference&gt;</div><div class='del'>-</div><div class='del'>-&lt;!--</div><div class='del'>-Local variables:</div><div class='del'>-mode: sgml</div><div class='del'>-sgml-parent-document: ("../evolution-devel-guide.sgml" "book" "part" "")</div><div class='del'>-End:</div><div class='del'>---&gt;</div><div class='head'>diff --git a/doc/devel/evolution-devel-guide.sgml b/doc/devel/evolution-devel-guide.sgml<br/>deleted file mode 100644<br/>index 9db8f1bdf0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/devel/evolution-devel-guide.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/devel/evolution-devel-guide.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-&lt;!doctype book PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity evolution-calendar SYSTEM "calendar/evolution-calendar.sgml"&gt;</div><div class='del'>-&lt;!entity calendar-architecture SYSTEM "calendar/architecture.sgml"&gt;</div><div class='del'>-&lt;!entity calendar-reference SYSTEM "calendar/reference.sgml"&gt;</div><div class='del'>-&lt;!entity CalClient SYSTEM "calendar/cal-client/sgml/cal-client.sgml"&gt;</div><div class='del'>-&lt;!entity CalComponent SYSTEM "calendar/cal-util/sgml/cal-component.sgml"&gt;</div><div class='del'>-&lt;!entity cal-util SYSTEM "calendar/cal-util/sgml/cal-util.sgml"&gt;</div><div class='del'>-&lt;!entity cal-recur SYSTEM "calendar/cal-util/sgml/cal-recur.sgml"&gt;</div><div class='del'>-&lt;!entity timeutil SYSTEM "calendar/cal-util/sgml/timeutil.sgml"&gt;</div><div class='del'>-&lt;!entity PCS "&lt;acronym&gt;PCS&lt;/acronym&gt;"&gt;</div><div class='del'>-&lt;!entity libical "&lt;application&gt;libical&lt;/application&gt;"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;book id="index"&gt;</div><div class='del'>-  &lt;bookinfo&gt;</div><div class='del'>-    &lt;title&gt;Evolution Developer's Guide&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;corpauthor&gt;</div><div class='del'>-	Helix Code, Inc.</div><div class='del'>-      &lt;/corpauthor&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Helix Code, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-  &lt;/bookinfo&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- DocBook parts for each individual component --&gt;</div><div class='del'>-</div><div class='del'>-  &amp;evolution-calendar;</div><div class='del'>-</div><div class='del'>-  &lt;!-- API Reference part --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;part&gt;</div><div class='del'>-    &lt;title&gt;Evolution Public API Reference&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;partintro&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This part presents the class and function reference for the</div><div class='del'>-	different libraries and interfaces that Evolution provides.</div><div class='del'>-	Classes are described together with their methods; individual</div><div class='del'>-	functions are grouped by functional group.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/partintro&gt;</div><div class='del'>-</div><div class='del'>-    &amp;calendar-reference;</div><div class='del'>-  &lt;/part&gt;</div><div class='del'>-&lt;/book&gt;</div><div class='head'>diff --git a/doc/white-papers/calendar/calendar.sgml b/doc/white-papers/calendar/calendar.sgml<br/>deleted file mode 100644<br/>index 2cb3132e2b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/white-papers/calendar/calendar.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/white-papers/calendar/calendar.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,209 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity CUA "&lt;acronym&gt;CUA&lt;/acronym&gt;"&gt;</div><div class='del'>-&lt;!entity PCS "&lt;acronym&gt;PCS&lt;/acronym&gt;"&gt;</div><div class='del'>-&lt;!entity Bonobo "&lt;application&gt;Bonobo&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity CORBA "&lt;acronym&gt;CORBA&lt;/acronym&gt;"&gt;</div><div class='del'>-&lt;!entity GTK "&lt;acronym&gt;GTK+&lt;/acronym&gt;"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;article class="whitepaper" id="calendar"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;title&gt;&amp;Evolution; Calendaring Framework&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Federico&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Mena Quintero&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;federico@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Helix Code, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-    &lt;abstract&gt;</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The &amp;Evolution; groupware suite provides a framework for</div><div class='del'>-	developing calendaring applications, as well as a graphical</div><div class='del'>-	calendar client and a personal calendar server.  This white</div><div class='del'>-	paper describes the architecture of the &amp;Evolution;</div><div class='del'>-	calendaring framework.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/abstract&gt;</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Introduction --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Calendaring is an important part of a groupware suite.  A</div><div class='del'>-      calendaring framework will allow a user to keep a personal</div><div class='del'>-      calendar and have several applications use it.  Such</div><div class='del'>-      applications could be a graphical calendar client that the user</div><div class='del'>-      employs to schedule appointments and keep track of his time, a</div><div class='del'>-      &lt;productname&gt;Palm Pilot&lt;/productname&gt; synchronization client, or</div><div class='del'>-      a simple alarm or reminder utility.  A comprehensive calendaring</div><div class='del'>-      framework will also allow multiple users to schedule</div><div class='del'>-      appointments between each other; for example, a project director</div><div class='del'>-      may want to schedule a weekly meeting with the rest of the</div><div class='del'>-      project members, or a person who owns a large house may want to</div><div class='del'>-      schedule a big party with his friends.  The attendees will then</div><div class='del'>-      want to reply with messages such as, &amp;ldquo;I will</div><div class='del'>-      attend&amp;rdquo;, or &amp;ldquo;I will attend only if the proposed time</div><div class='del'>-      is changed&amp;rdquo;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &amp;Evolution; groupware suite provides a framework for</div><div class='del'>-      developing calendaring applications, as well as a graphical</div><div class='del'>-      calendar client or calendar user agent (&amp;CUA;) and a personal</div><div class='del'>-      calendar server (&amp;PCS;).</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The following sections explain the basic calendaring framework,</div><div class='del'>-      the functions of the calendar user agent and the personal</div><div class='del'>-      calendar server, and the relationship between the two.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Personal Calendar Server --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="pcs"&gt;</div><div class='del'>-    &lt;title&gt;Personal Calendar Server&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The personal calendar server (&amp;PCS;) provides centralized</div><div class='del'>-      management and storage of a user's personal calendar.  Multiple</div><div class='del'>-      clients can connect to the &amp;PCS; simultaneously to query and</div><div class='del'>-      modify the user's calendar in a synchronized fashion.  The main</div><div class='del'>-      features of the &amp;PCS; are as follows:</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;formalpara&gt;</div><div class='del'>-      &lt;title&gt;Storage&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The &amp;PCS; is responsible for loading and saving calendars.</div><div class='del'>-	Centralizing the loading and saving functionality allows</div><div class='del'>-	multiple clients to use the same calendar at the same time</div><div class='del'>-	without having to worry about each other.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-    &lt;formalpara&gt;</div><div class='del'>-      &lt;title&gt;Basic Queries&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	The &amp;PCS; provides functions to do basic queries on a</div><div class='del'>-	calendar, for example, a client can ask the server for a list</div><div class='del'>-	of all the appointments in the calendar, or for all the data</div><div class='del'>-	for a specific appointment.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-    &lt;formalpara&gt;</div><div class='del'>-      &lt;title&gt;Recurrence and Alarm Queries&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	Clients can ask the &amp;PCS; for a list of the appointments that</div><div class='del'>-	occur within a specified time range; for example a graphical</div><div class='del'>-	client that has a per-week view could ask the &amp;PCS; for all</div><div class='del'>-	the appointments that occur in a particular week.  This</div><div class='del'>-	includes multiple occurrences of a single recurring event; for</div><div class='del'>-	example, the object for &amp;ldquo;a 1-hour meeting that occurs on</div><div class='del'>-	every Tuesday and Thursday&amp;rdquo; is represented inside the</div><div class='del'>-	&amp;PCS; as a single event with a recurrence rule.  Similarly,</div><div class='del'>-	clients can ask the &amp;PCS; for a list of events that have</div><div class='del'>-	alarms that trigger within a specified time range.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/formalpara&gt;</div><div class='del'>-</div><div class='del'>-    &lt;formalpara&gt;</div><div class='del'>-      &lt;title&gt;Notification of Changes&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-	This is the most important function of the &amp;PCS;, as it allows</div><div class='del'>-	multiple calendar clients to maintain a unified view of the</div><div class='del'>-	calendar between the server and themselves.  When a client</div><div class='del'>-	asks the &amp;PCS; to modify or remove an event, the &amp;PCS;</div><div class='del'>-	notifies all the clients that are connected to it about the</div><div class='del'>-	change.  The policy is that &amp;ldquo;the server is always</div><div class='del'>-	right&amp;rdquo;; clients can act as dumb views onto the</div><div class='del'>-	calendar's data and they will be notified by the &amp;PCS; when</div><div class='del'>-	something changes.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/formalpara&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Calenar User Agent --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="cua"&gt;</div><div class='del'>-    &lt;title&gt;Calendar User Agent&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A calendar user agent (&amp;CUA;) is a program that lets a user</div><div class='del'>-      manipulate a calendar.  &amp;Evolution; provides an attractive,</div><div class='del'>-      graphical calendar client that communicates with the &amp;Evolution;</div><div class='del'>-      personal calendar server.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &amp;Evolution; calendar client just provides a view onto the</div><div class='del'>-      data that is stored and managed by the personal calendar server.</div><div class='del'>-      The calendar client does not perform direct manipulations on a</div><div class='del'>-      calendar's data; instead it offloads those requests to the</div><div class='del'>-      calendar server, which takes care of making the appropriate</div><div class='del'>-      modifications in the calendar and then notifies all the clients</div><div class='del'>-      about the changes.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;!-- Calendar Client Library --&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="client-lib"&gt;</div><div class='del'>-    &lt;title&gt;Calendar Client Library&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Communication between the personal calendar server and calendar</div><div class='del'>-      clients is defined by a set of &amp;Bonobo; &amp;CORBA; interfaces.</div><div class='del'>-      Clients can be written by implementing the client-side</div><div class='del'>-      &lt;classname&gt;Listener&lt;/classname&gt; interface, which defines the</div><div class='del'>-      notification callbacks that the PCS uses to inform clients about</div><div class='del'>-      changes to the calendar.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      As a convenience for &amp;GTK; programmers, &amp;Evolution; also</div><div class='del'>-      includes a library which provides a</div><div class='del'>-      &lt;classname&gt;CalClient&lt;/classname&gt; class which can be used for</div><div class='del'>-      communication with the personal calendar server.  Objects of</div><div class='del'>-      this class automatically contact the PCS when they are created.</div><div class='del'>-      &lt;classname&gt;CalClient&lt;/classname&gt; provides functions to request</div><div class='del'>-      changes in the calendar, and it also emits signals when it gets</div><div class='del'>-      notification about changes from the PCS.  This makes it easy and</div><div class='del'>-      convenient to write calendar clients for &amp;Evolution; using</div><div class='del'>-      &amp;GTK;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The implementation of the &lt;classname&gt;CalClient&lt;/classname&gt; class</div><div class='del'>-      simply wraps the &amp;Evolution; &amp;CORBA; interfaces for calendaring</div><div class='del'>-      with a familiar-looking &amp;GTK; object.  Calls to the</div><div class='del'>-      &lt;classname&gt;Listener&lt;/classname&gt; interface get translated to</div><div class='del'>-      signal emissions from the &lt;classname&gt;CalClient&lt;/classname&gt;, thus</div><div class='del'>-      shielding programmers from the details of the &amp;CORBA;</div><div class='del'>-      interfaces.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/doc/white-papers/mail/camel.sgml b/doc/white-papers/mail/camel.sgml<br/>deleted file mode 100644<br/>index a339909f54..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/white-papers/mail/camel.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/white-papers/mail/camel.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,339 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity Camel "Camel"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;article class="whitepaper" id="camel"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;title&gt;The &amp;Camel; Messaging Library&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Dan&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Winship&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;danw@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Bertrand&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Guiheneuf&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;bertrand@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Helix Code, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Camel; is a generic messaging library. It is being used as the</div><div class='del'>-      back end for the mail component of &amp;Evolution;. The name</div><div class='del'>-      "&amp;Camel;" is an acronym; it refers to the fact that the</div><div class='del'>-      library is capable of going several days without food or water.</div><div class='del'>-      It means : Camel's Acronym Makes Everyone Laugh.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Camel;'s initial design is heavily based on Sun's</div><div class='del'>-      &lt;trademark&gt;JavaMail&lt;/trademark&gt; API. It uses the Gtk+ object</div><div class='del'>-      system, and many of its classes are direct analags of JavaMail</div><div class='del'>-      classes. Its design has also been influenced by the features of</div><div class='del'>-      IMAP, and the limitations of the standard UNIX mbox mail store,</div><div class='del'>-      which set some of the boundaries on its requirements and</div><div class='del'>-      extensibility.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Camel; sees all message repositories as stores containing</div><div class='del'>-      folders. These folders in turn contain the messages the client</div><div class='del'>-      actually accesses. The use of such a unified interface allows</div><div class='del'>-      the client applications to be very extensible. &amp;Camel; includes</div><div class='del'>-      an external provider mechanism which allows applications to</div><div class='del'>-      dynamically load and use protocols which were not available when</div><div class='del'>-      the application was initially written.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The abstract store/folder mechanism is a powerful and versatile</div><div class='del'>-      way of accessing messages. No particular asumptions are made on</div><div class='del'>-      the client side, thus allowing new ways of managing the</div><div class='del'>-      messages. For example, the messages stored in the folders don't</div><div class='del'>-      necessarily have to share some common physical location. The</div><div class='del'>-      folder can be a purely virtual folder, containing only</div><div class='del'>-      references to the actual messages. This is used by the "vFolder"</div><div class='del'>-      provider, which allows you select messages meeting particular</div><div class='del'>-      criteria and deal with them as a group.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      In addition to these possibilities, &amp;Camel; has full MIME</div><div class='del'>-      support. &amp;Camel; MIME messages are lightweight objects</div><div class='del'>-      representing the MIME skeleton of the actual message. The data</div><div class='del'>-      contained in the subparts are never stored in memory except when</div><div class='del'>-      they are actually needed. The application, when accessing the</div><div class='del'>-      various MIME objects contained in the message (text parts,</div><div class='del'>-      attachments, embedded binary objects ...) asks &amp;Camel; for a</div><div class='del'>-      stream that it can read data from. This scheme is particularly</div><div class='del'>-      useful with the IMAP provider. IMAP has strong MIME support</div><div class='del'>-      built-in, which allows &amp;Camel; to download only the parts of</div><div class='del'>-      messages that it actually needs: attachments need not be</div><div class='del'>-      downloaded until they are viewed, and unnecessary</div><div class='del'>-      "multipart/alternative" parts will never be read off the server.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="overview"&gt;</div><div class='del'>-    &lt;title&gt;Overview&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;graphic format="gif" fileref="camel"&gt;&lt;/graphic&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      To begin using &amp;Camel;, an application first creates a</div><div class='del'>-      &lt;classname&gt;CamelSession&lt;/classname&gt; object. This object is used</div><div class='del'>-      to store application defaults, and to coordinate communication</div><div class='del'>-      between providers and the application.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A &lt;classname&gt;CamelProvider&lt;/classname&gt; is a dynamically-loadable</div><div class='del'>-      module that provides functionality associated with a specific</div><div class='del'>-      service. Examples of providers are IMAP and SMTP. Providers</div><div class='del'>-      include subclasses of the various other &amp;Camel; classes for</div><div class='del'>-      accessing and manipulating messages.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &lt;classname&gt;CamelService&lt;/classname&gt; is an abstract class for</div><div class='del'>-      describing a connection to a local or remote service. It</div><div class='del'>-      currently has two subclasses: &lt;classname&gt;CamelStore&lt;/classname&gt;,</div><div class='del'>-      for services that store messages (such as IMAP servers and mbox</div><div class='del'>-      files), and &lt;classname&gt;CamelTransport&lt;/classname&gt;, for services</div><div class='del'>-      that deliver messages (such as SMTP, or a local MTA). A provider</div><div class='del'>-      could also be both a store and a transport, as in the case of</div><div class='del'>-      NNTP.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      A &lt;classname&gt;CamelStore&lt;/classname&gt; contains some number of</div><div class='del'>-      &lt;classname&gt;CamelFolder&lt;/classname&gt; objects, which in turn</div><div class='del'>-      contain messages. A &lt;classname&gt;CamelFolder&lt;/classname&gt; provides</div><div class='del'>-      a &lt;classname&gt;CamelFolderSummary&lt;/classname&gt; object, which</div><div class='del'>-      includes details about the subject, date, and sender of each</div><div class='del'>-      message in the folder. The folder also includes the messages</div><div class='del'>-      themselves, as subclasses of &lt;classname&gt;CamelMedium&lt;/classname&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Email messages are represented by the</div><div class='del'>-      &lt;classname&gt;CamelMimeMessage&lt;/classname&gt; class, a subclass of</div><div class='del'>-      &lt;classname&gt;CamelMedium&lt;/classname&gt;. This class includes</div><div class='del'>-      operations for accessing RFC822 and MIME headers, accessing</div><div class='del'>-      subparts of MIME messages, encoding and decoding Base64 and</div><div class='del'>-      Quoted-Printable, etc.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &lt;classname&gt;CamelTransport&lt;/classname&gt; includes methods for</div><div class='del'>-      delivering messages. While the abstract</div><div class='del'>-      &lt;function&gt;CamelTransport::send&lt;/function&gt; method takes a</div><div class='del'>-      &lt;classname&gt;CamelMedium&lt;/classname&gt;, its subclasses may only be</div><div class='del'>-      able to deliver messages of specific</div><div class='del'>-      &lt;classname&gt;CamelMedium&lt;/classname&gt; subclasses. For instance,</div><div class='del'>-      &lt;classname&gt;CamelSendmailTransport&lt;/classname&gt; requires a</div><div class='del'>-      &lt;classname&gt;CamelMimeMessage&lt;/classname&gt;, because it needs a</div><div class='del'>-      message that includes a "To:" header. A hypothetical</div><div class='del'>-      &lt;classname&gt;CamelNNTPTransport&lt;/classname&gt; would need a</div><div class='del'>-      &lt;classname&gt;CamelNewsMessage&lt;/classname&gt;, which would have a</div><div class='del'>-      "Newsgroups:" header.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The content of messages are referred to using</div><div class='del'>-      &lt;classname&gt;CamelStream&lt;/classname&gt; and its subclasses. In the</div><div class='del'>-      case of an mbox-based store, the</div><div class='del'>-      &lt;classname&gt;CamelStream&lt;/classname&gt; would abstract the operation</div><div class='del'>-      of reading the correct section of the mbox file. For IMAP,</div><div class='del'>-      reading off the &lt;classname&gt;CamelStream&lt;/classname&gt; might result</div><div class='del'>-      in commands being issued to the remote IMAP server and data</div><div class='del'>-      being read off a socket.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The final major class in &amp;Camel; is</div><div class='del'>-      &lt;classname&gt;CamelException&lt;/classname&gt;, which is used to</div><div class='del'>-      propagate information about errors. Many methods take a</div><div class='del'>-      &lt;classname&gt;CamelException&lt;/classname&gt; as an argument, which the</div><div class='del'>-      caller can then check if an error occurs. It includes both a</div><div class='del'>-      numeric error code which can be interpreted by the program, and</div><div class='del'>-      a text error message that can be displayed to the user.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="classes"&gt;</div><div class='del'>-    &lt;title&gt;Major Subcomponents&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="store"&gt;</div><div class='del'>-      &lt;title&gt;The Message Store&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        A &lt;classname&gt;CamelStore&lt;/classname&gt; inherits the ability to</div><div class='del'>-        connect and authenticate to a service from its parent class,</div><div class='del'>-        &lt;classname&gt;CamelService&lt;/classname&gt;. It then adds the ability</div><div class='del'>-        to retrieve folders. A store must contain at least one folder,</div><div class='del'>-        which can be retrieved with</div><div class='del'>-        &lt;function&gt;CamelStore::get_default_folder&lt;/function&gt;. There are</div><div class='del'>-        also methods to retrieve the "top-level" folder (for</div><div class='del'>-        hieararchical stores), and to retrieve an arbitrary folder by</div><div class='del'>-        name.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        All &lt;classname&gt;CamelFolder&lt;/classname&gt;s must implement certain</div><div class='del'>-        core operations, most notably generating a summary and</div><div class='del'>-        retrieving and deleting messages. A</div><div class='del'>-        &lt;classname&gt;CamelFolder&lt;/classname&gt; must assign a permanently</div><div class='del'>-        unique identifier to each message it contains. Messages can</div><div class='del'>-        then be retrieved via</div><div class='del'>-        &lt;function&gt;CamelFolder::get_message_by_uid&lt;/function&gt;. Alternately,</div><div class='del'>-        within a single mail-reading session, messages can be referred</div><div class='del'>-        to by their linear position within the store using</div><div class='del'>-        &lt;function&gt;CamelFolder::get_message_by_number&lt;/function&gt;.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Folders must also implement the</div><div class='del'>-        &lt;function&gt;get_parent_folder&lt;/function&gt; and</div><div class='del'>-        &lt;function&gt;list_subfolders&lt;/function&gt; methods. For stores that</div><div class='del'>-        don't allow multiple folders, they would return NULL and an</div><div class='del'>-        empty list, respectively. Stores that do allow multiple</div><div class='del'>-        folders will also define methods for creating and deleting</div><div class='del'>-        folders, and for moving messages between them (assuming the</div><div class='del'>-        folders are writable).</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Folders that support searching can define the</div><div class='del'>-        &lt;function&gt;search_by_expression&lt;/function&gt; method. For mbox</div><div class='del'>-        folders, this is implemented by indexing the messages with the</div><div class='del'>-        ibex library and using that to search them later. For IMAP</div><div class='del'>-        folders, this uses the IMAP SEARCH command. Other folder types</div><div class='del'>-        might not be able to implement this functionality, in which</div><div class='del'>-        case users would not be able to do full-content searches on</div><div class='del'>-        them.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-    &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-    &lt;sect2 id="messages"&gt;</div><div class='del'>-      &lt;title&gt;Messages&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        As mentioned before, messages are represented by subclasses of</div><div class='del'>-        &lt;classname&gt;CamelMedium&lt;/classname&gt;.</div><div class='del'>-        &lt;classname&gt;CamelMedium&lt;/classname&gt; itself is a subclass of</div><div class='del'>-        &lt;classname&gt;CamelDataWrapper&lt;/classname&gt;, a generic class for</div><div class='del'>-        connecting a typed data source to a data sink.</div><div class='del'>-        &lt;classname&gt;CamelMedium&lt;/classname&gt; adds the concept of message</div><div class='del'>-        headers versus message body.</div><div class='del'>-        (&lt;classname&gt;CamelDataWrapper&lt;/classname&gt; has one other</div><div class='del'>-        important subclass, &lt;classname&gt;CamelMultipart&lt;/classname&gt;,</div><div class='del'>-        which is used to provide separate access to the multiple</div><div class='del'>-        independent parts of a multipart MIME type.)</div><div class='del'>-        &lt;classname&gt;CamelMedium&lt;/classname&gt;'s subclasses provide more</div><div class='del'>-        specialized handling of various headers:</div><div class='del'>-        &lt;classname&gt;CamelMimePart&lt;/classname&gt; adds special handling for</div><div class='del'>-        the &amp;ldquot;Content-*&amp;rdquot; headers in MIME messages, and</div><div class='del'>-        its subclass &lt;classname&gt;CamelMimeMessage&lt;/classname&gt; adds</div><div class='del'>-        handling for the RFC822 headers.</div><div class='del'>-      &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-      &lt;graphic format="gif" fileref="mimemessage"&gt;&lt;/graphic&gt;</div><div class='del'>-</div><div class='del'>-      &lt;para&gt;</div><div class='del'>-        Consider a message with two parts: a text part (in both plain</div><div class='del'>-        text and HTML), and an attached image:</div><div class='del'>-</div><div class='del'>-	&lt;programlisting&gt;</div><div class='del'>-</div><div class='del'>-	  From: Dan Winship &amp;lt;danw@helixcode.com&amp;gt;</div><div class='del'>-	  To: Matt Loper &amp;lt;matt@helixcode.com&amp;gt;</div><div class='del'>-	  Subject: the Camel white paper</div><div class='del'>-	  MIME-Version: 1.0</div><div class='del'>-	  Content-Type: multipart/mixed;</div><div class='del'>-		boundary="jhTYrnsRrdhDFGa"</div><div class='del'>-</div><div class='del'>-	  This is a multi-part message in MIME format.</div><div class='del'>-	  --jhTYrnsRrdhDFGa</div><div class='del'>-	  Content-Type: multipart/alternative;</div><div class='del'>-		boundary="sFSenbAFDSgDfg"</div><div class='del'>-</div><div class='del'>-	  --sFSenbAFDSgDfg</div><div class='del'>-	  Content-Type: text/plain</div><div class='del'>-</div><div class='del'>-	  Hey, Matt</div><div class='del'>-</div><div class='del'>-	  Check out this graphic...</div><div class='del'>-</div><div class='del'>-	  -- Dan</div><div class='del'>-</div><div class='del'>-	  --sFSenbAFDSgDfg</div><div class='del'>-	  Content-Type: text/html</div><div class='del'>-</div><div class='del'>-	  Hey, Matt&amp;lt;br&amp;gt;</div><div class='del'>-	  &amp;lt;br&amp;gt;</div><div class='del'>-	  Check out this graphic...&amp;lt;br&amp;gt;</div><div class='del'>-	  &amp;lt;br&amp;gt;</div><div class='del'>-	  -- Dan&amp;lt;br&amp;gt;</div><div class='del'>-	  &amp;lt;br&amp;gt;</div><div class='del'>-	  --sFSenbAFDSgDfg--</div><div class='del'>-</div><div class='del'>-	  --jhTYrnsRrdhDFGa</div><div class='del'>-	  Content-Type: image/png</div><div class='del'>-	  Content-Transfer-Encoding: base64</div><div class='del'>-</div><div class='del'>-	  F4JLw0ORrkRa8AwAMQJLAaI3UDIGsco9RAaB92...</div><div class='del'>-	  --jhTYrnsRrdhDFGa--</div><div class='del'>-	&lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  In &amp;Camel;, this would be represented as follows:</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-        &lt;graphic fileref="samplemsg"&gt;&lt;/graphic&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-      &lt;sect2 id="streams"&gt;</div><div class='del'>-        &lt;title&gt;Streams&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Streams are a generic data transport layer. Two basic stream</div><div class='del'>-	  classes are &lt;classname&gt;CamelStreamFs&lt;/classname&gt;, for</div><div class='del'>-	  reading and writing files, and</div><div class='del'>-	  &lt;classname&gt;CamelStreamMem&lt;/classname&gt;, for reading from and</div><div class='del'>-	  writing to objects that are already in memory.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Streams can also be chained together. So a CamelMimePart</div><div class='del'>-	  containing base64-encoded data can filter its output through</div><div class='del'>-	  a CamelStreamB64. Other parts of the application that want</div><div class='del'>-	  to read its data will never need to even realize that the</div><div class='del'>-	  original data was encoded.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/sect2&gt;</div><div class='del'>-</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/doc/white-papers/mail/ibex.sgml b/doc/white-papers/mail/ibex.sgml<br/>deleted file mode 100644<br/>index dcb8f5ca4b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/white-papers/mail/ibex.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/white-papers/mail/ibex.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,158 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity Camel "Camel"&gt;</div><div class='del'>-&lt;!entity Ibex "Ibex"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;article class="whitepaper" id="ibex"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;title&gt;Ibex: an Indexing System&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Dan&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Winship&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;danw@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Helix Code, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Ibex; is a library for text indexing. It is being used by</div><div class='del'>-      &amp;Camel; to allow it to quickly search locally-stored messages,</div><div class='del'>-      either because the user is looking for a specific piece of text,</div><div class='del'>-      or because the application is contructing a vFolder or filtering</div><div class='del'>-      incoming mail.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="goals"&gt;</div><div class='del'>-    &lt;title&gt;Design Goals and Requirements for Ibex&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The design of &amp;Ibex; is based on a number of requirements.</div><div class='del'>-</div><div class='del'>-    &lt;itemizedlist&gt;</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  First, obviously, it must be fast. In particular, searching</div><div class='del'>-	  the index must be appreciably faster than searching through</div><div class='del'>-	  the messages themselves, and constructing and maintaining</div><div class='del'>-	  the index must not take a noticeable amount of time.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  The indexes must not take up too much space. Many users have</div><div class='del'>-	  limited filesystem quotas on the systems where they read</div><div class='del'>-	  their mail, and even users who read mail on private machines</div><div class='del'>-	  have to worry about running out of space on their disks. The</div><div class='del'>-	  indexes should be able to do their job without taking up so</div><div class='del'>-	  much space that the user decides he would be better off</div><div class='del'>-	  without them.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-</div><div class='del'>-	&lt;para&gt;</div><div class='del'>-	  Another aspect of this problem is that the system as a whole</div><div class='del'>-	  must be clever about what it does and does not index:</div><div class='del'>-	  accidentally indexing a "text" mail message containing</div><div class='del'>-	  uuencoded, BinHexed, or PGP-encrypted data will drastically</div><div class='del'>-	  affect the size of the index file. Either the caller or the</div><div class='del'>-	  indexer itself has to avoid trying to index these sorts of</div><div class='del'>-	  things.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  The indexing system must allow data to be added to the index</div><div class='del'>-	  incrementally, so that new messages can be added to the</div><div class='del'>-	  index (and deleted messages can be removed from it) without</div><div class='del'>-	  having to re-scan all existing messages.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  It must allow the calling application to explain the</div><div class='del'>-	  structure of the data however it wants to, rather than</div><div class='del'>-	  requiring that the unit of indexing be individual files.</div><div class='del'>-	  This way, &amp;Camel; can index a single mbox-format file and</div><div class='del'>-	  treat it as multiple messages.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-</div><div class='del'>-      &lt;listitem&gt;</div><div class='del'>-        &lt;para&gt;</div><div class='del'>-	  It must support non-ASCII text, given that many people send</div><div class='del'>-	  and receive non-English email, and even people who only</div><div class='del'>-	  speak English may receive email from people whose names</div><div class='del'>-	  cannot be written in the US-ASCII character set.</div><div class='del'>-	&lt;/para&gt;</div><div class='del'>-      &lt;/listitem&gt;</div><div class='del'>-    &lt;/itemizedlist&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      While there are a number of existing indexing systems, none of</div><div class='del'>-      them met all (or even most) of our requirements.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="implementation"&gt;</div><div class='del'>-    &lt;title&gt;The Implementation&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;Ibex; is still young, and many of the details of the current</div><div class='del'>-      implementation are not yet finalized.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      With the current index file format, 13 megabytes of Info files</div><div class='del'>-      can be indexed into a 371 kilobyte index file&amp;mdash;a bit under</div><div class='del'>-      3% of the original size. This is reasonable, but making it</div><div class='del'>-      smaller would be nice. (The file format includes some simple</div><div class='del'>-      compression, but &lt;application&gt;gzip&lt;/application&gt; can compress an</div><div class='del'>-      index file to about half its size, so we can clearly do better.)</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The implementation has been profiled and optimized for speed to</div><div class='del'>-      some degree. But, it has so far only been run on a 500MHz</div><div class='del'>-      Pentium III system with very fast disks, so we have no solid</div><div class='del'>-      benchmarks.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Further optimization (of both the file format and the in-memory</div><div class='del'>-      data structures) awaits seeing how the library is most easily</div><div class='del'>-      used by &amp;Evolution;: if the indexes are likely to be kept in</div><div class='del'>-      memory for long periods of time, the in-memory data structures</div><div class='del'>-      need to be kept small, but the reading and writing operations</div><div class='del'>-      can be slow. On the other hand, if the indexes will only be</div><div class='del'>-      opened when they are needed, reading and writing must be fast,</div><div class='del'>-      and memory usage is less critical.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Of course, to be useful for other applications that have</div><div class='del'>-      indexing needs, the library should provide several options, so</div><div class='del'>-      that each application can use the library in the way that is</div><div class='del'>-      most suited for its needs.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/doc/white-papers/widgets/e-table.sgml b/doc/white-papers/widgets/e-table.sgml<br/>deleted file mode 100644<br/>index 5ff4faf2ae..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/doc/white-papers/widgets/e-table.sgml?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>doc/white-papers/widgets/e-table.sgml</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,279 +0,0 @@</div><div class='del'>-&lt;!doctype article PUBLIC "-//Davenport//DTD DocBook V3.0//EN" [</div><div class='del'>-&lt;!entity Evolution "&lt;application&gt;Evolution&lt;/application&gt;"&gt;</div><div class='del'>-&lt;!entity ETable "&lt;classname&gt;ETable&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableModel "&lt;classname&gt;ETableModel&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableSimple "&lt;classname&gt;ETableSimple&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableHeader "&lt;classname&gt;ETableHeader&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableSpecification "&lt;classname&gt;ETableSpecification&lt;/classname&gt;"&gt;</div><div class='del'>-&lt;!entity ETableCol "&lt;classname&gt;ETableCol&lt;/classname&gt;"&gt;</div><div class='del'>-]&gt;</div><div class='del'>-</div><div class='del'>-&lt;article class="whitepaper" id="e-table"&gt;</div><div class='del'>-</div><div class='del'>-  &lt;artheader&gt;</div><div class='del'>-    &lt;title&gt;The ETable Widget&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;authorgroup&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Chris&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;Lahey&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;clahey@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-      &lt;author&gt;</div><div class='del'>-	&lt;firstname&gt;Miguel&lt;/firstname&gt;</div><div class='del'>-	&lt;surname&gt;de Icaza&lt;/surname&gt;</div><div class='del'>-	&lt;affiliation&gt;</div><div class='del'>-	  &lt;address&gt;</div><div class='del'>-	    &lt;email&gt;miguel@helixcode.com&lt;/email&gt;</div><div class='del'>-	  &lt;/address&gt;</div><div class='del'>-	&lt;/affiliation&gt;</div><div class='del'>-      &lt;/author&gt;</div><div class='del'>-    &lt;/authorgroup&gt;</div><div class='del'>-</div><div class='del'>-    &lt;copyright&gt;</div><div class='del'>-      &lt;year&gt;2000&lt;/year&gt;</div><div class='del'>-      &lt;holder&gt;Helix Code, Inc.&lt;/holder&gt;</div><div class='del'>-    &lt;/copyright&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/artheader&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="introduction"&gt;</div><div class='del'>-    &lt;title&gt;Introduction&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; is a table widget on steroids. It is intended to provide</div><div class='del'>-      all the table functionality needed throughout &amp;Evolution;, and</div><div class='del'>-      hopefully be general purpose enough to be used in other projects.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; provides a lot of interactive control over the data in the</div><div class='del'>-      table.  Without any work from the programmer, &amp;ETable; provides</div><div class='del'>-      rearrangeable columns and editable data.  When finished, &amp;ETable; will</div><div class='del'>-      also provide, again with no programmer intervention, easy interactive</div><div class='del'>-      sorting and grouping.  </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; gives you a great deal of functionality, flexibility, and</div><div class='del'>-      power. Most of this power is internal to the widget, but some of</div><div class='del'>-      the flexibility requires a bit of work by the programmer.</div><div class='del'>-      However, once you learn it, &amp;ETable; is not very hard at all to</div><div class='del'>-      use.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable;'s power comes from the fact that it is fully</div><div class='del'>-      model/view/controller based.  Various models are involved into</div><div class='del'>-      the process of rendering the information, and various views are</div><div class='del'>-      provided.  The programmer has a wide range of options: from the</div><div class='del'>-      most finely hand-tuned table to a generic all-encompasing widget</div><div class='del'>-      that takes over most of tasks.  It is up to the programmer: he</div><div class='del'>-      can use the simple to use &amp;ETable; widget that takes care of</div><div class='del'>-      everything in a generic way, or he can use the various</div><div class='del'>-      components to roll his own tabular display.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; ships with a standard set of information renderers:</div><div class='del'>-      strings, bitmaps, toggle-buttons, check-boxes, and multi-line</div><div class='del'>-      strings.  But the programmer can write and implement his own</div><div class='del'>-      renderer for his information.  This means that by default</div><div class='del'>-      &amp;ETable; provides the basic display facilities that programmers</div><div class='del'>-      required, but they offer the programmer a complete freedom to</div><div class='del'>-      incorporate new cell renderers.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="model"&gt;</div><div class='del'>-    &lt;title&gt;ETableModel&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The data back end for the &amp;ETable; is an &amp;ETableModel;. The</div><div class='del'>-      &amp;ETableModel is an abstract interface that acts as the</div><div class='del'>-      information repository for the various &amp;ETable components.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-    </div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      To use &amp;ETable; you have to create a subclass of the abstract</div><div class='del'>-      &amp;ETableModel; class.  However, to save you the work of defining</div><div class='del'>-      a new &lt;classname&gt;GtkClass&lt;/classname&gt; every time you use</div><div class='del'>-      &amp;ETable, there is a predefined subclass of &amp;ETableModel; called</div><div class='del'>-      &amp;ETableSimple; which simply takes a list of function callbacks</div><div class='del'>-      to perform the various operations.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-    </div><div class='del'>-  &lt;sect1 id="columns"&gt;</div><div class='del'>-    &lt;title&gt;Columns&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      There are two different meanings to the word "column". The first</div><div class='del'>-      is the model column (defined by the &amp;ETableCol: object). A model</div><div class='del'>-      column describes how it maps to the column in the &amp;ETableModel;</div><div class='del'>-      as well as containing information about its properties (name,</div><div class='del'>-      resizability, resize dimensions, and a renderer for this</div><div class='del'>-      specific columns). </div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; distinguishes between a model column index, and a view</div><div class='del'>-      column index.  The former reflects the column in which the data</div><div class='del'>-      is stored in the &amp;ETableModel;  The later represents the actual</div><div class='del'>-      location at which the column is being displayed in the screen.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      Each view column index corresponds to a specific model column,</div><div class='del'>-      though a model column may have any number of view columns</div><div class='del'>-      associated with it (including zero).  For example the same</div><div class='del'>-      column might be rendered twice, or the data from one column</div><div class='del'>-      could be used to display different bits of information</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The view column does not necessarily depend on only one model</div><div class='del'>-      column. In some cases, the view column renderer can be given a</div><div class='del'>-      reference to another model column to get extra information about</div><div class='del'>-      its display. For example, a mail program could display deleted</div><div class='del'>-      messages with a line through them by creating a model column</div><div class='del'>-      with no corresponding view column that told whether or not the</div><div class='del'>-      message is deleted, and then having the text column</div><div class='del'>-      strikethrough the display if the invisible column had a value</div><div class='del'>-      corresponding to "deleted".</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The view column also specifies a few other pieces of</div><div class='del'>-      information. One piece of information is the renderer. &amp;ETable;</div><div class='del'>-      provides a number of renderers to choose from, or you can write</div><div class='del'>-      your own. Currently, there are renderers for text, image sets,</div><div class='del'>-      and checkboxes.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The view column also includes information about the header.</div><div class='del'>-      There are two types of headers: text, and pixbuf. The first</div><div class='del'>-      allows you to specify a string which is rendered in the header.</div><div class='del'>-      The second allows you to specify an image to copy into the</div><div class='del'>-      header.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="header"&gt;</div><div class='del'>-    &lt;title&gt;Header&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The &amp;ETableHeader; represents the header information for the</div><div class='del'>-      table. The &amp;ETableHeader; is used in two different ways. The</div><div class='del'>-      first is the in the &lt;structfield&gt;full_header&lt;/structfield&gt;</div><div class='del'>-      element of an &amp;ETable;. This is the list of possible columns in</div><div class='del'>-      the view. You add each of your columns to this &amp;ETableHeader;</div><div class='del'>-      and then pass it into the &amp;ETable;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The second use is completely internal. &amp;ETable; uses another</div><div class='del'>-      &amp;ETableHeader; to store the actual displayed columns. Many of</div><div class='del'>-      the &amp;ETableHeader; functions are for this purpose. The only</div><div class='del'>-      functions that users of the library should need to use are</div><div class='del'>-      &lt;function&gt;e_table_header_new&lt;/function&gt; and</div><div class='del'>-      &lt;function&gt;e_table_header_add_col&lt;/function&gt;.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="layout"&gt;</div><div class='del'>-    &lt;title&gt;Layout Specification&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      &amp;ETable; uses an &amp;ETableSpecification; to layout the columns of</div><div class='del'>-      the widget. The &amp;ETableSpecification; is specified as XML data</div><div class='del'>-      passed into the &amp;ETable; as a string.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The most powerful part of the &amp;ETableSpecification; is that when</div><div class='del'>-      finished, &amp;ETable; will allow you to get a copy of an</div><div class='del'>-      &amp;ETableSpecification; that describes the current view of the</div><div class='del'>-      tree. This allows the developer to save the current view so that</div><div class='del'>-      next time the user opens this table, they find it in exactly the</div><div class='del'>-      state that they left it.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The XML specification allows for a number of things. First, it</div><div class='del'>-      allows you to pick a set of default columns to be shown. Thus,</div><div class='del'>-      even if you had hundreds of pieces of data, you could choose to</div><div class='del'>-      only display a few that fit on the screen by default.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The second major thing that the &amp;ETableSpecification; allows you</div><div class='del'>-      to specify is the column grouping and sorting. &amp;ETable; has a</div><div class='del'>-      powerful mechanism for allowing the user to choose columns to</div><div class='del'>-      group by, thus allowing multiple columns of sorting, as well as</div><div class='del'>-      visual grouping of similar elements and interactive selection of</div><div class='del'>-      what data to display.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      The grouping in &amp;ETableSpecification; is specified as a</div><div class='del'>-      hierarchy of columns to group by. Each level of the hierarchy</div><div class='del'>-      lets you sort by a particular column, either ascending or</div><div class='del'>-      descending. All levels except the last cause the canvas to group</div><div class='del'>-      by the given column.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      An example &amp;ETableSpecification; follows.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-</div><div class='del'>-    &lt;programlisting&gt;</div><div class='del'>-      &amp;lt;ETableSpecification&amp;gt;</div><div class='del'>-        &amp;lt;columns-shown frozen_columns="2"&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 0 &amp;lt;/column&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 1 &amp;lt;/column&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 2 &amp;lt;/column&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 3 &amp;lt;/column&amp;gt;</div><div class='del'>-	  &amp;lt;column&amp;gt; 4 &amp;lt;/column&amp;gt;</div><div class='del'>-	&amp;lt;/columns-shown&amp;gt;</div><div class='del'>-	&amp;lt;grouping&amp;gt;</div><div class='del'>-	  &amp;lt;group column="3" ascending="1"&amp;gt;</div><div class='del'>-	    &amp;lt;group column="4" ascending="0"&amp;gt;</div><div class='del'>-	      &amp;lt;leaf column="2" ascending="1"/&amp;gt;</div><div class='del'>-	    &amp;lt;/group&amp;gt;</div><div class='del'>-	  &amp;lt;/group&amp;gt;</div><div class='del'>-	&amp;lt;/grouping&amp;gt;</div><div class='del'>-      &amp;lt;/ETableSpecification&amp;gt;</div><div class='del'>-    &lt;/programlisting&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      This example has 5 columns which are initially in order. It has</div><div class='del'>-      2 levels of grouping. The first is grouped by the 4th column</div><div class='del'>-      (all indexes are 0 based) and sorts those groups in ascending</div><div class='del'>-      order. Inside those groups, the data is grouped by the fifth</div><div class='del'>-      column and sorted in descending order of the fifth column.</div><div class='del'>-      Finally, the data in those groups is sorted by the third column</div><div class='del'>-      in ascending order. Due to the "frozen_columns" attribute on the</div><div class='del'>-      columns-shown element, the user will not be</div><div class='del'>-      able to rearrange the first two columns. They will always be the</div><div class='del'>-      first two.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-</div><div class='del'>-  &lt;sect1 id="conclusion"&gt;</div><div class='del'>-    &lt;title&gt;Conclusion&lt;/title&gt;</div><div class='del'>-</div><div class='del'>-    &lt;para&gt;</div><div class='del'>-      All in all, &amp;ETable; is a very powerful widget. Once you learn</div><div class='del'>-      to use it, you have access to a vast amount of power requiring a</div><div class='del'>-      comparatively small amount of work.</div><div class='del'>-    &lt;/para&gt;</div><div class='del'>-  &lt;/sect1&gt;</div><div class='del'>-&lt;/article&gt;</div><div class='head'>diff --git a/e-util/.cvsignore b/e-util/.cvsignore<br/>deleted file mode 100644<br/>index cb49036068..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='head'>diff --git a/e-util/ChangeLog b/e-util/ChangeLog<br/>deleted file mode 100644<br/>index 9cad1815d6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,749 +0,0 @@</div><div class='del'>-200-10-30  Kjartan Maraas  &lt;kmaraas@gnome.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c: #include &lt;string.h&gt; to quench warning.</div><div class='del'>-	* e-sexp.c: #include &lt;stdlib.h&gt; for same reason.</div><div class='del'>-	</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: build md5-utils</div><div class='del'>-</div><div class='del'>-	* md5-utils.c: Make part of util, get rid of camel stream util</div><div class='del'>-	function include string.h</div><div class='del'>-</div><div class='del'>-	* md5-utils.h: ditto</div><div class='del'>-	</div><div class='del'>-2000-10-27    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_lookup_uid): Return null if no</div><div class='del'>-	pnode was found.</div><div class='del'>-</div><div class='del'>-2000-10-27  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (map_sax_start_element): Get archive field while</div><div class='del'>-	parsing</div><div class='del'>-	(map_write_foreach): Write out archive field</div><div class='del'>-	(e_pilot_map_pid_is_archived): implement</div><div class='del'>-	(e_pilot_map_uid_is_archived): ditto</div><div class='del'>-	(e_pilot_map_insert): Insert new node structures</div><div class='del'>-	(e_pilot_map_lookup_pid): Take into account the list is now</div><div class='del'>-	a list of structures</div><div class='del'>-	(e_pilot_map_lookup_uid): ditto</div><div class='del'>-</div><div class='del'>-2000-10-26  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c (e_address_western_is_postal): </div><div class='del'>-	unsigned chars.</div><div class='del'>-</div><div class='del'>-	* ename/e-name-western.c (e_name_western_get_one_prefix_at_str):</div><div class='del'>-	cast to unsigned char.</div><div class='del'>-</div><div class='del'>-2000-10-25  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Deal properly with URLs at the</div><div class='del'>-	end of the buffer. (The old code would append a "&amp;#0;" to the</div><div class='del'>-	text.)</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c (e_pilot_map_lookup_pid): Lookup a pid by uid.</div><div class='del'>-	(e_pilot_map_lookup_uid): Lookup a uid by pid.</div><div class='del'>-	Now this is wrapped, we can store archive info internally</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h: New accessor prototypes</div><div class='del'>-	</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/Makefile.am (INCLUDES): Remove unused GNOMELOCALEDIR</div><div class='del'>-	setting.</div><div class='del'>-</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c: Operate with EPilotMap structure so things are</div><div class='del'>-	abstract to the caller</div><div class='del'>-	(e_pilot_map_pid_is_archived): Infrastructure for marking records</div><div class='del'>-	as archived</div><div class='del'>-	(e_pilot_map_uid_is_archived): ditto</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h: Add more to public interface, including EPilotMap</div><div class='del'>-	structure</div><div class='del'>-	</div><div class='del'>-2000-10-23  JP Rosevear  &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.c: Pilot map functions grabbed from existing conduits</div><div class='del'>-</div><div class='del'>-	* e-pilot-map.h (e_pilot_map_write): Header</div><div class='del'>-</div><div class='del'>-2000-10-18  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): If unicode_get_utf8 returns -1,</div><div class='del'>-	assume it was actually undeclared iso-8859-1 text.</div><div class='del'>-</div><div class='del'>-2000-10-17  Jesse Pavel  &lt;jpavel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c: made the routines use the stardard</div><div class='del'>-	e_strstrcase instead of the included function that existed</div><div class='del'>-	earlier.</div><div class='del'>-</div><div class='del'>-2000-10-11  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* ename/e-address-western.c (e_address_western_parse): g_strconcat</div><div class='del'>-	needs to be NULL terminated or it goes funny.</div><div class='del'>-</div><div class='del'>-Tue Sep 26 16:48:49 2000  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added $(EXTRA_GNOME_CFLAGS).</div><div class='del'>-</div><div class='del'>-2000-09-25  Jeffrey Stedfast  &lt;fejj@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: add ename as a SUBDIR</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-list-iterator.c, e-list.c, e-list.h: Made e_list a bit more</div><div class='del'>-	reentrant.  If a iterator gets its data pulled out from under it</div><div class='del'>-	while in a loop, it goes back one so that loops will be able to</div><div class='del'>-	continue.</div><div class='del'>-</div><div class='del'>-2000-09-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Removed all the files moved to gal.</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c: Fixed the #include lines to deal properly</div><div class='del'>-	with gal.</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-gui-utils.h: Removed all of the functionality</div><div class='del'>-	that was moved to gal.</div><div class='del'>-</div><div class='del'>-	* e-canvas-utils.c, e-canvas-utils.h, e-canvas-vbox.c,</div><div class='del'>-	e-canvas-vbox.h, e-canvas.c, e-canvas.h, e-cursors.c, e-cursors.h,</div><div class='del'>-	e-font.c, e-font.h, e-popup-menu.c, e-popup-menu.h, e-printable.c,</div><div class='del'>-	e-printable.h, e-unicode.c, e-unicode.h, e-util.c, e-util.h,</div><div class='del'>-	e-xml-utils.c, e-xml-utils.h: Moved to gal.</div><div class='del'>-</div><div class='del'>-2000-09-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c: Fixed an uninitialized variable.</div><div class='del'>-</div><div class='del'>-2000-09-12  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.c (e_utf8_to_gtk_string_sized): Use underscores</div><div class='del'>-	for untranslatable characters</div><div class='del'>-	(e_utf8_from_gtk_string_sized): Ditto</div><div class='del'>-</div><div class='del'>-2000-09-12  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c (e_font_from_gdk_font): Change this a bit so that if</div><div class='del'>-	you pass it a bold font, it puts that in font-&gt;bold and finds a</div><div class='del'>-	lighter font for font-&gt;font (if it can). This is for themes like</div><div class='del'>-	Metal where the default font is bold.</div><div class='del'>-	(find_variants): renamed from find_best_bold</div><div class='del'>-	</div><div class='del'>-2000-09-11  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c (find_best_bold): Thou shalt leave space for the</div><div class='del'>-	trailing \0.</div><div class='del'>-</div><div class='del'>-	* e-util.c (e_strstrcase): The return value should not be</div><div class='del'>-	const. (Well, unless the input was, but you can't know that.)</div><div class='del'>-</div><div class='del'>-2000-09-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.c, e-unicode.h: Added e_utf8_gtk_editable_get_text and</div><div class='del'>-	e_utf8_gtk_editable_set_text.</div><div class='del'>-</div><div class='del'>-2000-09-11  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c: Try to find real bold variant of X font, fall</div><div class='del'>-	to double stroke only if not found</div><div class='del'>-</div><div class='del'>-2000-09-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gtk-utils.c: New.</div><div class='del'>-	(e_gtk_signal_connect_full_while_alive): New.</div><div class='del'>-</div><div class='del'>-	* e-gtk-utils.h: New.</div><div class='del'>-</div><div class='del'>-2000-09-08  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.c: Use experimental 16-bit font stuff for EFonts</div><div class='del'>-</div><div class='del'>-2000-09-08  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.h: remove consts from the EPopupMenu structure: the</div><div class='del'>-	caller may want to modify its own EPopupMenu before calling</div><div class='del'>-	e_popup_menu_run.</div><div class='del'>-</div><div class='del'>-2000-09-07  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (e_dialog_editable_get): Use UTF-8</div><div class='del'>-	(e_dialog_editable_set): Use UTF-8</div><div class='del'>-</div><div class='del'>-	* e-font.c (translate_encoding): More encodings</div><div class='del'>-	(e_gdk_font_encoding): Use experimental stuff</div><div class='del'>-</div><div class='del'>-	* e-unicode.* (e_utf8_gtk_editable_insert_text): New wrapper</div><div class='del'>-	</div><div class='del'>-2000-09-07  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c (emit_event): Remove incorrect optimization.  Events</div><div class='del'>-	are read-only!</div><div class='del'>-</div><div class='del'>-2000-09-04  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.c: Added new font code, but comment it out now</div><div class='del'>-	* e-font.h, e-font.c: Test code for font analyzing</div><div class='del'>-</div><div class='del'>-2000-09-02  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h, e-unicode.c: New functions</div><div class='del'>-	e_utf8_gtk_clist_append, e_utf8_gtk_clist_set_text</div><div class='del'>-	e_unicode_init</div><div class='del'>-</div><div class='del'>-2000-08-31  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Use UTF-8</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c (g_unichar_to_utf8): glib 1.3 function</div><div class='del'>-	(gdk_keyval_to_unicode): gdk 1.3 function</div><div class='del'>-	(e_utf8_from_gdk_event_key): Use keyval, not string</div><div class='del'>-</div><div class='del'>-2000-08-30  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h: #define gnome_font_get_size and</div><div class='del'>-	gnome_font_get_width, and gnome_font_lookup_default,</div><div class='del'>-	if compiling with gnome-print 0.20</div><div class='del'>-</div><div class='del'>-2000-08-30  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_LIBADD): make e-util depend on</div><div class='del'>-	libunicode</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c (make_item): Use GtkMenuItem rather than</div><div class='del'>-	GtkPixmapMenuItem for items with no pixmaps, so that if the whole</div><div class='del'>-	menu is pixmapless, you don't get a column of blank pixmaps.</div><div class='del'>-</div><div class='del'>-2000-08-24  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c (e_utf8_gtk_menu_item_new_with_label): New wrapper</div><div class='del'>-</div><div class='del'>-2000-08-23  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c (e_utf8_strstrcase): New function</div><div class='del'>-</div><div class='del'>-2000-08-23  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (e_dialog_editable_set): Constify.</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c: e_utf8_gtk_editable_get_chars</div><div class='del'>-	e_utf8_gtk_entry_get_text</div><div class='del'>-	e_utf8_gtk_entry_set_text</div><div class='del'>-	e_utf8_to_gtk_string: New convenience functions</div><div class='del'>-</div><div class='del'>-2000-08-22  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-unicode.h:</div><div class='del'>-	* e-unicode.c: Some convenience functions to deal with Gtk+ and UTF-8</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-unicode.h, e-unicode.c</div><div class='del'>-</div><div class='del'>-2000-08-21  Lauris Kaplinski  &lt;lauris@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-font.h:</div><div class='del'>-	* e-font.c: Changed UTF-8 syntax from char-based to byte-based</div><div class='del'>-	</div><div class='del'>-2000-08-21  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Fix a booboo in the tab</div><div class='del'>-	expansion code (didn't use the new value of 'out').</div><div class='del'>-</div><div class='del'>-2000-08-19  Lauris Kaplinski  lauris@helixcode.com</div><div class='del'>-</div><div class='del'>-	* e-font.h: #define e_font_height(f) to save some space</div><div class='del'>-	</div><div class='del'>-2000-08-19  Lauris Kaplinski  lauris@helixcode.com</div><div class='del'>-</div><div class='del'>-	* e-font.h:</div><div class='del'>-	* e-font.c: Thin wrapper around GdkFont to deal with UTF-8 directly</div><div class='del'>-	Also handles bold/italic styling</div><div class='del'>-</div><div class='del'>-2000-08-14  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (scanner_config): Add "-" to be an acceptable</div><div class='del'>-	first character for an operation -- yaaay subtraction!</div><div class='del'>-</div><div class='del'>-2000-08-11  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Fix the tab expansion</div><div class='del'>-	for when the length would exceed the ten characters that</div><div class='del'>-	we allocated.</div><div class='del'>-</div><div class='del'>-2000-08-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-setup.[ch]: Remove. The shell tells the components where</div><div class='del'>-	the evolution homedir is now.</div><div class='del'>-	</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Remove e-setup.c</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): If converting both spaces and</div><div class='del'>-	newlines, then convert tabs too. The joys of pseudo-&lt;PRE&gt;.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c: Fix the bug where it truncates the last item</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c: Ooops.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added uncompiled e_read_uri function.</div><div class='del'>-</div><div class='del'>-2000-08-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c, e-popup-menu.h: Added a hide_mask argument to</div><div class='del'>-	the two popup menu functions.</div><div class='del'>-</div><div class='del'>-2000-08-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-gui-utils.c: Added</div><div class='del'>-	e_container_change_tab_order.</div><div class='del'>-</div><div class='del'>-2000-07-27  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c (e_canvas_destroy): Chain the</div><div class='del'>-	destroy handler.</div><div class='del'>-	</div><div class='del'>-2000-07-25  Peter Williams  &lt;peterw@helixcode.com&gt;	</div><div class='del'>-	</div><div class='del'>-	* e-canvas.c (emit_event): Don't bother with </div><div class='del'>-	dereferencing the event pointer.</div><div class='del'>-	(e_canvas_item_set_cursor): Reference our selection</div><div class='del'>-	item; print a debug message. Deref when destroying</div><div class='del'>-	(e_canvas_item_add_selection): Same.</div><div class='del'>-	(e_canvas_item_remove_selection): Same.</div><div class='del'>-	</div><div class='del'>-2000-07-25  Peter Williams  &lt;peterw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_static_la_LDFLAGS): Build both libraries</div><div class='del'>-	(a typo didn't build libeutil.la, only -static.)</div><div class='del'>-</div><div class='del'>-2000-07-25  Seth Alves  &lt;alves@hungry.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_static_la_LDFLAGS): build static version</div><div class='del'>-	of library for conduit to use</div><div class='del'>-</div><div class='del'>-2000-07-25  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added a bunch of e_marshal functions.</div><div class='del'>-</div><div class='del'>-2000-07-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_strstrcase function.</div><div class='del'>-</div><div class='del'>-2000-07-11  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas-vbox.c: Removed some debugging printfs.</div><div class='del'>-	</div><div class='del'>-	* e-canvas.c (e_canvas_unrealize): Call parent unrealize method.</div><div class='del'>-</div><div class='del'>-2000-07-10  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (eval_dump_result): `#if 0'ed out.</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.h (e_popup_menu_create): New prototype.</div><div class='del'>-</div><div class='del'>-2000-07-10  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c: Fix warnings.</div><div class='del'>-</div><div class='del'>-2000-07-08  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-list.c, e-list.h: Added e_list_duplicate.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_strsplit to work around a bug in</div><div class='del'>-	g_strsplit.</div><div class='del'>-</div><div class='del'>-2000-07-07  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-iterator.c, e-iterator.h, e-list-iterator.c,</div><div class='del'>-	e-list-iterator.h: Added last and insert functions.</div><div class='del'>-</div><div class='del'>-2000-07-06  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c: Added docstrings.  This file did not have</div><div class='del'>-	them at all.  EEEEEEK!</div><div class='del'>-</div><div class='del'>-2000-07-05  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_parse): Kill debugging message</div><div class='del'>-</div><div class='del'>-2000-07-03  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-iterator.c, e-iterator.h, e-list-iterator.c,</div><div class='del'>-	e-list-iterator.h, e-list.c, e-list.h: New list class with</div><div class='del'>-	iterators.</div><div class='del'>-</div><div class='del'>-	* e-canvas.c: Made it so that you don't get the same selection in</div><div class='del'>-	the selection list more than once.</div><div class='del'>-</div><div class='del'>-2000-07-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.h: #include &lt;libgnomeui/gnome-messagebox.h&gt;.  It's</div><div class='del'>-	needed to be able to pass an appropriate @type arg to</div><div class='del'>-	`e_notice()'.</div><div class='del'>-</div><div class='del'>-2000-06-29  Jody Goldberg &lt;jgoldberg@home.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c (e_canvas_init) : Init the InputContext members</div><div class='del'>-	(e_canvas_class_init) : Add a handler for unrealize.</div><div class='del'>-	(e_canvas_focus_in) : enable the input context.</div><div class='del'>-	(e_canvas_focus_out) : enable the input context.</div><div class='del'>-	(e_canvas_realize) : Create an input context.</div><div class='del'>-	(e_canvas_unrealize) : New function to release the input context.</div><div class='del'>-</div><div class='del'>-2000-06-28  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (url_extract): add ")" to the set of characters</div><div class='del'>-	to back up over at the end of a potential URL.</div><div class='del'>-</div><div class='del'>-2000-06-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (get_toggle_value): Use `value_var', not</div><div class='del'>-	`value'.</div><div class='del'>-</div><div class='del'>-2000-06-27  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am (INCLUDES): `-I$(top_srcdir)' to fix compilation</div><div class='del'>-	with builddir != srcdir.</div><div class='del'>-</div><div class='del'>-2000-06-26  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-canvas-vbox.c and e-canvas-vbox.h.</div><div class='del'>-</div><div class='del'>-	* e-canvas-vbox.c, e-canvas-vbox.h: New canvas object to act like</div><div class='del'>-	a vbox using the reflow system.</div><div class='del'>-</div><div class='del'>-2000-06-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c, e-canvas.h: Added a variable to keep track of the</div><div class='del'>-	cursor.  Set the cursor when selection_add is called.  Properly</div><div class='del'>-	unset the cursor at the right times.</div><div class='del'>-</div><div class='del'>-2000-06-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c: Grab the focus when setting the cursor.</div><div class='del'>-</div><div class='del'>-2000-06-20  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c, e-canvas.h: Built a system for doing selections</div><div class='del'>-	and/or a cursor in canvas.</div><div class='del'>-</div><div class='del'>-2000-06-13  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Changed the needed e_marshal functions.</div><div class='del'>-</div><div class='del'>-	* e-printable.c, e-printable.h: Added a quantize parameter to</div><div class='del'>-	e_printable_height.  Also, added a e_printable_will_fit function.</div><div class='del'>-	</div><div class='del'>-2000-06-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Added e-printable.c and e-printable.h.</div><div class='del'>-</div><div class='del'>-	* e-printable.c, e-printable.h: This new class is a printing</div><div class='del'>-	context.  Other classes return an EPrintable which represents a</div><div class='del'>-	context for printing that object.</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added</div><div class='del'>-	e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL and</div><div class='del'>-	e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c: Fixed e_marshal_INT__INT_INT_POINTER.</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_marshal_INT__INT_INT_POINTER.</div><div class='del'>-</div><div class='del'>-2000-06-01  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c (g_int_compare): Duh! -1 != 1. :)</div><div class='del'>-</div><div class='del'>-2000-06-01  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_term_eval): g_return_val_if_fail to prevent a crash.</div><div class='del'>-</div><div class='del'>-2000-05-30  Not Zed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_encode_bool): Utility function to build a bool</div><div class='del'>-	as part of an expression string.</div><div class='del'>-	(e_sexp_encode_string): Likewise for strings.</div><div class='del'>-</div><div class='del'>-2000-05-30  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas-utils.c, e-canvas-utils.h: Added</div><div class='del'>-	e_canvas_item_show_area which makes sure that a particular area of</div><div class='del'>-	a given item is in the scroll area.</div><div class='del'>-</div><div class='del'>-2000-05-30  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (hook_radio): Use the exported function to</div><div class='del'>-	set the value.</div><div class='del'>-	(get_radio_value): Likewise.</div><div class='del'>-	(hook_option_menu): Likewise.</div><div class='del'>-	(get_option_menu_value): Likewise.</div><div class='del'>-	(hook_toggle): Likewise.</div><div class='del'>-	(get_toggle_value): Likewise.</div><div class='del'>-	(hook_spin_button): Likewise.</div><div class='del'>-	(get_spin_button_value): Likewise.</div><div class='del'>-	(hook_editable): Likewise.</div><div class='del'>-	(get_editable_value): Likewise.</div><div class='del'>-	(e_dialog_radio_set): Radio buttons are prepended to their parent</div><div class='del'>-	group's list, so we need to flip the index around when</div><div class='del'>-	getting/setting the value.</div><div class='del'>-	(e_dialog_radio_get): Likewise.</div><div class='del'>-</div><div class='del'>-2000-05-27  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (e_dialog_editable_set): Moved over from</div><div class='del'>-	event-editor-utils.c.</div><div class='del'>-	(e_dialog_editable_get): Likewise.</div><div class='del'>-	(e_dialog_toggle_set): Likewise.</div><div class='del'>-	(e_dialog_toggle_get): Likewise.</div><div class='del'>-	(e_dialog_spin_set): Likewise.</div><div class='del'>-	(e_dialog_spin_get_double): Likewise.</div><div class='del'>-	(e_dialog_spin_get_int): Likewise.</div><div class='del'>-	(e_dialog_option_menu_set): Likewise, and added a value map.</div><div class='del'>-	(e_dialog_option_menu_get): Likewise.</div><div class='del'>-	(e_dialog_dateedit_set): Likewise.</div><div class='del'>-	(e_dialog_dateedit_get): Likewise.</div><div class='del'>-	(e_dialog_radio_set): New function.</div><div class='del'>-	(e_dialog_radio_get): New function.</div><div class='del'>-</div><div class='del'>-2000-05-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-paned.c, e-paned.h: Removed.</div><div class='del'>-</div><div class='del'>-2000-05-23  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.c (get_radio_value): Implemented.  Amazing that</div><div class='del'>-	one has to go through so much pain to get a stupid value from</div><div class='del'>-	GTK+.</div><div class='del'>-	(hook_option_menu): Implemented.  Same complaint.</div><div class='del'>-	(get_toggle_value): Implemented.</div><div class='del'>-	(get_spin_button_value): Implemented.</div><div class='del'>-	(get_entry_value): Implemented.</div><div class='del'>-	(e_dialog_widget_hook_value): Function to hook a widget to the</div><div class='del'>-	variable it will modify.</div><div class='del'>-	(e_dialog_get_values): Function to feed the variables from a</div><div class='del'>-	dialog's widgets.</div><div class='del'>-	(e_dialog_xml_widget_hook_value): Function to hook a widget from</div><div class='del'>-	a Glade file.</div><div class='del'>-</div><div class='del'>-2000-05-23  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_write_file.</div><div class='del'>-</div><div class='del'>-2000-05-19  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-dialog-widgets.[ch]: New files with utilities for hooking up</div><div class='del'>-	widgets in Glade-generated dialogs.</div><div class='del'>-</div><div class='del'>-	* Makefile.am (libeutil_la_SOURCES): Added e-dialog-widgets.[ch].</div><div class='del'>-</div><div class='del'>-2000-05-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-gui-utils.h: Added e_container_foreach_leaf.</div><div class='del'>-</div><div class='del'>-2000-05-18  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: Add imagesdir support.</div><div class='del'>-</div><div class='del'>-	* e-gui-utils.c, e-gui-utils.h: Added e_create_image_widget for</div><div class='del'>-	glade use.</div><div class='del'>-</div><div class='del'>-2000-05-16  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c: xmlGetProp appears to return malloced memory.</div><div class='del'>-	Thus we must free it.</div><div class='del'>-</div><div class='del'>-2000-05-15  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c (e_free_string_list): New function.</div><div class='del'>-</div><div class='del'>-2000-05-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_strdup_strip which returns a copy of</div><div class='del'>-	the string with the leading and trailing spaces removed.</div><div class='del'>-</div><div class='del'>-2000-05-11  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_finalise): Destroy the g_scanner when cleaning up.</div><div class='del'>-	(e_sexp_finalise): Free symbol table on finalise.</div><div class='del'>-</div><div class='del'>-2000-05-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c: Remove reflow idle when being destroyed.</div><div class='del'>-</div><div class='del'>-2000-05-06  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c: Got rid of some warnings.</div><div class='del'>-</div><div class='del'>-	* e-util.c, e-util.h: Added e_read_file which takes a filename and</div><div class='del'>-	returns a newly allocated string containing the contents of that</div><div class='del'>-	file.</div><div class='del'>-</div><div class='del'>-2000-05-03  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util.h: #include &lt;glib.h&gt; and &lt;gtk/gtktypeutils.h&gt;.</div><div class='del'>-</div><div class='del'>-	* e-util.c (e_free_object_list): New utility function.</div><div class='del'>-</div><div class='del'>-2000-05-02  Damon Chaplin  &lt;damon@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c (e_canvas_focus_in): </div><div class='del'>-	(e_canvas_focus_out): set and reset the GTK_HAS_FOCUS flag. We now get</div><div class='del'>-	focus_out events correctly.</div><div class='del'>-</div><div class='del'>-2000-05-02  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-sexp.c (e_sexp_finalise): Free the parse tree if we have one.</div><div class='del'>-	(e_sexp_parse): If we already have a parse tree, free it.</div><div class='del'>-</div><div class='del'>-2000-05-02  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Makefile.am: set G_LOG_DOMAIN.</div><div class='del'>-</div><div class='del'>-2000-05-01  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c, e-xml-utils.h: Constified all the functions.</div><div class='del'>-</div><div class='del'>-2000-04-27  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-html-utils.c (e_text_to_html): Moved here from the mailer,</div><div class='del'>-	since it's of general use, and the composer needs it too.</div><div class='del'>-</div><div class='del'>-2000-04-24  Miguel de Icaza  &lt;miguel@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-popup-menu.c: New file.  Implements easy to use popup menus. </div><div class='del'>-</div><div class='del'>-2000-04-24  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-paned.c: New file. Makes a GtkPaned with more than two</div><div class='del'>-	children.</div><div class='del'>-	* e-paned.h: same.</div><div class='del'>-</div><div class='del'>-	* Makefile.am: added e-paned.[ch].</div><div class='del'>-</div><div class='del'>-2000-04-19  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c, e-xml-utils.h: Added</div><div class='del'>-	e_xml_get_child_by_name_by_lang.</div><div class='del'>-</div><div class='del'>-2000-04-16  Anders Carlsson  &lt;andersca@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-      * e-canvas.c (e_canvas_class_init): Add realize.</div><div class='del'>-      (e_canvas_realize): Set the back pixmap to NULL to reduce flicker.</div><div class='del'>-</div><div class='del'>-2000-04-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c: Fixing a warning.</div><div class='del'>-</div><div class='del'>-2000-04-14  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-xml-utils.c: Add g_return_if_fails.</div><div class='del'>-</div><div class='del'>-2000-04-12  Miguel de Icaza  &lt;miguel@gnu.org&gt;</div><div class='del'>-</div><div class='del'>-	* e-cursors.c (e_cursor_get): Prevent next hacker to get bitten by this.</div><div class='del'>-</div><div class='del'>-2000-04-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-canvas.c: Added proper keyboard focus handling.</div><div class='del'>-</div><div class='del'>-2000-04-06  Matt Loper  &lt;matt@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-setup.c (e_setup_base_dir): Get/set Evolution's base directory</div><div class='del'>-	via gnome-config.</div><div class='del'>-	(mkdir_if_necessary): New function.</div><div class='del'>-	(e_setup_base_dir): Use mkdir_if_necessary().</div><div class='del'>-</div><div class='del'>-2000-03-22  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-sexp.h: Formatting cleanup.</div><div class='del'>-</div><div class='del'>-2000-03-07  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am (libeutil_la_SOURCES): s-sexp.h -&gt; e-sexp.h.</div><div class='del'>-</div><div class='del'>-2000-03-12  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-util/e-canvas.c, e-util/e-canvas.h: Fixed some bugs here to</div><div class='del'>-	speed up reflow and to make it fail less often.</div><div class='del'>-</div><div class='del'>-2000-03-10  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-canvas.c, e-util/e-canvas.h: Designed a new system for</div><div class='del'>-	doing hierarchical displays in the canvas.  Adds an extra idle</div><div class='del'>-	loop to the canvas system.</div><div class='del'>-</div><div class='del'>-2000-03-05  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-xml-utils.c: Fixed e_xml_set_integer_prop_by_name.</div><div class='del'>-</div><div class='del'>-2000-03-04  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added</div><div class='del'>-	e_xml_set_integer_prop_by_name.</div><div class='del'>-</div><div class='del'>-2000-02-28  NotZed  &lt;NotZed@HelixCode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-util/e-sexp.[ch]: Added.  moved from filter-sexp.[ch]</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am (libeutil_a_SOURCES): Add e-sexp.</div><div class='del'>-	(noinst_LTLIBRARIES): Changed to a libtool library.</div><div class='del'>-</div><div class='del'>-2000-02-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-xml-utils.c, e-util/e-xml-utils.h: Added</div><div class='del'>-	e_xml_get_integer_prop_by_name.</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am: Added e-util.c.</div><div class='del'>-</div><div class='del'>-	* e-util/e-util.h: Added e-util.c functions.</div><div class='del'>-</div><div class='del'>-	* e-util/e-util.c: New file for compare functions</div><div class='del'>-</div><div class='del'>-2000-02-24  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-util/e-canvas-utils.h: Fixed the comment at the top and added</div><div class='del'>-	#ifndef __E_CANVAS_UTILS__.</div><div class='del'>-</div><div class='del'>-	* e-util/Makefile.am: Added e-xml-utils.c and</div><div class='del'>-	e-xml-utils.h.</div><div class='del'>-</div><div class='del'>-	* e-util/e-xml-utils.h, e-util/e-xml-utils.c: Added files for some</div><div class='del'>-	xml utilities.</div><div class='del'>-</div><div class='del'>-	* e-util/e-util.h: Added type EFocus which describes which</div><div class='del'>-	direction the focus will be coming from.</div><div class='del'>-</div><div class='del'>-2000-02-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* e-util/e-setup.c (e_setup_base_dir): Make ~/evolution mode 700</div><div class='del'>-	rather than mode 600 (and use the symbolic name rather than the</div><div class='del'>-	number).</div><div class='del'>-	</div><div class='del'>-2000-02-09  Christopher James Lahey  &lt;clahey@helixcode.com&gt;</div><div class='del'>-	</div><div class='del'>-	* e-util/Makefile.am: Add canvas utilities to libeutil.</div><div class='del'>-</div><div class='head'>diff --git a/e-util/Makefile.am b/e-util/Makefile.am<br/>deleted file mode 100644<br/>index a2c25b0501..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,50 +0,0 @@</div><div class='del'>-SUBDIRS = . ename</div><div class='del'>-</div><div class='del'>-imagesdir = $(datadir)/images/evolution</div><div class='del'>-</div><div class='del'>-INCLUDES =					\</div><div class='del'>-	-I$(top_srcdir)				\</div><div class='del'>-	$(GNOME_INCLUDEDIR)			\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)			\</div><div class='del'>-	$(UNICODE_CFLAGS)			\</div><div class='del'>-	-DEVOLUTION_IMAGES=\""$(imagesdir)"\"	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"e-utils\"		\</div><div class='del'>-	$(UNICODE_CFLAGS)</div><div class='del'>-</div><div class='del'>-noinst_LTLIBRARIES = libeutil.la libeutil-static.la \</div><div class='del'>-	libeconduit.la libeconduit-static.la</div><div class='del'>-</div><div class='del'>-libeutil_la_SOURCES =			\</div><div class='del'>-	e-dialog-widgets.c		\</div><div class='del'>-	e-dialog-widgets.h		\</div><div class='del'>-	e-gtk-utils.c			\</div><div class='del'>-	e-gtk-utils.h			\</div><div class='del'>-	e-gui-utils.c			\</div><div class='del'>-	e-gui-utils.h			\</div><div class='del'>-	e-html-utils.c			\</div><div class='del'>-	e-html-utils.h			\</div><div class='del'>-	e-iterator.c			\</div><div class='del'>-	e-iterator.h			\</div><div class='del'>-	e-list-iterator.c		\</div><div class='del'>-	e-list-iterator.h		\</div><div class='del'>-	e-list.c			\</div><div class='del'>-	e-list.h			\</div><div class='del'>-	e-sexp.c			\</div><div class='del'>-	e-sexp.h			\</div><div class='del'>-	md5-utils.c			\</div><div class='del'>-	md5-utils.h</div><div class='del'>-</div><div class='del'>-libeutil_la_LIBADD = $(UNICODE_LIBS)</div><div class='del'>-</div><div class='del'>-libeutil_static_la_SOURCES = $(libeutil_la_SOURCES)</div><div class='del'>-libeutil_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-libeconduit_la_SOURCES =		\</div><div class='del'>-	e-pilot-map.c			\</div><div class='del'>-	e-pilot-map.h</div><div class='del'>-</div><div class='del'>-libeconduit_static_la_SOURCES = $(libeconduit_la_SOURCES)</div><div class='del'>-libeconduit_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-dialog-widgets.c b/e-util/e-dialog-widgets.c<br/>deleted file mode 100644<br/>index 2a564cbc19..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-dialog-widgets.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-dialog-widgets.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,826 +0,0 @@</div><div class='del'>-/* Evolution internal utilities - Glade dialog widget utilities</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@gimp.org&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;math.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkmenuitem.h&gt;</div><div class='del'>-#include &lt;gtk/gtkoptionmenu.h&gt;</div><div class='del'>-#include &lt;gtk/gtkradiobutton.h&gt;</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtk/gtkspinbutton.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-dateedit.h&gt;</div><div class='del'>-#include "e-dialog-widgets.h"</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* A widget, a pointer to the variable it will modify, and extra information */</div><div class='del'>-typedef struct {</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-	gpointer value_var;</div><div class='del'>-	gpointer info;</div><div class='del'>-} WidgetHook;</div><div class='del'>-</div><div class='del'>-/* Hook information for a complete dialog */</div><div class='del'>-typedef struct {</div><div class='del'>-	GSList *whooks;</div><div class='del'>-} DialogHooks;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Destroy handler for the dialog; frees the dialog hooks */</div><div class='del'>-static void</div><div class='del'>-dialog_destroy_cb (GtkObject *dialog, gpointer data)</div><div class='del'>-{</div><div class='del'>-	DialogHooks *hooks;</div><div class='del'>-</div><div class='del'>-	hooks = data;</div><div class='del'>-</div><div class='del'>-	g_slist_free (hooks-&gt;whooks);</div><div class='del'>-	hooks-&gt;whooks = NULL;</div><div class='del'>-</div><div class='del'>-	g_free (hooks);</div><div class='del'>-	gtk_object_set_data (dialog, "dialog-hooks", NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Ensures that the dialog has the necessary attached data to store the widget</div><div class='del'>- * hook information.</div><div class='del'>- */</div><div class='del'>-static DialogHooks *</div><div class='del'>-get_dialog_hooks (GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	DialogHooks *hooks;</div><div class='del'>-</div><div class='del'>-	hooks = gtk_object_get_data (GTK_OBJECT (dialog), "dialog-hooks");</div><div class='del'>-	if (!hooks) {</div><div class='del'>-		hooks = g_new0 (DialogHooks, 1);</div><div class='del'>-		gtk_object_set_data (GTK_OBJECT (dialog), "dialog-hooks", hooks);</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (dialog), "destroy",</div><div class='del'>-				    GTK_SIGNAL_FUNC (dialog_destroy_cb), hooks);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return hooks;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts an mapped value to the appropriate index in an item group.  The</div><div class='del'>- * values for the items are provided as a -1-terminated array.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-value_to_index (const int *value_map, int value)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; value_map[i] != -1; i++)</div><div class='del'>-		if (value_map[i] == value)</div><div class='del'>-			return i;</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Converts an index in an item group to the appropriate mapped value.  See the</div><div class='del'>- * function above.</div><div class='del'>- */</div><div class='del'>-static int</div><div class='del'>-index_to_value (const int *value_map, int index)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	/* We do this the hard way, i.e. not as a simple array reference, to</div><div class='del'>-	 * check for correctness.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	for (i = 0; value_map[i] != -1; i++)</div><div class='del'>-		if (i == index)</div><div class='del'>-			return value_map[i];</div><div class='del'>-</div><div class='del'>-	return -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "toggled" signal of toggle buttons */</div><div class='del'>-static void</div><div class='del'>-toggled_cb (GtkToggleButton *toggle, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePropertyBox *pbox;</div><div class='del'>-</div><div class='del'>-	pbox = GNOME_PROPERTY_BOX (data);</div><div class='del'>-</div><div class='del'>-	/* For radio buttons, we only notify the property box if the button is</div><div class='del'>-	 * active, because we'll get one call for each of the changed buttons in</div><div class='del'>-	 * the radio group.</div><div class='del'>-	 */</div><div class='del'>-	if (!GTK_IS_RADIO_BUTTON (toggle) || toggle-&gt;active)</div><div class='del'>-		gnome_property_box_changed (pbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks a radio button group */</div><div class='del'>-static void</div><div class='del'>-hook_radio (GtkWidget *dialog, GtkRadioButton *radio, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	GSList *group;</div><div class='del'>-	GSList *l;</div><div class='del'>-	int *value;</div><div class='del'>-	const int *value_map;</div><div class='del'>-</div><div class='del'>-	group = gtk_radio_button_group (radio);</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (int *) value_var;</div><div class='del'>-	value_map = (const int *) info;</div><div class='del'>-</div><div class='del'>-	e_dialog_radio_set (GTK_WIDGET (radio), *value, value_map);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog))</div><div class='del'>-		for (l = group; l; l = l-&gt;next)</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (l-&gt;data), "toggled",</div><div class='del'>-					    GTK_SIGNAL_FUNC (toggled_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of a radio button group */</div><div class='del'>-static void</div><div class='del'>-get_radio_value (GtkRadioButton *radio, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	int *value;</div><div class='del'>-	const int *value_map;</div><div class='del'>-</div><div class='del'>-	value = (int *) value_var;</div><div class='del'>-	value_map = (const int *) info;</div><div class='del'>-</div><div class='del'>-	*value = e_dialog_radio_get (GTK_WIDGET (radio), value_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "activate" signal of menu items */</div><div class='del'>-static void</div><div class='del'>-activate_cb (GtkMenuItem *item, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePropertyBox *pbox;</div><div class='del'>-</div><div class='del'>-	pbox = GNOME_PROPERTY_BOX (data);</div><div class='del'>-	gnome_property_box_changed (pbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks an option menu */</div><div class='del'>-static void</div><div class='del'>-hook_option_menu (GtkWidget *dialog, GtkOptionMenu *omenu, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	int *value;</div><div class='del'>-	const int *value_map;</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (int *) value_var;</div><div class='del'>-	value_map = (const int *) info;</div><div class='del'>-</div><div class='del'>-	e_dialog_option_menu_set (GTK_WIDGET (omenu), *value, value_map);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog)) {</div><div class='del'>-		GtkMenu *menu;</div><div class='del'>-		GList *l;</div><div class='del'>-</div><div class='del'>-		menu = GTK_MENU (gtk_option_menu_get_menu (omenu));</div><div class='del'>-</div><div class='del'>-		for (l = GTK_MENU_SHELL (menu)-&gt;children; l; l = l-&gt;next)</div><div class='del'>-			gtk_signal_connect (GTK_OBJECT (l-&gt;data), "activate",</div><div class='del'>-					    GTK_SIGNAL_FUNC (activate_cb), dialog);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of an option menu */</div><div class='del'>-static void</div><div class='del'>-get_option_menu_value (GtkOptionMenu *omenu, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	int *value;</div><div class='del'>-	const int *value_map;</div><div class='del'>-</div><div class='del'>-	value = (int *) value_var;</div><div class='del'>-	value_map = (const int *) info;</div><div class='del'>-</div><div class='del'>-	*value = e_dialog_option_menu_get (GTK_WIDGET (omenu), value_map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks a toggle button */</div><div class='del'>-static void</div><div class='del'>-hook_toggle (GtkWidget *dialog, GtkToggleButton *toggle, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	gboolean *value;</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (gboolean *) value_var;</div><div class='del'>-	e_dialog_toggle_set (GTK_WIDGET (toggle), *value);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog))</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (toggle), "toggled",</div><div class='del'>-				    GTK_SIGNAL_FUNC (toggled_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of a toggle button */</div><div class='del'>-static void</div><div class='del'>-get_toggle_value (GtkToggleButton *toggle, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	gboolean *value;</div><div class='del'>-</div><div class='del'>-	value = (gboolean *) value_var;</div><div class='del'>-	*value = e_dialog_toggle_get (GTK_WIDGET (toggle));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "value_changed" signal of the adjustment of a spin button */</div><div class='del'>-static void</div><div class='del'>-value_changed_cb (GtkAdjustment *adj, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePropertyBox *pbox;</div><div class='del'>-</div><div class='del'>-	pbox = GNOME_PROPERTY_BOX (data);</div><div class='del'>-	gnome_property_box_changed (pbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks a spin button */</div><div class='del'>-static void</div><div class='del'>-hook_spin_button (GtkWidget *dialog, GtkSpinButton *spin, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	double *value;</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (double *) value_var;</div><div class='del'>-	e_dialog_spin_set (GTK_WIDGET (spin), *value);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (spin);</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog))</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (adj), "value_changed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (value_changed_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of a spin button */</div><div class='del'>-static void</div><div class='del'>-get_spin_button_value (GtkSpinButton *spin, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	double *value;</div><div class='del'>-</div><div class='del'>-	value = (double *) value_var;</div><div class='del'>-	*value = e_dialog_spin_get_double (GTK_WIDGET (spin));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Callback for the "changed" signal of a GtkEditable widget */</div><div class='del'>-static void</div><div class='del'>-changed_cb (GtkEditable *editable, gpointer data)</div><div class='del'>-{</div><div class='del'>-	GnomePropertyBox *pbox;</div><div class='del'>-</div><div class='del'>-	pbox = GNOME_PROPERTY_BOX (data);</div><div class='del'>-	gnome_property_box_changed (pbox);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Hooks a GtkEditable widget */</div><div class='del'>-static void</div><div class='del'>-hook_editable (GtkWidget *dialog, GtkEditable *editable, gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	char **value;</div><div class='del'>-</div><div class='del'>-	/* Set the value */</div><div class='del'>-</div><div class='del'>-	value = (char **) value_var;</div><div class='del'>-</div><div class='del'>-	e_dialog_editable_set (GTK_WIDGET (editable), *value);</div><div class='del'>-</div><div class='del'>-	/* Hook to changed */</div><div class='del'>-</div><div class='del'>-	if (GNOME_IS_PROPERTY_BOX (dialog))</div><div class='del'>-		gtk_signal_connect (GTK_OBJECT (editable), "changed",</div><div class='del'>-				    GTK_SIGNAL_FUNC (changed_cb), dialog);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Gets the value of a GtkEditable widget */</div><div class='del'>-static void</div><div class='del'>-get_editable_value (GtkEditable *editable, gpointer value_var, gpointer data)</div><div class='del'>-{</div><div class='del'>-	char **value;</div><div class='del'>-</div><div class='del'>-	value = (char **) value_var;</div><div class='del'>-	if (*value)</div><div class='del'>-		g_free (*value);</div><div class='del'>-</div><div class='del'>-	*value = e_dialog_editable_get (GTK_WIDGET (editable));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_editable_set:</div><div class='del'>- * @widget: A #GtkEditable widget.</div><div class='del'>- * @value: String value.</div><div class='del'>- * </div><div class='del'>- * Sets the string value inside a #GtkEditable-derived widget.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_editable_set (GtkWidget *widget, const char *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_EDITABLE (widget));</div><div class='del'>-</div><div class='del'>-	gtk_editable_delete_text (GTK_EDITABLE (widget), 0, -1);</div><div class='del'>-</div><div class='del'>-	if (value) {</div><div class='del'>-		gint pos;</div><div class='del'>-</div><div class='del'>-		pos = 0;</div><div class='del'>-		e_utf8_gtk_editable_insert_text (GTK_EDITABLE (widget), value, strlen (value), &amp;pos);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_editable_get:</div><div class='del'>- * @widget: A #GtkEditable widget.</div><div class='del'>- * </div><div class='del'>- * Queries the string value inside a #GtkEditable-derived widget.</div><div class='del'>- * </div><div class='del'>- * Return value: String value.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_dialog_editable_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (widget != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_EDITABLE (widget), NULL);</div><div class='del'>-</div><div class='del'>-	return e_utf8_gtk_editable_get_chars (GTK_EDITABLE (widget), 0, -1);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_radio_set:</div><div class='del'>- * @widget: A #GtkRadioButton in a radio button group.</div><div class='del'>- * @value: Enumerated value.</div><div class='del'>- * @value_map: Map from enumeration values to array indices.</div><div class='del'>- * </div><div class='del'>- * Sets the selected item in a radio group.  The specified @widget can be any of</div><div class='del'>- * the #GtkRadioButtons in the group.  Each radio button should correspond to an</div><div class='del'>- * enumeration value; the specified @value will be mapped to an integer from</div><div class='del'>- * zero to the number of items in the group minus 1 by using a mapping table</div><div class='del'>- * specified in @value_map.  The last element in this table should be -1.  Thus</div><div class='del'>- * a table to map three possible interpolation values to integers could be</div><div class='del'>- * specified as { NEAREST_NEIGHBOR, BILINEAR, HYPERBOLIC, -1 }.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map)</div><div class='del'>-{</div><div class='del'>-	GSList *group;</div><div class='del'>-	int i;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_RADIO_BUTTON (widget));</div><div class='del'>-	g_return_if_fail (value_map != NULL);</div><div class='del'>-</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	i = value_to_index (value_map, value);</div><div class='del'>-	if (i != -1) {</div><div class='del'>-		/* Groups are built by prepending items, so the list ends up in reverse</div><div class='del'>-		 * order; we need to flip the index around.</div><div class='del'>-		 */</div><div class='del'>-		i = g_slist_length (group) - i - 1;</div><div class='del'>-</div><div class='del'>-		l = g_slist_nth (group, i);</div><div class='del'>-		if (!l)</div><div class='del'>-			g_message ("e_dialog_radio_set(): could not find index %d in radio group!",</div><div class='del'>-				   i);</div><div class='del'>-</div><div class='del'>-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (l-&gt;data), TRUE);</div><div class='del'>-	} else</div><div class='del'>-		g_message ("e_dialog_radio_set(): could not find value %d in value map!",</div><div class='del'>-			   value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_radio_get:</div><div class='del'>- * @widget: A #GtkRadioButton in a radio button group.</div><div class='del'>- * @value_map: Map from enumeration values to array indices.</div><div class='del'>- * </div><div class='del'>- * Queries the selected item in a #GtkRadioButton group.  Please read the</div><div class='del'>- * description of e_dialog_radio_set() to see how @value_map maps enumeration</div><div class='del'>- * values to button indices.</div><div class='del'>- * </div><div class='del'>- * Return value: Enumeration value which corresponds to the selected item in the</div><div class='del'>- * radio group.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_dialog_radio_get (GtkWidget *widget, const int *value_map)</div><div class='del'>-{</div><div class='del'>-	GSList *group;</div><div class='del'>-	GSList *l;</div><div class='del'>-	int i;</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_RADIO_BUTTON (widget), -1);</div><div class='del'>-	g_return_val_if_fail (value_map != NULL, -1);</div><div class='del'>-</div><div class='del'>-	group = gtk_radio_button_group (GTK_RADIO_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	for (i = 0, l = group; l; l = l-&gt;next, i++) {</div><div class='del'>-		widget = GTK_WIDGET (l-&gt;data);</div><div class='del'>-</div><div class='del'>-		if (GTK_TOGGLE_BUTTON (widget)-&gt;active)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!l)</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	/* Groups are built by prepending items, so the list ends up in reverse</div><div class='del'>-	 * order; we need to flip the index around.</div><div class='del'>-	 */</div><div class='del'>-	i = g_slist_length (group) - i - 1;</div><div class='del'>-</div><div class='del'>-	v = index_to_value (value_map, i);</div><div class='del'>-	if (v == -1) {</div><div class='del'>-		g_message ("e_dialog_radio_get(): could not find index %d in value map!", i);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_toggle_set:</div><div class='del'>- * @widget: A #GtkToggleButton.</div><div class='del'>- * @value: Toggle value.</div><div class='del'>- * </div><div class='del'>- * Sets the value of a #GtkToggleButton-derived widget.  This should not be used</div><div class='del'>- * for radio buttons; it is more convenient to use use e_dialog_radio_set()</div><div class='del'>- * instead.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_toggle_set (GtkWidget *widget, gboolean value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_TOGGLE_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_toggle_get:</div><div class='del'>- * @widget: A #GtkToggleButton.</div><div class='del'>- * </div><div class='del'>- * Queries the value of a #GtkToggleButton-derived widget.  This should not be</div><div class='del'>- * used for radio buttons; it is more convenient to use e_dialog_radio_get()</div><div class='del'>- * instead.</div><div class='del'>- * </div><div class='del'>- * Return value: Toggle value.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_dialog_toggle_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_TOGGLE_BUTTON (widget), FALSE);</div><div class='del'>-</div><div class='del'>-	return GTK_TOGGLE_BUTTON (widget)-&gt;active;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_spin_set:</div><div class='del'>- * @widget: A #GtkSpinButton.</div><div class='del'>- * @value: Numeric value.</div><div class='del'>- * </div><div class='del'>- * Sets the value of a #GtkSpinButton widget.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_spin_set (GtkWidget *widget, double value)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_SPIN_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));</div><div class='del'>-</div><div class='del'>-	adj-&gt;value = value;</div><div class='del'>-	gtk_signal_emit_by_name (GTK_OBJECT (adj), "value_changed");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_spin_get_double:</div><div class='del'>- * @widget: A #GtkSpinButton.</div><div class='del'>- * </div><div class='del'>- * Queries the floating-point value of a #GtkSpinButton widget.</div><div class='del'>- * </div><div class='del'>- * Return value: Numeric value.</div><div class='del'>- **/</div><div class='del'>-double</div><div class='del'>-e_dialog_spin_get_double (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	GtkAdjustment *adj;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, 0.0);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), 0.0);</div><div class='del'>-</div><div class='del'>-	adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget));</div><div class='del'>-	return adj-&gt;value;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_spin_get_int:</div><div class='del'>- * @widget: A #GtkSpinButton.</div><div class='del'>- * </div><div class='del'>- * Queries the integer value of a #GtkSpinButton widget.</div><div class='del'>- * </div><div class='del'>- * Return value: Numeric value.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_dialog_spin_get_int (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	double value;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_SPIN_BUTTON (widget), -1);</div><div class='del'>-</div><div class='del'>-	value = e_dialog_spin_get_double (widget);</div><div class='del'>-	return (int) floor (value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_option_menu_set:</div><div class='del'>- * @widget: A #GtkOptionMenu.</div><div class='del'>- * @value: Enumerated value.</div><div class='del'>- * @value_map: Map from enumeration values to array indices.</div><div class='del'>- * </div><div class='del'>- * Sets the selected item in a #GtkOptionMenu.  Please read the description of</div><div class='del'>- * e_dialog_radio_set() to see how @value_map maps enumeration values to item</div><div class='del'>- * indices.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_OPTION_MENU (widget));</div><div class='del'>-	g_return_if_fail (value_map != NULL);</div><div class='del'>-</div><div class='del'>-	i = value_to_index (value_map, value);</div><div class='del'>-</div><div class='del'>-	if (i != -1)</div><div class='del'>-		gtk_option_menu_set_history (GTK_OPTION_MENU (widget), i);</div><div class='del'>-	else</div><div class='del'>-		g_message ("e_dialog_option_menu_set(): could not find value %d in value map!",</div><div class='del'>-			   value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_option_menu_get:</div><div class='del'>- * @widget: A #GtkOptionMenu.</div><div class='del'>- * @value_map: Map from enumeration values to array indices.</div><div class='del'>- * </div><div class='del'>- * Queries the selected item in a #GtkOptionMenu.  Please read the description</div><div class='del'>- * of e_dialog_radio_set() to see how @value_map maps enumeration values to item</div><div class='del'>- * indices.</div><div class='del'>- * </div><div class='del'>- * Return value: Enumeration value which corresponds to the selected item in the</div><div class='del'>- * option menu.</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_dialog_option_menu_get (GtkWidget *widget, const int *value_map)</div><div class='del'>-{</div><div class='del'>-	GtkMenu *menu;</div><div class='del'>-	GtkWidget *active;</div><div class='del'>-	GList *children;</div><div class='del'>-	GList *l;</div><div class='del'>-	int i;</div><div class='del'>-	int v;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (widget != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_OPTION_MENU (widget), -1);</div><div class='del'>-	g_return_val_if_fail (value_map != NULL, -1);</div><div class='del'>-</div><div class='del'>-	menu = GTK_MENU (gtk_option_menu_get_menu (GTK_OPTION_MENU (widget)));</div><div class='del'>-</div><div class='del'>-	active = gtk_menu_get_active (menu);</div><div class='del'>-	g_assert (active != NULL);</div><div class='del'>-</div><div class='del'>-	children = GTK_MENU_SHELL (menu)-&gt;children;</div><div class='del'>-</div><div class='del'>-	for (i = 0, l = children; l; l = l-&gt;next, i++) {</div><div class='del'>-		if (GTK_WIDGET (l-&gt;data) == active)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!l)</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-</div><div class='del'>-	v = index_to_value (value_map, i);</div><div class='del'>-	if (v == -1) {</div><div class='del'>-		g_message ("e_dialog_option_menu_get(): could not find index %d in value map!", i);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return v;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_dateedit_set:</div><div class='del'>- * @widget: A #GnomeDateEdit widget.</div><div class='del'>- * @t: Date/time value.</div><div class='del'>- * </div><div class='del'>- * Sets the value of a #GnomeDateEdit widget.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_dateedit_set (GtkWidget *widget, time_t t)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (widget != NULL);</div><div class='del'>-	g_return_if_fail (GNOME_IS_DATE_EDIT (widget));</div><div class='del'>-</div><div class='del'>-	gnome_date_edit_set_time (GNOME_DATE_EDIT (widget), t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_dateedit_get:</div><div class='del'>- * @widget: A #GnomeDateEdit widget.</div><div class='del'>- * </div><div class='del'>- * Queries the value of a #GnomeDateEdit widget.</div><div class='del'>- * </div><div class='del'>- * Return value: Date/time value.</div><div class='del'>- **/</div><div class='del'>-time_t</div><div class='del'>-e_dialog_dateedit_get (GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail (widget != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (GNOME_IS_DATE_EDIT (widget), -1);</div><div class='del'>-</div><div class='del'>-	return gnome_date_edit_get_date (GNOME_DATE_EDIT (widget));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_widget_hook_value:</div><div class='del'>- * @dialog: Dialog box in which the @widget lives in.</div><div class='del'>- * @widget: A widget that will control a variable.</div><div class='del'>- * @value_var: Pointer to the variable that the @widget will control.</div><div class='del'>- * @info: NULL for most widgets, or an integer value map array (see</div><div class='del'>- * e_dialog_radio_set() for details).</div><div class='del'>- * </div><div class='del'>- * Hooks a widget from a dialog box to the variable it will modify.  Supported</div><div class='del'>- * widgets are:  #GtkEditable (char *), #GtkRadioButton (int/value_map pair; see</div><div class='del'>- * e_dialog_radio_set() for more information), #GtkTogglebutton (gboolean),</div><div class='del'>- * #GtkSpinButton (double), #GtkOptionMenu (int/value_map pair), and</div><div class='del'>- * #GnomeDateEdit (time_t).</div><div class='del'>- *</div><div class='del'>- * A pointer to the appropriate variable to modify should be passed in @value_var.</div><div class='del'>- * For values that take a value_map array as well, it should be passed in @info.</div><div class='del'>- *</div><div class='del'>- * The widgets within a dialog that are hooked with this function will set their</div><div class='del'>- * respective variables only when e_dialog_get_values() is called.  The typical</div><div class='del'>- * use is to call that function in the handler for the "OK" button of a dialog</div><div class='del'>- * box.</div><div class='del'>- *</div><div class='del'>- * In addition, if the specified @dialog is a #GnomePropertyBox, the widgets wil</div><div class='del'>- * automatically turn on the "Apply" button of the property box when they are</div><div class='del'>- * modified by the user.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the type of the specified @widget is supported, FALSE</div><div class='del'>- * otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,</div><div class='del'>-			    gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	DialogHooks *hooks;</div><div class='del'>-	WidgetHook *wh;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (dialog != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (widget != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE);</div><div class='del'>-	g_return_val_if_fail (value_var != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	hooks = get_dialog_hooks (dialog);</div><div class='del'>-</div><div class='del'>-	/* First check if it is a "group" widget, like a radio button or an</div><div class='del'>-	 * option menu.  Then we check for normal ungrouped widgets.</div><div class='del'>-	 */</div><div class='del'>-</div><div class='del'>-	if (GTK_IS_RADIO_BUTTON (widget))</div><div class='del'>-		hook_radio (dialog, GTK_RADIO_BUTTON (widget), value_var, info);</div><div class='del'>-	else if (GTK_IS_OPTION_MENU (widget))</div><div class='del'>-		hook_option_menu (dialog, GTK_OPTION_MENU (widget), value_var, info);</div><div class='del'>-	else if (GTK_IS_TOGGLE_BUTTON (widget))</div><div class='del'>-		hook_toggle (dialog, GTK_TOGGLE_BUTTON (widget), value_var, info);</div><div class='del'>-	else if (GTK_IS_SPIN_BUTTON (widget))</div><div class='del'>-		hook_spin_button (dialog, GTK_SPIN_BUTTON (widget), value_var, info);</div><div class='del'>-	else if (GTK_IS_EDITABLE (widget))</div><div class='del'>-		hook_editable (dialog, GTK_EDITABLE (widget), value_var, info);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	wh = g_new (WidgetHook, 1);</div><div class='del'>-	wh-&gt;widget = widget;</div><div class='del'>-	wh-&gt;value_var = value_var;</div><div class='del'>-	wh-&gt;info = info;</div><div class='del'>-</div><div class='del'>-	hooks-&gt;whooks = g_slist_prepend (hooks-&gt;whooks, wh);</div><div class='del'>-</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_get_values:</div><div class='del'>- * @dialog: A dialog box whose widgets have been hooked to the appropriate</div><div class='del'>- * variables with e_dialog_widget_hook_value().</div><div class='del'>- * </div><div class='del'>- * Makes every widget in a @dialog that was hooked with</div><div class='del'>- * e_dialog_widget_hook_value() apply its value to its corresponding variable.</div><div class='del'>- * The typical usage is to call this function in the handler for the "OK" button</div><div class='del'>- * of a dialog box.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_dialog_get_values (GtkWidget *dialog)</div><div class='del'>-{</div><div class='del'>-	DialogHooks *hooks;</div><div class='del'>-	GSList *l;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (dialog != NULL);</div><div class='del'>-</div><div class='del'>-	hooks = get_dialog_hooks (dialog);</div><div class='del'>-</div><div class='del'>-	for (l = hooks-&gt;whooks; l; l = l-&gt;next) {</div><div class='del'>-		WidgetHook *wh;</div><div class='del'>-</div><div class='del'>-		wh = l-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (GTK_IS_RADIO_BUTTON (wh-&gt;widget))</div><div class='del'>-			get_radio_value (GTK_RADIO_BUTTON (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else if (GTK_IS_OPTION_MENU (wh-&gt;widget))</div><div class='del'>-			get_option_menu_value (GTK_OPTION_MENU (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else if (GTK_IS_TOGGLE_BUTTON (wh-&gt;widget))</div><div class='del'>-			get_toggle_value (GTK_TOGGLE_BUTTON (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else if (GTK_IS_SPIN_BUTTON (wh-&gt;widget))</div><div class='del'>-			get_spin_button_value (GTK_SPIN_BUTTON (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else if (GTK_IS_EDITABLE (wh-&gt;widget))</div><div class='del'>-			get_editable_value (GTK_EDITABLE (wh-&gt;widget), wh-&gt;value_var, wh-&gt;info);</div><div class='del'>-		else</div><div class='del'>-			g_assert_not_reached ();</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_dialog_xml_widget_hook_value:</div><div class='del'>- * @xml: Glade XML description of a dialog box.</div><div class='del'>- * @dialog: Dialog box in which the widget lives in.</div><div class='del'>- * @widget_name: Name of the widget in the Glade XML data.</div><div class='del'>- * @value_var: Pointer to the variable that the widget will control.</div><div class='del'>- * @info: NULL for most widgets, or an integer value map array (see</div><div class='del'>- * e_dialog_radio_set() for details).</div><div class='del'>- * </div><div class='del'>- * Similar to e_dialog_widget_hook_value(), but uses the widget from a #GladeXML</div><div class='del'>- * data structure.</div><div class='del'>- * </div><div class='del'>- * Return value: TRUE if the type of the specified widget is supported, FALSE</div><div class='del'>- * otherwise.</div><div class='del'>- **/</div><div class='del'>-gboolean</div><div class='del'>-e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name,</div><div class='del'>-				gpointer value_var, gpointer info)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *widget;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (xml != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (GLADE_IS_XML (xml), FALSE);</div><div class='del'>-	g_return_val_if_fail (dialog != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (widget_name != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (value_var != NULL, FALSE);</div><div class='del'>-</div><div class='del'>-	widget = glade_xml_get_widget (xml, widget_name);</div><div class='del'>-	if (!widget) {</div><div class='del'>-		g_message ("e_dialog_xml_widget_hook_value(): could not find widget `%s' in "</div><div class='del'>-			   "Glade data!", widget_name);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return e_dialog_widget_hook_value (dialog, widget, value_var, info);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-dialog-widgets.h b/e-util/e-dialog-widgets.h<br/>deleted file mode 100644<br/>index 7ace238d1f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-dialog-widgets.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-dialog-widgets.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,60 +0,0 @@</div><div class='del'>-/* Evolution internal utilities - Glade dialog widget utilities</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Author: Federico Mena-Quintero &lt;federico@gimp.org&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 E_DIALOG_WIDGETS_H</div><div class='del'>-#define E_DIALOG_WIDGETS_H</div><div class='del'>-</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;glade/glade.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-propertybox.h&gt;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void e_dialog_editable_set (GtkWidget *widget, const char *value);</div><div class='del'>-char *e_dialog_editable_get (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-void e_dialog_radio_set (GtkWidget *widget, int value, const int *value_map);</div><div class='del'>-int e_dialog_radio_get (GtkWidget *widget, const int *value_map);</div><div class='del'>-</div><div class='del'>-void e_dialog_toggle_set (GtkWidget *widget, gboolean value);</div><div class='del'>-gboolean e_dialog_toggle_get (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-void e_dialog_spin_set (GtkWidget *widget, double value);</div><div class='del'>-double e_dialog_spin_get_double (GtkWidget *widget);</div><div class='del'>-int e_dialog_spin_get_int (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-void e_dialog_option_menu_set (GtkWidget *widget, int value, const int *value_map);</div><div class='del'>-int e_dialog_option_menu_get (GtkWidget *widget, const int *value_map);</div><div class='del'>-</div><div class='del'>-void e_dialog_dateedit_set (GtkWidget *widget, time_t t);</div><div class='del'>-time_t e_dialog_dateedit_get (GtkWidget *widget);</div><div class='del'>-</div><div class='del'>-gboolean e_dialog_widget_hook_value (GtkWidget *dialog, GtkWidget *widget,</div><div class='del'>-				     gpointer value_var, gpointer info);</div><div class='del'>-</div><div class='del'>-void e_dialog_get_values (GtkWidget *dialog);</div><div class='del'>-</div><div class='del'>-gboolean e_dialog_xml_widget_hook_value (GladeXML *xml, GtkWidget *dialog, const char *widget_name,</div><div class='del'>-					 gpointer value_var, gpointer info);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-gtk-utils.c b/e-util/e-gtk-utils.c<br/>deleted file mode 100644<br/>index 3cca1d0789..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-gtk-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-gtk-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,106 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-gtk-utils.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "e-gtk-utils.h"</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* (Cut and pasted from Gtk.)  */</div><div class='del'>-</div><div class='del'>-typedef struct DisconnectInfo {</div><div class='del'>-	unsigned int signal_handler;</div><div class='del'>-</div><div class='del'>-	GtkObject *object1;</div><div class='del'>-	unsigned int disconnect_handler1;</div><div class='del'>-</div><div class='del'>-	GtkObject *object2;</div><div class='del'>-	unsigned int disconnect_handler2;</div><div class='del'>-} DisconnectInfo;</div><div class='del'>-</div><div class='del'>-static unsigned int</div><div class='del'>-alive_disconnecter (GtkObject *object,</div><div class='del'>-		    DisconnectInfo *info)</div><div class='del'>-{</div><div class='del'>-	g_assert (info != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_signal_disconnect (info-&gt;object1, info-&gt;disconnect_handler1);</div><div class='del'>-	gtk_signal_disconnect (info-&gt;object1, info-&gt;signal_handler);</div><div class='del'>-	gtk_signal_disconnect (info-&gt;object2, info-&gt;disconnect_handler2);</div><div class='del'>-	</div><div class='del'>-	g_free (info);</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_gtk_signal_connect_full_while_alive:</div><div class='del'>- * @object: </div><div class='del'>- * @name: </div><div class='del'>- * @func: </div><div class='del'>- * @marshal: </div><div class='del'>- * @data: </div><div class='del'>- * @destroy_func: </div><div class='del'>- * @object_signal: </div><div class='del'>- * @after: </div><div class='del'>- * @alive_object: </div><div class='del'>- * </div><div class='del'>- * Connect a signal like `gtk_signal_connect_while_alive()', but with full</div><div class='del'>- * params like `gtk_signal_connect_full()'.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_gtk_signal_connect_full_while_alive (GtkObject *object,</div><div class='del'>-				       const char *name,</div><div class='del'>-				       GtkSignalFunc func,</div><div class='del'>-				       GtkCallbackMarshal marshal,</div><div class='del'>-				       void *data,</div><div class='del'>-				       GtkDestroyNotify destroy_func,</div><div class='del'>-				       gboolean object_signal,</div><div class='del'>-				       gboolean after,</div><div class='del'>-				       GtkObject *alive_object)</div><div class='del'>-{</div><div class='del'>-	DisconnectInfo *info;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (GTK_IS_OBJECT (object));</div><div class='del'>-	g_return_if_fail (name != NULL);</div><div class='del'>-	g_return_if_fail (func != NULL);</div><div class='del'>-	g_return_if_fail (GTK_IS_OBJECT (alive_object));</div><div class='del'>-	</div><div class='del'>-	info = g_new (DisconnectInfo, 1);</div><div class='del'>-</div><div class='del'>-	info-&gt;signal_handler = gtk_signal_connect_full (object, name,</div><div class='del'>-							func, marshal, data,</div><div class='del'>-							destroy_func,</div><div class='del'>-							object_signal, after);</div><div class='del'>-</div><div class='del'>-	info-&gt;object1 = object;</div><div class='del'>-	info-&gt;disconnect_handler1 = gtk_signal_connect (object, "destroy",</div><div class='del'>-							GTK_SIGNAL_FUNC (alive_disconnecter), info);</div><div class='del'>-</div><div class='del'>-	info-&gt;object2 = alive_object;</div><div class='del'>-	info-&gt;disconnect_handler2 = gtk_signal_connect (alive_object, "destroy",</div><div class='del'>-							GTK_SIGNAL_FUNC (alive_disconnecter), info);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-gtk-utils.h b/e-util/e-gtk-utils.h<br/>deleted file mode 100644<br/>index 0dc6b68512..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-gtk-utils.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-gtk-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,39 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-gtk-utils.c</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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_GTK_UTILS_H</div><div class='del'>-#define E_GTK_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-void  e_gtk_signal_connect_full_while_alive  (GtkObject          *object,</div><div class='del'>-					      const char         *name,</div><div class='del'>-					      GtkSignalFunc       func,</div><div class='del'>-					      GtkCallbackMarshal  marshal,</div><div class='del'>-					      void               *data,</div><div class='del'>-					      GtkDestroyNotify    destroy_func,</div><div class='del'>-					      gboolean            object_signal,</div><div class='del'>-					      gboolean            after,</div><div class='del'>-					      GtkObject          *alive_object);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-gui-utils.c b/e-util/e-gui-utils.c<br/>deleted file mode 100644<br/>index 3ce7110fff..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-gui-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-gui-utils.c</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'>- * GUI utility functions</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) 1999 Miguel de Icaza</div><div class='del'>- * (C) 2000 Helix Code, Inc.</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;gnome.h&gt;</div><div class='del'>-#include "e-gui-utils.h"</div><div class='del'>-#include &lt;gdk-pixbuf/gdk-pixbuf.h&gt;</div><div class='del'>-#include &lt;gdk-pixbuf/gnome-canvas-pixbuf.h&gt;</div><div class='del'>-</div><div class='del'>-GtkWidget *e_create_image_widget(gchar *name,</div><div class='del'>-				 gchar *string1, gchar *string2,</div><div class='del'>-				 gint int1, gint int2)</div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-	double width, height;</div><div class='del'>-	GtkWidget *canvas, *alignment;</div><div class='del'>-	if (string1) {</div><div class='del'>-		if (*string1 == '/')</div><div class='del'>-			filename = g_strdup(string1);</div><div class='del'>-		else</div><div class='del'>-			filename = g_concat_dir_and_file(EVOLUTION_IMAGES, string1);</div><div class='del'>-		pixbuf = gdk_pixbuf_new_from_file(filename);</div><div class='del'>-		width = gdk_pixbuf_get_width(pixbuf);</div><div class='del'>-		height = gdk_pixbuf_get_height(pixbuf);</div><div class='del'>-</div><div class='del'>-		canvas = gnome_canvas_new_aa();</div><div class='del'>-		GTK_OBJECT_UNSET_FLAGS(GTK_WIDGET(canvas), GTK_CAN_FOCUS);</div><div class='del'>-		gnome_canvas_item_new(gnome_canvas_root(GNOME_CANVAS(canvas)),</div><div class='del'>-				      gnome_canvas_pixbuf_get_type(),</div><div class='del'>-				      "pixbuf", pixbuf,</div><div class='del'>-				      NULL);</div><div class='del'>-</div><div class='del'>-		alignment = gtk_widget_new(gtk_alignment_get_type(),</div><div class='del'>-					   "child", canvas,</div><div class='del'>-					   "xalign", (double) 0,</div><div class='del'>-					   "yalign", (double) 0,</div><div class='del'>-					   "xscale", (double) 0,</div><div class='del'>-					   "yscale", (double) 0,</div><div class='del'>-					   NULL);</div><div class='del'>-	</div><div class='del'>-		gtk_widget_set_usize(canvas, width, height);</div><div class='del'>-</div><div class='del'>-		gdk_pixbuf_unref(pixbuf);</div><div class='del'>-</div><div class='del'>-		gtk_widget_show(canvas);</div><div class='del'>-		gtk_widget_show(alignment);</div><div class='del'>-		g_free(filename);</div><div class='del'>-</div><div class='del'>-		return alignment;</div><div class='del'>-	} else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-gui-utils.h b/e-util/e-gui-utils.h<br/>deleted file mode 100644<br/>index 9cbb64fbf6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-gui-utils.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-gui-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-#ifndef E_GUI_UTILS_H</div><div class='del'>-#define E_GUI_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtkwidget.h&gt;</div><div class='del'>-</div><div class='del'>-GtkWidget *e_create_image_widget     (gchar *name, gchar *string1, gchar *string2, gint int1, gint int2);</div><div class='del'>-</div><div class='del'>-#endif /* E_GUI_UTILS_H */</div><div class='head'>diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c<br/>deleted file mode 100644<br/>index 7395f6144b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-html-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-html-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,252 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-html-utils.c</div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Dan Winship &lt;danw@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 "e-html-utils.h"</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;unicode.h&gt;</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-check_size (char **buffer, int *buffer_size, char *out, int len)</div><div class='del'>-{</div><div class='del'>-	if (out + len &gt; *buffer + *buffer_size) {</div><div class='del'>-		int index = out - *buffer;</div><div class='del'>-</div><div class='del'>-		*buffer_size *= 2;</div><div class='del'>-		*buffer = g_realloc (*buffer, *buffer_size);</div><div class='del'>-		out = *buffer + index;</div><div class='del'>-	}</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-url_extract (const unsigned char **text, gboolean check)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *end = *text, *p;</div><div class='del'>-	char *out;</div><div class='del'>-</div><div class='del'>-	while (*end &amp;&amp; !isspace (*end) &amp;&amp; (*end != '"') &amp;&amp; (*end &lt; 0x80))</div><div class='del'>-		end++;</div><div class='del'>-</div><div class='del'>-	/* Back up if we probably went too far. */</div><div class='del'>-	while (end &gt; *text &amp;&amp; strchr (",.!?;:&gt;)", *(end - 1)))</div><div class='del'>-		end--;</div><div class='del'>-</div><div class='del'>-	if (check) {</div><div class='del'>-		/* Make sure we weren't fooled. */</div><div class='del'>-		p = memchr (*text, ':', end - *text);</div><div class='del'>-		if (!p || end - p &lt; 3)</div><div class='del'>-			return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out = g_strndup (*text, end - *text);</div><div class='del'>-	*text = end;</div><div class='del'>-	return out;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_text_to_html:</div><div class='del'>- * @input: a NUL-terminated input buffer</div><div class='del'>- * @flags: some combination of the E_TEXT_TO_HTML_* flags defined</div><div class='del'>- * in e-html-utils.h</div><div class='del'>- *</div><div class='del'>- * This takes a buffer of text as input and produces a buffer of</div><div class='del'>- * "equivalent" HTML, subject to certain transformation rules.</div><div class='del'>- *</div><div class='del'>- * The set of possible flags is:</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_PRE: wrap the output HTML in &lt;PRE&gt; and &lt;/PRE&gt;.</div><div class='del'>- *     Should only be used if @input is the entire buffer to be</div><div class='del'>- *     converted. If e_text_to_html is being called with small pieces</div><div class='del'>- *     of data, you should wrap the entire result in &lt;PRE&gt; yourself.</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_CONVERT_NL: convert "\n" to "&lt;BR&gt;\n" on output.</div><div class='del'>- *     (should not be used with E_TEXT_TO_HTML_PRE, since that would</div><div class='del'>- *     result in double-newlines).</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_CONVERT_SPACES: convert a block of N spaces</div><div class='del'>- *     into N-1 non-breaking spaces and one normal space. A space</div><div class='del'>- *     at the start of the buffer is always converted to a</div><div class='del'>- *     non-breaking space, regardless of the following character,</div><div class='del'>- *     which probably means you don't want to use this flag on</div><div class='del'>- *     pieces of data that aren't delimited by at least line breaks.</div><div class='del'>- *</div><div class='del'>- *     If E_TEXT_TO_HTML_CONVERT_NL and E_TEXT_TO_HTML_CONVERT_SPACES</div><div class='del'>- *     are both defined, then TABs will also be converted to spaces.</div><div class='del'>- *</div><div class='del'>- *   - E_TEXT_TO_HTML_CONVERT_URLS: wrap &lt;a href="..."&gt; &lt;/a&gt; around</div><div class='del'>- *     strings that look like URLs.</div><div class='del'>- **/</div><div class='del'>-char *</div><div class='del'>-e_text_to_html (const char *input, unsigned int flags)</div><div class='del'>-{</div><div class='del'>-	const unsigned char *cur = input;</div><div class='del'>-	char *buffer = NULL;</div><div class='del'>-	char *out = NULL;</div><div class='del'>-	int buffer_size = 0, col;</div><div class='del'>-</div><div class='del'>-	/* Allocate a translation buffer.  */</div><div class='del'>-	buffer_size = strlen (input) * 2 + 5;</div><div class='del'>-	buffer = g_malloc (buffer_size);</div><div class='del'>-</div><div class='del'>-	out = buffer;</div><div class='del'>-	if (flags &amp; E_TEXT_TO_HTML_PRE)</div><div class='del'>-		out += sprintf (out, "&lt;PRE&gt;\n");</div><div class='del'>-</div><div class='del'>-	col = 0;</div><div class='del'>-</div><div class='del'>-	for (cur = input; cur &amp;&amp; *cur; cur = unicode_next_utf8 (cur)) {</div><div class='del'>-		unicode_char_t u;</div><div class='del'>-</div><div class='del'>-		unicode_get_utf8 (cur, &amp;u);</div><div class='del'>-		if (unicode_isalpha (u) &amp;&amp;</div><div class='del'>-		    (flags &amp; E_TEXT_TO_HTML_CONVERT_URLS)) {</div><div class='del'>-			char *tmpurl = NULL, *refurl = NULL, *dispurl = NULL;</div><div class='del'>-</div><div class='del'>-			if (!strncasecmp (cur, "http://", 7) ||</div><div class='del'>-			    !strncasecmp (cur, "https://", 8) ||</div><div class='del'>-			    !strncasecmp (cur, "ftp://", 6) ||</div><div class='del'>-			    !strncasecmp (cur, "nntp://", 7) ||</div><div class='del'>-			    !strncasecmp (cur, "mailto:", 7) ||</div><div class='del'>-			    !strncasecmp (cur, "news:", 5)) {</div><div class='del'>-				tmpurl = url_extract (&amp;cur, TRUE);</div><div class='del'>-				if (tmpurl) {</div><div class='del'>-					refurl = e_text_to_html (tmpurl, 0);</div><div class='del'>-					dispurl = g_strdup (refurl);</div><div class='del'>-				}</div><div class='del'>-			} else if (!strncasecmp (cur, "www.", 4) &amp;&amp;</div><div class='del'>-				   (*(cur + 4) &lt; 0x80) &amp;&amp;</div><div class='del'>-				   unicode_isalnum (*(cur + 4))) {</div><div class='del'>-				tmpurl = url_extract (&amp;cur, FALSE);</div><div class='del'>-				dispurl = e_text_to_html (tmpurl, 0);</div><div class='del'>-				refurl = g_strdup_printf ("http://%s",</div><div class='del'>-							  dispurl);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (tmpurl) {</div><div class='del'>-				out = check_size (&amp;buffer, &amp;buffer_size, out,</div><div class='del'>-						  strlen (refurl) +</div><div class='del'>-						  strlen (dispurl) + 15);</div><div class='del'>-				out += sprintf (out,</div><div class='del'>-						"&lt;a href=\"%s\"&gt;%s&lt;/a&gt;",</div><div class='del'>-						refurl, dispurl);</div><div class='del'>-				col += strlen (tmpurl);</div><div class='del'>-				g_free (tmpurl);</div><div class='del'>-				g_free (refurl);</div><div class='del'>-				g_free (dispurl);</div><div class='del'>-			}</div><div class='del'>-</div><div class='del'>-			if (!*cur)</div><div class='del'>-				break;</div><div class='del'>-			unicode_get_utf8 (cur, &amp;u);</div><div class='del'>-		}</div><div class='del'>-		if (u == (unicode_char_t)-1) {</div><div class='del'>-			/* Sigh. Someone sent undeclared 8-bit data.</div><div class='del'>-			 * Assume it's iso-8859-1.</div><div class='del'>-			 */</div><div class='del'>-			u = *cur;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		out = check_size (&amp;buffer, &amp;buffer_size, out, 10);</div><div class='del'>-</div><div class='del'>-		switch (u) {</div><div class='del'>-		case '&lt;':</div><div class='del'>-			strcpy (out, "&amp;lt;");</div><div class='del'>-			out += 4;</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '&gt;':</div><div class='del'>-			strcpy (out, "&amp;gt;");</div><div class='del'>-			out += 4;</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '&amp;':</div><div class='del'>-			strcpy (out, "&amp;amp;");</div><div class='del'>-			out += 5;</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '"':</div><div class='del'>-			strcpy (out, "&amp;quot;");</div><div class='del'>-			out += 6;</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '\n':</div><div class='del'>-			if (flags &amp; E_TEXT_TO_HTML_CONVERT_NL) {</div><div class='del'>-				strcpy (out, "&lt;br&gt;");</div><div class='del'>-				out += 4;</div><div class='del'>-			}</div><div class='del'>-			*out++ = *cur;</div><div class='del'>-			col = 0;</div><div class='del'>-			break;</div><div class='del'>-</div><div class='del'>-		case '\t':</div><div class='del'>-			if (flags &amp; (E_TEXT_TO_HTML_CONVERT_SPACES |</div><div class='del'>-				     E_TEXT_TO_HTML_CONVERT_NL)) {</div><div class='del'>-				do {</div><div class='del'>-					out = check_size (&amp;buffer, &amp;buffer_size,</div><div class='del'>-						    out, 6);</div><div class='del'>-					strcpy (out, "&amp;nbsp;");</div><div class='del'>-					out += 6;</div><div class='del'>-					col++;</div><div class='del'>-				} while (col % 8);</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			/* otherwise, FALL THROUGH */</div><div class='del'>-</div><div class='del'>-		case ' ':</div><div class='del'>-			if (flags &amp; E_TEXT_TO_HTML_CONVERT_SPACES) {</div><div class='del'>-				if (cur == (const unsigned char *)input ||</div><div class='del'>-				    *(cur + 1) == ' ' || *(cur + 1) == '\t') {</div><div class='del'>-					strcpy (out, "&amp;nbsp;");</div><div class='del'>-					out += 6;</div><div class='del'>-					col++;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			/* otherwise, FALL THROUGH */</div><div class='del'>-</div><div class='del'>-		default:</div><div class='del'>-			if ((u &gt;= 0x20 &amp;&amp; u &lt; 0x80) ||</div><div class='del'>-			    (u == '\r' || u == '\t')) {</div><div class='del'>-				/* Default case, just copy. */</div><div class='del'>-				*out++ = u;</div><div class='del'>-			} else {</div><div class='del'>-				out += g_snprintf(out, 9, "&amp;#%d;", u);</div><div class='del'>-			}</div><div class='del'>-			col++;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	out = check_size (&amp;buffer, &amp;buffer_size, out, 7);</div><div class='del'>-	if (flags &amp; E_TEXT_TO_HTML_PRE)</div><div class='del'>-		strcpy (out, "&lt;/PRE&gt;");</div><div class='del'>-	else</div><div class='del'>-		*out = '\0';</div><div class='del'>-</div><div class='del'>-	return buffer;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-html-utils.h b/e-util/e-html-utils.h<br/>deleted file mode 100644<br/>index a56889f4d9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-html-utils.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-html-utils.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'>-/* e-html-utils.c */</div><div class='del'>-/* </div><div class='del'>- * Copyright (C) 2000  Helix Code, Inc.</div><div class='del'>- * Author: Dan Winship &lt;danw@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_HTML_UTILS__</div><div class='del'>-#define __E_HTML_UTILS__</div><div class='del'>-</div><div class='del'>-#define E_TEXT_TO_HTML_PRE            (1 &lt;&lt; 0)</div><div class='del'>-#define E_TEXT_TO_HTML_CONVERT_NL     (1 &lt;&lt; 1)</div><div class='del'>-#define E_TEXT_TO_HTML_CONVERT_SPACES (1 &lt;&lt; 2)</div><div class='del'>-#define E_TEXT_TO_HTML_CONVERT_URLS   (1 &lt;&lt; 3)</div><div class='del'>-</div><div class='del'>-char *e_text_to_html (const char *input, unsigned int flags);</div><div class='del'>-</div><div class='del'>-#endif /* __E_HTML_UTILS__ */</div><div class='head'>diff --git a/e-util/e-iterator.c b/e-util/e-iterator.c<br/>deleted file mode 100644<br/>index 874d05ccea..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-iterator.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-iterator.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,186 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors: </div><div class='del'>- *   Christopher James Lahey &lt;clahey@umich.edu&gt;</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 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-iterator.h"</div><div class='del'>-</div><div class='del'>-#define ECI_CLASS(object) (E_ITERATOR_CLASS(GTK_OBJECT((object))-&gt;klass))</div><div class='del'>-</div><div class='del'>-static void e_iterator_init (EIterator *card);</div><div class='del'>-static void e_iterator_class_init (EIteratorClass *klass);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gtk_object_get_type ())</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	INVALIDATE,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_iterator_signals [LAST_SIGNAL] = { 0, };</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_iterator_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;EIterator class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;EIterator class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_iterator_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EIterator",</div><div class='del'>-			sizeof (EIterator),</div><div class='del'>-			sizeof (EIteratorClass),</div><div class='del'>-			(GtkClassInitFunc) e_iterator_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_iterator_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_iterator_class_init (EIteratorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	e_iterator_signals [INVALIDATE] =</div><div class='del'>-		gtk_signal_new ("invalidate",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (EIteratorClass, invalidate),</div><div class='del'>-				gtk_marshal_NONE__NONE,</div><div class='del'>-				GTK_TYPE_NONE, 0);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_iterator_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	klass-&gt;invalidate = NULL;</div><div class='del'>-	klass-&gt;get        = NULL;</div><div class='del'>-	klass-&gt;reset      = NULL;</div><div class='del'>-	klass-&gt;last       = NULL;</div><div class='del'>-	klass-&gt;next       = NULL;</div><div class='del'>-	klass-&gt;prev       = NULL;</div><div class='del'>-	klass-&gt;delete     = NULL;</div><div class='del'>-	klass-&gt;insert     = NULL;</div><div class='del'>-	klass-&gt;set        = NULL;</div><div class='del'>-	klass-&gt;is_valid   = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_iterator_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_iterator_init (EIterator *card)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Virtual functions: </div><div class='del'>- */</div><div class='del'>-const void *</div><div class='del'>-e_iterator_get      (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;get)</div><div class='del'>-		return ECI_CLASS(iterator)-&gt;get(iterator);</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_reset    (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;reset)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;reset(iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_last     (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;last)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;last(iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_iterator_next     (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;next)</div><div class='del'>-		return ECI_CLASS(iterator)-&gt;next(iterator);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_iterator_prev     (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;prev)</div><div class='del'>-		return ECI_CLASS(iterator)-&gt;prev(iterator);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_delete   (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;delete)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;delete(iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void           e_iterator_insert     (EIterator  *iterator,</div><div class='del'>-				      const void *object,</div><div class='del'>-				      gboolean    before)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;insert)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;insert(iterator, object, before);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_set      (EIterator *iterator,</div><div class='del'>-			  const void    *object)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;set)</div><div class='del'>-		ECI_CLASS(iterator)-&gt;set(iterator, object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_iterator_is_valid (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	if (ECI_CLASS(iterator)-&gt;is_valid)</div><div class='del'>-		return ECI_CLASS(iterator)-&gt;is_valid(iterator);</div><div class='del'>-	else</div><div class='del'>-		return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_iterator_invalidate (EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (iterator != NULL);</div><div class='del'>-	g_return_if_fail (E_IS_ITERATOR (iterator));</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (iterator),</div><div class='del'>-			 e_iterator_signals [INVALIDATE]);</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-iterator.h b/e-util/e-iterator.h<br/>deleted file mode 100644<br/>index 84a2db142b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-iterator.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-iterator.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,69 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@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_ITERATOR_H__</div><div class='del'>-#define __E_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_ITERATOR            (e_iterator_get_type ())</div><div class='del'>-#define E_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_ITERATOR, EIterator))</div><div class='del'>-#define E_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_ITERATOR, EIteratorClass))</div><div class='del'>-#define E_IS_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_ITERATOR))</div><div class='del'>-#define E_IS_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_ITERATOR))</div><div class='del'>-</div><div class='del'>-typedef struct _EIterator EIterator;</div><div class='del'>-typedef struct _EIteratorClass EIteratorClass;</div><div class='del'>-</div><div class='del'>-struct _EIterator {</div><div class='del'>-	GtkObject object;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EIteratorClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* Signals */</div><div class='del'>-	void         (*invalidate) (EIterator  *iterator);</div><div class='del'>-	</div><div class='del'>-	/* Virtual functions */</div><div class='del'>-	const void * (*get)        (EIterator  *iterator);</div><div class='del'>-	void         (*reset)      (EIterator  *iterator);</div><div class='del'>-	void         (*last)       (EIterator  *iterator);</div><div class='del'>-	gboolean     (*next)       (EIterator  *iterator);</div><div class='del'>-	gboolean     (*prev)       (EIterator  *iterator);</div><div class='del'>-	void         (*delete)     (EIterator  *iterator);</div><div class='del'>-	void         (*insert)     (EIterator  *iterator,</div><div class='del'>-				    const void *object,</div><div class='del'>-				    gboolean   	before);</div><div class='del'>-	void         (*set)        (EIterator  *iterator,</div><div class='del'>-				    const void *object);</div><div class='del'>-	gboolean     (*is_valid)   (EIterator  *iterator);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-const void    *e_iterator_get        (EIterator  *iterator);</div><div class='del'>-void           e_iterator_reset      (EIterator  *iterator);</div><div class='del'>-void           e_iterator_last       (EIterator  *iterator);</div><div class='del'>-gboolean       e_iterator_next       (EIterator  *iterator);</div><div class='del'>-gboolean       e_iterator_prev       (EIterator  *iterator);</div><div class='del'>-void           e_iterator_delete     (EIterator  *iterator);</div><div class='del'>-void           e_iterator_insert     (EIterator  *iterator,</div><div class='del'>-				      const void *object,</div><div class='del'>-				      gboolean    before);</div><div class='del'>-void           e_iterator_set        (EIterator  *iterator, </div><div class='del'>-				      const void *object);</div><div class='del'>-gboolean       e_iterator_is_valid   (EIterator  *iterator);</div><div class='del'>-</div><div class='del'>-void           e_iterator_invalidate (EIterator  *iterator);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType        e_iterator_get_type   (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_ITERATOR_H__ */</div><div class='head'>diff --git a/e-util/e-list-iterator.c b/e-util/e-list-iterator.c<br/>deleted file mode 100644<br/>index 360e37ca40..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-list-iterator.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-list-iterator.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,242 +0,0 @@</div><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-list-iterator.h"</div><div class='del'>-#include "e-list.h"</div><div class='del'>-</div><div class='del'>-static void        e_list_iterator_init       (EListIterator *list);</div><div class='del'>-static void        e_list_iterator_class_init (EListIteratorClass *klass);</div><div class='del'>-		   </div><div class='del'>-static void        e_list_iterator_invalidate (EIterator *iterator);</div><div class='del'>-static gboolean    e_list_iterator_is_valid   (EIterator *iterator);</div><div class='del'>-static void        e_list_iterator_set        (EIterator  *iterator,</div><div class='del'>-	           			       const void *object);</div><div class='del'>-static void        e_list_iterator_delete     (EIterator  *iterator);</div><div class='del'>-static void        e_list_iterator_insert     (EIterator  *iterator,</div><div class='del'>-		   			       const void *object,</div><div class='del'>-		   			       gboolean    before);</div><div class='del'>-static gboolean    e_list_iterator_prev       (EIterator  *iterator);</div><div class='del'>-static gboolean    e_list_iterator_next       (EIterator  *iterator);</div><div class='del'>-static void        e_list_iterator_reset      (EIterator *iterator);</div><div class='del'>-static void        e_list_iterator_last       (EIterator *iterator);</div><div class='del'>-static const void *e_list_iterator_get        (EIterator *iterator);</div><div class='del'>-static void        e_list_iterator_destroy    (GtkObject *object);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (e_iterator_get_type ())</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-#define PARENT_CLASS (E_LIST_ITERATOR_CLASS(parent_class))</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_list_iterator_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;EListIterator class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;EListIterator class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_list_iterator_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EListIterator",</div><div class='del'>-			sizeof (EListIterator),</div><div class='del'>-			sizeof (EListIteratorClass),</div><div class='del'>-			(GtkClassInitFunc) e_list_iterator_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_list_iterator_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_class_init (EListIteratorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	EIteratorClass *iterator_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-	iterator_class = E_ITERATOR_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_list_iterator_destroy;</div><div class='del'>-</div><div class='del'>-	iterator_class-&gt;invalidate = e_list_iterator_invalidate;</div><div class='del'>-	iterator_class-&gt;get        = e_list_iterator_get;</div><div class='del'>-	iterator_class-&gt;reset      = e_list_iterator_reset;</div><div class='del'>-	iterator_class-&gt;last       = e_list_iterator_last;</div><div class='del'>-	iterator_class-&gt;next       = e_list_iterator_next;</div><div class='del'>-	iterator_class-&gt;prev       = e_list_iterator_prev;</div><div class='del'>-	iterator_class-&gt;delete     = e_list_iterator_delete;</div><div class='del'>-	iterator_class-&gt;insert     = e_list_iterator_insert;</div><div class='del'>-	iterator_class-&gt;set        = e_list_iterator_set;</div><div class='del'>-	iterator_class-&gt;is_valid   = e_list_iterator_is_valid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_list_iterator_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_init (EListIterator *list)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EIterator *</div><div class='del'>-e_list_iterator_new (EList *list)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = gtk_type_new(e_list_iterator_get_type());</div><div class='del'>-</div><div class='del'>-	iterator-&gt;list = list;</div><div class='del'>-	gtk_object_ref(GTK_OBJECT(list));</div><div class='del'>-	iterator-&gt;iterator = list-&gt;list;</div><div class='del'>-</div><div class='del'>-	return E_ITERATOR(iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>- * Virtual functions: </div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(object);</div><div class='del'>-	e_list_remove_iterator(iterator-&gt;list, E_ITERATOR(iterator));</div><div class='del'>-	gtk_object_unref(GTK_OBJECT(iterator-&gt;list));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static const void *</div><div class='del'>-e_list_iterator_get      (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator)</div><div class='del'>-		return iterator-&gt;iterator-&gt;data;</div><div class='del'>-	else</div><div class='del'>-		return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_reset    (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	iterator-&gt;iterator = iterator-&gt;list-&gt;list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_last     (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	iterator-&gt;iterator = g_list_last(iterator-&gt;list-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_list_iterator_next     (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator)</div><div class='del'>-		iterator-&gt;iterator = g_list_next(iterator-&gt;iterator);</div><div class='del'>-	return (iterator-&gt;iterator != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_list_iterator_prev     (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator)</div><div class='del'>-		iterator-&gt;iterator = g_list_previous(iterator-&gt;iterator);</div><div class='del'>-	return (iterator-&gt;iterator != NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_insert   (EIterator  *_iterator,</div><div class='del'>-			  const void *object,</div><div class='del'>-			  gboolean    before)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	void *data;</div><div class='del'>-	if (iterator-&gt;list-&gt;copy)</div><div class='del'>-		data = iterator-&gt;list-&gt;copy(object, iterator-&gt;list-&gt;closure);</div><div class='del'>-	else</div><div class='del'>-		data = (void *) object;</div><div class='del'>-	if (iterator-&gt;iterator) {</div><div class='del'>-		if (before) {</div><div class='del'>-			iterator-&gt;list-&gt;list = g_list_first(g_list_prepend(iterator-&gt;iterator, data));</div><div class='del'>-			iterator-&gt;iterator = iterator-&gt;iterator-&gt;prev;</div><div class='del'>-		} else {</div><div class='del'>-			if (iterator-&gt;iterator-&gt;next)</div><div class='del'>-				g_list_prepend(iterator-&gt;iterator-&gt;next, data);</div><div class='del'>-			else</div><div class='del'>-				g_list_append(iterator-&gt;iterator, data);</div><div class='del'>-			iterator-&gt;iterator = iterator-&gt;iterator-&gt;next;</div><div class='del'>-		}</div><div class='del'>-		e_list_invalidate_iterators(iterator-&gt;list, E_ITERATOR(iterator));</div><div class='del'>-	} else {</div><div class='del'>-		if (before) {</div><div class='del'>-			iterator-&gt;list-&gt;list = g_list_append(iterator-&gt;list-&gt;list, data);</div><div class='del'>-			iterator-&gt;iterator = g_list_last(iterator-&gt;list-&gt;list);</div><div class='del'>-		} else {</div><div class='del'>-			iterator-&gt;list-&gt;list = g_list_prepend(iterator-&gt;list-&gt;list, data);</div><div class='del'>-			iterator-&gt;iterator = iterator-&gt;list-&gt;list;</div><div class='del'>-		}</div><div class='del'>-		e_list_invalidate_iterators(iterator-&gt;list, E_ITERATOR(iterator));</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_delete   (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator) {</div><div class='del'>-		e_list_remove_link (iterator-&gt;list, iterator-&gt;iterator);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_set      (EIterator  *_iterator,</div><div class='del'>-			  const void *object)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	if (iterator-&gt;iterator) {</div><div class='del'>-		if (iterator-&gt;list-&gt;free)</div><div class='del'>-			iterator-&gt;list-&gt;free(iterator-&gt;iterator-&gt;data, iterator-&gt;list-&gt;closure);</div><div class='del'>-		if (iterator-&gt;list-&gt;copy)</div><div class='del'>-			iterator-&gt;iterator-&gt;data = iterator-&gt;list-&gt;copy(object, iterator-&gt;list-&gt;closure);</div><div class='del'>-		else</div><div class='del'>-			iterator-&gt;iterator-&gt;data = (void *) object;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_list_iterator_is_valid (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	return iterator-&gt;iterator != NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_iterator_invalidate (EIterator *_iterator)</div><div class='del'>-{</div><div class='del'>-	EListIterator *iterator = E_LIST_ITERATOR(_iterator);</div><div class='del'>-	iterator-&gt;iterator = NULL;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-list-iterator.h b/e-util/e-list-iterator.h<br/>deleted file mode 100644<br/>index a2b7d82988..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-list-iterator.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-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_LIST_ITERATOR_H__</div><div class='del'>-#define __E_LIST_ITERATOR_H__</div><div class='del'>-</div><div class='del'>-typedef struct _EListIterator EListIterator;</div><div class='del'>-typedef struct _EListIteratorClass EListIteratorClass;</div><div class='del'>-</div><div class='del'>-#include &lt;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;e-util/e-iterator.h&gt;</div><div class='del'>-#include &lt;e-util/e-list.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_LIST_ITERATOR            (e_list_iterator_get_type ())</div><div class='del'>-#define E_LIST_ITERATOR(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_LIST_ITERATOR, EListIterator))</div><div class='del'>-#define E_LIST_ITERATOR_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST_ITERATOR, EListIteratorClass))</div><div class='del'>-#define E_IS_LIST_ITERATOR(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_LIST_ITERATOR))</div><div class='del'>-#define E_IS_LIST_ITERATOR_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST_ITERATOR))</div><div class='del'>-</div><div class='del'>-struct _EListIterator {</div><div class='del'>-	EIterator      parent;</div><div class='del'>-</div><div class='del'>-	EList         *list;</div><div class='del'>-	GList         *iterator;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EListIteratorClass {</div><div class='del'>-	EIteratorClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EIterator *e_list_iterator_new      (EList *list);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType    e_list_iterator_get_type (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_LIST_ITERATOR_H__ */</div><div class='head'>diff --git a/e-util/e-list.c b/e-util/e-list.c<br/>deleted file mode 100644<br/>index 6fd0e559d5..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-list.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-list.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,177 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * 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-list.h"</div><div class='del'>-#include "e-list-iterator.h"</div><div class='del'>-</div><div class='del'>-#define ECL_CLASS(object) (E_LIST_CLASS(GTK_OBJECT((object))-&gt;klass))</div><div class='del'>-</div><div class='del'>-static void e_list_init (EList *list);</div><div class='del'>-static void e_list_class_init (EListClass *klass);</div><div class='del'>-static void e_list_destroy (GtkObject *object);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gtk_object_get_type ())</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_list_get_type:</div><div class='del'>- * @void: </div><div class='del'>- * </div><div class='del'>- * Registers the &amp;EList class if necessary, and returns the type ID</div><div class='del'>- * associated to it.</div><div class='del'>- * </div><div class='del'>- * Return value: The type ID of the &amp;EList class.</div><div class='del'>- **/</div><div class='del'>-GtkType</div><div class='del'>-e_list_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static GtkType type = 0;</div><div class='del'>-</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo info = {</div><div class='del'>-			"EList",</div><div class='del'>-			sizeof (EList),</div><div class='del'>-			sizeof (EListClass),</div><div class='del'>-			(GtkClassInitFunc) e_list_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_list_init,</div><div class='del'>-			NULL, /* reserved_1 */</div><div class='del'>-			NULL, /* reserved_2 */</div><div class='del'>-			(GtkClassInitFunc) NULL</div><div class='del'>-		};</div><div class='del'>-</div><div class='del'>-		type = gtk_type_unique (PARENT_TYPE, &amp;info);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_list_class_init (EListClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS(klass);</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = e_list_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_list_init:</div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_list_init (EList *list)</div><div class='del'>-{</div><div class='del'>-	list-&gt;list = NULL;</div><div class='del'>-	list-&gt;iterators = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EList *</div><div class='del'>-e_list_new          (EListCopyFunc copy, EListFreeFunc free, void *closure)</div><div class='del'>-{</div><div class='del'>-	EList *list = gtk_type_new(e_list_get_type());</div><div class='del'>-	list-&gt;copy    = copy;</div><div class='del'>-	list-&gt;free    = free;</div><div class='del'>-	list-&gt;closure = closure;</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EList *</div><div class='del'>-e_list_duplicate    (EList *old)</div><div class='del'>-{</div><div class='del'>-	EList *list = gtk_type_new(e_list_get_type());</div><div class='del'>-</div><div class='del'>-	list-&gt;copy    = old-&gt;copy;</div><div class='del'>-	list-&gt;free    = old-&gt;free;</div><div class='del'>-	list-&gt;closure = old-&gt;closure;</div><div class='del'>-	list-&gt;list    = g_list_copy(old-&gt;list);</div><div class='del'>-	if (list-&gt;copy) {</div><div class='del'>-		GList *listlist;</div><div class='del'>-		for (listlist = list-&gt;list; listlist; listlist = listlist-&gt;next) {</div><div class='del'>-			listlist-&gt;data = list-&gt;copy (listlist-&gt;data, list-&gt;closure);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return list;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-EIterator *</div><div class='del'>-e_list_get_iterator (EList *list)</div><div class='del'>-{</div><div class='del'>-	EIterator *iterator = e_list_iterator_new(list);</div><div class='del'>-	list-&gt;iterators = g_list_append(list-&gt;iterators, iterator);</div><div class='del'>-	return iterator;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_list_length (EList *list)</div><div class='del'>-{</div><div class='del'>-	return g_list_length(list-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_list_append       (EList *list, const void *data)</div><div class='del'>-{</div><div class='del'>-	e_list_invalidate_iterators(list, NULL);</div><div class='del'>-	if (list-&gt;copy)</div><div class='del'>-		list-&gt;list = g_list_append(list-&gt;list, list-&gt;copy(data, list-&gt;closure));</div><div class='del'>-	else</div><div class='del'>-		list-&gt;list = g_list_append(list-&gt;list, (void *) data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_list_invalidate_iterators (EList *list, EIterator *skip)</div><div class='del'>-{</div><div class='del'>-	GList *iterators = list-&gt;iterators;</div><div class='del'>-	for (; iterators; iterators = iterators-&gt;next) {</div><div class='del'>-		if (iterators-&gt;data != skip) {</div><div class='del'>-			e_iterator_invalidate(E_ITERATOR(iterators-&gt;data));</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: This doesn't work properly if the iterator is the first</div><div class='del'>-   iterator in the list.  Well, the iterator doesn't continue on after</div><div class='del'>-   the next time next is called, at least. */</div><div class='del'>-void</div><div class='del'>-e_list_remove_link (EList *list, GList *link)</div><div class='del'>-{</div><div class='del'>-	GList *iterators = list-&gt;iterators;</div><div class='del'>-	for (; iterators; iterators = iterators-&gt;next) {</div><div class='del'>-		if (((EListIterator *)iterators-&gt;data)-&gt;iterator == link) {</div><div class='del'>-			e_iterator_prev(iterators-&gt;data);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (list-&gt;free)</div><div class='del'>-		list-&gt;free(link-&gt;data, list-&gt;closure);</div><div class='del'>-	list-&gt;list = g_list_remove_link(list-&gt;list, link);</div><div class='del'>-	g_list_free_1(link);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_list_remove_iterator (EList *list, EIterator *iterator)</div><div class='del'>-{</div><div class='del'>-	list-&gt;iterators = g_list_remove(list-&gt;iterators, iterator);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* </div><div class='del'>- * Virtual functions </div><div class='del'>- */</div><div class='del'>-static void</div><div class='del'>-e_list_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	EList *list = E_LIST(object);</div><div class='del'>-	g_list_foreach(list-&gt;list, (GFunc) list-&gt;free, list-&gt;closure);</div><div class='del'>-	g_list_free(list-&gt;list);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-list.h b/e-util/e-list.h<br/>deleted file mode 100644<br/>index 017f48d813..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-list.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-list.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * Authors:</div><div class='del'>- *   Chris Lahey &lt;clahey@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_LIST_H__</div><div class='del'>-#define __E_LIST_H__</div><div class='del'>-</div><div class='del'>-typedef struct _EList EList;</div><div class='del'>-typedef struct _EListClass EListClass;</div><div class='del'>-</div><div class='del'>-#include &lt;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;e-util/e-list-iterator.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_TYPE_LIST            (e_list_get_type ())</div><div class='del'>-#define E_LIST(obj)            (GTK_CHECK_CAST ((obj), E_TYPE_LIST, EList))</div><div class='del'>-#define E_LIST_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), E_TYPE_LIST, EListClass))</div><div class='del'>-#define E_IS_LIST(obj)         (GTK_CHECK_TYPE ((obj), E_TYPE_LIST))</div><div class='del'>-#define E_IS_LIST_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), E_TYPE_LIST))</div><div class='del'>-</div><div class='del'>-typedef void *(*EListCopyFunc) (const void *data, void *closure);</div><div class='del'>-typedef void (*EListFreeFunc) (void *data, void *closure);</div><div class='del'>-</div><div class='del'>-struct _EList {</div><div class='del'>-	GtkObject      object;</div><div class='del'>-	GList         *list;</div><div class='del'>-	GList         *iterators;</div><div class='del'>-	EListCopyFunc  copy;</div><div class='del'>-	EListFreeFunc  free;</div><div class='del'>-	void          *closure;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _EListClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-EList     *e_list_new                  (EListCopyFunc  copy, </div><div class='del'>-					EListFreeFunc  free,</div><div class='del'>-					void          *closure);</div><div class='del'>-EList     *e_list_duplicate            (EList *list);</div><div class='del'>-EIterator *e_list_get_iterator         (EList         *list);</div><div class='del'>-void       e_list_append               (EList         *list,</div><div class='del'>-					const void    *data);</div><div class='del'>-int        e_list_length               (EList         *list);</div><div class='del'>-</div><div class='del'>-/* For iterators to call. */</div><div class='del'>-void       e_list_remove_link          (EList         *list, </div><div class='del'>-					GList         *link);</div><div class='del'>-void       e_list_remove_iterator      (EList         *list,</div><div class='del'>-					EIterator     *iterator);</div><div class='del'>-void       e_list_invalidate_iterators (EList         *list,</div><div class='del'>-					EIterator     *skip);</div><div class='del'>-</div><div class='del'>-/* Standard Gtk function */</div><div class='del'>-GtkType    e_list_get_type             (void);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_LIST_H__ */</div><div class='head'>diff --git a/e-util/e-pilot-map.c b/e-util/e-pilot-map.c<br/>deleted file mode 100644<br/>index 4f985ccace..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-pilot-map.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-pilot-map.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,263 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution Conduits - Pilot Map routines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: JP Rosevear &lt;jpr@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;stdlib.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;gnome-xml/parser.h&gt;</div><div class='del'>-#include &lt;e-pilot-map.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct </div><div class='del'>-{</div><div class='del'>-	char *uid;</div><div class='del'>-	gboolean archived;</div><div class='del'>-} EPilotMapPidNode;</div><div class='del'>-</div><div class='del'>-typedef struct</div><div class='del'>-{</div><div class='del'>-	guint32 pid;</div><div class='del'>-	gboolean archived;</div><div class='del'>-} EPilotMapUidNode;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-map_set_node_timet (xmlNodePtr node, const char *name, time_t t)</div><div class='del'>-{</div><div class='del'>-	char *tstring;</div><div class='del'>-	</div><div class='del'>-	tstring = g_strdup_printf ("%ld", t);</div><div class='del'>-	xmlSetProp (node, name, tstring);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-map_sax_start_element (void *data, const xmlChar *name, </div><div class='del'>-		       const xmlChar **attrs)</div><div class='del'>-{</div><div class='del'>-	EPilotMap *map = (EPilotMap *)data;</div><div class='del'>-</div><div class='del'>-	if (!strcmp (name, "PilotMap")) {</div><div class='del'>-		while (attrs &amp;&amp; *attrs != NULL) {</div><div class='del'>-			const xmlChar **val = attrs;</div><div class='del'>-			</div><div class='del'>-			val++;</div><div class='del'>-			if (!strcmp (*attrs, "timestamp")) </div><div class='del'>-				map-&gt;since = (time_t)strtoul (*val, NULL, 0);</div><div class='del'>-</div><div class='del'>-			attrs = ++val;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	 </div><div class='del'>-	if (!strcmp (name, "map")) {</div><div class='del'>-		const char *uid = NULL;</div><div class='del'>-		guint32 pid = 0;</div><div class='del'>-		gboolean archived = FALSE;</div><div class='del'>-</div><div class='del'>-		while (attrs &amp;&amp; *attrs != NULL) {</div><div class='del'>-			const xmlChar **val = attrs;</div><div class='del'>-			</div><div class='del'>-			val++;</div><div class='del'>-			if (!strcmp (*attrs, "uid")) </div><div class='del'>-				uid = *val;</div><div class='del'>-			</div><div class='del'>-			if (!strcmp (*attrs, "pilot_id"))</div><div class='del'>-				pid = strtoul (*val, NULL, 0);</div><div class='del'>-</div><div class='del'>-			if (!strcmp (*attrs, "archived"))</div><div class='del'>-				archived = strtoul (*val, NULL, 0)== 1 ? TRUE : FALSE;</div><div class='del'>-				</div><div class='del'>-			attrs = ++val;</div><div class='del'>-		}</div><div class='del'>-			</div><div class='del'>-		if (uid &amp;&amp; pid != 0)</div><div class='del'>-			e_pilot_map_insert (map, pid, uid, archived);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-map_write_foreach (gpointer key, gpointer value, gpointer data)</div><div class='del'>-{</div><div class='del'>-	xmlNodePtr root = data;</div><div class='del'>-	xmlNodePtr mnode;</div><div class='del'>-	unsigned long *pid = key;</div><div class='del'>-	EPilotMapPidNode *pnode = value;</div><div class='del'>-	char *pidstr;</div><div class='del'>-</div><div class='del'>-	mnode = xmlNewChild (root, NULL, "map", NULL);</div><div class='del'>-	</div><div class='del'>-	pidstr = g_strdup_printf ("%lu", *pid);</div><div class='del'>-	xmlSetProp (mnode, "pilot_id", pidstr);</div><div class='del'>-	g_free (pidstr);</div><div class='del'>-</div><div class='del'>-	xmlSetProp (mnode, "uid", pnode-&gt;uid);</div><div class='del'>-</div><div class='del'>-	if (pnode-&gt;archived)</div><div class='del'>-		xmlSetProp (mnode, "archived", "1");</div><div class='del'>-	else</div><div class='del'>-		xmlSetProp (mnode, "archived", "0");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean </div><div class='del'>-e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid)</div><div class='del'>-{</div><div class='del'>-	EPilotMapPidNode *pnode;</div><div class='del'>-	</div><div class='del'>-	pnode = g_hash_table_lookup (map-&gt;pid_map, &amp;pid);</div><div class='del'>-</div><div class='del'>-	if (pnode == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return pnode-&gt;archived;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean </div><div class='del'>-e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid)</div><div class='del'>-{</div><div class='del'>-	EPilotMapUidNode *unode;</div><div class='del'>-	</div><div class='del'>-	unode = g_hash_table_lookup (map-&gt;uid_map, uid);</div><div class='del'>-</div><div class='del'>-	if (unode == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-	</div><div class='del'>-	return unode-&gt;archived;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived)</div><div class='del'>-{</div><div class='del'>-	char *new_uid;</div><div class='del'>-	guint32 *new_pid = g_new (guint32, 1);</div><div class='del'>-	EPilotMapPidNode *pnode = g_new0 (EPilotMapPidNode, 1);</div><div class='del'>-	EPilotMapUidNode *unode = g_new0 (EPilotMapUidNode, 1);</div><div class='del'>-	</div><div class='del'>-	*new_pid = pid;</div><div class='del'>-	new_uid = g_strdup (uid);</div><div class='del'>-</div><div class='del'>-	pnode-&gt;uid = new_uid;</div><div class='del'>-	pnode-&gt;archived = archived;</div><div class='del'>-	</div><div class='del'>-	unode-&gt;pid = pid;</div><div class='del'>-	unode-&gt;archived = archived;</div><div class='del'>-	</div><div class='del'>-	g_hash_table_insert (map-&gt;pid_map, new_pid, pnode);</div><div class='del'>-	g_hash_table_insert (map-&gt;uid_map, new_uid, unode);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint32 </div><div class='del'>-e_pilot_map_lookup_pid (EPilotMap *map, const char *uid) </div><div class='del'>-{</div><div class='del'>-	EPilotMapUidNode *unode = NULL;</div><div class='del'>-	</div><div class='del'>-	unode = g_hash_table_lookup (map-&gt;uid_map, uid);</div><div class='del'>-</div><div class='del'>-	if (unode == NULL)</div><div class='del'>-		return 0;</div><div class='del'>-	</div><div class='del'>-	return unode-&gt;pid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid)</div><div class='del'>-{</div><div class='del'>-	EPilotMapPidNode *pnode = NULL;</div><div class='del'>-	</div><div class='del'>-	pnode = g_hash_table_lookup (map-&gt;pid_map, &amp;pid);</div><div class='del'>-</div><div class='del'>-	if (pnode == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	return pnode-&gt;uid;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int </div><div class='del'>-e_pilot_map_read (const char *filename, EPilotMap **map)</div><div class='del'>-{</div><div class='del'>-	xmlSAXHandler handler;</div><div class='del'>-	EPilotMap *new_map = g_new0 (EPilotMap, 1);</div><div class='del'>-</div><div class='del'>-	*map = NULL;</div><div class='del'>-	</div><div class='del'>-	memset (&amp;handler, 0, sizeof (xmlSAXHandler));</div><div class='del'>-	handler.startElement = map_sax_start_element;</div><div class='del'>-</div><div class='del'>-	new_map-&gt;pid_map = g_hash_table_new (g_int_hash, g_int_equal);</div><div class='del'>-	new_map-&gt;uid_map = g_hash_table_new (g_str_hash, g_str_equal);</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (filename)) {</div><div class='del'>-		if (xmlSAXUserParseFile (&amp;handler, new_map, filename) &lt; 0) {</div><div class='del'>-			g_free (new_map);</div><div class='del'>-			return -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	*map = new_map;</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-		</div><div class='del'>-int</div><div class='del'>-e_pilot_map_write (const char *filename, EPilotMap *map)</div><div class='del'>-{</div><div class='del'>-	xmlDocPtr doc;</div><div class='del'>-	int ret;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (map != NULL, -1);</div><div class='del'>-	</div><div class='del'>-	doc = xmlNewDoc ("1.0");</div><div class='del'>-	if (doc == NULL) {</div><div class='del'>-		g_warning ("Pilot map file could not be created\n");</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	doc-&gt;root = xmlNewDocNode(doc, NULL, "PilotMap", NULL);</div><div class='del'>-	map-&gt;since = time (NULL);</div><div class='del'>-	map_set_node_timet (doc-&gt;root, "timestamp", map-&gt;since);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (map-&gt;pid_map, map_write_foreach, doc-&gt;root);</div><div class='del'>-	</div><div class='del'>-	/* Write the file */</div><div class='del'>-	xmlSetDocCompressMode (doc, 0);</div><div class='del'>-	ret = xmlSaveFile (filename, doc);</div><div class='del'>-	if (ret &lt; 0) {</div><div class='del'>-		g_warning ("Pilot map file '%s' could not be saved\n", filename);</div><div class='del'>-		return -1;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	xmlFreeDoc (doc);</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_pilot_map_destroy (EPilotMap *map)</div><div class='del'>-{</div><div class='del'>-	g_hash_table_destroy (map-&gt;pid_map);</div><div class='del'>-	g_hash_table_destroy (map-&gt;uid_map);</div><div class='del'>-	g_free (map);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='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/e-util/e-pilot-map.h b/e-util/e-pilot-map.h<br/>deleted file mode 100644<br/>index 8e3d2b71f6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-pilot-map.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-pilot-map.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,51 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* Evolution Conduits - Pilot Map routines</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 Helix Code, Inc.</div><div class='del'>- *</div><div class='del'>- * Authors: JP Rosevear &lt;jpr@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 E_PILOT_MAP_H</div><div class='del'>-#define E_PILOT_MAP_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-</div><div class='del'>-typedef struct _EPilotMap EPilotMap;</div><div class='del'>-</div><div class='del'>-struct _EPilotMap</div><div class='del'>-{</div><div class='del'>-	GHashTable *pid_map;</div><div class='del'>-	GHashTable *uid_map;</div><div class='del'>-</div><div class='del'>-	time_t since;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-gboolean e_pilot_map_pid_is_archived (EPilotMap *map, guint32 pid);</div><div class='del'>-gboolean e_pilot_map_uid_is_archived (EPilotMap *map, const char *uid);</div><div class='del'>-</div><div class='del'>-void e_pilot_map_insert (EPilotMap *map, guint32 pid, const char *uid, gboolean archived);</div><div class='del'>-guint32 e_pilot_map_lookup_pid (EPilotMap *map, const char *uid);</div><div class='del'>-const char * e_pilot_map_lookup_uid (EPilotMap *map, guint32 pid);</div><div class='del'>-</div><div class='del'>-int e_pilot_map_read (const char *filename, EPilotMap **map);</div><div class='del'>-int e_pilot_map_write (const char *filename, EPilotMap *map);</div><div class='del'>-</div><div class='del'>-void e_pilot_map_destroy (EPilotMap *map);</div><div class='del'>-</div><div class='del'>-#endif /* E_PILOT_MAP_H */</div><div class='head'>diff --git a/e-util/e-sexp.c b/e-util/e-sexp.c<br/>deleted file mode 100644<br/>index 2757ea2043..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-sexp.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-sexp.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,1164 +0,0 @@</div><div class='del'>-/* </div><div class='del'>- * Copyright 2000 HelixCode (http://www.helixcode.com).</div><div class='del'>- *</div><div class='del'>- * A simple, extensible s-exp evaluation engine.</div><div class='del'>- *</div><div class='del'>- * Author : </div><div class='del'>- *  Michael Zucchi &lt;notzed@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'>-  The following built-in s-exp's are supported:</div><div class='del'>-</div><div class='del'>-  list = (and list*)</div><div class='del'>-	perform an intersection of a number of lists, and return that.</div><div class='del'>-</div><div class='del'>-  bool = (and bool*)</div><div class='del'>-	perform a boolean AND of boolean values.</div><div class='del'>-</div><div class='del'>-  list = (or list*)</div><div class='del'>-	perform a union of a number of lists, returning the new list.</div><div class='del'>-</div><div class='del'>-  bool = (or bool*)</div><div class='del'>-	perform a boolean OR of boolean values.</div><div class='del'>-</div><div class='del'>-  int = (+ int*)</div><div class='del'>-	Add integers.</div><div class='del'>-</div><div class='del'>-  string = (+ string*)</div><div class='del'>-	Concat strings.</div><div class='del'>-</div><div class='del'>-  int = (- int int*)</div><div class='del'>-	Subtract integers from the first.</div><div class='del'>-</div><div class='del'>-  Comparison operators:</div><div class='del'>-</div><div class='del'>-  bool = (&lt; int int)</div><div class='del'>-  bool = (&gt; int int)</div><div class='del'>-  bool = (= int int)</div><div class='del'>-</div><div class='del'>-  bool = (&lt; string string)</div><div class='del'>-  bool = (&gt; string string)</div><div class='del'>-  bool = (= string string)</div><div class='del'>-	Perform a comparision of 2 integers, or 2 string values.</div><div class='del'>-</div><div class='del'>-  Function flow:</div><div class='del'>-</div><div class='del'>-  type = (if bool function)</div><div class='del'>-  type = (if bool function function)</div><div class='del'>-  	Choose a flow path based on a boolean value</div><div class='del'>-</div><div class='del'>-  type = (begin  func func func)</div><div class='del'>-        Execute a sequence.  The last function return is the return type.</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;stdio.h&gt;</div><div class='del'>-#include &lt;stdlib.h&gt;</div><div class='del'>-#include &lt;time.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-sexp.h"</div><div class='del'>-</div><div class='del'>-#define p(x)			/* parse debug */</div><div class='del'>-#define r(x)			/* run debug */</div><div class='del'>-#define d(x)			/* general debug */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static struct _ESExpTerm * parse_list(ESExp *f, int gotbrace);</div><div class='del'>-static struct _ESExpTerm * parse_value(ESExp *f);</div><div class='del'>-</div><div class='del'>-static void parse_dump_term(struct _ESExpTerm *t, int depth);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static GScannerConfig scanner_config =</div><div class='del'>-{</div><div class='del'>-	( " \t\r\n")		/* cset_skip_characters */,</div><div class='del'>-	( G_CSET_a_2_z</div><div class='del'>-	  "_+-&lt;=&gt;"</div><div class='del'>-	  G_CSET_A_2_Z)		/* cset_identifier_first */,</div><div class='del'>-	( G_CSET_a_2_z</div><div class='del'>-	  "_0123456789-&lt;&gt;"</div><div class='del'>-	  G_CSET_A_2_Z</div><div class='del'>-	  G_CSET_LATINS</div><div class='del'>-	  G_CSET_LATINC	)	/* cset_identifier_nth */,</div><div class='del'>-	( ";\n" )		/* cpair_comment_single */,</div><div class='del'>-  </div><div class='del'>-	FALSE			/* case_sensitive */,</div><div class='del'>-  </div><div class='del'>-	TRUE			/* skip_comment_multi */,</div><div class='del'>-	TRUE			/* skip_comment_single */,</div><div class='del'>-	TRUE			/* scan_comment_multi */,</div><div class='del'>-	TRUE			/* scan_identifier */,</div><div class='del'>-	TRUE			/* scan_identifier_1char */,</div><div class='del'>-	FALSE			/* scan_identifier_NULL */,</div><div class='del'>-	TRUE			/* scan_symbols */,</div><div class='del'>-	FALSE			/* scan_binary */,</div><div class='del'>-	TRUE			/* scan_octal */,</div><div class='del'>-	TRUE			/* scan_float */,</div><div class='del'>-	TRUE			/* scan_hex */,</div><div class='del'>-	FALSE			/* scan_hex_dollar */,</div><div class='del'>-	TRUE			/* scan_string_sq */,</div><div class='del'>-	TRUE			/* scan_string_dq */,</div><div class='del'>-	TRUE			/* numbers_2_int */,</div><div class='del'>-	FALSE			/* int_2_float */,</div><div class='del'>-	FALSE			/* identifier_2_string */,</div><div class='del'>-	TRUE			/* char_2_token */,</div><div class='del'>-	FALSE			/* symbol_2_token */,</div><div class='del'>-	FALSE			/* scope_0_fallback */,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpResult *</div><div class='del'>-e_sexp_result_new(int type)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r = g_malloc0(sizeof(*r));</div><div class='del'>-	r-&gt;type = type;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_result_free(struct _ESExpResult *t)</div><div class='del'>-{</div><div class='del'>-	if (t == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	switch(t-&gt;type) {</div><div class='del'>-	case ESEXP_RES_ARRAY_PTR:</div><div class='del'>-		g_ptr_array_free(t-&gt;value.ptrarray, TRUE);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_BOOL:</div><div class='del'>-	case ESEXP_RES_INT:</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_STRING:</div><div class='del'>-		g_free(t-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_UNDEFINED:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	g_free(t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* implementations for the builtin functions */</div><div class='del'>-</div><div class='del'>-/* can you tell, i dont like glib? */</div><div class='del'>-/* we can only itereate a hashtable from a called function */</div><div class='del'>-struct _glib_sux_donkeys {</div><div class='del'>-	int count;</div><div class='del'>-	GPtrArray *uids;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* ok, store any values that are in all sets */</div><div class='del'>-static void</div><div class='del'>-g_lib_sux_htand(char *key, int value, struct _glib_sux_donkeys *fuckup)</div><div class='del'>-{</div><div class='del'>-	if (value == fuckup-&gt;count) {</div><div class='del'>-		g_ptr_array_add(fuckup-&gt;uids, key);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* or, store all unique values */</div><div class='del'>-static void</div><div class='del'>-g_lib_sux_htor(char *key, int value, struct _glib_sux_donkeys *fuckup)</div><div class='del'>-{</div><div class='del'>-	g_ptr_array_add(fuckup-&gt;uids, key);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_and(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1;</div><div class='del'>-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	struct _glib_sux_donkeys lambdafoo;</div><div class='del'>-	int type=-1;</div><div class='del'>-	int bool = TRUE;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	r(printf("( and\n"));</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(ESEXP_RES_UNDEFINED);</div><div class='del'>-	</div><div class='del'>-	for (i=0;bool &amp;&amp; i&lt;argc;i++) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[i]);</div><div class='del'>-		if (type == -1)</div><div class='del'>-			type = r1-&gt;type;</div><div class='del'>-		if (type != r1-&gt;type) {</div><div class='del'>-			printf("invalid types in and operation, all types must be the same\n");</div><div class='del'>-		} else if ( r1-&gt;type == ESEXP_RES_ARRAY_PTR ) {</div><div class='del'>-			char **a1;</div><div class='del'>-			int l1, j;</div><div class='del'>-			</div><div class='del'>-			a1 = (char **)r1-&gt;value.ptrarray-&gt;pdata;</div><div class='del'>-			l1 = r1-&gt;value.ptrarray-&gt;len;</div><div class='del'>-			for (j=0;j&lt;l1;j++) {</div><div class='del'>-				int n;</div><div class='del'>-				n = (int)g_hash_table_lookup(ht, a1[j]);</div><div class='del'>-				g_hash_table_insert(ht, a1[j], (void *)n+1);</div><div class='del'>-			}</div><div class='del'>-		} else if ( r1-&gt;type == ESEXP_RES_BOOL ) {</div><div class='del'>-			bool &amp;= r1-&gt;value.bool;</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(r1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-		lambdafoo.count = argc;</div><div class='del'>-		lambdafoo.uids = g_ptr_array_new();</div><div class='del'>-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htand, &amp;lambdafoo);</div><div class='del'>-		r-&gt;type = ESEXP_RES_ARRAY_PTR;</div><div class='del'>-		r-&gt;value.ptrarray = lambdafoo.uids;</div><div class='del'>-	} else if (type == ESEXP_RES_BOOL) {</div><div class='del'>-		r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-		r-&gt;value.bool = bool;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_hash_table_destroy(ht);</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_or(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1;</div><div class='del'>-	GHashTable *ht = g_hash_table_new(g_str_hash, g_str_equal);</div><div class='del'>-	struct _glib_sux_donkeys lambdafoo;</div><div class='del'>-	int type = -1;</div><div class='del'>-	int bool = FALSE;</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	r(printf("(or \n"));</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(ESEXP_RES_UNDEFINED);</div><div class='del'>-	</div><div class='del'>-	for (i=0;!bool &amp;&amp; i&lt;argc;i++) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[i]);</div><div class='del'>-		if (type == -1)</div><div class='del'>-			type = r1-&gt;type;</div><div class='del'>-		if (r1-&gt;type != type) {</div><div class='del'>-			printf("wrong types in or operation\n");</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-			char **a1;</div><div class='del'>-			int l1, j;</div><div class='del'>-			</div><div class='del'>-			a1 = (char **)r1-&gt;value.ptrarray-&gt;pdata;</div><div class='del'>-			l1 = r1-&gt;value.ptrarray-&gt;len;</div><div class='del'>-			for (j=0;j&lt;l1;j++) {</div><div class='del'>-				g_hash_table_insert(ht, a1[j], (void *)1);</div><div class='del'>-			}</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_BOOL) {</div><div class='del'>-			bool |= r1-&gt;value.bool;				</div><div class='del'>-		}</div><div class='del'>-		e_sexp_result_free(r1);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	if (type == ESEXP_RES_ARRAY_PTR) {</div><div class='del'>-		lambdafoo.count = argc;</div><div class='del'>-		lambdafoo.uids = g_ptr_array_new();</div><div class='del'>-		g_hash_table_foreach(ht, (GHFunc)g_lib_sux_htor, &amp;lambdafoo);</div><div class='del'>-		r-&gt;type = ESEXP_RES_ARRAY_PTR;</div><div class='del'>-		r-&gt;value.ptrarray = lambdafoo.uids;</div><div class='del'>-	} else if (type == ESEXP_RES_BOOL) {</div><div class='del'>-		r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-		r-&gt;value.bool = bool;</div><div class='del'>-	}</div><div class='del'>-	g_hash_table_destroy(ht);</div><div class='del'>-	</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_not(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	int res = TRUE;</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	if (argc&gt;0) {</div><div class='del'>-		if (argv[0]-&gt;type == ESEXP_RES_BOOL</div><div class='del'>-		    &amp;&amp; argv[0]-&gt;value.bool)</div><div class='del'>-			res = FALSE;</div><div class='del'>-	}</div><div class='del'>-	r = e_sexp_result_new(ESEXP_RES_BOOL);</div><div class='del'>-	r-&gt;value.bool = res;</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this should support all arguments ...? */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_lt(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1, *r2;</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(ESEXP_RES_UNDEFINED);</div><div class='del'>-	</div><div class='del'>-	if (argc == 2) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-		r2 = e_sexp_term_eval(f, argv[1]);</div><div class='del'>-		if (r1-&gt;type != r2-&gt;type) {</div><div class='del'>-			printf("error, invalid types in compare\n");</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_INT) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.number &lt; r2-&gt;value.number;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = strcmp(r1-&gt;value.string, r2-&gt;value.string) &lt; 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this should support all arguments ...? */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_gt(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1, *r2;</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(ESEXP_RES_UNDEFINED);</div><div class='del'>-	</div><div class='del'>-	if (argc == 2) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-		r2 = e_sexp_term_eval(f, argv[1]);</div><div class='del'>-		if (r1-&gt;type != r2-&gt;type) {</div><div class='del'>-			printf("error, invalid types in compare\n");</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_INT) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.number &gt; r2-&gt;value.number;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-			r-&gt;value.bool = strcmp(r1-&gt;value.string, r2-&gt;value.string) &gt; 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* this should support all arguments ...? */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_eq(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1, *r2;</div><div class='del'>-</div><div class='del'>-	r = e_sexp_result_new(ESEXP_RES_BOOL);</div><div class='del'>-	</div><div class='del'>-	if (argc == 2) {</div><div class='del'>-		r1 = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-		r2 = e_sexp_term_eval(f, argv[1]);</div><div class='del'>-		if (r1-&gt;type != r2-&gt;type) {</div><div class='del'>-			r-&gt;value.bool = FALSE;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_INT) {</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.number == r2-&gt;value.number;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_BOOL) {</div><div class='del'>-			r-&gt;value.bool = r1-&gt;value.bool == r2-&gt;value.bool;</div><div class='del'>-		} else if (r1-&gt;type == ESEXP_RES_STRING) {</div><div class='del'>-			r-&gt;value.bool = strcmp(r1-&gt;value.string, r2-&gt;value.string) == 0;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_plus(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r=NULL;</div><div class='del'>-	int type;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (argc&gt;0) {</div><div class='del'>-		type = argv[0]-&gt;type;</div><div class='del'>-		switch(type) {</div><div class='del'>-		case ESEXP_RES_INT: {</div><div class='del'>-			int total = argv[0]-&gt;value.number;</div><div class='del'>-			for (i=1;i&lt;argc &amp;&amp; argv[i]-&gt;type == ESEXP_RES_INT;i++) {</div><div class='del'>-				total += argv[i]-&gt;value.number;</div><div class='del'>-			}</div><div class='del'>-			if (i&lt;argc) {</div><div class='del'>-				g_warning("Wrong type trying to add integers: ignored");</div><div class='del'>-			}</div><div class='del'>-			r = e_sexp_result_new(ESEXP_RES_INT);</div><div class='del'>-			r-&gt;value.number = total;</div><div class='del'>-			break; }</div><div class='del'>-		case ESEXP_RES_STRING: {</div><div class='del'>-			GString *s = g_string_new(argv[0]-&gt;value.string);</div><div class='del'>-			for (i=1;i&lt;argc &amp;&amp; argv[i]-&gt;type == ESEXP_RES_STRING;i++) {</div><div class='del'>-				g_string_append(s, argv[i]-&gt;value.string);</div><div class='del'>-			}</div><div class='del'>-			if (i&lt;argc) {</div><div class='del'>-				g_warning("Wrong type trying to concat strings: ignored");</div><div class='del'>-			}</div><div class='del'>-			r = e_sexp_result_new(ESEXP_RES_STRING);</div><div class='del'>-			r-&gt;value.string = s-&gt;str;</div><div class='del'>-			g_string_free(s, FALSE);</div><div class='del'>-			break; }</div><div class='del'>-			</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!r) {</div><div class='del'>-		r = e_sexp_result_new(ESEXP_RES_INT);</div><div class='del'>-		r-&gt;value.number = 0;</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_sub(struct _ESExp *f, int argc, struct _ESExpResult **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r=NULL;</div><div class='del'>-	int type;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (argc&gt;0) {</div><div class='del'>-		type = argv[0]-&gt;type;</div><div class='del'>-		switch(type) {</div><div class='del'>-		case ESEXP_RES_INT: {</div><div class='del'>-			int total = argv[0]-&gt;value.number;</div><div class='del'>-			for (i=1;i&lt;argc &amp;&amp; argv[i]-&gt;type == ESEXP_RES_INT;i++) {</div><div class='del'>-				total -= argv[i]-&gt;value.number;</div><div class='del'>-			}</div><div class='del'>-			if (i&lt;argc) {</div><div class='del'>-				g_warning("Wrong type trying to subtract numbers: ignored");</div><div class='del'>-			}</div><div class='del'>-			r = e_sexp_result_new(ESEXP_RES_INT);</div><div class='del'>-			r-&gt;value.number = total;</div><div class='del'>-			break; }</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (!r) {</div><div class='del'>-		r = e_sexp_result_new(ESEXP_RES_INT);</div><div class='del'>-		r-&gt;value.number = 0;</div><div class='del'>-	}</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* implements 'if' function */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_if(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r;</div><div class='del'>-	int doit;</div><div class='del'>-</div><div class='del'>-	if (argc &gt;=2 &amp;&amp; argc&lt;=3) {</div><div class='del'>-		r = e_sexp_term_eval(f, argv[0]);</div><div class='del'>-		doit = (r-&gt;type == ESEXP_RES_BOOL &amp;&amp; r-&gt;value.bool);</div><div class='del'>-		e_sexp_result_free(r);</div><div class='del'>-		if (doit) {</div><div class='del'>-			return e_sexp_term_eval(f, argv[1]);</div><div class='del'>-		} else if (argc&gt;2) {</div><div class='del'>-			return e_sexp_term_eval(f, argv[2]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return e_sexp_result_new(ESEXP_RES_UNDEFINED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* implements 'begin' statement */</div><div class='del'>-static ESExpResult *</div><div class='del'>-term_eval_begin(struct _ESExp *f, int argc, struct _ESExpTerm **argv, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r=NULL;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;argc;i++) {</div><div class='del'>-		if (r)</div><div class='del'>-			e_sexp_result_free(r);</div><div class='del'>-		r = e_sexp_term_eval(f, argv[i]);</div><div class='del'>-	}</div><div class='del'>-	if (r)</div><div class='del'>-		return r;</div><div class='del'>-	else</div><div class='del'>-		return e_sexp_result_new(ESEXP_RES_UNDEFINED);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _ESExpResult *</div><div class='del'>-e_sexp_term_eval(struct _ESExp *f, struct _ESExpTerm *t)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpResult *r, *r1;</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(t != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	r(printf("eval term :\n"));</div><div class='del'>-	r(parse_dump_term(t, 0));</div><div class='del'>-</div><div class='del'>-	r = g_malloc0(sizeof(*r));</div><div class='del'>-	r-&gt;type = ESEXP_RES_UNDEFINED;</div><div class='del'>-</div><div class='del'>-	switch (t-&gt;type) {</div><div class='del'>-	case ESEXP_TERM_STRING:</div><div class='del'>-		r(printf(" (string \"%s\")\n", t-&gt;value.string));</div><div class='del'>-		r-&gt;type = ESEXP_RES_STRING;</div><div class='del'>-		/* erk, this shoul;dn't need to strdup this ... */</div><div class='del'>-		r-&gt;value.string = g_strdup(t-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_INT:</div><div class='del'>-		r(printf(" (int %d)\n", t-&gt;value.number));</div><div class='del'>-		r-&gt;type = ESEXP_RES_INT;</div><div class='del'>-		r-&gt;value.number = t-&gt;value.number;</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_BOOL:</div><div class='del'>-		r(printf(" (int %d)\n", t-&gt;value.number));</div><div class='del'>-		r-&gt;type = ESEXP_RES_BOOL;</div><div class='del'>-		r-&gt;value.bool = t-&gt;value.bool;</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_IFUNC: {</div><div class='del'>-		if (t-&gt;value.func.sym-&gt;f.ifunc) {</div><div class='del'>-			r1 = t-&gt;value.func.sym-&gt;f.ifunc(f, t-&gt;value.func.termcount, t-&gt;value.func.terms, t-&gt;value.func.sym-&gt;data);</div><div class='del'>-			if (r1) {</div><div class='del'>-				e_sexp_result_free(r);</div><div class='del'>-				r = r1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		break; }</div><div class='del'>-	case ESEXP_TERM_FUNC: {</div><div class='del'>-		struct _ESExpResult **argv;</div><div class='del'>-</div><div class='del'>-		/* first evaluate all arguments to result types */</div><div class='del'>-		argv = alloca(sizeof(argv[0]) * t-&gt;value.func.termcount);</div><div class='del'>-		for (i=0;i&lt;t-&gt;value.func.termcount;i++) {</div><div class='del'>-			argv[i] = e_sexp_term_eval(f, t-&gt;value.func.terms[i]);</div><div class='del'>-		}</div><div class='del'>-		/* call the function */</div><div class='del'>-		if (t-&gt;value.func.sym-&gt;f.func) {</div><div class='del'>-			r1 = t-&gt;value.func.sym-&gt;f.func(f, t-&gt;value.func.termcount, argv, t-&gt;value.func.sym-&gt;data);</div><div class='del'>-			if (r1) {</div><div class='del'>-				e_sexp_result_free(r);</div><div class='del'>-				r = r1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		for (i=0;i&lt;t-&gt;value.func.termcount;i++) {</div><div class='del'>-			e_sexp_result_free(argv[i]);</div><div class='del'>-		}</div><div class='del'>-		break; }</div><div class='del'>-	default:</div><div class='del'>-		printf("Warning: Unknown type encountered in parse tree: %d\n", t-&gt;type);</div><div class='del'>-		r-&gt;type = ESEXP_RES_UNDEFINED;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return r;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-eval_dump_result(ESExpResult *r, int depth)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	</div><div class='del'>-	if (r==NULL) {</div><div class='del'>-		printf("null result???\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;depth;i++)</div><div class='del'>-		printf("   ");</div><div class='del'>-</div><div class='del'>-	switch (r-&gt;type) {</div><div class='del'>-	case ESEXP_RES_ARRAY_PTR:</div><div class='del'>-		printf("array pointers\n");</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_INT:</div><div class='del'>-		printf("int: %d\n", r-&gt;value.number);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_STRING:</div><div class='del'>-		printf("string: '%s'\n", r-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_BOOL:</div><div class='del'>-		printf("bool: %c\n", r-&gt;value.bool?'t':'f');</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_RES_UNDEFINED:</div><div class='del'>-		printf(" &lt;undefined&gt;\n");</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	printf("\n");</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_dump_term(struct _ESExpTerm *t, int depth)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (t==NULL) {</div><div class='del'>-		printf("null term??\n");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	for (i=0;i&lt;depth;i++)</div><div class='del'>-		printf("   ");</div><div class='del'>-	</div><div class='del'>-	switch (t-&gt;type) {</div><div class='del'>-	case ESEXP_TERM_STRING:</div><div class='del'>-		printf(" \"%s\"", t-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_INT:</div><div class='del'>-		printf(" %d", t-&gt;value.number);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_BOOL:</div><div class='del'>-		printf(" #%c", t-&gt;value.bool?'t':'f');</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_IFUNC:</div><div class='del'>-	case ESEXP_TERM_FUNC:</div><div class='del'>-		printf(" (function %s\n", t-&gt;value.func.sym-&gt;name);</div><div class='del'>-		/*printf(" [%d] ", t-&gt;value.func.termcount);*/</div><div class='del'>-		for (i=0;i&lt;t-&gt;value.func.termcount;i++) {</div><div class='del'>-			parse_dump_term(t-&gt;value.func.terms[i], depth+1);</div><div class='del'>-		}</div><div class='del'>-		for (i=0;i&lt;depth;i++)</div><div class='del'>-			printf("   ");</div><div class='del'>-		printf(" )");</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_VAR:</div><div class='del'>-		printf(" (variable %s )\n", t-&gt;value.var-&gt;name);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printf("unknown type: %d\n", t-&gt;type);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	printf("\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/*</div><div class='del'>-  PARSER</div><div class='del'>-*/</div><div class='del'>-</div><div class='del'>-static struct _ESExpTerm *</div><div class='del'>-parse_new_term(int type)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpTerm *s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;type = type;</div><div class='del'>-	return s;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-parse_term_free(struct _ESExpTerm *t)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	if (t==NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (t-&gt;type) {</div><div class='del'>-	case ESEXP_TERM_FUNC:</div><div class='del'>-	case ESEXP_TERM_IFUNC:</div><div class='del'>-		for (i=0;i&lt;t-&gt;value.func.termcount;i++) {</div><div class='del'>-			parse_term_free(t-&gt;value.func.terms[i]);</div><div class='del'>-		}</div><div class='del'>-		g_free(t-&gt;value.func.terms);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_VAR:</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_STRING:</div><div class='del'>-		g_free(t-&gt;value.string);</div><div class='del'>-		break;</div><div class='del'>-	case ESEXP_TERM_INT:</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printf("parse_term_free: unknown type: %d\n", t-&gt;type);</div><div class='del'>-	}</div><div class='del'>-	g_free(t);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _ESExpTerm **</div><div class='del'>-parse_values(ESExp *f, int *len)</div><div class='del'>-{</div><div class='del'>-	int token;</div><div class='del'>-	struct _ESExpTerm **terms;</div><div class='del'>-	int i=0;</div><div class='del'>-	GScanner *gs = f-&gt;scanner;</div><div class='del'>-</div><div class='del'>-	p(printf("parsing values\n"));</div><div class='del'>-</div><div class='del'>-	/* FIXME: This hardcoded nonsense!!! :) */</div><div class='del'>-	terms = g_malloc0(20*sizeof(*terms));</div><div class='del'>-</div><div class='del'>-	while ( (token = g_scanner_peek_next_token(gs)) != G_TOKEN_EOF</div><div class='del'>-		&amp;&amp; token != ')') {</div><div class='del'>-		terms[i]=parse_value(f);</div><div class='del'>-		i++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p(printf("found %d subterms\n", i));</div><div class='del'>-	*len = i;</div><div class='del'>-	</div><div class='del'>-	p(printf("dont parsing values\n"));</div><div class='del'>-	return terms;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static struct _ESExpTerm *</div><div class='del'>-parse_value(ESExp *f)</div><div class='del'>-{</div><div class='del'>-	int token;</div><div class='del'>-	struct _ESExpTerm *t = NULL;</div><div class='del'>-	GScanner *gs = f-&gt;scanner;</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	p(printf("parsing value\n"));</div><div class='del'>-</div><div class='del'>-	token = g_scanner_get_next_token(gs);</div><div class='del'>-	switch(token) {</div><div class='del'>-	case G_TOKEN_LEFT_PAREN:</div><div class='del'>-		p(printf("got brace, its a list!\n"));</div><div class='del'>-		return parse_list(f, TRUE);</div><div class='del'>-	case G_TOKEN_STRING:</div><div class='del'>-		p(printf("got string\n"));</div><div class='del'>-		t = parse_new_term(ESEXP_TERM_STRING);</div><div class='del'>-		t-&gt;value.string = g_strdup(g_scanner_cur_value(gs).v_string);</div><div class='del'>-		break;</div><div class='del'>-	case G_TOKEN_INT:</div><div class='del'>-		t = parse_new_term(ESEXP_TERM_INT);</div><div class='del'>-		t-&gt;value.number = g_scanner_cur_value(gs).v_int;</div><div class='del'>-		p(printf("got int\n"));</div><div class='del'>-		break;</div><div class='del'>-	case '#':</div><div class='del'>-		printf("got bool?\n");</div><div class='del'>-		token = g_scanner_get_next_token(gs);</div><div class='del'>-		t = parse_new_term(ESEXP_TERM_BOOL);</div><div class='del'>-		t-&gt;value.bool = token=='t';</div><div class='del'>-		break;</div><div class='del'>-	case G_TOKEN_SYMBOL:</div><div class='del'>-		s = g_scanner_cur_value(gs).v_symbol;</div><div class='del'>-		switch (s-&gt;type) {</div><div class='del'>-		case ESEXP_TERM_FUNC:</div><div class='del'>-		case ESEXP_TERM_IFUNC:</div><div class='del'>-				/* this is basically invalid, since we can't use function</div><div class='del'>-				   pointers, but let the runtime catch it ... */</div><div class='del'>-			t = parse_new_term(s-&gt;type);</div><div class='del'>-			t-&gt;value.func.sym = s;</div><div class='del'>-			t-&gt;value.func.terms = parse_values(f, &amp;t-&gt;value.func.termcount);</div><div class='del'>-			break;</div><div class='del'>-		case ESEXP_TERM_VAR:</div><div class='del'>-			t = parse_new_term(s-&gt;type);</div><div class='del'>-			t-&gt;value.var = s;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printf("Invalid symbol type: %d\n", s-&gt;type);</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case G_TOKEN_IDENTIFIER:</div><div class='del'>-		printf("Unknown identifier encountered: %s\n", g_scanner_cur_value(gs).v_identifier);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		printf("Innvalid token trying to parse a list of values\n");</div><div class='del'>-	}</div><div class='del'>-	p(printf("done parsing value\n"));</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* FIXME: this needs some robustification */</div><div class='del'>-static struct _ESExpTerm *</div><div class='del'>-parse_list(ESExp *f, int gotbrace)</div><div class='del'>-{</div><div class='del'>-	int token;</div><div class='del'>-	struct _ESExpTerm *t = NULL;</div><div class='del'>-	GScanner *gs = f-&gt;scanner;</div><div class='del'>-</div><div class='del'>-	p(printf("parsing list\n"));</div><div class='del'>-	if (gotbrace)</div><div class='del'>-		token = '(';</div><div class='del'>-	else</div><div class='del'>-		token = g_scanner_get_next_token(gs);</div><div class='del'>-	if (token =='(') {</div><div class='del'>-		token = g_scanner_get_next_token(gs);</div><div class='del'>-		switch(token) {</div><div class='del'>-		case G_TOKEN_SYMBOL: {</div><div class='del'>-			struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-			s = g_scanner_cur_value(gs).v_symbol;</div><div class='del'>-			p(printf("got funciton: %s\n", s-&gt;name));</div><div class='del'>-			t = parse_new_term(s-&gt;type);</div><div class='del'>-			p(printf("created new list %p\n", t));</div><div class='del'>-			/* if we have a variable, find out its base type */</div><div class='del'>-			while (s-&gt;type == ESEXP_TERM_VAR) {</div><div class='del'>-				s = ((ESExpTerm *)(s-&gt;data))-&gt;value.var;</div><div class='del'>-			}</div><div class='del'>-			if (s-&gt;type == ESEXP_TERM_FUNC</div><div class='del'>-			    || s-&gt;type == ESEXP_TERM_IFUNC) {</div><div class='del'>-				t-&gt;value.func.sym = s;</div><div class='del'>-				t-&gt;value.func.terms = parse_values(f, &amp;t-&gt;value.func.termcount);</div><div class='del'>-			} else {</div><div class='del'>-				printf("Error, trying to call variable as function\n");</div><div class='del'>-			}</div><div class='del'>-			break; }</div><div class='del'>-		case G_TOKEN_IDENTIFIER:</div><div class='del'>-			printf("Unknown identifier: %s\n", g_scanner_cur_value(gs).v_identifier);</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			printf("unknown sequence encountered, type = %d\n", token);</div><div class='del'>-		}</div><div class='del'>-		token = g_scanner_get_next_token(gs);</div><div class='del'>-		if (token != ')') {</div><div class='del'>-			printf("Error, expected ')' not found\n");</div><div class='del'>-		}</div><div class='del'>-	} else {</div><div class='del'>-		printf("Error, list term without opening (\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	p(printf("returning list %p\n", t));</div><div class='del'>-	return t;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-GList *</div><div class='del'>-camel_mbox_folder_search_by_expression(CamelFolder *folder, char *expression, CamelException *ex)</div><div class='del'>-{</div><div class='del'>-	GScanner *gs;</div><div class='del'>-	int i;</div><div class='del'>-	struct _ESExpTerm *t;</div><div class='del'>-	struct _searchcontext *ctx;</div><div class='del'>-	struct _ESExpResult *r;</div><div class='del'>-	GList *matches = NULL;</div><div class='del'>-</div><div class='del'>-	gs = g_scanner_new(&amp;scanner_config);</div><div class='del'>-	for(i=0;i&lt;sizeof(symbols)/sizeof(symbols[0]);i++)</div><div class='del'>-		g_scanner_scope_add_symbol(gs, 0, symbols[i].name, &amp;symbols[i]);</div><div class='del'>-</div><div class='del'>-	g_scanner_input_text(gs, expression, strlen(expression));</div><div class='del'>-	t = parse_list(gs, 0);</div><div class='del'>-</div><div class='del'>-	if (t) {</div><div class='del'>-		ctx = g_malloc0(sizeof(*ctx));</div><div class='del'>-		ctx-&gt;folder = folder;</div><div class='del'>-		ctx-&gt;summary = camel_folder_get_summary(folder, ex);</div><div class='del'>-		ctx-&gt;message_info = camel_folder_summary_get_message_info_list(ctx-&gt;summary);</div><div class='del'>-#ifdef HAVE_IBEX</div><div class='del'>-		ctx-&gt;index = ibex_open(CAMEL_MBOX_FOLDER(folder)-&gt;index_file_path, FALSE);</div><div class='del'>-		if (!ctx-&gt;index) {</div><div class='del'>-			perror("Cannot open index file, body searches will be ignored\n");</div><div class='del'>-		}</div><div class='del'>-#endif</div><div class='del'>-		r = term_eval(ctx, t);</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'>-		}</div><div class='del'>-</div><div class='del'>-		if (ctx-&gt;index)</div><div class='del'>-			ibex_close(ctx-&gt;index);</div><div class='del'>-</div><div class='del'>-		gtk_object_unref((GtkObject *)ctx-&gt;summary);</div><div class='del'>-		g_free(ctx);</div><div class='del'>-		parse_term_free(t);</div><div class='del'>-	} else {</div><div class='del'>-		printf("Warning, Could not parse expression!\n %s\n", expression);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_scanner_destroy(gs);</div><div class='del'>-</div><div class='del'>-	return matches;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void e_sexp_finalise(GtkObject *);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_sexp_class_init (ESExpClass *class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *) class;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;finalize = e_sexp_finalise;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* 'builtin' functions */</div><div class='del'>-static struct {</div><div class='del'>-	char *name;</div><div class='del'>-	ESExpFunc *func;</div><div class='del'>-	int type;		/* set to 1 if a function can perform shortcut evaluation, or</div><div class='del'>-				   doesn't execute everything, 0 otherwise */</div><div class='del'>-} symbols[] = {</div><div class='del'>-	{ "and", (ESExpFunc *)term_eval_and, 1 },</div><div class='del'>-	{ "or", (ESExpFunc *)term_eval_or, 1 },</div><div class='del'>-	{ "not", (ESExpFunc *)term_eval_not, 0 },</div><div class='del'>-	{ "&lt;", (ESExpFunc *)term_eval_lt, 1 },</div><div class='del'>-	{ "&gt;", (ESExpFunc *)term_eval_gt, 1 },</div><div class='del'>-	{ "=", (ESExpFunc *)term_eval_eq, 1 },</div><div class='del'>-	{ "+", (ESExpFunc *)term_eval_plus, 0 },</div><div class='del'>-	{ "-", (ESExpFunc *)term_eval_sub, 0 },</div><div class='del'>-	{ "if", (ESExpFunc *)term_eval_if, 1 },</div><div class='del'>-	{ "begin", (ESExpFunc *)term_eval_begin, 1 },</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-free_symbol(void *key, void *value, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpSymbol *s = value;</div><div class='del'>-</div><div class='del'>-	g_free(s-&gt;name);</div><div class='del'>-	g_free(s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_sexp_finalise(GtkObject *o)</div><div class='del'>-{</div><div class='del'>-	ESExp *s = (ESExp *)o;</div><div class='del'>-</div><div class='del'>-	if (s-&gt;tree) {</div><div class='del'>-		parse_term_free(s-&gt;tree);</div><div class='del'>-		s-&gt;tree = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_scanner_scope_foreach_symbol(s-&gt;scanner, 0, free_symbol, 0);</div><div class='del'>-	g_scanner_destroy(s-&gt;scanner);</div><div class='del'>-</div><div class='del'>-	((GtkObjectClass *)(parent_class))-&gt;finalize((GtkObject *)o);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_sexp_init (ESExp *s)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	s-&gt;scanner = g_scanner_new(&amp;scanner_config);</div><div class='del'>-</div><div class='del'>-	/* load in builtin symbols? */</div><div class='del'>-	for(i=0;i&lt;sizeof(symbols)/sizeof(symbols[0]);i++) {</div><div class='del'>-		if (symbols[i].type == 1) {</div><div class='del'>-			e_sexp_add_ifunction(s, 0, symbols[i].name, (ESExpIFunc *)symbols[i].func, &amp;symbols[i]);</div><div class='del'>-		} else {</div><div class='del'>-			e_sexp_add_function(s, 0, symbols[i].name, symbols[i].func, &amp;symbols[i]);</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-guint</div><div class='del'>-e_sexp_get_type (void)</div><div class='del'>-{</div><div class='del'>-	static guint type = 0;</div><div class='del'>-	</div><div class='del'>-	if (!type) {</div><div class='del'>-		GtkTypeInfo type_info = {</div><div class='del'>-			"ESExp",</div><div class='del'>-			sizeof (ESExp),</div><div class='del'>-			sizeof (ESExpClass),</div><div class='del'>-			(GtkClassInitFunc) e_sexp_class_init,</div><div class='del'>-			(GtkObjectInitFunc) e_sexp_init,</div><div class='del'>-			(GtkArgSetFunc) NULL,</div><div class='del'>-			(GtkArgGetFunc) NULL</div><div class='del'>-		};</div><div class='del'>-		</div><div class='del'>-		type = gtk_type_unique (gtk_object_get_type (), &amp;type_info);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	return type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESExp *</div><div class='del'>-e_sexp_new (void)</div><div class='del'>-{</div><div class='del'>-	ESExp *f = E_SEXP ( gtk_type_new (e_sexp_get_type ()));</div><div class='del'>-</div><div class='del'>-	return f;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_add_function(ESExp *f, int scope, char *name, ESExpFunc *func, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(name != NULL);</div><div class='del'>-</div><div class='del'>-	s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;name = g_strdup(name);</div><div class='del'>-	s-&gt;f.func = func;</div><div class='del'>-	s-&gt;type = ESEXP_TERM_FUNC;</div><div class='del'>-	s-&gt;data = data;</div><div class='del'>-	g_scanner_scope_add_symbol(f-&gt;scanner, scope, s-&gt;name, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_add_ifunction(ESExp *f, int scope, char *name, ESExpIFunc *ifunc, void *data)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(name != NULL);</div><div class='del'>-</div><div class='del'>-	s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;name = g_strdup(name);</div><div class='del'>-	s-&gt;f.ifunc = ifunc;</div><div class='del'>-	s-&gt;type = ESEXP_TERM_IFUNC;</div><div class='del'>-	s-&gt;data = data;</div><div class='del'>-	g_scanner_scope_add_symbol(f-&gt;scanner, scope, s-&gt;name, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_add_variable(ESExp *f, int scope, char *name, ESExpTerm *value)</div><div class='del'>-{</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(name != NULL);</div><div class='del'>-</div><div class='del'>-	s = g_malloc0(sizeof(*s));</div><div class='del'>-	s-&gt;name = g_strdup(name);</div><div class='del'>-	s-&gt;type = ESEXP_TERM_VAR;</div><div class='del'>-	s-&gt;data = value;</div><div class='del'>-	g_scanner_scope_add_symbol(f-&gt;scanner, scope, s-&gt;name, s);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_remove_symbol(ESExp *f, int scope, char *name)</div><div class='del'>-{</div><div class='del'>-	int oldscope;</div><div class='del'>-	struct _ESExpSymbol *s;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(name != NULL);</div><div class='del'>-</div><div class='del'>-	oldscope = g_scanner_set_scope(f-&gt;scanner, scope);</div><div class='del'>-	s = g_scanner_lookup_symbol(f-&gt;scanner, name);</div><div class='del'>-	g_scanner_scope_remove_symbol(f-&gt;scanner, scope, name);</div><div class='del'>-	g_scanner_set_scope(f-&gt;scanner, oldscope);</div><div class='del'>-	if (s) {</div><div class='del'>-		g_free(s-&gt;name);</div><div class='del'>-		g_free(s);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_sexp_set_scope(ESExp *f, int scope)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(FILTER_IS_SEXP(f), 0);</div><div class='del'>-</div><div class='del'>-	return g_scanner_set_scope(f-&gt;scanner, scope);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_input_text(ESExp *f, const char *text, int len)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-	g_return_if_fail(text != NULL);</div><div class='del'>-</div><div class='del'>-	g_scanner_input_text(f-&gt;scanner, text, len);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_sexp_input_file (ESExp *f, int fd)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-</div><div class='del'>-	g_scanner_input_file(f-&gt;scanner, fd);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* needs some error return? */</div><div class='del'>-void</div><div class='del'>-e_sexp_parse(ESExp *f)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail(FILTER_IS_SEXP(f));</div><div class='del'>-</div><div class='del'>-	if (f-&gt;tree)</div><div class='del'>-		parse_term_free(f-&gt;tree);</div><div class='del'>-</div><div class='del'>-	f-&gt;tree = parse_list(f, FALSE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-struct _ESExpResult *</div><div class='del'>-e_sexp_eval(ESExp *f)</div><div class='del'>-{</div><div class='del'>-	g_return_val_if_fail(FILTER_IS_SEXP(f), NULL);</div><div class='del'>-	g_return_val_if_fail(f-&gt;tree != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	return e_sexp_term_eval(f, f-&gt;tree);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_sexp_encode_bool:</div><div class='del'>- * @s: </div><div class='del'>- * @state: </div><div class='del'>- * </div><div class='del'>- * Encode a bool into an s-expression @s.  Bools are</div><div class='del'>- * encoded using #t #f syntax.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_sexp_encode_bool(GString *s, gboolean state)</div><div class='del'>-{</div><div class='del'>-	if (state)</div><div class='del'>-		g_string_append(s, " #t");</div><div class='del'>-	else</div><div class='del'>-		g_string_append(s, " #f");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_sexp_encode_string:</div><div class='del'>- * @s: Destination string.</div><div class='del'>- * @string: String expression.</div><div class='del'>- * </div><div class='del'>- * Add a c string @string to the s-expression stored in</div><div class='del'>- * the gstring @s.  Quotes are added, and special characters</div><div class='del'>- * are escaped appropriately.</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-e_sexp_encode_string(GString *s, const char *string)</div><div class='del'>-{</div><div class='del'>-	char c;</div><div class='del'>-	const char *p;</div><div class='del'>-</div><div class='del'>-	p = string;</div><div class='del'>-	g_string_append(s, " \"");</div><div class='del'>-	while ( (c = *p++) ) {</div><div class='del'>-		if (c=='\\' || c=='\"' || c=='\'')</div><div class='del'>-			g_string_append_c(s, '\\');</div><div class='del'>-		g_string_append_c(s, c);</div><div class='del'>-	}</div><div class='del'>-	g_string_append(s, "\"");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#ifdef TESTER</div><div class='del'>-int main(int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	ESExp *f;</div><div class='del'>-	char *t = "(+ \"foo\" \"\\\"\" \"bar\" \"\\\\ blah \\x \")";</div><div class='del'>-	ESExpResult *r;</div><div class='del'>-</div><div class='del'>-	gtk_init(&amp;argc, &amp;argv);</div><div class='del'>-</div><div class='del'>-	f = e_sexp_new();</div><div class='del'>-</div><div class='del'>-	e_sexp_add_variable(f, 0, "test", NULL);</div><div class='del'>-</div><div class='del'>-	e_sexp_input_text(f, t, strlen(t));</div><div class='del'>-	e_sexp_parse(f);</div><div class='del'>-</div><div class='del'>-	if (f-&gt;tree) {</div><div class='del'>-		parse_dump_term(f-&gt;tree, 0);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	r = e_sexp_eval(f);</div><div class='del'>-	if (r) {</div><div class='del'>-		eval_dump_result(r, 0);</div><div class='del'>-	} else {</div><div class='del'>-		printf("no result?|\n");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='head'>diff --git a/e-util/e-sexp.h b/e-util/e-sexp.h<br/>deleted file mode 100644<br/>index 1030531133..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-sexp.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-sexp.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,119 +0,0 @@</div><div class='del'>-/*</div><div class='del'>-  generic s-exp evaluator class</div><div class='del'>-*/</div><div class='del'>-#ifndef _E_SEXP_H</div><div class='del'>-#define _E_SEXP_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtk.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_SEXP(obj)         GTK_CHECK_CAST (obj, e_sexp_get_type (), ESExp)</div><div class='del'>-#define E_SEXP_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, e_sexp_get_type (), ESExpClass)</div><div class='del'>-#define FILTER_IS_SEXP(obj)      GTK_CHECK_TYPE (obj, e_sexp_get_type ())</div><div class='del'>-</div><div class='del'>-typedef struct _ESExp      ESExp;</div><div class='del'>-typedef struct _ESExpClass ESExpClass;</div><div class='del'>-</div><div class='del'>-typedef struct _ESExpSymbol ESExpSymbol;</div><div class='del'>-typedef struct _ESExpResult ESExpResult;</div><div class='del'>-typedef struct _ESExpTerm ESExpTerm;</div><div class='del'>-</div><div class='del'>-typedef struct _ESExpResult *(ESExpFunc)(struct _ESExp *sexp,</div><div class='del'>-						   int argc,</div><div class='del'>-						   struct _ESExpResult **argv,</div><div class='del'>-						   void *data);</div><div class='del'>-</div><div class='del'>-typedef struct _ESExpResult *(ESExpIFunc)(struct _ESExp *sexp,</div><div class='del'>-						    int argc,</div><div class='del'>-						    struct _ESExpTerm **argv,</div><div class='del'>-						    void *data);</div><div class='del'>-enum _ESExpResultType {</div><div class='del'>-	ESEXP_RES_ARRAY_PTR=0,	/* type is a ptrarray, what it points to is implementation dependant */</div><div class='del'>-	ESEXP_RES_INT,		/* type is a number */</div><div class='del'>-	ESEXP_RES_STRING,	/* type is a pointer to a single string */</div><div class='del'>-	ESEXP_RES_BOOL,		/* boolean type */</div><div class='del'>-	ESEXP_RES_UNDEFINED	/* unknown type */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpResult {</div><div class='del'>-	enum _ESExpResultType type;</div><div class='del'>-	union {</div><div class='del'>-		GPtrArray *ptrarray;</div><div class='del'>-		int number;</div><div class='del'>-		char *string;</div><div class='del'>-		int bool;</div><div class='del'>-	} value;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _ESExpTermType {</div><div class='del'>-	ESEXP_TERM_INT	= 0,	/* integer literal */</div><div class='del'>-	ESEXP_TERM_BOOL,	/* boolean literal */</div><div class='del'>-	ESEXP_TERM_STRING,	/* string literal */</div><div class='del'>-	ESEXP_TERM_FUNC,	/* normal function, arguments are evaluated before calling */</div><div class='del'>-	ESEXP_TERM_IFUNC,	/* immediate function, raw terms are arguments */</div><div class='del'>-	ESEXP_TERM_VAR,		/* variable reference */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpSymbol {</div><div class='del'>-	int type;		/* ESEXP_TERM_FUNC or ESEXP_TERM_VAR */</div><div class='del'>-	char *name;</div><div class='del'>-	void *data;</div><div class='del'>-	union {</div><div class='del'>-		ESExpFunc *func;</div><div class='del'>-		ESExpIFunc *ifunc;</div><div class='del'>-	} f;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpTerm {</div><div class='del'>-	enum _ESExpTermType type;</div><div class='del'>-	union {</div><div class='del'>-		char *string;</div><div class='del'>-		int number;</div><div class='del'>-		int bool;</div><div class='del'>-		struct {</div><div class='del'>-			struct _ESExpSymbol *sym;</div><div class='del'>-			struct _ESExpTerm **terms;</div><div class='del'>-			int termcount;</div><div class='del'>-		} func;</div><div class='del'>-		struct _ESExpSymbol *var;</div><div class='del'>-	} value;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-struct _ESExp {</div><div class='del'>-	GtkObject object;</div><div class='del'>-</div><div class='del'>-	GScanner *scanner;	/* for parsing text version */</div><div class='del'>-	ESExpTerm *tree;	/* root of expression tree */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESExpClass {</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-guint		e_sexp_get_type		(void);</div><div class='del'>-ESExp 	       *e_sexp_new		(void);</div><div class='del'>-void		e_sexp_add_function  	(ESExp *f, int scope, char *name, ESExpFunc *func, void *data);</div><div class='del'>-void		e_sexp_add_ifunction  	(ESExp *f, int scope, char *name, ESExpIFunc *func, void *data);</div><div class='del'>-void		e_sexp_add_variable  	(ESExp *f, int scope, char *name, ESExpTerm *value);</div><div class='del'>-void		e_sexp_remove_symbol	(ESExp *f, int scope, char *name);</div><div class='del'>-int		e_sexp_set_scope		(ESExp *f, int scope);</div><div class='del'>-</div><div class='del'>-void		e_sexp_input_text		(ESExp *f, const char *text, int len);</div><div class='del'>-void		e_sexp_input_file		(ESExp *f, int fd);</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void		e_sexp_parse		(ESExp *f);</div><div class='del'>-ESExpResult    *e_sexp_eval		(ESExp *f);</div><div class='del'>-</div><div class='del'>-ESExpResult    *e_sexp_term_eval		(struct _ESExp *f, struct _ESExpTerm *t);</div><div class='del'>-ESExpResult    *e_sexp_result_new	(int type);</div><div class='del'>-void		e_sexp_result_free		(struct _ESExpResult *t);</div><div class='del'>-</div><div class='del'>-/* utility functions for creating s-exp strings. */</div><div class='del'>-void		e_sexp_encode_bool(GString *s, gboolean state);</div><div class='del'>-void		e_sexp_encode_string(GString *s, const char *string);</div><div class='del'>-</div><div class='del'>-#endif /* _E_SEXP_H */</div><div class='head'>diff --git a/e-util/e-text-event-processor-emacs-like.c b/e-util/e-text-event-processor-emacs-like.c<br/>deleted file mode 100644<br/>index bfba76885b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor-emacs-like.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-text-event-processor-emacs-like.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,497 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-text-event-processor.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-text-event-processor-emacs-like.h"</div><div class='del'>-</div><div class='del'>-static void e_text_event_processor_emacs_like_init		(ETextEventProcessorEmacsLike		 *card);</div><div class='del'>-static void e_text_event_processor_emacs_like_class_init	(ETextEventProcessorEmacsLikeClass	 *klass);</div><div class='del'>-static gint e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);</div><div class='del'>-</div><div class='del'>-static ETextEventProcessorClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const ETextEventProcessorCommand control_keys[26] =</div><div class='del'>-{</div><div class='del'>-	{ E_TEP_START_OF_LINE,      E_TEP_MOVE, 0, "" }, /* a */</div><div class='del'>-	{ E_TEP_BACKWARD_CHARACTER, E_TEP_MOVE, 0, "" }, /* b */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_COPY, 0, "" }, /* c */</div><div class='del'>-	{ E_TEP_FORWARD_CHARACTER,  E_TEP_DELETE, 0, "" }, /* d */</div><div class='del'>-	{ E_TEP_END_OF_LINE,        E_TEP_MOVE, 0, "" }, /* e */</div><div class='del'>-	{ E_TEP_FORWARD_CHARACTER,  E_TEP_MOVE, 0, "" }, /* f */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* g */</div><div class='del'>-	{ E_TEP_BACKWARD_CHARACTER, E_TEP_DELETE, 0, "" }, /* h */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* i */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* j */</div><div class='del'>-	{ E_TEP_END_OF_LINE,        E_TEP_DELETE, 0, "" }, /* k */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* l */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* m */</div><div class='del'>-	{ E_TEP_FORWARD_LINE,       E_TEP_MOVE, 0, "" }, /* n */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* o */</div><div class='del'>-	{ E_TEP_BACKWARD_LINE,      E_TEP_MOVE, 0, "" }, /* p */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* q */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* r */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* s */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* t */</div><div class='del'>-	{ E_TEP_START_OF_LINE,      E_TEP_DELETE, 0, "" }, /* u */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_PASTE, 0, "" }, /* v */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_DELETE, 0, "" }, /* w */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_DELETE, 0, "" }, /* x */</div><div class='del'>-	{ E_TEP_SELECTION,          E_TEP_PASTE, 0, "" }, /* y */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }           /* z */</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static const ETextEventProcessorCommand alt_keys[26] =</div><div class='del'>-{</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* a */</div><div class='del'>-	{ E_TEP_BACKWARD_WORD,      E_TEP_MOVE, 0, "" }, /* b */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* c */</div><div class='del'>-	{ E_TEP_FORWARD_WORD,       E_TEP_DELETE, 0, "" }, /* d */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* e */</div><div class='del'>-	{ E_TEP_FORWARD_WORD,       E_TEP_MOVE, 0, "" }, /* f */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* g */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* h */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* i */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* j */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* k */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* l */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* m */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* n */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* o */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* p */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* q */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* r */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* s */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* t */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* u */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* v */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* w */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* x */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" },           /* y */</div><div class='del'>-	{ E_TEP_SELECTION, E_TEP_NOP, 0, "" }           /* z */</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_text_event_processor_emacs_like_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType text_event_processor_emacs_like_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!text_event_processor_emacs_like_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo text_event_processor_emacs_like_info =</div><div class='del'>-      {</div><div class='del'>-        "ETextEventProcessorEmacsLike",</div><div class='del'>-        sizeof (ETextEventProcessorEmacsLike),</div><div class='del'>-        sizeof (ETextEventProcessorEmacsLikeClass),</div><div class='del'>-        (GtkClassInitFunc) e_text_event_processor_emacs_like_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_text_event_processor_emacs_like_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      text_event_processor_emacs_like_type = gtk_type_unique (e_text_event_processor_get_type (), &amp;text_event_processor_emacs_like_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return text_event_processor_emacs_like_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_emacs_like_class_init (ETextEventProcessorEmacsLikeClass *klass)</div><div class='del'>-{</div><div class='del'>-  GtkObjectClass *object_class;</div><div class='del'>-  ETextEventProcessorClass *processor_class;</div><div class='del'>-</div><div class='del'>-  object_class = (GtkObjectClass*) klass;</div><div class='del'>-  processor_class = (ETextEventProcessorClass*) klass;</div><div class='del'>-</div><div class='del'>-  parent_class = gtk_type_class (e_text_event_processor_get_type ());</div><div class='del'>-</div><div class='del'>-  processor_class-&gt;event = e_text_event_processor_emacs_like_event;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_emacs_like_init (ETextEventProcessorEmacsLike *tep)</div><div class='del'>-{</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gint</div><div class='del'>-e_text_event_processor_emacs_like_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessorCommand command;</div><div class='del'>-	ETextEventProcessorEmacsLike *tep_el = E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(tep);</div><div class='del'>-	command.action = E_TEP_NOP;</div><div class='del'>-	switch (event-&gt;type) {</div><div class='del'>-	case GDK_BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			command.action = E_TEP_GRAB;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-			if (event-&gt;button.state &amp; GDK_SHIFT_MASK)</div><div class='del'>-				command.action = E_TEP_SELECT;</div><div class='del'>-			else</div><div class='del'>-				command.action = E_TEP_MOVE;</div><div class='del'>-			command.position = E_TEP_VALUE;</div><div class='del'>-			command.value = event-&gt;button.position;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			tep_el-&gt;mouse_down = TRUE;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_2BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			command.action = E_TEP_SELECT;</div><div class='del'>-			command.position = E_TEP_SELECT_WORD;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_3BUTTON_PRESS:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			command.action = E_TEP_SELECT;</div><div class='del'>-			command.position = E_TEP_SELECT_ALL;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_BUTTON_RELEASE:</div><div class='del'>-		if (event-&gt;button.button == 1) {</div><div class='del'>-			command.action = E_TEP_UNGRAB;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			tep_el-&gt;mouse_down = FALSE;</div><div class='del'>-			command.action = E_TEP_NOP;</div><div class='del'>-		} else if (event-&gt;button.button == 2) {</div><div class='del'>-			command.action = E_TEP_MOVE;</div><div class='del'>-			command.position = E_TEP_VALUE;</div><div class='del'>-			command.value = event-&gt;button.position;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-			gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);			</div><div class='del'>-</div><div class='del'>-			command.action = E_TEP_GET_SELECTION;</div><div class='del'>-			command.position = E_TEP_SELECTION;</div><div class='del'>-			command.value = 0;</div><div class='del'>-			command.time = event-&gt;button.time;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_MOTION_NOTIFY:</div><div class='del'>-		if (tep_el-&gt;mouse_down) {</div><div class='del'>-			command.action = E_TEP_SELECT;</div><div class='del'>-			command.position = E_TEP_VALUE;</div><div class='del'>-			command.time = event-&gt;motion.time;</div><div class='del'>-			command.value = event-&gt;motion.position;</div><div class='del'>-		}</div><div class='del'>-		break;</div><div class='del'>-	case GDK_KEY_PRESS: </div><div class='del'>-		{</div><div class='del'>-			ETextEventProcessorEventKey key = event-&gt;key;</div><div class='del'>-			command.time = event-&gt;key.time;</div><div class='del'>-			if (key.state &amp; GDK_SHIFT_MASK)</div><div class='del'>-				command.action = E_TEP_SELECT;</div><div class='del'>-			else</div><div class='del'>-				command.action = E_TEP_MOVE;</div><div class='del'>-			switch(key.keyval) {</div><div class='del'>-			case GDK_Home:</div><div class='del'>-			case GDK_KP_Home:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_START_OF_BUFFER;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_START_OF_LINE;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_End:</div><div class='del'>-			case GDK_KP_End:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_END_OF_BUFFER;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_END_OF_LINE;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Page_Up:</div><div class='del'>-			case GDK_KP_Page_Up: command.position = E_TEP_BACKWARD_PAGE; break;</div><div class='del'>-</div><div class='del'>-			case GDK_Page_Down:</div><div class='del'>-			case GDK_KP_Page_Down: command.position = E_TEP_FORWARD_PAGE; break;</div><div class='del'>-				/* CUA has Ctrl-Up/Ctrl-Down as paragraph up down */</div><div class='del'>-			case GDK_Up:</div><div class='del'>-			case GDK_KP_Up:        command.position = E_TEP_BACKWARD_LINE; break;</div><div class='del'>-</div><div class='del'>-			case GDK_Down:</div><div class='del'>-			case GDK_KP_Down:      command.position = E_TEP_FORWARD_LINE; break;</div><div class='del'>-</div><div class='del'>-			case GDK_Left:</div><div class='del'>-			case GDK_KP_Left:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_BACKWARD_WORD;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_BACKWARD_CHARACTER;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Right:</div><div class='del'>-			case GDK_KP_Right:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_FORWARD_WORD;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_FORWARD_CHARACTER;</div><div class='del'>-				break;</div><div class='del'>-	  </div><div class='del'>-			case GDK_BackSpace:</div><div class='del'>-				command.action = E_TEP_DELETE;</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK)</div><div class='del'>-					command.position = E_TEP_BACKWARD_WORD;</div><div class='del'>-				else</div><div class='del'>-					command.position = E_TEP_BACKWARD_CHARACTER;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Clear:</div><div class='del'>-				command.action = E_TEP_DELETE;</div><div class='del'>-				command.position = E_TEP_END_OF_LINE;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Insert:</div><div class='del'>-			case GDK_KP_Insert:</div><div class='del'>-				if (key.state &amp; GDK_SHIFT_MASK) {</div><div class='del'>-					command.action = E_TEP_PASTE;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-				} else if (key.state &amp; GDK_CONTROL_MASK) {</div><div class='del'>-					command.action = E_TEP_COPY;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-				} else {</div><div class='del'>-				/* gtk_toggle_insert(text) -- IMPLEMENT -- FIXME */</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Delete:</div><div class='del'>-			case GDK_KP_Delete:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK){</div><div class='del'>-					command.action = E_TEP_DELETE;</div><div class='del'>-					command.position = E_TEP_FORWARD_WORD;</div><div class='del'>-				} else if (key.state &amp; GDK_SHIFT_MASK) {</div><div class='del'>-					command.action = E_TEP_COPY;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-					gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-				</div><div class='del'>-					command.action = E_TEP_DELETE;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-				} else {</div><div class='del'>-					command.action = E_TEP_DELETE;</div><div class='del'>-					command.position = E_TEP_FORWARD_CHARACTER;</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Tab:</div><div class='del'>-			case GDK_KP_Tab:</div><div class='del'>-			case GDK_ISO_Left_Tab:</div><div class='del'>-			case GDK_3270_BackTab:</div><div class='del'>-				/* Don't insert literally */</div><div class='del'>-				command.action = E_TEP_NOP;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Return:</div><div class='del'>-			case GDK_KP_Enter:</div><div class='del'>-				if ((key.state &amp; GDK_CONTROL_MASK) || (!tep-&gt;allow_newlines)) {</div><div class='del'>-					command.action = E_TEP_ACTIVATE;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-				} else {</div><div class='del'>-					command.action = E_TEP_INSERT;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-					command.value = 1;</div><div class='del'>-					command.string = "\n";</div><div class='del'>-				}</div><div class='del'>-				break;</div><div class='del'>-			case GDK_Escape:</div><div class='del'>-				/* Don't insert literally */</div><div class='del'>-				command.action = E_TEP_NOP;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			case GDK_KP_Space:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = " ";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Equal:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "=";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Multiply:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "*";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Add:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "+";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Subtract:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "-";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Decimal:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = ".";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_Divide:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "/";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_0:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "0";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_1:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "1";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_2:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "2";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_3:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "3";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_4:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "4";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_5:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "5";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_6:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "6";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_7:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "7";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_8:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "8";</div><div class='del'>-				break;</div><div class='del'>-			case GDK_KP_9:</div><div class='del'>-				command.action = E_TEP_INSERT;</div><div class='del'>-				command.position = E_TEP_SELECTION;</div><div class='del'>-				command.value = 1;</div><div class='del'>-				command.string = "9";</div><div class='del'>-				break;</div><div class='del'>-</div><div class='del'>-			default:</div><div class='del'>-				if (key.state &amp; GDK_CONTROL_MASK) {</div><div class='del'>-					if ((key.keyval &gt;= 'A') &amp;&amp; (key.keyval &lt;= 'Z'))</div><div class='del'>-						key.keyval -= 'A' - 'a';</div><div class='del'>-					</div><div class='del'>-					if ((key.keyval &gt;= 'a') &amp;&amp; (key.keyval &lt;= 'z')) {</div><div class='del'>-						command.position = control_keys[(int) (key.keyval - 'a')].position;</div><div class='del'>-						if (control_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)</div><div class='del'>-							command.action = control_keys[(int) (key.keyval - 'a')].action;</div><div class='del'>-						command.value = control_keys[(int) (key.keyval - 'a')].value;</div><div class='del'>-						command.string = control_keys[(int) (key.keyval - 'a')].string;</div><div class='del'>-					}</div><div class='del'>-</div><div class='del'>-					if (key.keyval == 'x' || key.keyval == 'w') {</div><div class='del'>-						command.action = E_TEP_COPY;</div><div class='del'>-						command.position = E_TEP_SELECTION;</div><div class='del'>-						gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-						</div><div class='del'>-						command.action = E_TEP_DELETE;</div><div class='del'>-						command.position = E_TEP_SELECTION;</div><div class='del'>-					}</div><div class='del'>-					</div><div class='del'>-					break;</div><div class='del'>-				} else if (key.state &amp; GDK_MOD1_MASK) {</div><div class='del'>-					if ((key.keyval &gt;= 'A') &amp;&amp; (key.keyval &lt;= 'Z'))</div><div class='del'>-						key.keyval -= 'A' - 'a';</div><div class='del'>-					</div><div class='del'>-					if ((key.keyval &gt;= 'a') &amp;&amp; (key.keyval &lt;= 'z')) {</div><div class='del'>-						command.position = alt_keys[(int) (key.keyval - 'a')].position;</div><div class='del'>-						if (alt_keys[(int) (key.keyval - 'a')].action != E_TEP_MOVE)</div><div class='del'>-							command.action = alt_keys[(int) (key.keyval - 'a')].action;</div><div class='del'>-						command.value = alt_keys[(int) (key.keyval - 'a')].value;</div><div class='del'>-						command.string = alt_keys[(int) (key.keyval - 'a')].string;</div><div class='del'>-					}</div><div class='del'>-				} else if (key.length &gt; 0) {</div><div class='del'>-					if (key.keyval &gt;= GDK_KP_0 &amp;&amp; key.keyval &lt;= GDK_KP_9) {</div><div class='del'>-						key.keyval = '0';</div><div class='del'>-						key.string = "0";</div><div class='del'>-					}</div><div class='del'>-					command.action = E_TEP_INSERT;</div><div class='del'>-					command.position = E_TEP_SELECTION;</div><div class='del'>-					command.value = strlen(key.string);</div><div class='del'>-					command.string = key.string;</div><div class='del'>-					</div><div class='del'>-				} else {</div><div class='del'>-					command.action = E_TEP_NOP;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			break;</div><div class='del'>-		case GDK_KEY_RELEASE:</div><div class='del'>-			command.time = event-&gt;key.time;</div><div class='del'>-			command.action = E_TEP_NOP;</div><div class='del'>-			break;</div><div class='del'>-		default:</div><div class='del'>-			command.action = E_TEP_NOP;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	if (command.action != E_TEP_NOP) {</div><div class='del'>-		gtk_signal_emit_by_name (GTK_OBJECT (tep), "command", &amp;command);</div><div class='del'>-		return 1;</div><div class='del'>-	}</div><div class='del'>-	else</div><div class='del'>-		return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ETextEventProcessor *</div><div class='del'>-e_text_event_processor_emacs_like_new (void)</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessorEmacsLike *retval = gtk_type_new (e_text_event_processor_emacs_like_get_type ());</div><div class='del'>-	return E_TEXT_EVENT_PROCESSOR (retval);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/e-util/e-text-event-processor-emacs-like.h b/e-util/e-text-event-processor-emacs-like.h<br/>deleted file mode 100644<br/>index 708ddfcbeb..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor-emacs-like.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-text-event-processor-emacs-like.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-text-event-processor-emacs-like.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_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__</div><div class='del'>-#define __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text-event-processor.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* ETextEventProcessorEmacsLike - Turns events on a text widget into commands.  Uses an emacs-ish interface.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE			(e_text_event_processor_emacs_like_get_type ())</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)			(GTK_CHECK_CAST ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLike))</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE, ETextEventProcessorEmacsLikeClass))</div><div class='del'>-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE(obj)		        (GTK_CHECK_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))</div><div class='del'>-#define E_IS_TEXT_EVENT_PROCESSOR_EMACS_LIKE_CLASS(klass)	        (GTK_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ETextEventProcessorEmacsLike       ETextEventProcessorEmacsLike;</div><div class='del'>-typedef struct _ETextEventProcessorEmacsLikeClass  ETextEventProcessorEmacsLikeClass;</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorEmacsLike</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessor parent;</div><div class='del'>-	</div><div class='del'>-	/* object specific fields */</div><div class='del'>-	guint mouse_down : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorEmacsLikeClass</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessorClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_text_event_processor_emacs_like_get_type (void);</div><div class='del'>-ETextEventProcessor *e_text_event_processor_emacs_like_new (void);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_TEXT_EVENT_PROCESSOR_EMACS_LIKE_H__ */</div><div class='head'>diff --git a/e-util/e-text-event-processor-types.h b/e-util/e-text-event-processor-types.h<br/>deleted file mode 100644<br/>index 8f2ffbaf39..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor-types.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-text-event-processor-types.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,140 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* e-text-event-processor.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'>-/*</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'>-#ifndef __E_TEXT_EVENT_PROCESSOR_TYPES_H__</div><div class='del'>-#define __E_TEXT_EVENT_PROCESSOR_TYPES_H__</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-#include &lt;gdk/gdktypes.h&gt;</div><div class='del'>-</div><div class='del'>-typedef enum _ETextEventProcessorCommandPosition ETextEventProcessorCommandPosition;</div><div class='del'>-typedef enum _ETextEventProcessorCommandAction ETextEventProcessorCommandAction;</div><div class='del'>-typedef struct _ETextEventProcessorCommand ETextEventProcessorCommand;</div><div class='del'>-</div><div class='del'>-typedef union _ETextEventProcessorEvent ETextEventProcessorEvent;</div><div class='del'>-typedef struct _ETextEventProcessorEventButton ETextEventProcessorEventButton;</div><div class='del'>-typedef struct _ETextEventProcessorEventKey ETextEventProcessorEventKey;</div><div class='del'>-typedef struct _ETextEventProcessorEventMotion ETextEventProcessorEventMotion;</div><div class='del'>-</div><div class='del'>-enum _ETextEventProcessorCommandPosition {</div><div class='del'>-	E_TEP_VALUE,</div><div class='del'>-	E_TEP_SELECTION,</div><div class='del'>-</div><div class='del'>-	E_TEP_START_OF_BUFFER,</div><div class='del'>-	E_TEP_END_OF_BUFFER,</div><div class='del'>-</div><div class='del'>-	E_TEP_START_OF_LINE,</div><div class='del'>-	E_TEP_END_OF_LINE,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_CHARACTER,</div><div class='del'>-	E_TEP_BACKWARD_CHARACTER,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_WORD,</div><div class='del'>-	E_TEP_BACKWARD_WORD,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_LINE,</div><div class='del'>-	E_TEP_BACKWARD_LINE,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_PARAGRAPH,</div><div class='del'>-	E_TEP_BACKWARD_PARAGRAPH,</div><div class='del'>-</div><div class='del'>-	E_TEP_FORWARD_PAGE,</div><div class='del'>-	E_TEP_BACKWARD_PAGE,</div><div class='del'>-</div><div class='del'>-	E_TEP_SELECT_WORD,</div><div class='del'>-	E_TEP_SELECT_ALL</div><div class='del'>-</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum _ETextEventProcessorCommandAction {</div><div class='del'>-	E_TEP_MOVE,</div><div class='del'>-	E_TEP_SELECT,</div><div class='del'>-	E_TEP_DELETE,</div><div class='del'>-	E_TEP_INSERT,</div><div class='del'>-</div><div class='del'>-	E_TEP_COPY,</div><div class='del'>-	E_TEP_PASTE,</div><div class='del'>-	E_TEP_GET_SELECTION,</div><div class='del'>-	E_TEP_SET_SELECT_BY_WORD,</div><div class='del'>-	E_TEP_ACTIVATE,</div><div class='del'>-	</div><div class='del'>-	E_TEP_GRAB,</div><div class='del'>-	E_TEP_UNGRAB,</div><div class='del'>-</div><div class='del'>-	E_TEP_NOP</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorCommand {</div><div class='del'>-	ETextEventProcessorCommandPosition position;</div><div class='del'>-	ETextEventProcessorCommandAction action;</div><div class='del'>-	int value;</div><div class='del'>-	char *string;</div><div class='del'>-	guint32 time;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorEventButton {</div><div class='del'>-	GdkEventType type;</div><div class='del'>-	guint32 time;</div><div class='del'>-	guint state;</div><div class='del'>-	guint button;</div><div class='del'>-	gint position;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorEventKey {</div><div class='del'>-	GdkEventType type;</div><div class='del'>-	guint32 time;</div><div class='del'>-	guint state;</div><div class='del'>-	guint keyval;</div><div class='del'>-	gint length;</div><div class='del'>-	gchar *string;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorEventMotion {</div><div class='del'>-	GdkEventType type;</div><div class='del'>-	guint32 time;</div><div class='del'>-	guint state;</div><div class='del'>-	gint position;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-union _ETextEventProcessorEvent {</div><div class='del'>-	GdkEventType type;</div><div class='del'>-	ETextEventProcessorEventButton button;</div><div class='del'>-	ETextEventProcessorEventKey key;</div><div class='del'>-	ETextEventProcessorEventMotion motion;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_TEXT_EVENT_PROCESSOR_TYPES_H__ */</div><div class='head'>diff --git a/e-util/e-text-event-processor.c b/e-util/e-text-event-processor.c<br/>deleted file mode 100644<br/>index 772ae5c12b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-text-event-processor.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'>-/* e-text-event-processor.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-text-event-processor.h"</div><div class='del'>-</div><div class='del'>-static void e_text_event_processor_init		(ETextEventProcessor		 *card);</div><div class='del'>-static void e_text_event_processor_class_init	(ETextEventProcessorClass	 *klass);</div><div class='del'>-</div><div class='del'>-static void e_text_event_processor_set_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-static void e_text_event_processor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-/* The arguments we take */</div><div class='del'>-enum {</div><div class='del'>-	ARG_0,</div><div class='del'>-	ARG_ALLOW_NEWLINES,</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	E_TEP_EVENT,</div><div class='del'>-	E_TEP_LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint e_tep_signals[E_TEP_LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-GtkType</div><div class='del'>-e_text_event_processor_get_type (void)</div><div class='del'>-{</div><div class='del'>-  static GtkType text_event_processor_type = 0;</div><div class='del'>-</div><div class='del'>-  if (!text_event_processor_type)</div><div class='del'>-    {</div><div class='del'>-      static const GtkTypeInfo text_event_processor_info =</div><div class='del'>-      {</div><div class='del'>-        "ETextEventProcessor",</div><div class='del'>-        sizeof (ETextEventProcessor),</div><div class='del'>-        sizeof (ETextEventProcessorClass),</div><div class='del'>-        (GtkClassInitFunc) e_text_event_processor_class_init,</div><div class='del'>-        (GtkObjectInitFunc) e_text_event_processor_init,</div><div class='del'>-        /* reserved_1 */ NULL,</div><div class='del'>-        /* reserved_2 */ NULL,</div><div class='del'>-        (GtkClassInitFunc) NULL,</div><div class='del'>-      };</div><div class='del'>-</div><div class='del'>-      text_event_processor_type = gtk_type_unique (gtk_object_get_type (), &amp;text_event_processor_info);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  return text_event_processor_type;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_class_init (ETextEventProcessorClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = (GtkObjectClass*) klass;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (gtk_object_get_type ());</div><div class='del'>-</div><div class='del'>-	e_tep_signals[E_TEP_EVENT] =</div><div class='del'>-		gtk_signal_new ("command",</div><div class='del'>-				GTK_RUN_LAST,</div><div class='del'>-				object_class-&gt;type,</div><div class='del'>-				GTK_SIGNAL_OFFSET (ETextEventProcessorClass, command),</div><div class='del'>-				gtk_marshal_NONE__POINTER,</div><div class='del'>-				GTK_TYPE_NONE, 1,</div><div class='del'>-				GTK_TYPE_POINTER);</div><div class='del'>-</div><div class='del'>-	gtk_object_class_add_signals (object_class, e_tep_signals, E_TEP_LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	gtk_object_add_arg_type ("ETextEventProcessor::allow_newlines", GTK_TYPE_BOOL,</div><div class='del'>-				 GTK_ARG_READWRITE, ARG_ALLOW_NEWLINES);</div><div class='del'>-</div><div class='del'>-	klass-&gt;event = NULL;</div><div class='del'>-	klass-&gt;command = NULL;</div><div class='del'>-</div><div class='del'>-	object_class-&gt;set_arg = e_text_event_processor_set_arg;</div><div class='del'>-	object_class-&gt;get_arg = e_text_event_processor_get_arg;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_init (ETextEventProcessor *tep)</div><div class='del'>-{</div><div class='del'>-	tep-&gt;allow_newlines = TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event)</div><div class='del'>-{</div><div class='del'>-	if (E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT(tep)-&gt;klass)-&gt;event) {</div><div class='del'>-		return E_TEXT_EVENT_PROCESSOR_CLASS(GTK_OBJECT(tep)-&gt;klass)-&gt;event(tep, event);</div><div class='del'>-	} else {</div><div class='del'>-		return 0;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Set_arg handler for the text item */</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_set_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_ALLOW_NEWLINES:</div><div class='del'>-		tep-&gt;allow_newlines = GTK_VALUE_BOOL (*arg);</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Get_arg handler for the text item */</div><div class='del'>-static void</div><div class='del'>-e_text_event_processor_get_arg (GtkObject *object, GtkArg *arg, guint arg_id)</div><div class='del'>-{</div><div class='del'>-	ETextEventProcessor *tep = E_TEXT_EVENT_PROCESSOR (object);</div><div class='del'>-</div><div class='del'>-	switch (arg_id) {</div><div class='del'>-	case ARG_ALLOW_NEWLINES:</div><div class='del'>-		GTK_VALUE_BOOL (*arg) = tep-&gt;allow_newlines;</div><div class='del'>-		break;</div><div class='del'>-	default:</div><div class='del'>-		arg-&gt;type = GTK_TYPE_INVALID;</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-text-event-processor.h b/e-util/e-text-event-processor.h<br/>deleted file mode 100644<br/>index 9f9fbc9c24..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-text-event-processor.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-text-event-processor.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-text-event-processor.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_TEXT_EVENT_PROCESSOR_H__</div><div class='del'>-#define __E_TEXT_EVENT_PROCESSOR_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/e-text/e-text-event-processor-types.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-extern "C" {</div><div class='del'>-#pragma }</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-/* ETextEventProcessor - Turns events on a text widget into commands.</div><div class='del'>- *</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_TYPE			(e_text_event_processor_get_type ())</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR(obj)			(GTK_CHECK_CAST ((obj), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessor))</div><div class='del'>-#define E_TEXT_EVENT_PROCESSOR_CLASS(klass)		(GTK_CHECK_CLASS_CAST ((klass), E_TEXT_EVENT_PROCESSOR_TYPE, ETextEventProcessorClass))</div><div class='del'>-#define E_IS_TEXT_EVENT_PROCESSOR(obj)		        (GTK_CHECK_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))</div><div class='del'>-#define E_IS_TEXT_EVENT_PROCESSOR_CLASS(klass)	        (GTK_CHECK_CLASS_TYPE ((obj), E_TEXT_EVENT_PROCESSOR_TYPE))</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-typedef struct _ETextEventProcessor       ETextEventProcessor;</div><div class='del'>-typedef struct _ETextEventProcessorClass  ETextEventProcessorClass;</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessor</div><div class='del'>-{</div><div class='del'>-	GtkObject parent;</div><div class='del'>-</div><div class='del'>-	/* object specific fields */</div><div class='del'>-	guint allow_newlines : 1;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ETextEventProcessorClass</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	/* signals */</div><div class='del'>-	void (* command) (ETextEventProcessor *tep, ETextEventProcessorCommand *command);</div><div class='del'>-</div><div class='del'>-	/* virtual functions */</div><div class='del'>-	gint (* event) (ETextEventProcessor *tep, ETextEventProcessorEvent *event);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-GtkType    e_text_event_processor_get_type (void);</div><div class='del'>-gint       e_text_event_processor_handle_event (ETextEventProcessor *tep, ETextEventProcessorEvent *event);</div><div class='del'>-</div><div class='del'>-#ifdef __cplusplus</div><div class='del'>-}</div><div class='del'>-#endif /* __cplusplus */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#endif /* __E_TEXT_EVENT_PROCESSOR_H__ */</div><div class='head'>diff --git a/e-util/e-util.c b/e-util/e-util.c<br/>deleted file mode 100644<br/>index 9a0929c865..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-util.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-util.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,525 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-xml-utils.c</div><div class='del'>- * Copyright (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;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtkobject.h&gt;</div><div class='del'>-#include &lt;errno.h&gt;</div><div class='del'>-#include &lt;fcntl.h&gt;</div><div class='del'>-#include &lt;unistd.h&gt;</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;sys/stat.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-util.h"</div><div class='del'>-#if 0</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-g_str_compare(const void *x, const void *y)</div><div class='del'>-{</div><div class='del'>-  return strcmp(x, y);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-g_int_compare(const void *x, const void *y)</div><div class='del'>-{</div><div class='del'>-  if ( GPOINTER_TO_INT(x) &lt; GPOINTER_TO_INT(y) )</div><div class='del'>-    return -1;</div><div class='del'>-  else if ( GPOINTER_TO_INT(x) == GPOINTER_TO_INT(y) )</div><div class='del'>-    return 0;</div><div class='del'>-  else</div><div class='del'>-    return 1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_strdup_strip(char *string)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-	int length = 0;</div><div class='del'>-	int initial = 0;</div><div class='del'>-	for ( i = 0; string[i]; i++ ) {</div><div class='del'>-		if (initial == i &amp;&amp; isspace(string[i])) {</div><div class='del'>-			initial ++;</div><div class='del'>-		}</div><div class='del'>-		if (!isspace(string[i])) {</div><div class='del'>-			length = i - initial + 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return g_strndup(string + initial, length);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_free_object_list (GList *list)</div><div class='del'>-{</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next)</div><div class='del'>-		gtk_object_unref (GTK_OBJECT (p-&gt;data));</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_free_string_list (GList *list)</div><div class='del'>-{</div><div class='del'>-	GList *p;</div><div class='del'>-</div><div class='del'>-	for (p = list; p != NULL; p = p-&gt;next)</div><div class='del'>-		g_free (p-&gt;data);</div><div class='del'>-</div><div class='del'>-	g_list_free (list);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#define BUFF_SIZE 1024</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_read_file(const char *filename)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	char buffer[BUFF_SIZE];</div><div class='del'>-	GList *list = NULL, *list_iterator;</div><div class='del'>-	GList *lengths = NULL, *lengths_iterator;</div><div class='del'>-	int length = 0;</div><div class='del'>-	int bytes;</div><div class='del'>-	char *ret_val;</div><div class='del'>-</div><div class='del'>-	fd = open(filename, O_RDONLY);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return NULL;</div><div class='del'>-	bytes = read(fd, buffer, BUFF_SIZE);</div><div class='del'>-	while (bytes) {</div><div class='del'>-		if (bytes &gt; 0) {</div><div class='del'>-			char *temp = g_malloc(bytes);</div><div class='del'>-			memcpy (temp, buffer, bytes);</div><div class='del'>-			list = g_list_prepend(list, temp);</div><div class='del'>-			lengths = g_list_prepend(lengths, GINT_TO_POINTER(bytes));</div><div class='del'>-			length += bytes;</div><div class='del'>-		} else {</div><div class='del'>-			if (errno != EINTR) {</div><div class='del'>-				close(fd);</div><div class='del'>-				g_list_foreach(list, (GFunc) g_free, NULL);</div><div class='del'>-				g_list_free(list);</div><div class='del'>-				g_list_free(lengths);</div><div class='del'>-				return NULL;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		bytes = read(fd, buffer, BUFF_SIZE);</div><div class='del'>-	}</div><div class='del'>-	ret_val = g_new(char, length + 1);</div><div class='del'>-	ret_val[length] = 0;</div><div class='del'>-	lengths_iterator = lengths;</div><div class='del'>-	list_iterator = list;</div><div class='del'>-	for ( ; list_iterator; list_iterator = list_iterator-&gt;next, lengths_iterator = lengths_iterator-&gt;next) {</div><div class='del'>-		int this_length = GPOINTER_TO_INT(lengths_iterator-&gt;data);</div><div class='del'>-		length -= this_length;</div><div class='del'>-		memcpy(ret_val + length, list_iterator-&gt;data, this_length);</div><div class='del'>-	}</div><div class='del'>-	close(fd);</div><div class='del'>-	g_list_foreach(list, (GFunc) g_free, NULL);</div><div class='del'>-	g_list_free(list);</div><div class='del'>-	g_list_free(lengths);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gint</div><div class='del'>-e_write_file(const char *filename, const char *data, int flags)</div><div class='del'>-{</div><div class='del'>-	int fd;</div><div class='del'>-	int length = strlen(data);</div><div class='del'>-	int bytes;</div><div class='del'>-	fd = open(filename, flags, 0666);</div><div class='del'>-	if (fd == -1)</div><div class='del'>-		return errno;</div><div class='del'>-	while (length &gt; 0) {</div><div class='del'>-		bytes = write(fd, data, length);</div><div class='del'>-		if (bytes &gt; 0) {</div><div class='del'>-			length -= bytes;</div><div class='del'>-			data += bytes;</div><div class='del'>-		} else {</div><div class='del'>-			if (errno != EINTR &amp;&amp; errno != EAGAIN) {</div><div class='del'>-				int save_errno = errno;</div><div class='del'>-				close(fd);</div><div class='del'>-				return save_errno;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	close(fd);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/**</div><div class='del'>- * e_mkdir_hier:</div><div class='del'>- * @path: a directory path</div><div class='del'>- * @mode: a mode, as for mkdir(2)</div><div class='del'>- *</div><div class='del'>- * This creates the named directory with the given @mode, creating</div><div class='del'>- * any necessary intermediate directories (with the same @mode).</div><div class='del'>- *</div><div class='del'>- * Return value: 0 on success, -1 on error, in which case errno will</div><div class='del'>- * be set as for mkdir(2).</div><div class='del'>- **/</div><div class='del'>-int</div><div class='del'>-e_mkdir_hier(const char *path, mode_t mode)</div><div class='del'>-{</div><div class='del'>-	char *copy, *p;</div><div class='del'>-</div><div class='del'>-	p = copy = g_strdup (path);</div><div class='del'>-	do {</div><div class='del'>-		p = strchr (p + 1, '/');</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '\0';</div><div class='del'>-		if (access (copy, F_OK) == -1) {</div><div class='del'>-			if (mkdir (copy, mode) == -1) {</div><div class='del'>-				g_free (copy);</div><div class='del'>-				return -1;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		if (p)</div><div class='del'>-			*p = '/';</div><div class='del'>-	} while (p);</div><div class='del'>-</div><div class='del'>-	g_free (copy);</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-char *</div><div class='del'>-e_read_uri(const char *uri)</div><div class='del'>-{</div><div class='del'>-	GnomeVFSHandle *handle;</div><div class='del'>-	GList *list = NULL, *list_iterator;</div><div class='del'>-	GList *lengths = NULL, *lengths_iterator;</div><div class='del'>-	gchar buffer[1025];</div><div class='del'>-	gchar *ret_val;</div><div class='del'>-	int length = 0;</div><div class='del'>-	GnomeVFSFileSize bytes;</div><div class='del'>-</div><div class='del'>-	gnome_vfs_open(&amp;handle, uri, GNOME_VFS_OPEN_READ);</div><div class='del'>-	</div><div class='del'>-	gnome_vfs_read(handle, buffer, 1024, &amp;bytes);</div><div class='del'>-	while (bytes) {</div><div class='del'>-		if (bytes) {</div><div class='del'>-			char *temp = g_malloc(bytes);</div><div class='del'>-			memcpy (temp, buffer, bytes);</div><div class='del'>-			list = g_list_prepend(list, temp);</div><div class='del'>-			lengths = g_list_prepend(lengths, GINT_TO_POINTER((gint) bytes));</div><div class='del'>-			length += bytes;</div><div class='del'>-		}</div><div class='del'>-		gnome_vfs_read(handle, buffer, 1024, &amp;bytes);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	ret_val = g_new(char, length + 1);</div><div class='del'>-	ret_val[length] = 0;</div><div class='del'>-	lengths_iterator = lengths;</div><div class='del'>-	list_iterator = list;</div><div class='del'>-	for ( ; list_iterator; list_iterator = list_iterator-&gt;next, lengths_iterator = lengths_iterator-&gt;next) {</div><div class='del'>-		int this_length = GPOINTER_TO_INT(lengths_iterator-&gt;data);</div><div class='del'>-		length -= this_length;</div><div class='del'>-		memcpy(ret_val + length, list_iterator-&gt;data, this_length);</div><div class='del'>-	}</div><div class='del'>-	gnome_vfs_close(handle);</div><div class='del'>-	g_list_foreach(list, (GFunc) g_free, NULL);</div><div class='del'>-	g_list_free(list);</div><div class='del'>-	g_list_free(lengths);</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-typedef gint (*GtkSignal_INT__INT_INT_POINTER) (GtkObject * object,</div><div class='del'>-						gint arg1,</div><div class='del'>-						gint arg2,</div><div class='del'>-						gpointer arg3,</div><div class='del'>-						gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_INT__INT_INT_POINTER (GtkObject * object,</div><div class='del'>-				GtkSignalFunc func,</div><div class='del'>-				gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_INT__INT_INT_POINTER rfunc;</div><div class='del'>-	gint *return_val;</div><div class='del'>-	return_val = GTK_RETLOC_INT (args[3]);</div><div class='del'>-	rfunc = (GtkSignal_INT__INT_INT_POINTER) func;</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_INT     (args[0]),</div><div class='del'>-				GTK_VALUE_INT     (args[1]),</div><div class='del'>-				GTK_VALUE_POINTER (args[2]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,</div><div class='del'>-							      GtkObject *arg1,</div><div class='del'>-							      gdouble arg2,</div><div class='del'>-							      gdouble arg3,</div><div class='del'>-							      gboolean arg4,</div><div class='del'>-							      gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-					   GtkSignalFunc func,</div><div class='del'>-					   gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;</div><div class='del'>-	rfunc = (GtkSignal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL) func;</div><div class='del'>-	(*rfunc) (object,</div><div class='del'>-		  GTK_VALUE_OBJECT (args[0]),</div><div class='del'>-		  GTK_VALUE_DOUBLE (args[1]),</div><div class='del'>-		  GTK_VALUE_DOUBLE (args[2]),</div><div class='del'>-		  GTK_VALUE_BOOL   (args[3]),</div><div class='del'>-		  func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gdouble (*GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,</div><div class='del'>-								GtkObject *arg1,</div><div class='del'>-								gdouble arg2,</div><div class='del'>-								gdouble arg3,</div><div class='del'>-								gboolean arg4,</div><div class='del'>-								gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-					GtkSignalFunc func,</div><div class='del'>-					gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;</div><div class='del'>-	gdouble *return_val;</div><div class='del'>-	return_val = GTK_RETLOC_DOUBLE (args[4]);</div><div class='del'>-	rfunc = (GtkSignal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL) func;</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_OBJECT (args[0]),</div><div class='del'>-				GTK_VALUE_DOUBLE (args[1]),</div><div class='del'>-				GTK_VALUE_DOUBLE (args[2]),</div><div class='del'>-				GTK_VALUE_BOOL   (args[3]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gdouble (*GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL) (GtkObject * object,</div><div class='del'>-							      GtkObject *arg1,</div><div class='del'>-							      gdouble arg2,</div><div class='del'>-							      gdouble arg3,</div><div class='del'>-							      gboolean arg4,</div><div class='del'>-							      gpointer user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-					GtkSignalFunc func,</div><div class='del'>-					gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-	GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL rfunc;</div><div class='del'>-	gboolean *return_val;</div><div class='del'>-	return_val = GTK_RETLOC_BOOL (args[4]);</div><div class='del'>-	rfunc = (GtkSignal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL) func;</div><div class='del'>-	*return_val = (*rfunc) (object,</div><div class='del'>-				GTK_VALUE_OBJECT (args[0]),</div><div class='del'>-				GTK_VALUE_DOUBLE (args[1]),</div><div class='del'>-				GTK_VALUE_DOUBLE (args[2]),</div><div class='del'>-				GTK_VALUE_BOOL   (args[3]),</div><div class='del'>-				func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT) (GtkObject * object,</div><div class='del'>-								 gint arg1, </div><div class='del'>-								 gint arg2,</div><div class='del'>-								 gpointer arg3,</div><div class='del'>-								 gpointer arg4,</div><div class='del'>-								 gint arg5,</div><div class='del'>-								 gint arg6,</div><div class='del'>-								 gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT (GtkObject * object,</div><div class='del'>-					   GtkSignalFunc func,</div><div class='del'>-					   gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_POINTER_INT_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[2]),</div><div class='del'>-	    GTK_VALUE_POINTER (args[3]),</div><div class='del'>-	    GTK_VALUE_INT (args[4]), GTK_VALUE_INT (args[5]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_INT_POINTER_INT) (GtkObject * object,</div><div class='del'>-						     gint arg1, </div><div class='del'>-						     gint arg2,</div><div class='del'>-						     gpointer arg3,</div><div class='del'>-						     gint arg4, gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_INT_POINTER_INT (GtkObject * object,</div><div class='del'>-			       GtkSignalFunc func,</div><div class='del'>-			       gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_INT_POINTER_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[2]), GTK_VALUE_INT (args[3]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef gboolean (*GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT) (GtkObject * object,</div><div class='del'>-								 gint arg1, </div><div class='del'>-								 gint arg2,</div><div class='del'>-								 gpointer arg3,</div><div class='del'>-								 gint arg4,</div><div class='del'>-								 gint arg5,</div><div class='del'>-								 gint arg6,</div><div class='del'>-								 gpointer user_data);</div><div class='del'>-void</div><div class='del'>-e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT (GtkObject * object,</div><div class='del'>-				       GtkSignalFunc func,</div><div class='del'>-				       gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT rfunc;</div><div class='del'>-  gboolean *return_val;</div><div class='del'>-  return_val = GTK_RETLOC_BOOL (args[6]);</div><div class='del'>-  rfunc = (GtkSignal_BOOL__INT_INT_POINTER_INT_INT_INT) func;</div><div class='del'>-  *return_val = (*rfunc) (object,</div><div class='del'>-			  GTK_VALUE_INT (args[0]),</div><div class='del'>-			  GTK_VALUE_INT (args[1]), </div><div class='del'>-			  GTK_VALUE_POINTER (args[2]),</div><div class='del'>-			  GTK_VALUE_INT (args[3]),</div><div class='del'>-			  GTK_VALUE_INT (args[4]),</div><div class='del'>-			  GTK_VALUE_INT (args[5]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT) (GtkObject *</div><div class='del'>-									 object,</div><div class='del'>-									 gint arg1, </div><div class='del'>-									 gint arg2,</div><div class='del'>-									 gpointer</div><div class='del'>-									 arg3,</div><div class='del'>-									 gint arg4,</div><div class='del'>-									 gint arg5,</div><div class='del'>-									 gpointer</div><div class='del'>-									 arg6,</div><div class='del'>-									 gint arg7,</div><div class='del'>-									 gint arg8,</div><div class='del'>-									 gpointer</div><div class='del'>-									 user_data);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject * object,</div><div class='del'>-						   GtkSignalFunc func,</div><div class='del'>-						   gpointer func_data,</div><div class='del'>-						   GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT) func;</div><div class='del'>-  (*rfunc) (object,</div><div class='del'>-	    GTK_VALUE_INT (args[0]), GTK_VALUE_INT (args[1]), </div><div class='del'>-	    GTK_VALUE_POINTER (args[2]),</div><div class='del'>-	    GTK_VALUE_INT (args[3]),</div><div class='del'>-	    GTK_VALUE_INT (args[4]),</div><div class='del'>-	    GTK_VALUE_POINTER (args[5]),</div><div class='del'>-	    GTK_VALUE_INT (args[6]), GTK_VALUE_INT (args[7]), func_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef void (*GtkSignal_NONE__POINTER_POINTER_INT) (GtkObject *, gpointer,</div><div class='del'>-						     gpointer, gint, gpointer);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_marshal_NONE__POINTER_POINTER_INT (GtkObject * object, GtkSignalFunc func,</div><div class='del'>-				     gpointer func_data, GtkArg * args)</div><div class='del'>-{</div><div class='del'>-  GtkSignal_NONE__POINTER_POINTER_INT rfunc;</div><div class='del'>-  rfunc = (GtkSignal_NONE__POINTER_POINTER_INT) func;</div><div class='del'>-  (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_POINTER (args[1]),</div><div class='del'>-	    GTK_VALUE_INT (args[2]), func_data);</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-gchar**</div><div class='del'>-e_strsplit (const gchar *string,</div><div class='del'>-	    const gchar *delimiter,</div><div class='del'>-	    gint         max_tokens)</div><div class='del'>-{</div><div class='del'>-  GSList *string_list = NULL, *slist;</div><div class='del'>-  gchar **str_array, *s;</div><div class='del'>-  guint i, n = 1;</div><div class='del'>-</div><div class='del'>-  g_return_val_if_fail (string != NULL, NULL);</div><div class='del'>-  g_return_val_if_fail (delimiter != NULL, NULL);</div><div class='del'>-</div><div class='del'>-  if (max_tokens &lt; 1)</div><div class='del'>-    max_tokens = G_MAXINT;</div><div class='del'>-</div><div class='del'>-  s = strstr (string, delimiter);</div><div class='del'>-  if (s)</div><div class='del'>-    {</div><div class='del'>-      guint delimiter_len = strlen (delimiter);</div><div class='del'>-</div><div class='del'>-      do</div><div class='del'>-	{</div><div class='del'>-	  guint len;</div><div class='del'>-	  gchar *new_string;</div><div class='del'>-</div><div class='del'>-	  len = s - string;</div><div class='del'>-	  new_string = g_new (gchar, len + 1);</div><div class='del'>-	  strncpy (new_string, string, len);</div><div class='del'>-	  new_string[len] = 0;</div><div class='del'>-	  string_list = g_slist_prepend (string_list, new_string);</div><div class='del'>-	  n++;</div><div class='del'>-	  string = s + delimiter_len;</div><div class='del'>-	  s = strstr (string, delimiter);</div><div class='del'>-	}</div><div class='del'>-      while (--max_tokens &amp;&amp; s);</div><div class='del'>-    }</div><div class='del'>-</div><div class='del'>-  n++;</div><div class='del'>-  string_list = g_slist_prepend (string_list, g_strdup (string));</div><div class='del'>-</div><div class='del'>-  str_array = g_new (gchar*, n);</div><div class='del'>-</div><div class='del'>-  i = n - 1;</div><div class='del'>-</div><div class='del'>-  str_array[i--] = NULL;</div><div class='del'>-  for (slist = string_list; slist; slist = slist-&gt;next)</div><div class='del'>-    str_array[i--] = slist-&gt;data;</div><div class='del'>-</div><div class='del'>-  g_slist_free (string_list);</div><div class='del'>-</div><div class='del'>-  return str_array;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gchar *</div><div class='del'>-e_strstrcase (const gchar *haystack, const gchar *needle)</div><div class='del'>-{</div><div class='del'>-	/* find the needle in the haystack neglecting case */</div><div class='del'>-	gchar *ptr;</div><div class='del'>-	guint len;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (haystack != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (needle != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	len = strlen(needle);</div><div class='del'>-	if (len &gt; strlen(haystack))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	if (len == 0)</div><div class='del'>-		return (char *)haystack;</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/e-util/e-util.h b/e-util/e-util.h<br/>deleted file mode 100644<br/>index 7f61295d9a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-util.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,98 +0,0 @@</div><div class='del'>-#ifndef _E_UTIL_H_</div><div class='del'>-#define _E_UTIL_H_</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-#include &lt;gtk/gtktypeutils.h&gt;</div><div class='del'>-#include &lt;sys/types.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_MAKE_TYPE(l,str,t,ci,i,parent) \</div><div class='del'>-GtkType l##_get_type(void)\</div><div class='del'>-{\</div><div class='del'>-	static GtkType type = 0;\</div><div class='del'>-	if (!type){\</div><div class='del'>-		GtkTypeInfo info = {\</div><div class='del'>-			str,\</div><div class='del'>-			sizeof (t),\</div><div class='del'>-			sizeof (t##Class),\</div><div class='del'>-			(GtkClassInitFunc) ci,\</div><div class='del'>-			(GtkObjectInitFunc) i,\</div><div class='del'>-			NULL, /* reserved 1 */\</div><div class='del'>-			NULL, /* reserved 2 */\</div><div class='del'>-			(GtkClassInitFunc) NULL\</div><div class='del'>-		};\</div><div class='del'>-                type = gtk_type_unique (parent, &amp;info);\</div><div class='del'>-	}\</div><div class='del'>-	return type;\</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-typedef enum {</div><div class='del'>-	E_FOCUS_NONE,</div><div class='del'>-	E_FOCUS_CURRENT,</div><div class='del'>-	E_FOCUS_START,</div><div class='del'>-	E_FOCUS_END</div><div class='del'>-} EFocus;</div><div class='del'>-</div><div class='del'>-int  g_str_compare  (const void *x, const void *y);</div><div class='del'>-int  g_int_compare  (const void *x, const void *y);</div><div class='del'>-</div><div class='del'>-char *e_strdup_strip  (char *string);</div><div class='del'>-</div><div class='del'>-void  e_free_object_list  (GList *list);</div><div class='del'>-void  e_free_string_list  (GList *list);</div><div class='del'>-</div><div class='del'>-char *e_read_file  (const char *filename);</div><div class='del'>-int   e_write_file (const char *filename, const char *data, int flags);</div><div class='del'>-int   e_mkdir_hier (const char *path, mode_t mode);</div><div class='del'>-</div><div class='del'>-gchar **e_strsplit (const gchar *string,</div><div class='del'>-		    const gchar *delimiter,</div><div class='del'>-		    gint         max_tokens);</div><div class='del'>-</div><div class='del'>-gchar *e_strstrcase (const gchar *haystack,</div><div class='del'>-		     const gchar *needle);</div><div class='del'>-</div><div class='del'>-void e_marshal_INT__INT_INT_POINTER (GtkObject * object,</div><div class='del'>-				     GtkSignalFunc func,</div><div class='del'>-				     gpointer func_data, GtkArg * args);</div><div class='del'>-</div><div class='del'>-void e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-						GtkSignalFunc func,</div><div class='del'>-						gpointer func_data, GtkArg * args);</div><div class='del'>-</div><div class='del'>-void e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-						  GtkSignalFunc func,</div><div class='del'>-						  gpointer func_data, GtkArg * args);</div><div class='del'>-</div><div class='del'>-void e_marshal_BOOL__OBJECT_DOUBLE_DOUBLE_BOOL (GtkObject * object,</div><div class='del'>-						GtkSignalFunc func,</div><div class='del'>-						gpointer func_data, GtkArg * args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_INT_POINTER_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT</div><div class='del'>-void e_marshal_NONE__INT_INT_POINTER_POINTER_INT_INT (GtkObject * object,</div><div class='del'>-						      GtkSignalFunc func,</div><div class='del'>-						      gpointer func_data,</div><div class='del'>-						      GtkArg * args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_INT_POINTER_UINT e_marshal_NONE__INT_INT_POINTER_INT</div><div class='del'>-void e_marshal_NONE__INT_INT_POINTER_INT (GtkObject * object,</div><div class='del'>-					  GtkSignalFunc func,</div><div class='del'>-					  gpointer func_data, GtkArg * args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_BOOL__INT_INT_POINTER_INT_INT_UINT e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT</div><div class='del'>-void e_marshal_BOOL__INT_INT_POINTER_INT_INT_INT (GtkObject * object,</div><div class='del'>-						  GtkSignalFunc func,</div><div class='del'>-						  gpointer func_data,</div><div class='del'>-						  GtkArg * args);</div><div class='del'>-</div><div class='del'>-#define e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_UINT_UINT e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT</div><div class='del'>-void e_marshal_NONE__INT_INT_POINTER_INT_INT_POINTER_INT_INT (GtkObject * object,</div><div class='del'>-							      GtkSignalFunc func,</div><div class='del'>-							      gpointer func_data,</div><div class='del'>-							      GtkArg * args);</div><div class='del'>-</div><div class='del'>-void e_marshal_NONE__POINTER_POINTER_INT (GtkObject * object,</div><div class='del'>-					  GtkSignalFunc func,</div><div class='del'>-					  gpointer func_data,</div><div class='del'>-					  GtkArg * args);</div><div class='del'>-</div><div class='del'>-#endif /* _E_UTIL_H_ */</div><div class='head'>diff --git a/e-util/e-xml-utils.c b/e-util/e-xml-utils.c<br/>deleted file mode 100644<br/>index 7802d5daf8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-xml-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-xml-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'>-/* </div><div class='del'>- * e-xml-utils.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;locale.h&gt;</div><div class='del'>-#include &lt;math.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-xml-utils.h"</div><div class='del'>-</div><div class='del'>-xmlNode *e_xml_get_child_by_name(const xmlNode *parent, const xmlChar *child_name)</div><div class='del'>-{</div><div class='del'>-	xmlNode *child;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(parent != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail(child_name != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	for (child = parent-&gt;childs; child; child = child-&gt;next) {</div><div class='del'>-		if ( !xmlStrcmp( child-&gt;name, child_name ) ) {</div><div class='del'>-			return child;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Returns the first child with the name child_name and the "lang"</div><div class='del'>- * attribute that matches the current LC_MESSAGES, or else, the first</div><div class='del'>- * child with the name child_name and no "lang" attribute.</div><div class='del'>- */</div><div class='del'>-xmlNode *</div><div class='del'>-e_xml_get_child_by_name_by_lang(const xmlNode *parent, const xmlChar *child_name, const char *lang)</div><div class='del'>-{</div><div class='del'>-	xmlNode *child;</div><div class='del'>-	/* This is the default version of the string. */</div><div class='del'>-	xmlNode *C = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail(parent != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail(child_name != NULL, NULL);</div><div class='del'>-</div><div class='del'>-	if (lang == NULL)</div><div class='del'>-		lang = setlocale(LC_MESSAGES, NULL);</div><div class='del'>-</div><div class='del'>-	for (child = parent-&gt;childs; child; child = child-&gt;next) {</div><div class='del'>-		if ( !xmlStrcmp( child-&gt;name, child_name ) ) {</div><div class='del'>-			char *this_lang = xmlGetProp(child, "lang");</div><div class='del'>-			if ( this_lang == NULL ) {</div><div class='del'>-				C = child;</div><div class='del'>-			}</div><div class='del'>-			else if (!strcmp(this_lang, "lang"))</div><div class='del'>-				return child;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	return C;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_xml_get_integer_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	int ret_val = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *)parent, prop_name);</div><div class='del'>-	if (prop) {</div><div class='del'>-		ret_val = atoi (prop);</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_integer_prop_by_name(xmlNode *parent, const xmlChar *prop_name, int value)</div><div class='del'>-{</div><div class='del'>-	xmlChar *valuestr;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	valuestr = g_strdup_printf ("%d", value);</div><div class='del'>-	xmlSetProp (parent, prop_name, valuestr);</div><div class='del'>-	g_free (valuestr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_xml_get_bool_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	gboolean ret_val = FALSE;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *)parent, prop_name);</div><div class='del'>-	if (prop) {</div><div class='del'>-		if(!strcasecmp(prop, "true"))</div><div class='del'>-			ret_val = TRUE;</div><div class='del'>-		xmlFree(prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_bool_prop_by_name(xmlNode *parent, const xmlChar *prop_name, gboolean value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	if (value)</div><div class='del'>-		xmlSetProp (parent, prop_name, "true");</div><div class='del'>-	else</div><div class='del'>-		xmlSetProp (parent, prop_name, "false");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-double</div><div class='del'>-e_xml_get_double_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	double ret_val = 0;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *)parent, prop_name);</div><div class='del'>-	if (prop) {</div><div class='del'>-		sscanf (prop, "%lf", &amp;ret_val);</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_double_prop_by_name(xmlNode *parent, const xmlChar *prop_name, double value)</div><div class='del'>-{</div><div class='del'>-	xmlChar *valuestr;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	if (fabs (value) &lt; 1e9 &amp;&amp; fabs (value) &gt; 1e-5)</div><div class='del'>-		valuestr = g_strdup_printf ("%f", value);</div><div class='del'>-	else</div><div class='del'>-		valuestr = g_strdup_printf ("%.*g", DBL_DIG, value);</div><div class='del'>-	xmlSetProp (parent, prop_name, valuestr);</div><div class='del'>-	g_free (valuestr);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_xml_get_string_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	char *ret_val = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *)parent, prop_name);</div><div class='del'>-	if (prop) {</div><div class='del'>-		ret_val = g_strdup (prop);</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_xml_set_string_prop_by_name(xmlNode *parent, const xmlChar *prop_name, char *value)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (parent != NULL);</div><div class='del'>-	g_return_if_fail (prop_name != NULL);</div><div class='del'>-</div><div class='del'>-	if (value)</div><div class='del'>-		xmlSetProp (parent, prop_name, value);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-char *</div><div class='del'>-e_xml_get_translated_string_prop_by_name(const xmlNode *parent, const xmlChar *prop_name)</div><div class='del'>-{</div><div class='del'>-	xmlChar *prop;</div><div class='del'>-	char *ret_val = NULL;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (parent != NULL, 0);</div><div class='del'>-	g_return_val_if_fail (prop_name != NULL, 0);</div><div class='del'>-</div><div class='del'>-	prop = xmlGetProp ((xmlNode *)parent, prop_name);</div><div class='del'>-	if (prop) {</div><div class='del'>-		ret_val = g_strdup (_(prop));</div><div class='del'>-		xmlFree (prop);</div><div class='del'>-	}</div><div class='del'>-	return ret_val;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/e-xml-utils.h b/e-util/e-xml-utils.h<br/>deleted file mode 100644<br/>index 6d857e4e1d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/e-xml-utils.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/e-xml-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,63 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/* </div><div class='del'>- * e-xml-utils.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_XML_UTILS__</div><div class='del'>-#define __E_XML_UTILS__</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gnome-xml/tree.h&gt;</div><div class='del'>-</div><div class='del'>-xmlNode  *e_xml_get_child_by_name                   (const xmlNode *parent,</div><div class='del'>-						     const xmlChar *child_name);</div><div class='del'>-/* lang set to NULL means use the current locale. */</div><div class='del'>-xmlNode  *e_xml_get_child_by_name_by_lang           (const xmlNode *parent,</div><div class='del'>-						     const xmlChar *child_name,</div><div class='del'>-						     const char    *lang);</div><div class='del'>-</div><div class='del'>-int       e_xml_get_integer_prop_by_name            (const xmlNode *parent,</div><div class='del'>-						     const xmlChar *prop_name);</div><div class='del'>-void      e_xml_set_integer_prop_by_name            (xmlNode       *parent,</div><div class='del'>-						     const xmlChar *prop_name,</div><div class='del'>-						     int            value);</div><div class='del'>-</div><div class='del'>-gboolean  e_xml_get_bool_prop_by_name               (const xmlNode *parent,</div><div class='del'>-						     const xmlChar *prop_name);</div><div class='del'>-void      e_xml_set_bool_prop_by_name               (xmlNode       *parent,</div><div class='del'>-						     const xmlChar *prop_name,</div><div class='del'>-						     gboolean       value);</div><div class='del'>-</div><div class='del'>-double    e_xml_get_double_prop_by_name             (const xmlNode *parent,</div><div class='del'>-						     const xmlChar *prop_name);</div><div class='del'>-void      e_xml_set_double_prop_by_name             (xmlNode       *parent,</div><div class='del'>-						     const xmlChar *prop_name,</div><div class='del'>-						     double         value);</div><div class='del'>-</div><div class='del'>-char     *e_xml_get_string_prop_by_name             (const xmlNode *parent,</div><div class='del'>-						     const xmlChar *prop_name);</div><div class='del'>-void      e_xml_set_string_prop_by_name             (xmlNode       *parent,</div><div class='del'>-						     const xmlChar *prop_name,</div><div class='del'>-						     char          *value);</div><div class='del'>-</div><div class='del'>-char     *e_xml_get_translated_string_prop_by_name  (const xmlNode *parent,</div><div class='del'>-						     const xmlChar *prop_name);</div><div class='del'>-</div><div class='del'>-#endif /* __E_XML_UTILS__ */</div><div class='head'>diff --git a/e-util/ename/.cvsignore b/e-util/ename/.cvsignore<br/>deleted file mode 100644<br/>index 4f8c173841..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,8 +0,0 @@</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-Makefile</div><div class='del'>-Makefile.in</div><div class='del'>-*.lo</div><div class='del'>-*.la</div><div class='del'>-test-ename-western</div><div class='del'>-test-ename-western-gtk</div><div class='head'>diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am<br/>deleted file mode 100644<br/>index b3abe633df..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,57 +0,0 @@</div><div class='del'>-INCLUDES =						\</div><div class='del'>-	-DG_LOG_DOMAIN=\"EName\"			\</div><div class='del'>-	-I$(srcdir)					\</div><div class='del'>-	-I$(srcdir)/..					\</div><div class='del'>-	-I$(top_srcdir) 				\</div><div class='del'>-	-I. 						\</div><div class='del'>-	-I.. 						\</div><div class='del'>-	-I$(top_builddir)				\</div><div class='del'>-        -I$(includedir)                                 \</div><div class='del'>-        $(GNOME_INCLUDEDIR)				\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)</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'>-	$(EXTRA_GNOME_LIBS)</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-address-western.c				\</div><div class='del'>-	e-name-western.c</div><div class='del'>-</div><div class='del'>-libenameincludedir = $(includedir)/ename</div><div class='del'>-</div><div class='del'>-libenameinclude_HEADERS =				\</div><div class='del'>-	e-address-western.h				\</div><div class='del'>-	e-name-western-tables.h				\</div><div class='del'>-	e-name-western.h</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-noinst_LTLIBRARIES = libename-static.la</div><div class='del'>-libename_static_la_SOURCES = $(libename_la_SOURCES)</div><div class='del'>-libename_static_la_LDFLAGS = --all-static</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =					\</div><div class='del'>-	test-ename-western				\</div><div class='del'>-	test-ename-western-gtk</div><div class='del'>-</div><div class='del'>-test_ename_western_SOURCES =				\</div><div class='del'>-	test-ename-western.c</div><div class='del'>-</div><div class='del'>-test_ename_western_LDADD = $(ename_libs)		\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</div><div class='del'>-</div><div class='del'>-test_ename_western_gtk_SOURCES =				\</div><div class='del'>-	test-ename-western-gtk.c</div><div class='del'>-</div><div class='del'>-test_ename_western_gtk_LDADD = 			\</div><div class='del'>-	$(ename_libs) 				\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la	\</div><div class='del'>-	$(gnome_libs)</div><div class='head'>diff --git a/e-util/ename/TODO b/e-util/ename/TODO<br/>deleted file mode 100644<br/>index 669661eea7..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/TODO?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/TODO</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-* Support other naming systems.</div><div class='del'>-* Handle misspelled suffixes better.</div><div class='head'>diff --git a/e-util/ename/e-address-western.c b/e-util/ename/e-address-western.c<br/>deleted file mode 100644<br/>index 12e977b973..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-address-western.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/e-address-western.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,446 +0,0 @@</div><div class='del'>-/* --------------------------------------------------</div><div class='del'>-</div><div class='del'>- An address parser, yielding fields as per RFC 2426.</div><div class='del'>-</div><div class='del'>- Author:</div><div class='del'>-   Jesse Pavel (jpavel@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'>-</div><div class='del'>-#include &lt;ctype.h&gt;</div><div class='del'>-#include &lt;string.h&gt;</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef E_ADDRESS_WESTERN_TEST </div><div class='del'>-</div><div class='del'>-#include "e-address-western.h"</div><div class='del'>-</div><div class='del'>-#else</div><div class='del'>-</div><div class='del'>-#include &lt;ename/e-address-western.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-/* These are the keywords that will distinguish the start of an extended</div><div class='del'>-   address. */</div><div class='del'>-</div><div class='del'>-static char *extended_keywords[] = {</div><div class='del'>-	"apt", "apartment", "suite", NULL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_address_western_is_line_blank (gchar *line)</div><div class='del'>-{</div><div class='del'>-	gboolean blank = TRUE;</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	/* A blank line consists of whitespace only, or a NULL line. */</div><div class='del'>-	for (cntr = 0; line[cntr] != '\0'; cntr++ ) {</div><div class='del'>-		if (!isspace(line[cntr])) {</div><div class='del'>-			blank = FALSE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return blank;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* In the array of lines, `lines', we will erase the line at line_num, and</div><div class='del'>- shift the remaining lines, up to line number num_lines, up one position. */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_western_shift_line (gchar *lines[], gint line_num, gint num_lines)</div><div class='del'>-{</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	if (line_num &gt;= (num_lines - 1)) {</div><div class='del'>-		/* It is the last line, so simply shift in a NULL. */</div><div class='del'>-		lines[line_num] = NULL;</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		for (cntr = line_num; cntr &lt; num_lines; cntr++)</div><div class='del'>-			lines[cntr] = lines[cntr + 1];</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-e_address_western_remove_blank_lines (gchar *lines[], gint *linecntr)</div><div class='del'>-{</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	for (cntr = 0; cntr &lt; *linecntr; cntr++) {</div><div class='del'>-		if (e_address_western_is_line_blank (lines[cntr])) {</div><div class='del'>-			/* Delete the blank line, and shift all subsequent lines up</div><div class='del'>-			   one spot to fill its old spot. */</div><div class='del'>-			e_address_western_shift_line (lines, cntr, *linecntr);</div><div class='del'>-</div><div class='del'>-			/* Since we must check the newly shifted line, let's </div><div class='del'>-			  not advance the counter on this next pass. */</div><div class='del'>-			cntr--;</div><div class='del'>-</div><div class='del'>-			/* There is now one less line, total. */</div><div class='del'>-			*linecntr -= 1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_address_western_is_po_box (gchar *line)</div><div class='del'>-{</div><div class='del'>-	gboolean retval = FALSE;</div><div class='del'>-</div><div class='del'>-	/* In which phase of processing are we? */</div><div class='del'>-	enum State { FIRSTCHAR, SECONDCHAR, WHITESPACE } state;</div><div class='del'>-	</div><div class='del'>-	</div><div class='del'>-	/* If the first two letters of the line are `p' and `o', and these</div><div class='del'>-	 are in turn followed by whitespace before another letter, then I</div><div class='del'>-	 will deem the line a representation of a PO Box address. */</div><div class='del'>-	</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	state = FIRSTCHAR;</div><div class='del'>-	for (cntr = 0; line[cntr] != '\0'; cntr++) {</div><div class='del'>-		if (state == FIRSTCHAR)	{</div><div class='del'>-			if (isalnum(line[cntr])) {</div><div class='del'>-				if (tolower(line[cntr]) == 'p')</div><div class='del'>-					state = SECONDCHAR;</div><div class='del'>-				else {</div><div class='del'>-					retval = FALSE;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else if (state == SECONDCHAR) {</div><div class='del'>-			if (isalnum (line[cntr])) {</div><div class='del'>-				if (tolower(line[cntr]) == 'o')</div><div class='del'>-					state = WHITESPACE;</div><div class='del'>-				else {</div><div class='del'>-					retval = FALSE;</div><div class='del'>-					break;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-		else if (state == WHITESPACE) {</div><div class='del'>-			if (isspace (line[cntr])) {</div><div class='del'>-				retval = TRUE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-			else if (isalnum (line[cntr])) {</div><div class='del'>-				retval = FALSE;</div><div class='del'>-				break;</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* A line that contains a comma followed eventually by a number is</div><div class='del'>-  deemed to be the line in the form of &lt;town, region postal-code&gt;. */</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_address_western_is_postal (guchar *line)</div><div class='del'>-{</div><div class='del'>-	gboolean retval;</div><div class='del'>-	int cntr;</div><div class='del'>-	</div><div class='del'>-	if (strchr (line, ',') == NULL)</div><div class='del'>-		retval = FALSE;  /* No comma. */</div><div class='del'>-	else {</div><div class='del'>-		int index;</div><div class='del'>-		</div><div class='del'>-		/* Ensure that the first character after the comma is</div><div class='del'>-		 a letter. */</div><div class='del'>-		index = strcspn (line, ",");</div><div class='del'>-		index++;</div><div class='del'>-		while (isspace(line[index]))</div><div class='del'>-			index++;</div><div class='del'>-		</div><div class='del'>-		if (!isalpha (line[index]))</div><div class='del'>-			return FALSE;   /* FIXME: ugly control flow. */</div><div class='del'>-</div><div class='del'>-		cntr = strlen(line) - 1;</div><div class='del'>-</div><div class='del'>-		/* Go to the character immediately following the last</div><div class='del'>-		  whitespace character. */</div><div class='del'>-		while (cntr &gt;= 0 &amp;&amp; isspace(line[cntr]))</div><div class='del'>-			cntr--;	</div><div class='del'>-		</div><div class='del'>-		while (cntr &gt;= 0 &amp;&amp; !isspace(line[cntr]))</div><div class='del'>-			cntr--;</div><div class='del'>-</div><div class='del'>-		if (cntr == 0)</div><div class='del'>-			retval = FALSE;</div><div class='del'>-		else {</div><div class='del'>-			if (isdigit (line[cntr+1]))</div><div class='del'>-				retval = TRUE;</div><div class='del'>-			else</div><div class='del'>-				retval = FALSE;</div><div class='del'>-		}</div><div class='del'>-	}	</div><div class='del'>-</div><div class='del'>-	return retval;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-e_address_western_extract_po_box (gchar *line)</div><div class='del'>-{</div><div class='del'>-	/* Return everything from the beginning of the line to</div><div class='del'>-	   the end of the first word that contains a number. */</div><div class='del'>-	</div><div class='del'>-	int index;</div><div class='del'>-</div><div class='del'>-	index = 0;</div><div class='del'>-	while (!isdigit(line[index]))</div><div class='del'>-		index++;</div><div class='del'>-	</div><div class='del'>-	while (isgraph(line[index]))</div><div class='del'>-		index++;</div><div class='del'>-	</div><div class='del'>-	return g_strndup (line, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-e_address_western_extract_locality (gchar *line)</div><div class='del'>-{</div><div class='del'>-	gint index;</div><div class='del'>-</div><div class='del'>-	/* Everything before the comma is the locality. */</div><div class='del'>-	index = strcspn(line, ",");</div><div class='del'>-</div><div class='del'>-	if (index == 0)</div><div class='del'>-		return NULL;</div><div class='del'>-	else</div><div class='del'>-		return g_strndup (line, index);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-/* Whatever resides between the comma and the start of the</div><div class='del'>-  postal code is deemed to be the region. */</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-e_address_western_extract_region (gchar *line)</div><div class='del'>-{</div><div class='del'>-	gint start, end;</div><div class='del'>-</div><div class='del'>-	start = strcspn (line, ",");</div><div class='del'>-	start++;</div><div class='del'>-	while (isspace(line[start]))</div><div class='del'>-		start++;</div><div class='del'>-	</div><div class='del'>-	end = strlen(line) - 1;</div><div class='del'>-	while (isspace (line[end]))</div><div class='del'>-		end--;</div><div class='del'>-</div><div class='del'>-	while (!isspace (line[end]))</div><div class='del'>-		end--;</div><div class='del'>-</div><div class='del'>-	while (isspace (line[end]))</div><div class='del'>-		end--;</div><div class='del'>-	end++;</div><div class='del'>-</div><div class='del'>-	/* Between start and end lie the string. */</div><div class='del'>-	return g_strndup ( (line+start), end-start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gchar *</div><div class='del'>-e_address_western_extract_postal_code (gchar *line)</div><div class='del'>-{</div><div class='del'>-	int start, end;</div><div class='del'>-</div><div class='del'>-	end = strlen (line) - 1;</div><div class='del'>-	while (isspace(line[end]))</div><div class='del'>-		end--;</div><div class='del'>-	</div><div class='del'>-	start = end;</div><div class='del'>-	end++;</div><div class='del'>-</div><div class='del'>-	while (!isspace(line[start]))</div><div class='del'>-		start--;</div><div class='del'>-	start++;	</div><div class='del'>-</div><div class='del'>-	/* Between start and end lie the string. */</div><div class='del'>-	return g_strndup ( (line+start), end-start);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_address_western_extract_street (gchar *line, gchar **street, gchar **extended)</div><div class='del'>-{</div><div class='del'>-        const gchar *split = NULL;</div><div class='del'>-	gint cntr;</div><div class='del'>-</div><div class='del'>-	for (cntr = 0; extended_keywords[cntr] != NULL; cntr++) {</div><div class='del'>-		split = e_strstrcase (line, extended_keywords[cntr]);</div><div class='del'>-		if (split != NULL)</div><div class='del'>-			break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (split != NULL) {</div><div class='del'>-		*street = g_strndup (line, (split - line));</div><div class='del'>-		*extended = g_strdup (split);</div><div class='del'>-	}</div><div class='del'>-	else {</div><div class='del'>-		*street = g_strdup (line);</div><div class='del'>-		*extended = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-EAddressWestern *</div><div class='del'>-e_address_western_parse (const gchar *in_address)</div><div class='del'>-{</div><div class='del'>-	gchar **lines;</div><div class='del'>-	gint linecntr, lineindex;</div><div class='del'>-	gchar *address;</div><div class='del'>-	gint cntr;</div><div class='del'>-	gboolean found_po_box, found_postal;</div><div class='del'>-</div><div class='del'>-	EAddressWestern *eaw;</div><div class='del'>-#if 0</div><div class='del'>-	gint start, end;  /* To be used to classify address lines. */</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-	if (in_address == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	eaw = (EAddressWestern *)g_malloc (sizeof(EAddressWestern));</div><div class='del'>-	eaw-&gt;po_box = NULL;</div><div class='del'>-	eaw-&gt;extended = NULL;</div><div class='del'>-	eaw-&gt;street = NULL;</div><div class='del'>-	eaw-&gt;locality = NULL;</div><div class='del'>-	eaw-&gt;region = NULL;</div><div class='del'>-	eaw-&gt;postal_code = NULL;</div><div class='del'>-	eaw-&gt;country = NULL;</div><div class='del'>-	</div><div class='del'>-	address = g_strdup (in_address);</div><div class='del'>-</div><div class='del'>-	/* The first thing I'll do is divide the multiline input string</div><div class='del'>-	into lines. */</div><div class='del'>-</div><div class='del'>-	/* ... count the lines. */</div><div class='del'>-	linecntr = 1;</div><div class='del'>-	lineindex = 0;</div><div class='del'>-	while (address[lineindex] != '\0') {</div><div class='del'>-		if (address[lineindex] == '\n')</div><div class='del'>-			linecntr++;</div><div class='del'>-			</div><div class='del'>-		lineindex++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* ... tally them. */</div><div class='del'>-	lines = (gchar **)g_malloc (sizeof(gchar *) * (linecntr+3));</div><div class='del'>-	lineindex = 0;</div><div class='del'>-	lines[0] = &amp;address[0];</div><div class='del'>-	linecntr = 1;</div><div class='del'>-	while (address[lineindex] != '\0') {</div><div class='del'>-		if (address[lineindex] == '\n') {</div><div class='del'>-			lines[linecntr] = &amp;address[lineindex + 1];</div><div class='del'>-			linecntr++;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		lineindex++;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Convert the newlines at the end of each line (except the last,</div><div class='del'>-	 because it is already NULL terminated) to NULLs. */</div><div class='del'>-	for (cntr = 0; cntr &lt; (linecntr - 1); cntr++) {</div><div class='del'>-		*(strchr (lines[cntr], '\n')) = '\0';</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	e_address_western_remove_blank_lines (lines, &amp;linecntr);</div><div class='del'>-</div><div class='del'>-	/* Let's just test these functions. */</div><div class='del'>-	found_po_box = FALSE;</div><div class='del'>-	found_postal = FALSE;</div><div class='del'>-</div><div class='del'>-   	for (cntr = 0; cntr &lt; linecntr; cntr++)  {</div><div class='del'>-		if (e_address_western_is_po_box (lines[cntr])) {</div><div class='del'>-			if (eaw-&gt;po_box == NULL)</div><div class='del'>-				eaw-&gt;po_box = e_address_western_extract_po_box (lines[cntr]);</div><div class='del'>-			found_po_box = TRUE;</div><div class='del'>-		}</div><div class='del'>-		else if (e_address_western_is_postal (lines[cntr])) {</div><div class='del'>-			if (eaw-&gt;locality == NULL)</div><div class='del'>-				eaw-&gt;locality = e_address_western_extract_locality (lines[cntr]);</div><div class='del'>-			if (eaw-&gt;region == NULL)</div><div class='del'>-				eaw-&gt;region = e_address_western_extract_region (lines[cntr]);</div><div class='del'>-			if (eaw-&gt;postal_code == NULL)</div><div class='del'>-				eaw-&gt;postal_code = e_address_western_extract_postal_code (lines[cntr]);</div><div class='del'>-			found_postal = TRUE;</div><div class='del'>-		}</div><div class='del'>-		else {</div><div class='del'>-			if (found_postal) {</div><div class='del'>-				if (eaw-&gt;country == NULL)</div><div class='del'>-					eaw-&gt;country = g_strdup (lines[cntr]);</div><div class='del'>-				else {</div><div class='del'>-					gchar *temp;</div><div class='del'>-					temp = g_strconcat (eaw-&gt;country, "\n", lines[cntr], NULL);</div><div class='del'>-					g_free (eaw-&gt;country);</div><div class='del'>-					eaw-&gt;country = temp;</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-			else {</div><div class='del'>-				if (eaw-&gt;street == NULL) {</div><div class='del'>-					e_address_western_extract_street (lines[cntr], &amp;eaw-&gt;street,</div><div class='del'>-										&amp;eaw-&gt;extended );</div><div class='del'>-				}</div><div class='del'>-				else {</div><div class='del'>-					if (eaw-&gt;extended == NULL) {</div><div class='del'>-						eaw-&gt;extended = g_strdup (lines[cntr]);</div><div class='del'>-					}</div><div class='del'>-					else {</div><div class='del'>-						gchar *temp;</div><div class='del'>-						temp = g_strconcat (eaw-&gt;extended, "\n", lines[cntr], NULL);</div><div class='del'>-						g_free (eaw-&gt;extended);</div><div class='del'>-						eaw-&gt;extended = temp;</div><div class='del'>-					}</div><div class='del'>-				}</div><div class='del'>-			}</div><div class='del'>-		}</div><div class='del'>-	}			</div><div class='del'>-	</div><div class='del'>-	g_free (lines);</div><div class='del'>-	g_free (address);	</div><div class='del'>-	</div><div class='del'>-	return eaw;</div><div class='del'>-}	</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-void </div><div class='del'>-e_address_western_free (EAddressWestern *eaw)</div><div class='del'>-{</div><div class='del'>-	if (eaw == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	if (eaw-&gt;po_box != NULL)</div><div class='del'>-		g_free(eaw-&gt;po_box);</div><div class='del'>-	if (eaw-&gt;extended != NULL)</div><div class='del'>-		g_free(eaw-&gt;extended);</div><div class='del'>-	if (eaw-&gt;street != NULL)</div><div class='del'>-		g_free(eaw-&gt;street);</div><div class='del'>-	if (eaw-&gt;locality != NULL)</div><div class='del'>-		g_free(eaw-&gt;locality);</div><div class='del'>-	if (eaw-&gt;region != NULL)</div><div class='del'>-		g_free(eaw-&gt;region);</div><div class='del'>-	if (eaw-&gt;postal_code != NULL)</div><div class='del'>-		g_free(eaw-&gt;postal_code);</div><div class='del'>-	if (eaw-&gt;country != NULL)</div><div class='del'>-		g_free(eaw-&gt;country);</div><div class='del'>-	</div><div class='del'>-	g_free (eaw);</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/e-util/ename/e-address-western.h b/e-util/ename/e-address-western.h<br/>deleted file mode 100644<br/>index e6417f88c4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-address-western.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/e-address-western.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-#ifndef __E_ADDRESS_WESTERN_H__</div><div class='del'>-#define __E_ADDRESS_WESTERN_H__</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-	</div><div class='del'>-	/* Public */</div><div class='del'>-	char *po_box;</div><div class='del'>-	char *extended;  /* I'm not sure what this is. */</div><div class='del'>-	char *street;</div><div class='del'>-	char *locality;  /* For example, the city or town. */</div><div class='del'>-	char *region;	/* The state or province. */</div><div class='del'>-	char *postal_code;</div><div class='del'>-	char *country;</div><div class='del'>-} EAddressWestern;</div><div class='del'>-</div><div class='del'>-EAddressWestern *e_address_western_parse (const char *address);</div><div class='del'>-void e_address_western_free (EAddressWestern *eaw);</div><div class='del'>-</div><div class='del'>-#endif  /* ! __E_ADDRESS_WESTERN_H__ */</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/e-util/ename/e-name-western-tables.h b/e-util/ename/e-name-western-tables.h<br/>deleted file mode 100644<br/>index 2e94a94845..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-name-western-tables.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/e-name-western-tables.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,74 +0,0 @@</div><div class='del'>-#ifndef __E_NAME_WESTERN_TABLES_H__</div><div class='del'>-#define __E_NAME_WESTERN_TABLES_H__</div><div class='del'>-</div><div class='del'>-char *e_name_western_pfx_table[] = {</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * English.</div><div class='del'>-	 */</div><div class='del'>-	"mister", "miss.", "mr.", "mrs.", "ms.",</div><div class='del'>-	"miss", "mr", "mrs", "ms", "sir", </div><div class='del'>-	"professor", "prof.", "dr", "dr.", "doctor",</div><div class='del'>-	"judge", "justice", "chief justice", </div><div class='del'>-	"congressman", "congresswoman", "commander",</div><div class='del'>-	"lieutenant", "lt.", "colonel", "col.", "major", "maj.",</div><div class='del'>-	"general", "gen.", "admiral", "admr.", "sergeant", "sgt.",</div><div class='del'>-	"lord", "lady", "baron", "baroness", "duke", "duchess",</div><div class='del'>-	"king", "queen", "prince", "princess",</div><div class='del'>-</div><div class='del'>-	"the most honorable", "the honorable",</div><div class='del'>-	"the reverend", "his holiness",</div><div class='del'>-	"his eminence", "his majesty", "her majesty", </div><div class='del'>-	"his grace", "her grace",</div><div class='del'>-</div><div class='del'>-	"president", "vice president", "secretary", "undersecretary",</div><div class='del'>-	"consul", "ambassador",</div><div class='del'>-</div><div class='del'>-	"senator", "saint", "st.", "pastor", "deacon",</div><div class='del'>-	"father", "bishop", "archbishop", "cardinal", "pope",</div><div class='del'>-	"reverend", "rev.", "rabbi", </div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * French.</div><div class='del'>-	 */</div><div class='del'>-	"monsieur", "m.", "mademoiselle", "melle",</div><div class='del'>-	"madame", "mme", "professeur", "dauphin", "dauphine",</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * German</div><div class='del'>-	 */</div><div class='del'>-	"herr", "frau", "fraulein", "herr doktor", "doktor frau", "doktor frau doktor",</div><div class='del'>-	"frau doktor",</div><div class='del'>- </div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Spanish.</div><div class='del'>-	 */</div><div class='del'>-	"senor", "senora", "sra.", "senorita", "srita.", </div><div class='del'>-</div><div class='del'>-	NULL};</div><div class='del'>-</div><div class='del'>-char *e_name_western_sfx_table[]  = {</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * English.</div><div class='del'>-	 */</div><div class='del'>-         "junior", "senior", "jr", "sr", "I", "II", "III", "IV", "V",</div><div class='del'>-	 "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV",</div><div class='del'>-	 "XV", "XVI", "XVII", "XVIII", "XIX", "XX", "XXI", "XXII",</div><div class='del'>-	 "phd", "ms", "md", "esq", "esq.", "esquire",</div><div class='del'>-</div><div class='del'>-	NULL};</div><div class='del'>-</div><div class='del'>-char *e_name_western_twopart_sfx_table[] = {</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * English.</div><div class='del'>-	 */</div><div class='del'>-	"the first", "the second", "the third",</div><div class='del'>-</div><div class='del'>-	NULL};</div><div class='del'>-</div><div class='del'>-char *e_name_western_complex_last_table[] = {"van", "von", "de", NULL};</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_NAME_WESTERN_TABLES_H__ */</div><div class='head'>diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c<br/>deleted file mode 100644<br/>index 3848e7249b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-name-western.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/e-name-western.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,870 +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; </div><div class='del'>-	    isalpha ((unsigned char) word [0]) &amp;&amp;</div><div class='del'>-	    isalpha ((unsigned char) word [1]) &amp;&amp;</div><div class='del'>-	    word [strlen (word) - 1] == '.')</div><div class='del'>-		return word;</div><div class='del'>-</div><div class='del'>-	g_free (word);</div><div class='del'>-</div><div class='del'>-	return NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_name_western_get_prefix_at_str (char *str)</div><div class='del'>-{</div><div class='del'>-	char *pfx;</div><div class='del'>-	char *pfx1;</div><div class='del'>-	char *pfx2;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	/* Get the first prefix. */</div><div class='del'>-	pfx1 = e_name_western_get_one_prefix_at_str (str);</div><div class='del'>-</div><div class='del'>-	if (pfx1 == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	/* Check for a second prefix. */</div><div class='del'>-	p = str + strlen (pfx1);</div><div class='del'>-	while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-		p ++;</div><div class='del'>-</div><div class='del'>-	pfx2 = e_name_western_get_one_prefix_at_str (p);</div><div class='del'>-</div><div class='del'>-	if (pfx2 != NULL) {</div><div class='del'>-		int pfx_len;</div><div class='del'>-</div><div class='del'>-		pfx_len = (p + strlen (pfx2)) - str;</div><div class='del'>-		pfx = g_malloc0 (pfx_len + 1);</div><div class='del'>-		strncpy (pfx, str, pfx_len);</div><div class='del'>-	} else {</div><div class='del'>-		pfx = g_strdup (pfx1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (pfx1);</div><div class='del'>-	g_free (pfx2);</div><div class='del'>-</div><div class='del'>-	return pfx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_prefix (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *pfx;</div><div class='del'>-</div><div class='del'>-	pfx = e_name_western_get_prefix_at_str (name-&gt;full);</div><div class='del'>-</div><div class='del'>-	if (pfx == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	idxs-&gt;prefix_idx = 0;</div><div class='del'>-	name-&gt;prefix     = pfx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_name_western_is_complex_last_beginning (char *word)</div><div class='del'>-{</div><div class='del'>-	int i;</div><div class='del'>-</div><div class='del'>-	for (i = 0; e_name_western_complex_last_table [i] != NULL; i ++) {</div><div class='del'>-</div><div class='del'>-		if (! g_strcasecmp (</div><div class='del'>-			word, e_name_western_complex_last_table [i]))</div><div class='del'>-			return TRUE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_first (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	/*</div><div class='del'>-	 * If there's a prefix, then the first name is right after it.</div><div class='del'>-	 */</div><div class='del'>-	if (idxs-&gt;prefix_idx != -1) {</div><div class='del'>-		int   first_idx;</div><div class='del'>-		char *p;</div><div class='del'>-</div><div class='del'>-		first_idx = idxs-&gt;prefix_idx + strlen (name-&gt;prefix);</div><div class='del'>-</div><div class='del'>-		/* Skip past white space. */</div><div class='del'>-		p = name-&gt;full + first_idx;</div><div class='del'>-		while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-			p++;</div><div class='del'>-</div><div class='del'>-		if (*p == '\0')</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		idxs-&gt;first_idx = p - name-&gt;full;</div><div class='del'>-		name-&gt;first = e_name_western_get_words_at_idx (</div><div class='del'>-			name-&gt;full, idxs-&gt;first_idx, 1);</div><div class='del'>-</div><div class='del'>-	} else {</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Otherwise, the first name is probably the first string.</div><div class='del'>-		 */</div><div class='del'>-		idxs-&gt;first_idx = 0;</div><div class='del'>-		name-&gt;first = e_name_western_get_words_at_idx (</div><div class='del'>-			name-&gt;full, idxs-&gt;first_idx, 1);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Check that we didn't just assign the beginning of a</div><div class='del'>-	 * compound last name to the first name.</div><div class='del'>-	 */</div><div class='del'>-	if (name-&gt;first != NULL) {</div><div class='del'>-		if (e_name_western_is_complex_last_beginning (name-&gt;first)) {</div><div class='del'>-			g_free (name-&gt;first);</div><div class='del'>-			name-&gt;first = NULL;</div><div class='del'>-			idxs-&gt;first_idx = -1;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *word;</div><div class='del'>-	int   middle_idx;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Middle names can only exist if you have a first name.</div><div class='del'>-	 */</div><div class='del'>-	if (idxs-&gt;first_idx == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	middle_idx = idxs-&gt;first_idx + strlen (name-&gt;first) + 1;</div><div class='del'>-</div><div class='del'>-	if (middle_idx &gt; strlen (name-&gt;full))</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Search for the first space (or the terminating \0)</div><div class='del'>-	 */</div><div class='del'>-	while (isspace (name-&gt;full [middle_idx]) &amp;&amp;</div><div class='del'>-	       name-&gt;full [middle_idx] != '\0')</div><div class='del'>-		middle_idx ++;</div><div class='del'>-		</div><div class='del'>-	if (name-&gt;full [middle_idx] == '\0')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Skip past the nickname, if it's there.</div><div class='del'>-	 */</div><div class='del'>-	if (name-&gt;full [middle_idx] == '\"') {</div><div class='del'>-		if (idxs-&gt;nick_idx == -1)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		middle_idx = idxs-&gt;nick_idx + strlen (name-&gt;nick) + 1;</div><div class='del'>-		</div><div class='del'>-		while (isspace (name-&gt;full [middle_idx]) &amp;&amp;</div><div class='del'>-		       name-&gt;full [middle_idx] != '\0')</div><div class='del'>-			middle_idx ++;</div><div class='del'>-</div><div class='del'>-		if (name-&gt;full [middle_idx] == '\0')</div><div class='del'>-			return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure this isn't the beginning of a complex last name.</div><div class='del'>-	 */</div><div class='del'>-	word = e_name_western_get_words_at_idx (name-&gt;full, middle_idx, 1);</div><div class='del'>-	if (e_name_western_is_complex_last_beginning (word)) {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure this isn't a suffix.</div><div class='del'>-	 */</div><div class='del'>-	e_name_western_cleanup_string (&amp; word);</div><div class='del'>-	if (e_name_western_word_is_suffix (word)) {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Make sure we didn't just grab a cute nickname.</div><div class='del'>-	 */</div><div class='del'>-	if (word [0] == '\"') {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	idxs-&gt;middle_idx = middle_idx;</div><div class='del'>-	name-&gt;middle = word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_nickname (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	int   idx;</div><div class='del'>-	int   start_idx;</div><div class='del'>-	char *str;</div><div class='del'>-</div><div class='del'>-	if (idxs-&gt;first_idx == -1)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (idxs-&gt;middle_idx &gt; idxs-&gt;first_idx)</div><div class='del'>-		idx = idxs-&gt;middle_idx + strlen (name-&gt;middle);</div><div class='del'>-	else</div><div class='del'>-		idx = idxs-&gt;first_idx + strlen (name-&gt;first);</div><div class='del'>-</div><div class='del'>-	while (name-&gt;full [idx] != '\"' &amp;&amp; name-&gt;full [idx] != '\0')</div><div class='del'>-		idx ++;</div><div class='del'>-</div><div class='del'>-	if (name-&gt;full [idx] != '\"')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	start_idx = idx;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Advance to the next double quote.</div><div class='del'>-	 */</div><div class='del'>-	idx ++;</div><div class='del'>-	</div><div class='del'>-	while (name-&gt;full [idx] != '\"' &amp;&amp; name-&gt;full [idx] != '\0')</div><div class='del'>-		idx ++;</div><div class='del'>-</div><div class='del'>-	if (name-&gt;full [idx] == '\0')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	str = g_malloc0 (idx - start_idx + 2);</div><div class='del'>-	strncpy (str, name-&gt;full + start_idx, idx - start_idx + 1);</div><div class='del'>-</div><div class='del'>-	name-&gt;nick = str;</div><div class='del'>-	idxs-&gt;nick_idx = start_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static int</div><div class='del'>-e_name_western_last_get_max_idx (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	int max_idx = -1;</div><div class='del'>-</div><div class='del'>-	if (name-&gt;prefix != NULL)</div><div class='del'>-		max_idx = e_name_western_max (</div><div class='del'>-			max_idx, idxs-&gt;prefix_idx + strlen (name-&gt;prefix));</div><div class='del'>-</div><div class='del'>-	if (name-&gt;first != NULL)</div><div class='del'>-		max_idx = e_name_western_max (</div><div class='del'>-			max_idx, idxs-&gt;first_idx + strlen (name-&gt;first));</div><div class='del'>-</div><div class='del'>-	if (name-&gt;middle != NULL)</div><div class='del'>-		max_idx = e_name_western_max (</div><div class='del'>-			max_idx, idxs-&gt;middle_idx + strlen (name-&gt;middle));</div><div class='del'>-</div><div class='del'>-	if (name-&gt;nick != NULL)</div><div class='del'>-		max_idx = e_name_western_max (</div><div class='del'>-			max_idx, idxs-&gt;nick_idx + strlen (name-&gt;nick));</div><div class='del'>-</div><div class='del'>-	return max_idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_last (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *word;</div><div class='del'>-	int   idx = -1;</div><div class='del'>-</div><div class='del'>-	idx = e_name_western_last_get_max_idx (name, idxs);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * In the case where there is no preceding name element, the</div><div class='del'>-	 * name is either just a first name ("Nat", "John"), is a</div><div class='del'>-	 * single-element name ("Cher", which we treat as a first</div><div class='del'>-	 * name), or is just a last name.  The only time we can</div><div class='del'>-	 * differentiate a last name alone from a single-element name</div><div class='del'>-	 * or a first name alone is if it's a complex last name ("de</div><div class='del'>-	 * Icaza", "van Josephsen").  So if there is no preceding name</div><div class='del'>-	 * element, we check to see whether or not the first part of</div><div class='del'>-	 * the name is the beginning of a complex name.  If it is,</div><div class='del'>-	 * we subsume the entire string.  If we accidentally subsume</div><div class='del'>-	 * the suffix, this will get fixed in the fixup routine.</div><div class='del'>-	 */</div><div class='del'>-	if (idx == -1) {</div><div class='del'>-		word = e_name_western_get_words_at_idx (name-&gt;full, 0, 1);</div><div class='del'>-		if (! e_name_western_is_complex_last_beginning (word)) {</div><div class='del'>-			g_free (word);</div><div class='del'>-			return;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		name-&gt;last     = g_strdup (name-&gt;full);</div><div class='del'>-		idxs-&gt;last_idx = 0;</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Skip past the white space. */</div><div class='del'>-	while (isspace (name-&gt;full [idx]) &amp;&amp; name-&gt;full [idx] != '\0')</div><div class='del'>-		idx ++;</div><div class='del'>-</div><div class='del'>-	if (name-&gt;full [idx] == '\0')</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	word = e_name_western_get_words_at_idx (name-&gt;full, idx, 1);</div><div class='del'>-	e_name_western_cleanup_string (&amp; word);</div><div class='del'>-	if (e_name_western_word_is_suffix (word)) {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	g_free (word);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Subsume the rest of the string into the last name.  If we</div><div class='del'>-	 * accidentally include the prefix, it will get fixed later.</div><div class='del'>-	 * This is the only way to handle things like "Miguel de Icaza</div><div class='del'>-	 * Amozorrutia" without dropping data and forcing the user</div><div class='del'>-	 * to retype it.</div><div class='del'>-	 */</div><div class='del'>-	name-&gt;last = g_strdup (name-&gt;full + idx);</div><div class='del'>-	idxs-&gt;last_idx = idx;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_name_western_get_preceding_word (char *str, int idx)</div><div class='del'>-{</div><div class='del'>-	int   word_len;</div><div class='del'>-	char *word;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	p = str + idx;</div><div class='del'>-</div><div class='del'>-	while (isspace (*p) &amp;&amp; p &gt; str)</div><div class='del'>-		p --;</div><div class='del'>-</div><div class='del'>-	while (! isspace (*p) &amp;&amp; p &gt; str)</div><div class='del'>-		p --;</div><div class='del'>-</div><div class='del'>-	if (isspace (*p))</div><div class='del'>-	    p ++;</div><div class='del'>-</div><div class='del'>-	word_len = (str + idx) - p;</div><div class='del'>-	word = g_malloc0 (word_len + 1);</div><div class='del'>-	if (word_len &gt; 0)</div><div class='del'>-		strncpy (word, p, word_len);</div><div class='del'>-</div><div class='del'>-	return word;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_name_western_get_suffix_at_str_end (char *str)</div><div class='del'>-{</div><div class='del'>-	char *suffix;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Walk backwards till we reach the beginning of the</div><div class='del'>-	 * (potentially-comma-separated) list of suffixes.</div><div class='del'>-	 */</div><div class='del'>-	p = str + strlen (str);</div><div class='del'>-	while (1) {</div><div class='del'>-		char *nextp;</div><div class='del'>-		char *word;</div><div class='del'>-</div><div class='del'>-		word = e_name_western_get_preceding_word (str, p - str);</div><div class='del'>-		nextp = p - strlen (word) - 1;</div><div class='del'>-		</div><div class='del'>-		e_name_western_cleanup_string (&amp; word);</div><div class='del'>-</div><div class='del'>-		if (e_name_western_word_is_suffix (word)) {</div><div class='del'>-			p = nextp;</div><div class='del'>-			g_free (word);</div><div class='del'>-		} else {</div><div class='del'>-			g_free (word);</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (p == (str + strlen (str)))</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	suffix = g_strdup (p);</div><div class='del'>-	e_name_western_cleanup_string (&amp; suffix);</div><div class='del'>-</div><div class='del'>-	if (strlen (suffix) == 0) {</div><div class='del'>-		g_free (suffix);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return suffix;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_extract_suffix (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-</div><div class='del'>-	name-&gt;suffix = e_name_western_get_suffix_at_str_end (name-&gt;full);</div><div class='del'>-</div><div class='del'>-	if (name-&gt;suffix == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	idxs-&gt;suffix_idx = strlen (name-&gt;full) - strlen (name-&gt;suffix);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-e_name_western_detect_backwards (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *comma;</div><div class='del'>-	char *word;</div><div class='del'>-</div><div class='del'>-	comma = strchr (name-&gt;full, ',');</div><div class='del'>-</div><div class='del'>-	if (comma == NULL)</div><div class='del'>-		return FALSE;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * If there's a comma, we need to detect whether it's</div><div class='del'>-	 * separating the last name from the first or just separating</div><div class='del'>-	 * suffixes.  So we grab the word which comes before the</div><div class='del'>-	 * comma and check if it's a suffix.</div><div class='del'>-	 */</div><div class='del'>-	word = e_name_western_get_preceding_word (name-&gt;full, comma - name-&gt;full);</div><div class='del'>-</div><div class='del'>-	if (e_name_western_word_is_suffix (word)) {</div><div class='del'>-		g_free (word);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (word);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_reorder_asshole (ENameWestern *name, ENameWesternIdxs *idxs)</div><div class='del'>-{</div><div class='del'>-	char *prefix;</div><div class='del'>-	char *last;</div><div class='del'>-	char *suffix;</div><div class='del'>-	char *firstmidnick;</div><div class='del'>-	char *newfull;</div><div class='del'>-</div><div class='del'>-	char *comma;</div><div class='del'>-	char *p;</div><div class='del'>-</div><div class='del'>-	if (! e_name_western_detect_backwards (name, idxs))</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Convert</div><div class='del'>-	 *    &lt;Prefix&gt; &lt;Last name&gt;, &lt;First name&gt; &lt;Middle[+nick] name&gt; &lt;Suffix&gt;</div><div class='del'>-	 * to</div><div class='del'>-	 *    &lt;Prefix&gt; &lt;First name&gt; &lt;Middle[+nick] name&gt; &lt;Last name&gt; &lt;Suffix&gt;</div><div class='del'>-	 */</div><div class='del'>-	</div><div class='del'>-	/*</div><div class='del'>-	 * Grab the prefix from the beginning.</div><div class='del'>-	 */</div><div class='del'>-	prefix = e_name_western_get_prefix_at_str (name-&gt;full);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Everything from the end of the prefix to the comma is the</div><div class='del'>-	 * last name.</div><div class='del'>-	 */</div><div class='del'>-	comma = strchr (name-&gt;full, ',');</div><div class='del'>-	if (comma == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	p = name-&gt;full + (prefix == NULL ? 0 : strlen (prefix));</div><div class='del'>-</div><div class='del'>-	while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-		p ++;</div><div class='del'>-</div><div class='del'>-	last = g_malloc0 (comma - p + 1);</div><div class='del'>-	strncpy (last, p, comma - p);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Get the suffix off the end.</div><div class='del'>-	 */</div><div class='del'>-	suffix = e_name_western_get_suffix_at_str_end (name-&gt;full);</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Firstmidnick is everything from the comma to the beginning</div><div class='del'>-	 * of the suffix.</div><div class='del'>-	 */</div><div class='del'>-	p = comma + 1;</div><div class='del'>-</div><div class='del'>-	while (isspace (*p) &amp;&amp; *p != '\0')</div><div class='del'>-		p ++;</div><div class='del'>-</div><div class='del'>-	if (suffix != NULL) {</div><div class='del'>-		char *q;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Point q at the beginning of the suffix.</div><div class='del'>-		 */</div><div class='del'>-		q = name-&gt;full + strlen (name-&gt;full) - strlen (suffix) - 1;</div><div class='del'>-</div><div class='del'>-		/*</div><div class='del'>-		 * Walk backwards until we hit the space which</div><div class='del'>-		 * separates the suffix from firstmidnick.</div><div class='del'>-		 */</div><div class='del'>-		while (! isspace (*q) &amp;&amp; q &gt; comma)</div><div class='del'>-			q --;</div><div class='del'>-</div><div class='del'>-		if ((q - p + 1) &gt; 0) {</div><div class='del'>-			firstmidnick = g_malloc0 (q - p + 1);</div><div class='del'>-			strncpy (firstmidnick, p, q - p);</div><div class='del'>-		} else</div><div class='del'>-			firstmidnick = NULL;</div><div class='del'>-	} else {</div><div class='del'>-		firstmidnick = g_strdup (p);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/*</div><div class='del'>-	 * Create our new reordered version of the name.</div><div class='del'>-	 */</div><div class='del'>-#define NULLSTR(a) ((a) == NULL ? "" : (a))</div><div class='del'>-	newfull = g_strdup_printf ("%s %s %s %s", NULLSTR (prefix), NULLSTR (firstmidnick),</div><div class='del'>-				   NULLSTR (last), NULLSTR (suffix));</div><div class='del'>-	g_strstrip (newfull);</div><div class='del'>-	g_free (name-&gt;full);</div><div class='del'>-	name-&gt;full = newfull;</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-	g_free (prefix);</div><div class='del'>-	g_free (firstmidnick);</div><div class='del'>-	g_free (last);</div><div class='del'>-	g_free (suffix);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_name_western_zap_nil (char **str, int *idx)</div><div class='del'>-{</div><div class='del'>-	if (*str == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (strlen (*str) != 0)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	*idx = -1;</div><div class='del'>-	g_free (*str);</div><div class='del'>-	*str = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-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/e-util/ename/e-name-western.h b/e-util/ename/e-name-western.h<br/>deleted file mode 100644<br/>index fa5bac494c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/e-name-western.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/e-name-western.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-#ifndef __E_NAME_WESTERN_H__</div><div class='del'>-#define __E_NAME_WESTERN_H__</div><div class='del'>-</div><div class='del'>-typedef struct {</div><div class='del'>-</div><div class='del'>-	/* Public */</div><div class='del'>-	char *prefix;</div><div class='del'>-	char *first;</div><div class='del'>-	char *middle;</div><div class='del'>-	char *nick;</div><div class='del'>-	char *last;</div><div class='del'>-	char *suffix;</div><div class='del'>-</div><div class='del'>-	/* Private */</div><div class='del'>-	char *full;</div><div class='del'>-} ENameWestern;</div><div class='del'>-</div><div class='del'>-ENameWestern *e_name_western_parse (const char   *full_name);</div><div class='del'>-void          e_name_western_free  (ENameWestern *w);</div><div class='del'>-</div><div class='del'>-#endif /* ! __E_NAME_WESTERN_H__ */</div><div class='head'>diff --git a/e-util/ename/test-ename-western-gtk.c b/e-util/ename/test-ename-western-gtk.c<br/>deleted file mode 100644<br/>index 74adb2a0b4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/test-ename-western-gtk.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/ename/test-ename-western-gtk.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,154 +0,0 @@</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-unicode.h&gt;</div><div class='del'>-#include &lt;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) (e_utf8_gtk_entry_set_text (GTK_ENTRY (a), (b) == NULL ? "" : (b)))</div><div class='del'>-	SET(prefix, name-&gt;prefix);</div><div class='del'>-	SET(first,  name-&gt;first);</div><div class='del'>-	SET(middle, name-&gt;middle);</div><div class='del'>-	SET(nick,   name-&gt;nick);</div><div class='del'>-	SET(last,   name-&gt;last);</div><div class='del'>-	SET(suffix, name-&gt;suffix);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-full_changed_cb (GtkEntry *fulle)</div><div class='del'>-{</div><div class='del'>-	gchar *str;</div><div class='del'>-</div><div class='del'>-	e_name_western_free (name);</div><div class='del'>-	str = e_utf8_gtk_entry_get_text (fulle);</div><div class='del'>-	name = e_name_western_parse (str);</div><div class='del'>-	fill_entries ();</div><div class='del'>-</div><div class='del'>-	g_free (str);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-create_window (void)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *app;</div><div class='del'>-	GtkTable  *table;</div><div class='del'>-</div><div class='del'>-	GtkWidget *prefix_label;</div><div class='del'>-	GtkWidget *first_label;</div><div class='del'>-	GtkWidget *middle_label;</div><div class='del'>-	GtkWidget *nick_label;</div><div class='del'>-	GtkWidget *last_label;</div><div class='del'>-	GtkWidget *suffix_label;</div><div class='del'>-</div><div class='del'>-	app = gnome_app_new ("test", "Evolution Western Name Parser");</div><div class='del'>-</div><div class='del'>-	table = GTK_TABLE (gtk_table_new (3, 6, FALSE));</div><div class='del'>-</div><div class='del'>-	full   = gtk_entry_new ();</div><div class='del'>-	prefix = gtk_entry_new ();</div><div class='del'>-	first  = gtk_entry_new ();</div><div class='del'>-	middle = gtk_entry_new ();</div><div class='del'>-	nick   = gtk_entry_new ();</div><div class='del'>-	last   = gtk_entry_new ();</div><div class='del'>-	suffix = gtk_entry_new ();</div><div class='del'>-</div><div class='del'>-	gtk_widget_set_usize (prefix, 100, 0);</div><div class='del'>-	gtk_widget_set_usize (first,  100, 0);</div><div class='del'>-	gtk_widget_set_usize (middle, 100, 0);</div><div class='del'>-	gtk_widget_set_usize (nick,   100, 0);</div><div class='del'>-	gtk_widget_set_usize (last,   100, 0);</div><div class='del'>-	gtk_widget_set_usize (suffix, 100, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, full, 0, 6, 0, 1,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, prefix, 0, 1, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, first, 1, 2, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, middle, 2, 3, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, nick, 3, 4, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, last, 4, 5, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, suffix, 5, 6, 1, 2,</div><div class='del'>-			  GTK_EXPAND | GTK_FILL | GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	prefix_label = gtk_label_new ("Prefix"); </div><div class='del'>-	first_label  = gtk_label_new ("First"); </div><div class='del'>-	middle_label = gtk_label_new ("Middle"); </div><div class='del'>-	nick_label   = gtk_label_new ("Nick"); </div><div class='del'>-	last_label   = gtk_label_new ("Last"); </div><div class='del'>-	suffix_label = gtk_label_new ("Suffix"); </div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, prefix_label, 0, 1, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, first_label, 1, 2, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, middle_label, 2, 3, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, nick_label, 3, 4, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, last_label, 4, 5, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gtk_table_attach (table, suffix_label, 5, 6, 2, 3,</div><div class='del'>-			  GTK_SHRINK, 0,</div><div class='del'>-			  0, 0);</div><div class='del'>-</div><div class='del'>-	gnome_app_set_contents (GNOME_APP (app), GTK_WIDGET (table));</div><div class='del'>-</div><div class='del'>-	gtk_widget_show_all (app);</div><div class='del'>-</div><div class='del'>-	gtk_entry_set_text (GTK_ENTRY (full),</div><div class='del'>-			    "The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");</div><div class='del'>-</div><div class='del'>-	name = e_name_western_parse ("The Honorable Doctor van Jacobsen, Albert Roderick \"The Clenched Fist\" Jr, MD, PhD, Esquire");</div><div class='del'>-	fill_entries ();</div><div class='del'>-</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (full), "changed", full_changed_cb, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	gnome_init ("Test EName", "Test EName", argc, argv);</div><div class='del'>-</div><div class='del'>-	create_window ();</div><div class='del'>-</div><div class='del'>-	gtk_main ();</div><div class='del'>-</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/e-util/ename/test-ename-western.c b/e-util/ename/test-ename-western.c<br/>deleted file mode 100644<br/>index 6d3beaf16f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/ename/test-ename-western.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/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/e-util/md5-utils.c b/e-util/md5-utils.c<br/>deleted file mode 100644<br/>index a4dd42af8b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/md5-utils.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/md5-utils.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,362 +0,0 @@</div><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'>-#include &lt;string.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_file: get the md5 hash of a file</div><div class='del'>- * @filename: file name</div><div class='del'>- * @digest: 16 bytes buffer receiving the hash code.</div><div class='del'>- * </div><div class='del'>- * Get the md5 hash of a file. The result is put in </div><div class='del'>- * the 16 bytes buffer @digest .</div><div class='del'>- **/</div><div class='del'>-void</div><div class='del'>-md5_get_digest_from_file (const gchar *filename, guchar digest[16])</div><div class='del'>-{	</div><div class='del'>-	MD5Context ctx;</div><div class='del'>-	guchar tmp_buf[1024];</div><div class='del'>-	gint nb_bytes_read;</div><div class='del'>-	FILE *fp;</div><div class='del'>-</div><div class='del'>-	printf("generating checksum\n");</div><div class='del'>-</div><div class='del'>-	md5_init (&amp;ctx);</div><div class='del'>-	fp = fopen(filename, "r");</div><div class='del'>-	if (!fp) {</div><div class='del'>-	return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	while ((nb_bytes_read = fread (tmp_buf, sizeof (guchar), 1024, fp)) &gt; 0)</div><div class='del'>-		md5_update (&amp;ctx, tmp_buf, nb_bytes_read);</div><div class='del'>-	</div><div class='del'>-	if (ferror(fp)) {</div><div class='del'>-		fclose(fp);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	md5_final (&amp;ctx, digest);</div><div class='del'>-	</div><div class='del'>-	printf("checksum done\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/e-util/md5-utils.h b/e-util/md5-utils.h<br/>deleted file mode 100644<br/>index 08e014e86e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/e-util/md5-utils.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>e-util/md5-utils.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,52 +0,0 @@</div><div class='del'>-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * This code implements the MD5 message-digest algorithm.</div><div class='del'>- * The algorithm is due to Ron Rivest.  This code was</div><div class='del'>- * written by Colin Plumb in 1993, no copyright is claimed.</div><div class='del'>- * This code is in the public domain; do with it what you wish.</div><div class='del'>- *</div><div class='del'>- * Equivalent code is available from RSA Data Security, Inc.</div><div class='del'>- * This code has been tested against that, and is equivalent,</div><div class='del'>- * except that you don't need to include two pages of legalese</div><div class='del'>- * with every copy.</div><div class='del'>- *</div><div class='del'>- * To compute the message digest of a chunk of bytes, declare an</div><div class='del'>- * MD5Context structure, pass it to rpmMD5Init, call rpmMD5Update as</div><div class='del'>- * needed on buffers full of bytes, and then call rpmMD5Final, which</div><div class='del'>- * will fill a supplied 16-byte array with the digest.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-/* parts of this file are :</div><div class='del'>- * Written March 1993 by Branko Lankester</div><div class='del'>- * Modified June 1993 by Colin Plumb for altered md5.c.</div><div class='del'>- * Modified October 1995 by Erik Troan for RPM</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-</div><div class='del'>-#ifndef MD5_UTILS_H</div><div class='del'>-#define MD5_UTILS_H</div><div class='del'>-</div><div class='del'>-#include &lt;glib.h&gt;</div><div class='del'>-</div><div class='del'>-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'>-</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/evolution.desktop b/evolution.desktop<br/>deleted file mode 100644<br/>index 665f94792e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/evolution.desktop?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>evolution.desktop</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-[Desktop Entry]</div><div class='del'>-Name=Evolution</div><div class='del'>-Name[pt_BR]=Evolution</div><div class='del'>-Name[es]=Evolution</div><div class='del'>-Name[fr]=Evolution</div><div class='del'>-Name[it]=Evolution</div><div class='del'>-Name[sl]=Evolucija</div><div class='del'>-Name[sv]=Evolution</div><div class='del'>-Name[tr]=Evolution</div><div class='del'>-Comment=The Evolution groupware suite</div><div class='del'>-Comment[pt_BR]=Suíte do grupo Evolution</div><div class='del'>-Comment[es]=El programa de trabajo en grupo Evolution</div><div class='del'>-Comment[fr]=La suite de travail collaboratif Evolution</div><div class='del'>-Comment[it]=La suite di produttivita' personale Evolution</div><div class='del'>-Comment[sl]=Programje za delo v skupini Evolucija</div><div class='del'>-Comment[sv]=Grupprogramvaran Evolution</div><div class='del'>-Comment[tr]=Evolution kitlesel iþlemler uygulamasý</div><div class='del'>-Exec=evolution</div><div class='del'>-Icon=evolution.png</div><div class='del'>-Terminal=0</div><div class='del'>-Type=Application</div><div class='head'>diff --git a/evolution.png b/evolution.png<br/>deleted file mode 100644<br/>index 3b0f90b292..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/evolution.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>evolution.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/executive-summary/.cvsignore b/executive-summary/.cvsignore<br/>deleted file mode 100644<br/>index aed809a312..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-core</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/ChangeLog b/executive-summary/ChangeLog<br/>deleted file mode 100644<br/>index cd46827052..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/ChangeLog?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/ChangeLog</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,226 +0,0 @@</div><div class='del'>-2000-11-03  Federico Mena Quintero  &lt;federico@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/Makefile.am: Clean the idl-generated files</div><div class='del'>-	properly.</div><div class='del'>-</div><div class='del'>-2000-11-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c:</div><div class='del'>-	  component/e-summary-factory.c:</div><div class='del'>-	  component/e-summary-url.c: Warning's cleanup.</div><div class='del'>-</div><div class='del'>-2000-11-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_rebuild_page): Requeue the redraw</div><div class='del'>-	if there is a selection on the widget.</div><div class='del'>-</div><div class='del'>-2000-11-01  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_display_window): Draw the window </div><div class='del'>-	controls to move, close and configure the window.</div><div class='del'>-	(e_summary_window_move_(left|right|up|down)): Move the window around the</div><div class='del'>-	window list.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): Add handlers for the</div><div class='del'>-	window control URIs (close:// configure:// up:// down:// left:// and </div><div class='del'>-	right://).</div><div class='del'>-	(get_protocol): Add support for the new protocols.</div><div class='del'>-	(parse_uri): Ditto.</div><div class='del'>-	(e_summary_url_describe): ditto.</div><div class='del'>-</div><div class='del'>-2000-10-30  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (embed_service): Generate the uid here</div><div class='del'>-	and pass it into the create_view method.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-client.c</div><div class='del'>-	(executive_summary_component_client_create_view): Use the passed in UID</div><div class='del'>-	to generate a view.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c</div><div class='del'>-	(impl_Evolution_SummaryComponent_create_view): Don't generate the id here</div><div class='del'>-	but use the passed in one instead.</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: create_view now takes an ID parameter.</div><div class='del'>-</div><div class='del'>-2000-10-26  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (load_default): Neaten the Report bug link.</div><div class='del'>-	(e_summary_end_load): Put in a &lt;hr&gt; and a mailto to me.</div><div class='del'>-	(e_summary_new): Create an EvolutionShellClient from the Evolution_Shell.</div><div class='del'>-	(e_summary_get_shell_client): Retrieve the shell-client.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_click): On a PROTOCOL_VIEW</div><div class='del'>-	change the current view to the one specified in the URL. </div><div class='del'>-</div><div class='del'>-2000-10-28  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (INCLUDES): Add</div><div class='del'>-	`-I$(top_builddir)/executive-summary/evolution-services' and</div><div class='del'>-	`-I$(top_srcdir)/executive-summary/evolution-services'.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.c (e_summary_url_exec): Execute a program</div><div class='del'>-	specified in the format "exec://program args".</div><div class='del'>-	(e_summary_url_mail_compose): Run the mail composer when a mailto:</div><div class='del'>-	URL is clicked.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (e_summary_start_load): Add a hack to stop the</div><div class='del'>-	GtkHTML widget returning to the top when it is redrawn.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-url.[ch]</div><div class='del'>-	* component/e-summary-util.[ch]: Split some functions out of e-summary.c</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am: Added the new files, and run orbit-idl on the</div><div class='del'>-	mail composer idl.</div><div class='del'>-</div><div class='del'>-2000-10-25    &lt;jpr@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (control_activate): User </div><div class='del'>-	bonobo_control_get_remote_uid_container, not the old version</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* test-service/main.c: Store each individual views data with the view.</div><div class='del'>-	Add comments to explain everything.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c </div><div class='del'>-	(impl_Evolution_SummaryComponent_create_view): Only try to create a </div><div class='del'>-	control if the returned control != NULL.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c </div><div class='del'>-	(impl_Evolution_SummaryComponent_create_view): Set the UID of the view </div><div class='del'>-	before passing it to the create_view method.</div><div class='del'>-</div><div class='del'>-2000-10-25  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/Summary.idl: Added set_icon method, and changed update_html_component</div><div class='del'>-	to update_component. Made all methods take a long ID instead of an</div><div class='del'>-	SummaryComponent.</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Combined the create_bonobo_view and </div><div class='del'>-	create_html_view into create_view.</div><div class='del'>-	Added a destroy_view method.</div><div class='del'>-</div><div class='del'>-	* evolution-services/Makefile.am: Added the 2 new files.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-view.[ch]: New</div><div class='del'>-	files implementing a view of an ExecutiveSummaryComponent.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary.[ch]</div><div class='del'>-	* evolution-services/executive-summary-client.[ch]</div><div class='del'>-	* evolution-services/executive-summary-component.[ch]</div><div class='del'>-	* evolution-services/executive-summary-component-client.[ch]:</div><div class='del'>-	* component/e-summary-factory.c</div><div class='del'>-	* component/e-summary.c</div><div class='del'>-	* test-service/main.c:</div><div class='del'>-	Updated to use new methods and the new ExecutiveSummaryComponentView</div><div class='del'>-	object.</div><div class='del'>-</div><div class='del'>-2000-10-16  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary.c (executive_summary_class_init):</div><div class='del'>-	Implement the update, set_title and flash functionality as signals</div><div class='del'>-	instead of methods.</div><div class='del'>-	(impl_Evolution_Summary_set_title): Emit signal.</div><div class='del'>-	(impl_Evolution_Summary_flash): Emit signal.</div><div class='del'>-	(impl_Evolution_Summary_update_html_component): Emit signal.</div><div class='del'>-	(executive_summary_new): Don't need the methods anymore.</div><div class='del'>-	(executive_summary_construct): Same.</div><div class='del'>-	(executive_summary_init): Remove the private initialisation.</div><div class='del'>-</div><div class='del'>-2000-10-23  Dan Winship  &lt;danw@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/Makefile.am (INCLUDES): </div><div class='del'>-	* evolution-services/Makefile.am (INCLUDES): </div><div class='del'>-	* component/Makefile.am (INCLUDES): Update EVOLUTION_LOCALEDIR</div><div class='del'>-</div><div class='del'>-2000-10-14  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-executive-summary.oafinfo: Added</div><div class='del'>-	"evolution:shell-component-icon" property.</div><div class='del'>-</div><div class='del'>-2000-10-10  Jacob "Ulysses" Berkman  &lt;jacob@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/Makefile.am (IDLS): make the built sources</div><div class='del'>-	depend on the idl files</div><div class='del'>-</div><div class='del'>-2000-10-09  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Added an icon parameter to the</div><div class='del'>-	create_view methods.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component.c: Implement</div><div class='del'>-	the icon parameter.</div><div class='del'>-</div><div class='del'>-	* evolution-services/executive-summary-component-client.c: Ditto</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c: Draw the specified icon.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c: Use the icon parameter.</div><div class='del'>-</div><div class='del'>-2000-10-09  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* evolution-services/Makefile.am: Added $(EXTRA_GNOME_CFLAGS) to </div><div class='del'>-	find gnomesupport.h</div><div class='del'>-</div><div class='del'>-2000-10-06  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary.c (request_cb): Use gnome-vfs to retrieve</div><div class='del'>-	the requested files. Allows services to specify remote urls.</div><div class='del'>-	(load_default, e_summary_display_window, e_summary_rebuild_page): </div><div class='del'>-	Change the html to match TigerT's lovely design.</div><div class='del'>-	(e_summary_add_html_service, e_summary_add_html_service): Add</div><div class='del'>-	the client argument so we can destroy it when we've quit.</div><div class='del'>-	(e_summary_window_update): Only do an update if there isn't one</div><div class='del'>-	pending.</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (embed_service): upd.</div><div class='del'>-</div><div class='del'>-	* test-service/main.c: Made the test service be really silly and count</div><div class='del'>-	the number of seconds since it was started.</div><div class='del'>-</div><div class='del'>-2000-10-06  Ettore Perazzoli  &lt;ettore@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/Makefile.am (INCLUDES): Fix builddir != srcdir.</div><div class='del'>-</div><div class='del'>-2000-10-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* widgets/.cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* .cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* idl/.cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* evolution-services/.cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* component/.cvsignore: ignore more stuff.</div><div class='del'>-</div><div class='del'>-	* .cvsignore: add Makefile</div><div class='del'>-</div><div class='del'>-2000-10-05  Chris Toshok  &lt;toshok@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/component-factory.c: include</div><div class='del'>-	&lt;gal/widgets/e-gui-utils.h&gt; instead of "e-util/e-gui-utils.h" to</div><div class='del'>-	clear up e_notice declaration, and #include &lt;gnome.h&gt; to get "_".</div><div class='del'>-</div><div class='del'>-2000-10-05  Michael Meeks  &lt;michael@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* component/e-summary-factory.c (control_activate): upd.</div><div class='del'>-	(set_pixmap): upd. (update_pixmaps): upd.</div><div class='del'>-	(control_activate_cb): upd.</div><div class='del'>-	(control_deactivate): upd.</div><div class='del'>-</div><div class='del'>-2000-10-04  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* idl/SummaryComponent.idl: Added a title argument to the </div><div class='del'>-	create_view methods.</div><div class='del'>-</div><div class='del'>-2000-09-13  Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>-</div><div class='del'>-	* Started the Executive Summary</div><div class='head'>diff --git a/executive-summary/GNOME_Evolution_Summary.oaf.in b/executive-summary/GNOME_Evolution_Summary.oaf.in<br/>deleted file mode 100644<br/>index fe39e4e631..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/GNOME_Evolution_Summary.oaf.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/GNOME_Evolution_Summary.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"</div><div class='del'>-	type="exe"</div><div class='del'>-	location="evolution-executive-summary"&gt;</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/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 executive summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"</div><div class='del'>-	type="factory"</div><div class='del'>-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"&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 the executive summary."/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-today.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/GNOME_Evolution_Summary.oafinfo b/executive-summary/GNOME_Evolution_Summary.oafinfo<br/>deleted file mode 100644<br/>index fe39e4e631..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/GNOME_Evolution_Summary.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/GNOME_Evolution_Summary.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-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"</div><div class='del'>-	type="exe"</div><div class='del'>-	location="evolution-executive-summary"&gt;</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/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 executive summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"</div><div class='del'>-	type="factory"</div><div class='del'>-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"&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 the executive summary."/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-today.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/Makefile.am b/executive-summary/Makefile.am<br/>deleted file mode 100644<br/>index 3c14ed5593..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,6 +0,0 @@</div><div class='del'>-SUBDIRS = idl widgets evolution-services component test-service</div><div class='del'>-</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_DATA = evolution-executive-summary.oafinfo</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(oaf_DATA) </div><div class='head'>diff --git a/executive-summary/component/.cvsignore b/executive-summary/component/.cvsignore<br/>deleted file mode 100644<br/>index 75f1a012f2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,10 +0,0 @@</div><div class='del'>-core</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-evolution-executive-summary</div><div class='del'>-Composer-common.c</div><div class='del'>-Composer.h</div><div class='del'>-Composer-stubs.c</div><div class='del'>-Composer-skels.c
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/component/Makefile.am b/executive-summary/component/Makefile.am<br/>deleted file mode 100644<br/>index 5b3f147dfd..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,62 +0,0 @@</div><div class='del'>-bin_PROGRAMS =	evolution-executive-summary</div><div class='del'>-</div><div class='del'>-INCLUDES = \</div><div class='del'>-	-I$(top_srcdir)/widgets					\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-text				\</div><div class='del'>-	-I$(top_srcdir)						\</div><div class='del'>-	-I$(top_builddir)/shell					\</div><div class='del'>-	-I$(top_srcdir)/shell					\</div><div class='del'>-	-I$(top_builddir)/executive-summary			\</div><div class='del'>-	-I$(top_srcdir)/executive-summary			\</div><div class='del'>-	-I$(top_builddir)/executive-summary/evolution-services  \</div><div class='del'>-	-I$(top_srcdir)/executive-summary/evolution-services    \</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)					\</div><div class='del'>-	$(GNOME_VFS_CFLAGS)					\</div><div class='del'>-	$(UNICODE_CFLAGS)					\</div><div class='del'>-	$(GTKHTML_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=\""$(localedir)"\"		\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"</div><div class='del'>-</div><div class='del'>-CLEANFILES = $(COMPOSER_GENERATED)</div><div class='del'>-</div><div class='del'>-COMPOSER_GENERATED = \</div><div class='del'>-	Composer.h			\</div><div class='del'>-	Composer-common.c		\</div><div class='del'>-	Composer-skels.c		\</div><div class='del'>-	Composer-stubs.c</div><div class='del'>-</div><div class='del'>-Composer-impl.o: Composer.h</div><div class='del'>-</div><div class='del'>-$(COMPOSER_GENERATED):</div><div class='del'>-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \</div><div class='del'>-		-I$(srcdir) $(top_srcdir)/composer/Composer.idl</div><div class='del'>-</div><div class='del'>-evolution_executive_summary_SOURCES =		\</div><div class='del'>-	$(COMPOSER_GENERATED)		\</div><div class='del'>-	component-factory.c		\</div><div class='del'>-	component-factory.h		\</div><div class='del'>-	e-summary.c			\</div><div class='del'>-	e-summary.h			\</div><div class='del'>-	e-summary-factory.c		\</div><div class='del'>-	e-summary-factory.h		\</div><div class='del'>-	e-summary-url.c			\</div><div class='del'>-	e-summary-url.h			\</div><div class='del'>-	e-summary-util.c		\</div><div class='del'>-	e-summary-util.h		\</div><div class='del'>-	main.c</div><div class='del'>-</div><div class='del'>-evolution_executive_summary_LDADD = 					\</div><div class='del'>-	$(top_builddir)/shell/libeshell.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)/executive-summary/evolution-services/libevolution-services.la	\</div><div class='del'>-	$(top_builddir)/executive-summary/widgets/libesummary-widgets.a	\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)			\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(GTKHTML_LIBS)					\</div><div class='del'>-	$(UNICODE_LIBS)</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/component/component-factory.c b/executive-summary/component/component-factory.c<br/>deleted file mode 100644<br/>index 9af99c7e67..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/component-factory.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/component-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,157 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.c</div><div class='del'>- *</div><div class='del'>- * Authors: Ettore Perazzoli &lt;ettore@helixcode.com&gt;</div><div class='del'>- *          Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Evolution.h"</div><div class='del'>-#include "evolution-storage.h"</div><div class='del'>-</div><div class='del'>-#include "evolution-shell-component.h"</div><div class='del'>-#include &lt;gal/widgets/e-gui-utils.h&gt;</div><div class='del'>-</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-#include "e-summary-factory.h"</div><div class='del'>-</div><div class='del'>-#define COMPONENT_FACTORY_IID "OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-static gint running_objects = 0;</div><div class='del'>-</div><div class='del'>-static const EvolutionShellComponentFolderType folder_types[] = {</div><div class='del'>-  { "executive-summary", "evolution-today.png" },</div><div class='del'>-  { NULL, NULL }</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-char *evolution_dir;</div><div class='del'>-</div><div class='del'>-/* EvolutionShellComponent methods and signals */</div><div class='del'>-</div><div class='del'>-static EvolutionShellComponentResult</div><div class='del'>-create_view (EvolutionShellComponent *shell_component,</div><div class='del'>-	     const char *physical_uri,</div><div class='del'>-	     const char *folder_type,</div><div class='del'>-	     BonoboControl **control_return,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-  EvolutionShellClient *shell_client;</div><div class='del'>-  Evolution_Shell corba_shell;</div><div class='del'>-  BonoboControl *control;</div><div class='del'>-</div><div class='del'>-  if (g_strcasecmp (folder_type, "executive-summary") != 0)</div><div class='del'>-    return EVOLUTION_SHELL_COMPONENT_UNSUPPORTEDTYPE;</div><div class='del'>-</div><div class='del'>-  shell_client = evolution_shell_component_get_owner (shell_component);</div><div class='del'>-  corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));</div><div class='del'>-</div><div class='del'>-  control = e_summary_factory_new_control (physical_uri, corba_shell);</div><div class='del'>-  if (!control)</div><div class='del'>-    return EVOLUTION_SHELL_COMPONENT_NOTFOUND;</div><div class='del'>-</div><div class='del'>-  *control_return = control;</div><div class='del'>-</div><div class='del'>-  return EVOLUTION_SHELL_COMPONENT_OK;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_set_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-	      EvolutionShellClient *shell_client,</div><div class='del'>-	      const char *evolution_homedir,</div><div class='del'>-	      gpointer user_data)</div><div class='del'>-{</div><div class='del'>-  Evolution_Shell corba_shell;</div><div class='del'>-</div><div class='del'>-  evolution_dir = g_strdup (evolution_homedir);</div><div class='del'>-</div><div class='del'>-  corba_shell = bonobo_object_corba_objref (BONOBO_OBJECT (shell_client));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-owner_unset_cb (EvolutionShellComponent *shell_component,</div><div class='del'>-		gpointer user_data)</div><div class='del'>-{</div><div class='del'>-  gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-factory_destroy (BonoboEmbeddable *embeddable,</div><div class='del'>-		 gpointer dummy)</div><div class='del'>-{</div><div class='del'>-  running_objects--;</div><div class='del'>-</div><div class='del'>-  if (running_objects &gt; 0)</div><div class='del'>-    return;</div><div class='del'>-</div><div class='del'>-  if (factory)</div><div class='del'>-    bonobo_object_unref (BONOBO_OBJECT (factory));</div><div class='del'>-  else</div><div class='del'>-    g_warning ("Serious ref counting error");</div><div class='del'>-  factory = NULL;</div><div class='del'>-</div><div class='del'>-  gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *factory, </div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-  EvolutionShellComponent *shell_component;</div><div class='del'>-</div><div class='del'>-  running_objects++;</div><div class='del'>-</div><div class='del'>-  shell_component = evolution_shell_component_new (folder_types,</div><div class='del'>-						   create_view,</div><div class='del'>-						   NULL,</div><div class='del'>-						   NULL,</div><div class='del'>-						   NULL,</div><div class='del'>-						   NULL);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (shell_component), "destroy",</div><div class='del'>-		      GTK_SIGNAL_FUNC (factory_destroy), NULL);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (shell_component), "owner_set",</div><div class='del'>-		      GTK_SIGNAL_FUNC (owner_set_cb), NULL);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (shell_component), "owner_unset",</div><div class='del'>-		      GTK_SIGNAL_FUNC (owner_unset_cb), NULL);</div><div class='del'>-</div><div class='del'>-  return BONOBO_OBJECT (shell_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-component_factory_init (void)</div><div class='del'>-{</div><div class='del'>-  if (factory != NULL)</div><div class='del'>-    return;</div><div class='del'>-</div><div class='del'>-  factory = bonobo_generic_factory_new (COMPONENT_FACTORY_IID, </div><div class='del'>-					factory_fn, NULL);</div><div class='del'>-</div><div class='del'>-  if (factory == NULL) {</div><div class='del'>-    e_notice (NULL, GNOME_MESSAGE_BOX_ERROR,</div><div class='del'>-	      _("Cannot initialize Evolution's Executive Summary component."));</div><div class='del'>-    exit (1);</div><div class='del'>-  }</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/component/component-factory.h b/executive-summary/component/component-factory.h<br/>deleted file mode 100644<br/>index 65e4ad1d56..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/component-factory.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/component-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* component-factory.h</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000  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</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/component/e-summary-factory.c b/executive-summary/component/e-summary-factory.c<br/>deleted file mode 100644<br/>index 79105c18a0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-factory.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/e-summary-factory.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,300 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-factory.c</div><div class='del'>- *</div><div class='del'>- * Authors: Ettore Perazzoli &lt;ettore@helixcode.com&gt;</div><div class='del'>- *          Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-generic-factory.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-control.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include "gal/util/e-util.h"</div><div class='del'>-#include "e-util/e-gui-utils.h"</div><div class='del'>-</div><div class='del'>-#include "e-summary-factory.h"</div><div class='del'>-</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-#include "Evolution.h"</div><div class='del'>-</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-client.h&gt;</div><div class='del'>-#include &lt;evolution-services/Executive-Summary.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-view.h&gt;</div><div class='del'>-</div><div class='del'>-static GList *control_list = NULL;</div><div class='del'>-</div><div class='del'>-void embed_service (GtkWidget *widget,</div><div class='del'>-		    ESummary *esummary);</div><div class='del'>-</div><div class='del'>-BonoboUIVerb verbs[] = {</div><div class='del'>-	BONOBO_UI_UNSAFE_VERB ("AddService", embed_service),</div><div class='del'>-	BONOBO_UI_VERB_END</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_pixmap (BonoboUIComponent *component,</div><div class='del'>-	    const char        *xml_path,</div><div class='del'>-	    const char        *icon)</div><div class='del'>-{</div><div class='del'>-	char *path;</div><div class='del'>-	GdkPixbuf *pixbuf;</div><div class='del'>-</div><div class='del'>-	path = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons", icon);</div><div class='del'>-</div><div class='del'>-	pixbuf = gdk_pixbuf_new_from_file (path);</div><div class='del'>-	g_return_if_fail (pixbuf != NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_pixbuf (component, xml_path, pixbuf);</div><div class='del'>-	gdk_pixbuf_unref (pixbuf);</div><div class='del'>-	g_free (path);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-update_pixmaps (BonoboUIComponent *component)</div><div class='del'>-{</div><div class='del'>-	set_pixmap (component, "/Toolbar/AddService", "add-service.png");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate (BonoboControl     *control,</div><div class='del'>-		  BonoboUIComponent *ui_component,</div><div class='del'>-		  ESummary          *esummary)</div><div class='del'>-{</div><div class='del'>-	Bonobo_UIContainer container;</div><div class='del'>-</div><div class='del'>-	container = bonobo_control_get_remote_ui_container (control);</div><div class='del'>-	bonobo_ui_component_set_container (ui_component, container);</div><div class='del'>-	bonobo_object_release_unref (container, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_component_add_verb_list_with_data (ui_component, verbs, esummary);</div><div class='del'>-	</div><div class='del'>-	bonobo_ui_component_freeze (ui_component, NULL);</div><div class='del'>-</div><div class='del'>-	bonobo_ui_util_set_ui (ui_component, EVOLUTION_DATADIR,</div><div class='del'>-			       "evolution-executive-summary.xml", </div><div class='del'>-			       "evolution-executive-summary");</div><div class='del'>-</div><div class='del'>-	update_pixmaps (ui_component);</div><div class='del'>-	bonobo_ui_component_thaw (ui_component, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_deactivate (BonoboControl     *control,</div><div class='del'>-		    BonoboUIComponent *ui_component,</div><div class='del'>-		    ESummary          *esummary)</div><div class='del'>-{</div><div class='del'>-	bonobo_ui_component_unset_container (ui_component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_activate_cb (BonoboControl *control,</div><div class='del'>-		     gboolean activate,</div><div class='del'>-		     gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	ESummary *summary;</div><div class='del'>-	BonoboUIComponent *ui_component;</div><div class='del'>-	Bonobo_ControlFrame control_frame;</div><div class='del'>-	Evolution_ShellView shell_view_interface;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	ui_component = bonobo_control_get_ui_component (control);</div><div class='del'>-	g_assert (ui_component != NULL);</div><div class='del'>-</div><div class='del'>-	if (gtk_object_get_data (GTK_OBJECT (control), "shell_view_interface") == NULL) {</div><div class='del'>-		control_frame = bonobo_control_get_control_frame (control);</div><div class='del'>-		if (control_frame == NULL) {</div><div class='del'>-			goto out;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		CORBA_exception_init (&amp;ev);</div><div class='del'>-		shell_view_interface = Bonobo_Unknown_queryInterface (control_frame,</div><div class='del'>-								      "IDL:Evolution/ShellView:1.0",</div><div class='del'>-								      &amp;ev);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-		if (shell_view_interface != CORBA_OBJECT_NIL) {</div><div class='del'>-			gtk_object_set_data (GTK_OBJECT (control),</div><div class='del'>-					     "shell_view_interface",</div><div class='del'>-					     shell_view_interface);</div><div class='del'>-		} else {</div><div class='del'>-			g_warning ("Control frame doesn't have Evolution/ShellView.");</div><div class='del'>-		}</div><div class='del'>-									       </div><div class='del'>-		summary = E_SUMMARY (user_data);</div><div class='del'>-		e_summary_set_shell_view_interface (summary, </div><div class='del'>-						    shell_view_interface);</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>- out:</div><div class='del'>-	if (activate)</div><div class='del'>-		control_activate (control, ui_component, user_data);</div><div class='del'>-	else</div><div class='del'>-		control_deactivate (control, ui_component, user_data);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-control_destroy_cb (BonoboControl *control,</div><div class='del'>-		    gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *esummary = user_data;</div><div class='del'>-</div><div class='del'>-	control_list = g_list_remove (control_list, control);</div><div class='del'>-</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (esummary));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void </div><div class='del'>-update (ExecutiveSummary *summary,</div><div class='del'>-	int id,</div><div class='del'>-	const char *html,</div><div class='del'>-	ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-</div><div class='del'>-	view = e_summary_view_from_id (esummary, id);</div><div class='del'>-	executive_summary_component_view_set_html (view, html);</div><div class='del'>-	e_summary_update_window (esummary, summary, html);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-set_title (ExecutiveSummary *summary,</div><div class='del'>-	   int id,</div><div class='del'>-	   const char *title,</div><div class='del'>-	   ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	</div><div class='del'>-	view = e_summary_view_from_id (esummary, id);</div><div class='del'>-	executive_summary_component_view_set_title (view, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-flash (ExecutiveSummary *summary,</div><div class='del'>-       int id,</div><div class='del'>-       gpointer user_data)</div><div class='del'>-{</div><div class='del'>-	g_print ("FLASH!\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-view_destroyed (ExecutiveSummaryComponentView *view,</div><div class='del'>-		ExecutiveSummaryComponentClient *client)</div><div class='del'>-{</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	g_print ("%s\n", __FUNCTION__);</div><div class='del'>-	id = executive_summary_component_view_get_id (view);</div><div class='del'>-	g_print ("%d\n", id);</div><div class='del'>-	executive_summary_component_client_destroy_view (client, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* A ********very********</div><div class='del'>-   temporary function to embed something</div><div class='del'>-*/</div><div class='del'>-void</div><div class='del'>-embed_service (GtkWidget *widget,</div><div class='del'>-	       ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	char *required_interfaces[2] = {"IDL:Evolution:SummaryComponent:1.0",</div><div class='del'>-					NULL};</div><div class='del'>-	char *obj_id;</div><div class='del'>-	</div><div class='del'>-	obj_id = bonobo_selector_select_id ("Select a service",</div><div class='del'>-					    (const char **) required_interfaces);</div><div class='del'>-	if (obj_id == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	e_summary_factory_embed_service_from_id (esummary, obj_id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_factory_embed_service_from_id (ESummary *esummary,</div><div class='del'>-					 const char *obj_id)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentClient *client;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	int id;</div><div class='del'>-	</div><div class='del'>-	client = executive_summary_component_client_new (obj_id);</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-</div><div class='del'>-	/* Set the owner */</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (executive_summary_new ());</div><div class='del'>-	executive_summary_component_client_set_owner (client, summary);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (summary), "flash",</div><div class='del'>-			    GTK_SIGNAL_FUNC (flash), esummary);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (summary), "set_title",</div><div class='del'>-			    GTK_SIGNAL_FUNC (set_title), esummary);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (summary), "update",</div><div class='del'>-			    GTK_SIGNAL_FUNC (update), esummary);</div><div class='del'>-</div><div class='del'>-	/* Create view */</div><div class='del'>-	id = executive_summary_component_create_unique_id ();</div><div class='del'>-	view = executive_summary_component_client_create_view (client, id);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (view_destroyed), client);</div><div class='del'>-</div><div class='del'>-	e_summary_add_service (esummary, summary, view, obj_id);</div><div class='del'>-	e_summary_rebuild_page (esummary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboControl *</div><div class='del'>-e_summary_factory_new_control (const char *uri,</div><div class='del'>-			       const Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-  BonoboControl *control;</div><div class='del'>-  GtkWidget *esummary;</div><div class='del'>-</div><div class='del'>-  esummary = e_summary_new (shell);</div><div class='del'>-  if (esummary == NULL)</div><div class='del'>-    return NULL;</div><div class='del'>-</div><div class='del'>-  gtk_widget_show (esummary);</div><div class='del'>-</div><div class='del'>-  control = bonobo_control_new (esummary);</div><div class='del'>-</div><div class='del'>-  if (control == NULL) {</div><div class='del'>-    gtk_object_destroy (GTK_OBJECT (esummary));</div><div class='del'>-    return NULL;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (control), "activate",</div><div class='del'>-		      control_activate_cb, esummary);</div><div class='del'>-</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (control), "destroy",</div><div class='del'>-		      control_destroy_cb, esummary);</div><div class='del'>-</div><div class='del'>-  control_list = g_list_prepend (control_list, control);</div><div class='del'>-</div><div class='del'>-  e_summary_rebuild_page (E_SUMMARY (esummary));</div><div class='del'>-  return control;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/component/e-summary-factory.h b/executive-summary/component/e-summary-factory.h<br/>deleted file mode 100644<br/>index 175988a78c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-factory.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/e-summary-factory.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,35 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-factory.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_FACTORY_H__</div><div class='del'>-#define _E_SUMMARY_FACTORY_H__</div><div class='del'>-</div><div class='del'>-#include &lt;Evolution.h&gt;</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-</div><div class='del'>-BonoboControl *e_summary_factory_new_control (const char *uri,</div><div class='del'>-					      const Evolution_Shell shell);</div><div class='del'>-void e_summary_factory_embed_service_from_id (ESummary *esummary,</div><div class='del'>-					      const char *obj_id);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary-url.c b/executive-summary/component/e-summary-url.c<br/>deleted file mode 100644<br/>index c07a3efc99..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-url.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/e-summary-url.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,567 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-url.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml-stream.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-#include "e-summary-url.h"</div><div class='del'>-#include "e-summary-util.h"</div><div class='del'>-</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-view.h&gt;</div><div class='del'>-#include "Composer.h"</div><div class='del'>-</div><div class='del'>-typedef enum _ESummaryProtocol {</div><div class='del'>-	PROTOCOL_NONE,</div><div class='del'>-	PROTOCOL_HTTP,</div><div class='del'>-	PROTOCOL_MAILTO,</div><div class='del'>-	PROTOCOL_VIEW,</div><div class='del'>-	PROTOCOL_EXEC,</div><div class='del'>-	PROTOCOL_FILE,</div><div class='del'>-	PROTOCOL_CLOSE,</div><div class='del'>-	PROTOCOL_LEFT,</div><div class='del'>-	PROTOCOL_RIGHT,</div><div class='del'>-	PROTOCOL_UP,</div><div class='del'>-	PROTOCOL_DOWN,</div><div class='del'>-	PROTOCOL_CONFIGURE,</div><div class='del'>-	PROTOCOL_OTHER</div><div class='del'>-} ESummaryProtocol;</div><div class='del'>-</div><div class='del'>-static char *descriptions[] = {</div><div class='del'>-	N_("Open %s with the default GNOME application"),</div><div class='del'>-	N_("Open %s with the default GNOME web browser"),</div><div class='del'>-	N_("Send an email to %s"),</div><div class='del'>-	N_("Change the view to %s"),</div><div class='del'>-	N_("Run %s"),</div><div class='del'>-	N_("Open %s with the default GNOME application"),</div><div class='del'>-	N_("Close %s"),</div><div class='del'>-	N_("Move %s to the left"),</div><div class='del'>-	N_("Move %s to the right"),</div><div class='del'>-	N_("Move %s into the previous row"),</div><div class='del'>-	N_("Move %s into the next row"),</div><div class='del'>-	N_("Configure %s"),</div><div class='del'>-	N_("Open %s with the default GNOME application")</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define COMPOSER_IID "OAFIID:evolution-composer:evolution-mail:cd8618ea-53e1-4b9e-88cf-ec578bdb903b"</div><div class='del'>-</div><div class='del'>-gboolean e_summary_url_mail_compose (ESummary *esummary,</div><div class='del'>-				     const char *url);</div><div class='del'>-gboolean e_summary_url_exec (const char *exec);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_url_request (GtkHTML *html,</div><div class='del'>-		       const gchar *url,</div><div class='del'>-		       GtkHTMLStream *stream)</div><div class='del'>-{</div><div class='del'>-	char *filename;</div><div class='del'>-	GnomeVFSHandle *handle = NULL;</div><div class='del'>-	GnomeVFSResult result;</div><div class='del'>-</div><div class='del'>-	if (strncasecmp (url, "file:", 5) == 0) {</div><div class='del'>-		url += 5;</div><div class='del'>-		filename = e_pixmap_file (url);</div><div class='del'>-	} else if (strchr (url, ':') &gt;= strchr (url, '/')) {</div><div class='del'>-		filename = e_pixmap_file (url);</div><div class='del'>-	} else</div><div class='del'>-		filename = g_strdup (url);</div><div class='del'>-</div><div class='del'>-	if (filename == NULL) {</div><div class='del'>-		gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	result = gnome_vfs_open (&amp;handle, filename, GNOME_VFS_OPEN_READ);</div><div class='del'>-	</div><div class='del'>-	if (result != GNOME_VFS_OK) {</div><div class='del'>-		g_warning ("%s: %s", filename, </div><div class='del'>-			   gnome_vfs_result_to_string (result));</div><div class='del'>-		g_free (filename);</div><div class='del'>-		gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	g_free (filename);</div><div class='del'>-	while (1) {</div><div class='del'>-		char buffer[4096];</div><div class='del'>-		GnomeVFSFileSize size;</div><div class='del'>-</div><div class='del'>-		/* Clear buffer */</div><div class='del'>-		memset (buffer, 0x00, 4096);</div><div class='del'>-</div><div class='del'>-		result = gnome_vfs_read (handle, buffer, 4096, &amp;size);</div><div class='del'>-		if (result != GNOME_VFS_OK &amp;&amp; result != GNOME_VFS_ERROR_EOF) {</div><div class='del'>-			g_warning ("Error reading data: %s", </div><div class='del'>-				   gnome_vfs_result_to_string (result));</div><div class='del'>-			gnome_vfs_close (handle);</div><div class='del'>-			gtk_html_stream_close (stream, GTK_HTML_STREAM_ERROR);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		if (size == 0)</div><div class='del'>-			break; /* EOF */</div><div class='del'>-</div><div class='del'>-		gtk_html_stream_write (stream, buffer, size);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gtk_html_stream_close (stream, GTK_HTML_STREAM_OK);</div><div class='del'>-	gnome_vfs_close (handle);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-parse_uri (const char *uri,</div><div class='del'>-	   ESummaryProtocol protocol,</div><div class='del'>-	   ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	char *parsed;</div><div class='del'>-	char *p;</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	switch (protocol) {</div><div class='del'>-		</div><div class='del'>-	case PROTOCOL_HTTP:</div><div class='del'>-		/* "http://" == 7 */</div><div class='del'>-		parsed = g_strdup (uri + 7);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_EXEC:</div><div class='del'>-		/* "exec://" == 7 */</div><div class='del'>-		parsed = g_strdup (uri + 7);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_VIEW:</div><div class='del'>-		/* "view://" == 7 */</div><div class='del'>-		parsed = g_strdup (uri + 7);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_MAILTO:</div><div class='del'>-		/* Fun. Mailto's might be "mailto:" or "mailto://" */</div><div class='del'>-		if (strstr (uri, "mailto://") == NULL) {</div><div class='del'>-			parsed = (char *) (uri + 7);</div><div class='del'>-		} else {</div><div class='del'>-			parsed = (char *) (uri + 9);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		/* Now strip anything after a question mark, </div><div class='del'>-		   as it is a parameter (that we ignore for the time being) */</div><div class='del'>-		if ( (p = strchr (parsed, '?')) != NULL) {</div><div class='del'>-			parsed = g_strndup (parsed, p - parsed);</div><div class='del'>-		} else {</div><div class='del'>-			parsed = g_strdup (parsed);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_CLOSE:</div><div class='del'>-		id = atoi (uri + 8);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		parsed = g_strdup (executive_summary_component_view_get_title (view));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_LEFT:</div><div class='del'>-		id = atoi (uri + 7);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		parsed = g_strdup (executive_summary_component_view_get_title (view));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_RIGHT:</div><div class='del'>-		id = atoi (uri + 8);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		parsed = g_strdup (executive_summary_component_view_get_title (view));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_UP:</div><div class='del'>-		id = atoi (uri + 5);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		parsed = g_strdup (executive_summary_component_view_get_title (view));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_DOWN:</div><div class='del'>-		id = atoi (uri + 7);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		parsed = g_strdup (executive_summary_component_view_get_title (view));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_CONFIGURE:</div><div class='del'>-		id = atoi (uri + 12);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		parsed = g_strdup (executive_summary_component_view_get_title (view));</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_NONE:</div><div class='del'>-	case PROTOCOL_OTHER:</div><div class='del'>-	default:</div><div class='del'>-		/* Just return the uneditted uri. */</div><div class='del'>-		parsed = g_strdup (uri);</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	return parsed;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static ESummaryProtocol</div><div class='del'>-get_protocol (const char *url)</div><div class='del'>-{</div><div class='del'>-	char *lowerurl;</div><div class='del'>-	ESummaryProtocol protocol = PROTOCOL_OTHER;</div><div class='del'>-	</div><div class='del'>-	lowerurl = g_strdup (url);</div><div class='del'>-	g_strdown (lowerurl);</div><div class='del'>-	</div><div class='del'>-	/* Check for no :/ */</div><div class='del'>-	if (strstr (lowerurl, "://") == NULL) {</div><div class='del'>-		</div><div class='del'>-		/* Annoying alternative for mailto URLs */</div><div class='del'>-		if (strncmp (lowerurl, "mailto:", 6) != 0) {</div><div class='del'>-			g_free (lowerurl);</div><div class='del'>-			return PROTOCOL_NONE;</div><div class='del'>-		} else {</div><div class='del'>-			g_free (lowerurl);</div><div class='del'>-			return PROTOCOL_MAILTO;</div><div class='del'>-		}</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	switch (lowerurl[0]) {</div><div class='del'>-	case 'c':</div><div class='del'>-		switch (lowerurl[1]) {</div><div class='del'>-		case 'l':</div><div class='del'>-			if (strncmp (lowerurl + 2, "ose", 3) == 0)</div><div class='del'>-				protocol = PROTOCOL_CLOSE;</div><div class='del'>-			break;</div><div class='del'>-		case 'o':</div><div class='del'>-			if (strncmp (lowerurl + 2, "nfigure", 7) == 0)</div><div class='del'>-				protocol = PROTOCOL_CONFIGURE;</div><div class='del'>-			break;</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-	case 'd':</div><div class='del'>-		if (strncmp (lowerurl + 1, "own", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_DOWN;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'e':</div><div class='del'>-		if (strncmp (lowerurl + 1, "xec", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_EXEC;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case 'f':</div><div class='del'>-		if (strncmp (lowerurl + 1, "ile", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_FILE;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'h':</div><div class='del'>-		if (strncmp (lowerurl + 1, "ttp", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_HTTP;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case 'l':</div><div class='del'>-		if (strncmp (lowerurl + 1, "eft", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_LEFT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'm':</div><div class='del'>-		if (strncmp (lowerurl + 1, "ailto", 5) == 0)</div><div class='del'>-			protocol = PROTOCOL_MAILTO;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case 'r':</div><div class='del'>-		if (strncmp (lowerurl + 1, "ight", 4) == 0)</div><div class='del'>-			protocol = PROTOCOL_RIGHT;</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 'u':</div><div class='del'>-		if (lowerurl[1] == 'p')</div><div class='del'>-			protocol = PROTOCOL_UP;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case 'v':</div><div class='del'>-		if (strncmp (lowerurl + 1, "iew", 3) == 0)</div><div class='del'>-			protocol = PROTOCOL_VIEW;</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	default:</div><div class='del'>-		break;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (lowerurl);</div><div class='del'>-	</div><div class='del'>-	return protocol;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_url_click (GtkWidget *widget,</div><div class='del'>-		     const char *url,</div><div class='del'>-		     ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryProtocol protocol;</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	gpointer window; /* FIXME */</div><div class='del'>-	char *parsed;</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	protocol = get_protocol (url);</div><div class='del'>-</div><div class='del'>-	parsed = parse_uri (url, protocol, esummary);</div><div class='del'>-</div><div class='del'>-	switch (protocol) {</div><div class='del'>-	case PROTOCOL_MAILTO:</div><div class='del'>-		/* Open a composer window */</div><div class='del'>-		e_summary_url_mail_compose (esummary, parsed);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case PROTOCOL_VIEW:</div><div class='del'>-		/* Change the EShellView's current uri */</div><div class='del'>-		e_summary_change_current_view (esummary, parsed);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	case PROTOCOL_EXEC:</div><div class='del'>-		/* Execute the rest of the url */</div><div class='del'>-		e_summary_url_exec (parsed);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_CLOSE:</div><div class='del'>-		/* Close the window. */</div><div class='del'>-		id = atoi (url + 8);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		if (view == NULL)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		window = e_summary_window_from_view (esummary, view);</div><div class='del'>-		e_summary_window_remove_from_ht (window, esummary);</div><div class='del'>-		e_summary_window_free (window, esummary);</div><div class='del'>-		e_summary_rebuild_page (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_CONFIGURE:</div><div class='del'>-		/* Configure the window. . . */</div><div class='del'>-		id = atoi (url + 12);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		if (view == NULL)</div><div class='del'>-			return;</div><div class='del'>-	</div><div class='del'>-		/* Issue the configure command some how :) */</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_LEFT:</div><div class='del'>-		/* Window left */</div><div class='del'>-		id = atoi (url + 7);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-</div><div class='del'>-		if (view == NULL)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		window = e_summary_window_from_view (esummary, view);</div><div class='del'>-</div><div class='del'>-		e_summary_window_move_left (esummary, window);</div><div class='del'>-		e_summary_rebuild_page (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_RIGHT:</div><div class='del'>-		id = atoi (url + 8);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		if (view == NULL)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		window = e_summary_window_from_view (esummary, view);</div><div class='del'>-</div><div class='del'>-		e_summary_window_move_right (esummary, window);</div><div class='del'>-		e_summary_rebuild_page (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_UP:</div><div class='del'>-		id = atoi (url + 5);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		if (view == NULL)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		window = e_summary_window_from_view (esummary, view);</div><div class='del'>-</div><div class='del'>-		e_summary_window_move_up (esummary, window);</div><div class='del'>-		e_summary_rebuild_page (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_DOWN:</div><div class='del'>-		id = atoi (url + 7);</div><div class='del'>-		view = e_summary_view_from_id (esummary, id);</div><div class='del'>-		if (view == NULL)</div><div class='del'>-			return;</div><div class='del'>-</div><div class='del'>-		window = e_summary_window_from_view (esummary, view);</div><div class='del'>-</div><div class='del'>-		e_summary_window_move_down (esummary, window);</div><div class='del'>-		e_summary_rebuild_page (esummary);</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case PROTOCOL_NONE:</div><div class='del'>-	case PROTOCOL_OTHER:</div><div class='del'>-	case PROTOCOL_HTTP:</div><div class='del'>-	case PROTOCOL_FILE:</div><div class='del'>-	default:</div><div class='del'>-		/* Let browser handle it */</div><div class='del'>-		gnome_url_show (url);</div><div class='del'>-		break;</div><div class='del'>-		</div><div class='del'>-	}      </div><div class='del'>-</div><div class='del'>-	g_free (parsed);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_summary_url_mail_compose (ESummary *esummary,</div><div class='del'>-			    const char *url)</div><div class='del'>-{</div><div class='del'>-	CORBA_Object composer;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	Evolution_Composer_RecipientList *to, *cc, *bcc;</div><div class='del'>-	Evolution_Composer_Recipient *recipient;</div><div class='del'>-	char *address, *proto;</div><div class='del'>-	CORBA_char *subject;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: Query for IIDs? */</div><div class='del'>-	composer = oaf_activate_from_id ((char *)COMPOSER_IID, 0, NULL, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("Unable to start composer component!");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if ( (proto = strstr (url, "://")) != NULL){</div><div class='del'>-		address = proto + 3;</div><div class='del'>-	} else {</div><div class='del'>-		if (strncmp (url, "mailto:", 7) == 0)</div><div class='del'>-			address = (char *) (url + 7);</div><div class='del'>-		else</div><div class='del'>-			address = (char *) url;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	to = Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	to-&gt;_length = 1;</div><div class='del'>-	to-&gt;_maximum = 1;</div><div class='del'>-	to-&gt;_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (to-&gt;_maximum);</div><div class='del'>-	</div><div class='del'>-	recipient = to-&gt;_buffer;</div><div class='del'>-	recipient-&gt;name = CORBA_string_dup ("");</div><div class='del'>-	recipient-&gt;address = CORBA_string_dup (address?address:"");</div><div class='del'>-	</div><div class='del'>-	/* FIXME: Get these out of the URL */</div><div class='del'>-	cc = Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	cc-&gt;_length = 0;</div><div class='del'>-	cc-&gt;_maximum = 0;</div><div class='del'>-	cc-&gt;_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (cc-&gt;_maximum);</div><div class='del'>-	</div><div class='del'>-	bcc = Evolution_Composer_RecipientList__alloc ();</div><div class='del'>-	bcc-&gt;_length = 0;</div><div class='del'>-	bcc-&gt;_maximum = 0;</div><div class='del'>-	bcc-&gt;_buffer = CORBA_sequence_Evolution_Composer_Recipient_allocbuf (bcc-&gt;_maximum);</div><div class='del'>-	</div><div class='del'>-	subject = CORBA_string_dup ("");</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Evolution_Composer_set_headers (composer, to, cc, bcc, subject, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		CORBA_free (to);</div><div class='del'>-		g_warning ("%s(%d): Error setting headers", __FUNCTION__, __LINE__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_free (to);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);  </div><div class='del'>-	Evolution_Composer_show (composer, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("%s(%d): Error showing composer", __FUNCTION__, __LINE__);</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	/* FIXME: Free the composer? */</div><div class='del'>-	</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-gboolean</div><div class='del'>-e_summary_url_exec (const char *exec)</div><div class='del'>-{</div><div class='del'>-	gchar **exec_array;</div><div class='del'>-	int argc;</div><div class='del'>-	</div><div class='del'>-	exec_array = g_strsplit (exec, " ", 0);</div><div class='del'>-	</div><div class='del'>-	argc = 0;</div><div class='del'>-	while (exec_array[argc] != NULL) {</div><div class='del'>-		argc++;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	gnome_execute_async (NULL, argc, exec_array);</div><div class='del'>-	</div><div class='del'>-	g_strfreev (exec_array);</div><div class='del'>-	return TRUE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static char *</div><div class='del'>-e_summary_url_describe (const char *uri, </div><div class='del'>-			ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryProtocol protocol;</div><div class='del'>-	char *contents, *description;</div><div class='del'>-</div><div class='del'>-	protocol = get_protocol (uri);</div><div class='del'>-	contents = parse_uri (uri, protocol, esummary);</div><div class='del'>-</div><div class='del'>-	description = g_strdup_printf (_(descriptions[protocol]), contents);</div><div class='del'>-	g_free (contents);</div><div class='del'>-</div><div class='del'>-	return description;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_url_over (GtkHTML *html,</div><div class='del'>-		    const char *uri,</div><div class='del'>-		    ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	char *description;</div><div class='del'>-</div><div class='del'>-	if (uri != NULL) {</div><div class='del'>-		description = e_summary_url_describe (uri, esummary);</div><div class='del'>-		e_summary_set_message (esummary, description, FALSE);</div><div class='del'>-		g_free (description);</div><div class='del'>-	} else {</div><div class='del'>-		e_summary_unset_message (esummary);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/component/e-summary-url.h b/executive-summary/component/e-summary-url.h<br/>deleted file mode 100644<br/>index 9844d384e0..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-url.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/e-summary-url.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,37 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-url.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_URL_H__</div><div class='del'>-#define _E_SUMMARY_URL_H__</div><div class='del'>-</div><div class='del'>-void e_summary_url_request (GtkHTML *html,</div><div class='del'>-			    const gchar *url,</div><div class='del'>-			    GtkHTMLStream *stream);</div><div class='del'>-void e_summary_url_click (GtkWidget *widget,</div><div class='del'>-			  const char *url,</div><div class='del'>-			  ESummary *esummary);</div><div class='del'>-void e_summary_url_over (GtkHTML *html,</div><div class='del'>-			 const char *uri,</div><div class='del'>-			 ESummary *esummary);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary-util.c b/executive-summary/component/e-summary-util.c<br/>deleted file mode 100644<br/>index 8ed8d4daea..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-util.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/e-summary-util.c</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-summary-url.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple 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'>-</div><div class='del'>-char *</div><div class='del'>-e_pixmap_file (const char *filename)</div><div class='del'>-{</div><div class='del'>-	char *ret;</div><div class='del'>-	char *edir;</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (filename)) {</div><div class='del'>-		ret = g_strdup (filename);</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try the evolution images dir */</div><div class='del'>-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution",</div><div class='del'>-				      filename);</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (edir)) {</div><div class='del'>-		ret = g_strdup (edir);</div><div class='del'>-		g_free (edir);</div><div class='del'>-</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Try the evolution button images dir */</div><div class='del'>-	edir = g_concat_dir_and_file (EVOLUTION_DATADIR "/images/evolution/buttons",</div><div class='del'>-				      filename);</div><div class='del'>-</div><div class='del'>-	if (g_file_exists (edir)) {</div><div class='del'>-		ret = g_strdup (edir);</div><div class='del'>-		g_free (edir);</div><div class='del'>-		</div><div class='del'>-		return ret;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Fall back to the gnome_pixmap_file */</div><div class='del'>-	return gnome_pixmap_file (filename);</div><div class='del'>-}</div><div class='del'>-	</div><div class='head'>diff --git a/executive-summary/component/e-summary-util.h b/executive-summary/component/e-summary-util.h<br/>deleted file mode 100644<br/>index 0cfd50403a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary-util.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/e-summary-util.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,29 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-util.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_UTIL_H__</div><div class='del'>-#define _E_SUMMARY_UTIL_H__</div><div class='del'>-</div><div class='del'>-char *e_pixmap_file (const char *filename);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/e-summary.c b/executive-summary/component/e-summary.c<br/>deleted file mode 100644<br/>index dca8f98f0f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/e-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,813 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml-stream.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-summary.h"</div><div class='del'>-#include "e-summary-factory.h"</div><div class='del'>-#include "e-summary-util.h"</div><div class='del'>-#include "e-summary-url.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gtk_vbox_get_type ())</div><div class='del'>-</div><div class='del'>-/* From component-factory.c */</div><div class='del'>-extern char *evolution_dir;</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *e_summary_parent_class;</div><div class='del'>-</div><div class='del'>-struct _ESummaryPrivate {</div><div class='del'>-	Evolution_Shell shell;</div><div class='del'>-	Evolution_ShellView shell_view_interface;</div><div class='del'>-</div><div class='del'>-	GtkWidget *html_scroller;</div><div class='del'>-	GtkWidget *html;</div><div class='del'>-</div><div class='del'>-	GHashTable *id_to_view;</div><div class='del'>-	GHashTable *view_to_window;</div><div class='del'>-	GHashTable *summary_to_window;</div><div class='del'>-	GList *window_list;</div><div class='del'>-</div><div class='del'>-	guint idle;</div><div class='del'>-</div><div class='del'>-	GtkHTMLStream *stream;</div><div class='del'>-	gboolean grabbed;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static gboolean on_object_requested (GtkHTML *html,</div><div class='del'>-				     GtkHTMLEmbedded *eb,</div><div class='del'>-				     ESummary *summary);</div><div class='del'>-static void e_summary_save_state (ESummary *esummary,</div><div class='del'>-				  const char *path);</div><div class='del'>-static void e_summary_load_state (ESummary *esummary,</div><div class='del'>-				  const char *path);</div><div class='del'>-		</div><div class='del'>-/* GtkObject methods */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-s2w_foreach (gpointer *key,</div><div class='del'>-	     gpointer *value,</div><div class='del'>-	     ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	e_summary_window_free ((ESummaryWindow *) value, esummary);</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_summary_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ESummary *esummary = E_SUMMARY (object);</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *prefix;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	prefix = g_concat_dir_and_file (evolution_dir, "config/Executive-Summary");</div><div class='del'>-	e_summary_save_state (esummary, prefix);</div><div class='del'>-	g_free (prefix);</div><div class='del'>-</div><div class='del'>-	g_hash_table_foreach (priv-&gt;summary_to_window, </div><div class='del'>-			      (GHFunc) s2w_foreach, esummary);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;summary_to_window);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;id_to_view);</div><div class='del'>-	g_hash_table_destroy (priv-&gt;view_to_window);</div><div class='del'>-</div><div class='del'>-	g_free (esummary-&gt;private);</div><div class='del'>-	esummary-&gt;private = NULL;</div><div class='del'>-</div><div class='del'>-	e_summary_parent_class-&gt;destroy (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-	object_class-&gt;destroy = e_summary_destroy;</div><div class='del'>-	</div><div class='del'>-	e_summary_parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_start_load (ESummary *summary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *header = "&lt;html&gt;&lt;body bgcolor=\"#ffffff\"&gt;";</div><div class='del'>-</div><div class='del'>-	priv = summary-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;stream = gtk_html_begin (GTK_HTML (priv-&gt;html));</div><div class='del'>-</div><div class='del'>-	/* Hack to stop page returning to the top */</div><div class='del'>-	GTK_HTML (priv-&gt;html)-&gt;engine-&gt;newPage = FALSE;</div><div class='del'>-</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-			header, strlen (header));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-load_default (ESummary *summary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *def = "&lt;table width=\"100%\"&gt;&lt;tr&gt;&lt;td align=\"right\"&gt;"</div><div class='del'>-		"&lt;img src=\"ccsplash.png\"&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;"</div><div class='del'>-		"&lt;table&gt;&lt;tr&gt;&lt;td&gt;&lt;a href=\"exec://bug-buddy\"&gt;&lt;img src=\"file://gnome-spider.png\" width=\"24\" height=\"24\" border=\"0\"&gt;"</div><div class='del'>-		"&lt;/a&gt;&lt;/td&gt;&lt;td&gt;&lt;a href=\"exec://bug-buddy\"&gt;Submit a bug report"</div><div class='del'>-		"&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;hr&gt;";</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (summary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (summary));</div><div class='del'>-</div><div class='del'>-	priv = summary-&gt;private;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (priv-&gt;stream != NULL);</div><div class='del'>-</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, def, strlen (def));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_end_load (ESummary *summary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *footer = "&lt;hr&gt;&lt;p align=\"right\"&gt;All Executive Summary comments to &lt;a href=\"mailto:iain@helixcode.com\"&gt;Iain Holmes (iain@helixcode.com)&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;";</div><div class='del'>-</div><div class='del'>-	priv = summary-&gt;private;</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, </div><div class='del'>-			footer, strlen (footer));</div><div class='del'>-	gtk_html_end (GTK_HTML (priv-&gt;html), priv-&gt;stream, GTK_HTML_STREAM_OK);</div><div class='del'>-</div><div class='del'>-	priv-&gt;stream = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_init (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	GdkColor bgcolour = {0, 0xdfff, 0xdfff, 0xffff};</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	esummary-&gt;private = g_new0 (ESummaryPrivate, 1);</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;window_list = NULL;</div><div class='del'>-	priv-&gt;idle = 0;</div><div class='del'>-</div><div class='del'>-	/* HTML widget */</div><div class='del'>-	priv-&gt;html_scroller = gtk_scrolled_window_new (NULL, NULL);</div><div class='del'>-	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv-&gt;html_scroller),</div><div class='del'>-					GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);</div><div class='del'>-	priv-&gt;html = gtk_html_new ();</div><div class='del'>-	gtk_html_set_editable (GTK_HTML (priv-&gt;html), FALSE);</div><div class='del'>-	gtk_html_set_default_background_color (GTK_HTML (priv-&gt;html), &amp;bgcolour);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "url-requested",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_summary_url_request), esummary);</div><div class='del'>-  	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "object-requested", </div><div class='del'>-  			    GTK_SIGNAL_FUNC (on_object_requested), esummary); </div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "link-clicked",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_summary_url_click), esummary);</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (priv-&gt;html), "on_url",</div><div class='del'>-			    GTK_SIGNAL_FUNC (e_summary_url_over), esummary);</div><div class='del'>-</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (priv-&gt;html_scroller), priv-&gt;html);</div><div class='del'>-	gtk_widget_show_all (priv-&gt;html_scroller);</div><div class='del'>-</div><div class='del'>-	e_summary_rebuild_page (esummary);</div><div class='del'>-</div><div class='del'>-	/* Pack stuff */</div><div class='del'>-	gtk_box_pack_start (GTK_BOX (esummary), priv-&gt;html_scroller, </div><div class='del'>-			    TRUE, TRUE, 0);</div><div class='del'>-</div><div class='del'>-	/* Init hashtables */</div><div class='del'>-	priv-&gt;summary_to_window = g_hash_table_new (NULL, NULL);</div><div class='del'>-	priv-&gt;id_to_view = g_hash_table_new (NULL, NULL);</div><div class='del'>-	priv-&gt;view_to_window = g_hash_table_new (NULL, NULL);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_summary, "ESummary", ESummary, e_summary_class_init,</div><div class='del'>-	     e_summary_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-GtkWidget *</div><div class='del'>-e_summary_new (const Evolution_Shell shell)</div><div class='del'>-{</div><div class='del'>-	ESummary *esummary;</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *path;</div><div class='del'>-</div><div class='del'>-	esummary = gtk_type_new (e_summary_get_type ());</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;shell = shell;</div><div class='del'>-</div><div class='del'>-	/* Restore services */</div><div class='del'>-	path = g_concat_dir_and_file (evolution_dir, </div><div class='del'>-				      "config/Executive-Summary");</div><div class='del'>-	e_summary_load_state (esummary, path);</div><div class='del'>-	g_free (path);</div><div class='del'>-</div><div class='del'>-	return GTK_WIDGET (esummary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static gboolean</div><div class='del'>-on_object_requested (GtkHTML *html,</div><div class='del'>-		     GtkHTMLEmbedded *eb,</div><div class='del'>-		     ESummary *summary)</div><div class='del'>-{</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-	int type;</div><div class='del'>-</div><div class='del'>-	if (sscanf (eb-&gt;classid, "cid:%d-%p", &amp;type, &amp;window) != 2) {</div><div class='del'>-		g_warning ("Could not get the window reference\n");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	switch (type) {</div><div class='del'>-	case 1:</div><div class='del'>-		g_assert_not_reached ();</div><div class='del'>-		break;</div><div class='del'>-</div><div class='del'>-	case 2:</div><div class='del'>-		g_warning ("Bonobo services are not supported in this version.");</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'>-static void</div><div class='del'>-e_summary_display_window (ESummary *esummary,</div><div class='del'>-			  ESummaryWindow *window,</div><div class='del'>-			  int row,</div><div class='del'>-			  int col)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	char *footer = "&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;";</div><div class='del'>-	char *title_html;</div><div class='del'>-	char *control_html;</div><div class='del'>-	char *colour[2] = {"e6e8e4", </div><div class='del'>-			   "edeeeb"};</div><div class='del'>-	char *title_colour[2] = {"bac1b6", </div><div class='del'>-				 "cdd1c7"};</div><div class='del'>-	const char *title, *icon, *html;</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	title = executive_summary_component_view_get_title (window-&gt;view);</div><div class='del'>-	icon = executive_summary_component_view_get_icon (window-&gt;view);</div><div class='del'>-	html = executive_summary_component_view_get_html (window-&gt;view);</div><div class='del'>-	id = executive_summary_component_view_get_id (window-&gt;view);</div><div class='del'>-</div><div class='del'>-	/** FIXME: Make this faster by caching it? */</div><div class='del'>-</div><div class='del'>-	control_html = g_strdup_printf </div><div class='del'>-		("&lt;table width=\"32\" height=\"48\"&gt;&lt;tr&gt;&lt;td&gt;"</div><div class='del'>-		 "&lt;a href=\"close://%d\"&gt;&lt;img border=\"0\" src=\"service-close.png\"&gt;&lt;/a&gt;&lt;/td&gt;"</div><div class='del'>-		 "&lt;td&gt;&lt;a href=\"configure://%d\"&gt;&lt;img border=\"0\" src=\"service-configure.png\"&gt;&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;"</div><div class='del'>-		 "&lt;tr&gt;&lt;td&gt;&lt;a href=\"left://%d\"&gt;&lt;img border=\"0\" src=\"service-left.png\"&gt;&lt;/a&gt;&lt;/td&gt;"</div><div class='del'>-		 "&lt;td&gt;&lt;a href=\"right://%d\"&gt;&lt;img border=\"0\" src=\"service-right.png\"&gt;&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;"</div><div class='del'>-		 "&lt;tr&gt;&lt;td&gt;&lt;a href=\"down://%d\"&gt;&lt;img border=\"0\" src=\"service-down.png\"&gt;&lt;/a&gt;&lt;/td&gt;"</div><div class='del'>-		 "&lt;td&gt;&lt;a href=\"up://%d\"&gt;&lt;img border=\"0\" src=\"service-up.png\"&gt;&lt;/a&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;", id, id, id, id, id, id);</div><div class='del'>-	</div><div class='del'>-	title_html = g_strdup_printf ("&lt;table cellspacing=\"0\" "</div><div class='del'>-				      "cellpadding=\"0\" border=\"0\" width=\"100%%\" height=\"100%%\"&gt;"</div><div class='del'>-				      "&lt;tr&gt;&lt;td bgcolor=\"#%s\"&gt;"</div><div class='del'>-				      "&lt;table width=\"100%%\"&gt;&lt;tr&gt;&lt;td&gt;"</div><div class='del'>-				      "&lt;img src=\"%s\"&gt;&lt;/td&gt;"</div><div class='del'>-				      "&lt;td nowrap align=\"center\" width=\"100%%\"&gt;"</div><div class='del'>-				      "&lt;b&gt;%s&lt;/b&gt;&lt;/td&gt;&lt;td&gt;%s&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;"</div><div class='del'>-				      "&lt;td bgcolor=\"#%s\" height=\"100%%\"&gt;",</div><div class='del'>-				      title_colour[col % 2], icon, title,</div><div class='del'>-				      control_html, colour[col % 2]);</div><div class='del'>-	g_free (control_html);</div><div class='del'>-	</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, title_html,</div><div class='del'>-			strlen (title_html));</div><div class='del'>-	g_free (title_html);</div><div class='del'>-	</div><div class='del'>-	if (html != NULL &amp;&amp; *html != '\0') {</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-				html, strlen (html));</div><div class='del'>-	} else {</div><div class='del'>-		g_warning ("Bonobo executive summary components are not supported at this time.");</div><div class='del'>-#if 0</div><div class='del'>-		body_cid = g_strdup_printf ("&lt;object classid=\"cid:2-%p\"&gt;&lt;/object&gt;", window);</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-				body_cid, strlen (body_cid));</div><div class='del'>-#endif</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-			footer, strlen (footer));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-e_summary_rebuild_page (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *windows;</div><div class='del'>-	char *service_table = "&lt;table numcols=\"3\" cellspacing=\"0\" cellpadding=\"0\" border=\"0\" height=\"100%\"&gt;";</div><div class='del'>-	int loc;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (esummary != NULL, FALSE);</div><div class='del'>-	g_return_val_if_fail (IS_E_SUMMARY (esummary), FALSE);</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	/* If there is a selection, don't redraw the page so that the selection</div><div class='del'>-	   isn't cleared */</div><div class='del'>-	if (GTK_HTML (priv-&gt;html)-&gt;in_selection == TRUE ||</div><div class='del'>-	    GTK_HTML (priv-&gt;html)-&gt;engine-&gt;active_selection == TRUE)</div><div class='del'>-		return TRUE;</div><div class='del'>-</div><div class='del'>-	gtk_layout_freeze (GTK_LAYOUT (priv-&gt;html));</div><div class='del'>-	e_summary_start_load (esummary);</div><div class='del'>-	load_default (esummary);</div><div class='del'>-</div><div class='del'>-	/* Load the start of the services */</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, service_table,</div><div class='del'>-			strlen (service_table));</div><div class='del'>-	/* Load each of the services */</div><div class='del'>-	loc = 0;</div><div class='del'>-	for (windows = priv-&gt;window_list; windows; windows = windows-&gt;next) {</div><div class='del'>-		ESummaryWindow *window;</div><div class='del'>-		char *td = "&lt;td height=\"100%\" width=\"33%\" valign=\"top\"&gt;";</div><div class='del'>-		</div><div class='del'>-		window = windows-&gt;data;</div><div class='del'>-</div><div class='del'>-		if (loc % 3 == 0) {</div><div class='del'>-			if (loc != 0) {</div><div class='del'>-				gtk_html_write (GTK_HTML (priv-&gt;html),</div><div class='del'>-						priv-&gt;stream, "&lt;/tr&gt;", 5);</div><div class='del'>-			}</div><div class='del'>-			gtk_html_write (GTK_HTML (priv-&gt;html),</div><div class='del'>-					priv-&gt;stream, "&lt;tr height=\"100%\"&gt;", 18);</div><div class='del'>-		}</div><div class='del'>-</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream,</div><div class='del'>-				td, strlen (td));</div><div class='del'>-</div><div class='del'>-		e_summary_display_window (esummary, window, </div><div class='del'>-					  (loc / 3), (loc % 3));</div><div class='del'>-</div><div class='del'>-		gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, "&lt;/td&gt;", 5);</div><div class='del'>-		loc++;</div><div class='del'>-	}</div><div class='del'>-				</div><div class='del'>-	gtk_html_write (GTK_HTML (priv-&gt;html), priv-&gt;stream, "&lt;/tr&gt;&lt;/table&gt;",</div><div class='del'>-			13);</div><div class='del'>-	e_summary_end_load (esummary);</div><div class='del'>-	gtk_layout_thaw (GTK_LAYOUT (priv-&gt;html));</div><div class='del'>-</div><div class='del'>-	priv-&gt;idle = 0;</div><div class='del'>-	return FALSE;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_add_service (ESummary *esummary,</div><div class='del'>-		       ExecutiveSummary *summary,</div><div class='del'>-		       ExecutiveSummaryComponentView *view,</div><div class='del'>-		       const char *iid)     </div><div class='del'>-{</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-	g_return_if_fail (summary != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary));</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	window = g_new0 (ESummaryWindow, 1);</div><div class='del'>-	window-&gt;summary = summary;</div><div class='del'>-	window-&gt;iid = g_strdup (iid);</div><div class='del'>-	window-&gt;view = view;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	priv-&gt;window_list = g_list_append (priv-&gt;window_list, window);</div><div class='del'>-	g_hash_table_insert (priv-&gt;summary_to_window, summary, window);</div><div class='del'>-	</div><div class='del'>-	id = executive_summary_component_view_get_id (view);</div><div class='del'>-	g_hash_table_insert (priv-&gt;id_to_view, GINT_TO_POINTER (id), view);</div><div class='del'>-	g_hash_table_insert (priv-&gt;view_to_window, view, window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-void</div><div class='del'>-e_summary_add_html_service (ESummary *esummary,</div><div class='del'>-			    ExecutiveSummary *summary,</div><div class='del'>-			    ExecutiveSummaryComponentClient *client,</div><div class='del'>-			    const char *html,</div><div class='del'>-			    const char *title,</div><div class='del'>-			    const char *icon)</div><div class='del'>-{</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	window = g_new0 (ESummaryWindow, 1);</div><div class='del'>-	window-&gt;type = E_SUMMARY_WINDOW_HTML;</div><div class='del'>-	window-&gt;html = g_strdup (html);</div><div class='del'>-	window-&gt;title = g_strdup (title);</div><div class='del'>-	window-&gt;icon = icon ? g_strdup (icon) : NULL;</div><div class='del'>-	window-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	window-&gt;summary = summary;</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	priv-&gt;window_list = g_list_append (priv-&gt;window_list, window);</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (priv-&gt;summary_to_window, summary, window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_add_bonobo_service (ESummary *esummary,</div><div class='del'>-			      ExecutiveSummary *summary,</div><div class='del'>-			      ExecutiveSummaryComponentClient *client,</div><div class='del'>-			      GtkWidget *control,</div><div class='del'>-			      const char *title,</div><div class='del'>-			      const char *icon)</div><div class='del'>-{</div><div class='del'>-	ESummaryWindow *window;</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	window = g_new0 (ESummaryWindow, 1);</div><div class='del'>-	window-&gt;type = E_SUMMARY_WINDOW_BONOBO;</div><div class='del'>-	window-&gt;control = control;</div><div class='del'>-</div><div class='del'>-	window-&gt;client = client;</div><div class='del'>-</div><div class='del'>-	window-&gt;title = g_strdup (title);</div><div class='del'>-	window-&gt;summary = summary;</div><div class='del'>-	window-&gt;icon = icon ? g_strdup (icon): NULL;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	priv-&gt;window_list = g_list_append (priv-&gt;window_list, window);</div><div class='del'>-</div><div class='del'>-	g_hash_table_insert (priv-&gt;summary_to_window, summary, window);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_free (ESummaryWindow *window,</div><div class='del'>-		       ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (window != NULL);</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	g_free (window-&gt;iid);</div><div class='del'>-</div><div class='del'>-	priv-&gt;window_list = g_list_remove (priv-&gt;window_list, window);</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (window-&gt;summary));</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (window-&gt;view));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Call this before e_summary_window_free, execpt when you are freeing</div><div class='del'>-   the hash table */</div><div class='del'>-void</div><div class='del'>-e_summary_window_remove_from_ht (ESummaryWindow *window,</div><div class='del'>-				 ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	g_hash_table_remove (priv-&gt;summary_to_window, window-&gt;summary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_update_window (ESummary *esummary,</div><div class='del'>-			 ExecutiveSummary *summary,</div><div class='del'>-			 const char *html)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-	g_return_if_fail (summary != NULL);</div><div class='del'>-	</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;idle != 0)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;idle = g_idle_add ((GSourceFunc) e_summary_rebuild_page, esummary);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ExecutiveSummaryComponentView *</div><div class='del'>-e_summary_view_from_id (ESummary *esummary,</div><div class='del'>-			int id)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (esummary != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_E_SUMMARY (esummary), NULL);</div><div class='del'>-	g_return_val_if_fail (id &gt; 0, NULL);</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	view = g_hash_table_lookup (priv-&gt;id_to_view, GINT_TO_POINTER (id));</div><div class='del'>-</div><div class='del'>-	return view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_set_shell_view_interface (ESummary *summary,</div><div class='del'>-				    Evolution_ShellView svi)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (summary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (summary));</div><div class='del'>-	g_return_if_fail (svi != CORBA_OBJECT_NIL);</div><div class='del'>-</div><div class='del'>-	priv = summary-&gt;private;</div><div class='del'>-	priv-&gt;shell_view_interface = svi;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Wrappers for Evolution_ShellView */</div><div class='del'>-void</div><div class='del'>-e_summary_set_message (ESummary *esummary,</div><div class='del'>-		       const char *message,</div><div class='del'>-		       gboolean busy)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	Evolution_ShellView svi;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	svi = priv-&gt;shell_view_interface;</div><div class='del'>-	if (svi == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	if (message != NULL)</div><div class='del'>-		Evolution_ShellView_set_message (svi, message, busy, &amp;ev);</div><div class='del'>-	else </div><div class='del'>-		Evolution_ShellView_set_message (svi, "", busy, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_unset_message (ESummary *esummary)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	Evolution_ShellView svi;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	svi = priv-&gt;shell_view_interface;</div><div class='del'>-	if (svi == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Evolution_ShellView_unset_message (svi, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_change_current_view (ESummary *esummary,</div><div class='del'>-			       const char *uri)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	Evolution_ShellView svi;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	svi = priv-&gt;shell_view_interface;</div><div class='del'>-	if (svi == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Evolution_ShellView_change_current_view (svi, uri, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_set_title (ESummary *esummary,</div><div class='del'>-		     const char *title)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	Evolution_ShellView svi;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	svi = priv-&gt;shell_view_interface;</div><div class='del'>-	if (svi == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	Evolution_ShellView_set_title (svi, title, &amp;ev);</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_load_state (ESummary *esummary,</div><div class='del'>-		      const char *path)</div><div class='del'>-{</div><div class='del'>-	char *fullpath;</div><div class='del'>-	char **argv;</div><div class='del'>-	int argc, i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	fullpath = g_strdup_printf ("=%s=/services/iids", path);</div><div class='del'>-	gnome_config_get_vector (fullpath, &amp;argc, &amp;argv);</div><div class='del'>-</div><div class='del'>-	for (i = 0; i &lt; argc; i++) {</div><div class='del'>-		e_summary_factory_embed_service_from_id (esummary, argv[i]);</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	g_free (argv);</div><div class='del'>-	g_free (fullpath);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_save_state (ESummary *esummary,</div><div class='del'>-		      const char *path)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *windows;</div><div class='del'>-	char *fullpath;</div><div class='del'>-	char **argv;</div><div class='del'>-	int argc, i;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (esummary != NULL);</div><div class='del'>-	g_return_if_fail (IS_E_SUMMARY (esummary));</div><div class='del'>-</div><div class='del'>-	fullpath = g_strdup_printf("=%s=/services/iids", path);</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	argc = g_list_length (priv-&gt;window_list);</div><div class='del'>-	argv = g_new (char *, argc);</div><div class='del'>-</div><div class='del'>-	for (windows = priv-&gt;window_list, i = 0; windows; </div><div class='del'>-	     windows = windows-&gt;next, i++) {</div><div class='del'>-		ESummaryWindow *window;</div><div class='del'>-</div><div class='del'>-		window = windows-&gt;data;</div><div class='del'>-		g_print ("%s: IID: %s\n", path, window-&gt;iid);</div><div class='del'>-		argv[i] = window-&gt;iid;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	gnome_config_set_vector (fullpath, argc, (const char **)argv);</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'>-	g_free (fullpath);</div><div class='del'>-	g_free (argv);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ESummaryWindow *</div><div class='del'>-e_summary_window_from_view (ESummary *esummary,</div><div class='del'>-			    ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-	return g_hash_table_lookup (priv-&gt;view_to_window, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_move_left (ESummary *esummary,</div><div class='del'>-			    ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *win_item, *grandparent;</div><div class='del'>-	int position;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	/* Need to cache this location */</div><div class='del'>-	win_item = g_list_find (priv-&gt;window_list, window);</div><div class='del'>-	</div><div class='del'>-	/* Find the item 2 previous. */</div><div class='del'>-	if (win_item-&gt;prev == NULL)</div><div class='del'>-		return; /* Item was first, can't be moved left */</div><div class='del'>-</div><div class='del'>-	grandparent = win_item-&gt;prev-&gt;prev;</div><div class='del'>-</div><div class='del'>-	/* Remove it from the list */</div><div class='del'>-	priv-&gt;window_list = g_list_remove_link (priv-&gt;window_list, win_item);</div><div class='del'>-</div><div class='del'>-	/* Insert it after the grandparent */</div><div class='del'>-	position = g_list_position (priv-&gt;window_list, grandparent);</div><div class='del'>-	priv-&gt;window_list = g_list_insert (priv-&gt;window_list, win_item-&gt;data,</div><div class='del'>-					   position + 1);</div><div class='del'>-	g_list_free_1 (win_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_move_right (ESummary *esummary,</div><div class='del'>-			     ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *win_item, *child;</div><div class='del'>-	int position;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	win_item = g_list_find (priv-&gt;window_list, window);</div><div class='del'>-</div><div class='del'>-	if (win_item-&gt;next == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	child = win_item-&gt;next;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;window_list = g_list_remove_link (priv-&gt;window_list, win_item);</div><div class='del'>-	</div><div class='del'>-	position = g_list_position (priv-&gt;window_list, child);</div><div class='del'>-	priv-&gt;window_list = g_list_insert (priv-&gt;window_list, win_item-&gt;data,</div><div class='del'>-					   position + 1);</div><div class='del'>-	g_list_free_1 (win_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_move_up (ESummary *esummary,</div><div class='del'>-			  ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *win_item;</div><div class='del'>-	int position;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	win_item = g_list_find (priv-&gt;window_list, window);</div><div class='del'>-	</div><div class='del'>-	position = g_list_position (priv-&gt;window_list, win_item);</div><div class='del'>-	priv-&gt;window_list = g_list_remove_link (priv-&gt;window_list, win_item);</div><div class='del'>-</div><div class='del'>-	priv-&gt;window_list = g_list_insert (priv-&gt;window_list, win_item-&gt;data,</div><div class='del'>-					   position - 3);</div><div class='del'>-	g_list_free_1 (win_item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_window_move_down (ESummary *esummary,</div><div class='del'>-			    ESummaryWindow *window)</div><div class='del'>-{</div><div class='del'>-	ESummaryPrivate *priv;</div><div class='del'>-	GList *win_item;</div><div class='del'>-	int position;</div><div class='del'>-</div><div class='del'>-	priv = esummary-&gt;private;</div><div class='del'>-</div><div class='del'>-	win_item = g_list_find (priv-&gt;window_list, window);</div><div class='del'>-</div><div class='del'>-	position = g_list_position (priv-&gt;window_list, win_item);</div><div class='del'>-	priv-&gt;window_list = g_list_remove_link (priv-&gt;window_list, win_item);</div><div class='del'>-</div><div class='del'>-	priv-&gt;window_list = g_list_insert (priv-&gt;window_list, win_item-&gt;data,</div><div class='del'>-					   position + 3);</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/component/e-summary.h b/executive-summary/component/e-summary.h<br/>deleted file mode 100644<br/>index f68575d76c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/e-summary.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/e-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,112 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_H__</div><div class='del'>-#define _E_SUMMARY_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;gtkhtml/gtkhtml.h&gt;</div><div class='del'>-#include &lt;gtk/gtkvbox.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-client.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-view.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;Evolution.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_SUMMARY_TYPE (e_summary_get_type ())</div><div class='del'>-#define E_SUMMARY(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_TYPE, ESummary))</div><div class='del'>-#define E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_TYPE, ESummaryClass))</div><div class='del'>-#define IS_E_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_TYPE))</div><div class='del'>-#define IS_E_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESummaryPrivate ESummaryPrivate;</div><div class='del'>-typedef struct _ESummary ESummary;</div><div class='del'>-typedef struct _ESummaryClass ESummaryClass;</div><div class='del'>-typedef struct _ESummaryWindow ESummaryWindow;</div><div class='del'>-</div><div class='del'>-struct _ESummaryWindow {</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	char *iid;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESummary {</div><div class='del'>-  GtkVBox parent;</div><div class='del'>-</div><div class='del'>-  ESummaryPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESummaryClass {</div><div class='del'>-  GtkVBoxClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_summary_get_type (void);</div><div class='del'>-GtkWidget *e_summary_new (const Evolution_Shell shell);</div><div class='del'>-int e_summary_rebuild_page (ESummary *esummary);</div><div class='del'>-void e_summary_add_html_service (ESummary *esummary,</div><div class='del'>-				 ExecutiveSummary *summary,</div><div class='del'>-				 ExecutiveSummaryComponentClient *client,</div><div class='del'>-				 const char *html,</div><div class='del'>-				 const char *title,</div><div class='del'>-				 const char *icon);</div><div class='del'>-void e_summary_add_bonobo_service (ESummary *esummary,</div><div class='del'>-				   ExecutiveSummary *summary,</div><div class='del'>-				   ExecutiveSummaryComponentClient *client,</div><div class='del'>-				   GtkWidget *control,</div><div class='del'>-				   const char *title,</div><div class='del'>-				   const char *icon);</div><div class='del'>-void e_summary_update_window (ESummary *esummary,</div><div class='del'>-			      ExecutiveSummary *summary,</div><div class='del'>-			      const char *html);</div><div class='del'>-void e_summary_window_free (ESummaryWindow *window,</div><div class='del'>-			    ESummary *esummary);</div><div class='del'>-void  e_summary_window_remove_from_ht (ESummaryWindow *window,</div><div class='del'>-				       ESummary *esummary);</div><div class='del'>-void e_summary_add_service (ESummary *esummary,</div><div class='del'>-			    ExecutiveSummary *summary,</div><div class='del'>-			    ExecutiveSummaryComponentView *view,</div><div class='del'>-			    const char *iid);</div><div class='del'>-ExecutiveSummaryComponentView * e_summary_view_from_id (ESummary *esummary,</div><div class='del'>-							int id);</div><div class='del'>-void e_summary_set_shell_view_interface (ESummary *summary,</div><div class='del'>-					 Evolution_ShellView svi);</div><div class='del'>-void e_summary_set_message (ESummary *esummary,</div><div class='del'>-			    const char *message,</div><div class='del'>-			    gboolean busy);</div><div class='del'>-void e_summary_unset_message (ESummary *esummary);</div><div class='del'>-void e_summary_change_current_view (ESummary *esummary,</div><div class='del'>-				    const char *uri);</div><div class='del'>-void e_summary_set_title (ESummary *esummary,</div><div class='del'>-			  const char *title);</div><div class='del'>-ESummaryWindow *e_summary_window_from_view (ESummary *esummary,</div><div class='del'>-					    ExecutiveSummaryComponentView *view);</div><div class='del'>-void e_summary_window_move_left (ESummary *esummary,</div><div class='del'>-				 ESummaryWindow *window);</div><div class='del'>-void e_summary_window_move_right (ESummary *esummary,</div><div class='del'>-				  ESummaryWindow *window);</div><div class='del'>-void e_summary_window_move_up (ESummary *esummary,</div><div class='del'>-			       ESummaryWindow *window);</div><div class='del'>-void e_summary_window_move_down (ESummary *esummary,</div><div class='del'>-				 ESummaryWindow *window);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/component/executive-summary.png b/executive-summary/component/executive-summary.png<br/>deleted file mode 100644<br/>index 10a122f39e..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/executive-summary.png?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/executive-summary.png</a><br/>+++ /dev/null</div>Binary files differ<div class='head'>diff --git a/executive-summary/component/main.c b/executive-summary/component/main.c<br/>deleted file mode 100644<br/>index 9c331ce813..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/component/main.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/component/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,84 +0,0 @@</div><div class='del'>-/* </div><div class='del'>- * main.c: The core of the executive summary component.</div><div class='del'>- *</div><div class='del'>- * Copyright (C) 2000 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: Iain Holmes  &lt;iain@helixcode.com&gt;</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;signal.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-main.h&gt;</div><div class='del'>-#include &lt;bonobo/bonobo-object-directory.h&gt;</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#ifdef GTKHTML_HAVE_GCONF</div><div class='del'>-#include &lt;gconf/gconf.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include "gal/widgets/e-gui-utils.h"</div><div class='del'>-#include "gal/widgets/e-cursors.h"</div><div class='del'>-#include "gal/widgets/e-unicode.h"</div><div class='del'>-</div><div class='del'>-#include &lt;libgnomevfs/gnome-vfs.h&gt;</div><div class='del'>-#include "component-factory.h"</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc,</div><div class='del'>-      char **argv)</div><div class='del'>-{</div><div class='del'>-  CORBA_ORB orb;</div><div class='del'>-</div><div class='del'>-#ifdef ENABLE_NLS</div><div class='del'>-  bindtextdomain (PACKAGE, EVOLUTION_LOCALEDIR);</div><div class='del'>-  textdomain (PACKAGE);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  gnome_init_with_popt_table ("evolution-executive-summary", VERSION,</div><div class='del'>-			      argc, argv, oaf_popt_options, 0, NULL);</div><div class='del'>-  orb = oaf_init (argc, argv);</div><div class='del'>-</div><div class='del'>-  gdk_rgb_init ();</div><div class='del'>-  if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {</div><div class='del'>-    g_error (_("Executive summary component could not initialize Bonobo.\n"</div><div class='del'>-	       "If there was a warning message about the "</div><div class='del'>-	       "RootPOA, it probably means\nyou compiled "</div><div class='del'>-	       "Bonobo against GOAD instead of OAF."));</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-#ifdef GTKHTML_HAVE_GCONF</div><div class='del'>-  gconf_init (argc, argv, NULL);</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-  e_unicode_init ();</div><div class='del'>-</div><div class='del'>-  e_cursors_init ();</div><div class='del'>-</div><div class='del'>-  component_factory_init ();</div><div class='del'>-</div><div class='del'>-  signal (SIGSEGV, SIG_DFL);</div><div class='del'>-  signal (SIGBUS, SIG_DFL);</div><div class='del'>-</div><div class='del'>-  gnome_vfs_init ();</div><div class='del'>-  bonobo_main ();</div><div class='del'>-</div><div class='del'>-  return 0;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/default-header.html b/executive-summary/default-header.html<br/>deleted file mode 100644<br/>index 64fc119ea6..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/default-header.html?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/default-header.html</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,14 +0,0 @@</div><div class='del'>-&lt;html&gt;</div><div class='del'>-&lt;head&gt;</div><div class='del'>-&lt;title&gt;Evolution - Executive Summary&lt;/title&gt;</div><div class='del'>-&lt;/head&gt;</div><div class='del'>-</div><div class='del'>-&lt;body bgcolor="#ffffff"&gt;</div><div class='del'>-&lt;table&gt;</div><div class='del'>-&lt;tr valign="center"&gt;</div><div class='del'>-&lt;td align="right"&gt;&lt;img src="executive-summary.png"&gt;&lt;/td&gt;</div><div class='del'>-&lt;/tr&gt;</div><div class='del'>-&lt;/table&gt;</div><div class='del'>-&lt;/body&gt;</div><div class='del'>-&lt;/html&gt;</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/evolution-executive-summary.oafinfo b/executive-summary/evolution-executive-summary.oafinfo<br/>deleted file mode 100644<br/>index fe39e4e631..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-executive-summary.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-executive-summary.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-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"</div><div class='del'>-	type="exe"</div><div class='del'>-	location="evolution-executive-summary"&gt;</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME/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 executive summary component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-shell-component:evolution-executive-summary:a978364e-3839-4570-a2a5-98cf0de587e4"</div><div class='del'>-	type="factory"</div><div class='del'>-	location="OAFIID:evolution-shell-component-factory:evolution-executive-summary:e030e71d-0c53-4118-8d48-28757f0a8504"&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 the executive summary."/&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="evolution:shell-component-icon" type="string"</div><div class='del'>-		       value="evolution-today.png"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/evolution-services/.cvsignore b/executive-summary/evolution-services/.cvsignore<br/>deleted file mode 100644<br/>index d9807cd94f..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,11 +0,0 @@</div><div class='del'>-Executive-Summary.h</div><div class='del'>-Executive-Summary-common.c</div><div class='del'>-Executive-Summary-skels.c</div><div class='del'>-Executive-Summary-stubs.c</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-core</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-*.lo</div><div class='del'>-*.la
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/evolution-services/Makefile.am b/executive-summary/evolution-services/Makefile.am<br/>deleted file mode 100644<br/>index 09b19f6bc9..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,58 +0,0 @@</div><div class='del'>-lib_LTLIBRARIES = libevolution-services.la</div><div class='del'>-</div><div class='del'>-INCLUDES = \</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/executive-summary		\</div><div class='del'>-	-I$(top_builddir)/executive-summary		\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)				\</div><div class='del'>-	$(GNOME_VFS_CFLAGS)				\</div><div class='del'>-	$(UNICODE_CFLAGS)				\</div><div class='del'>-	$(GTKHTML_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=\""$(localedir)"\"	\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-services\"</div><div class='del'>-</div><div class='del'>-IDL_GENERATED = \</div><div class='del'>-	Executive-Summary.h		\</div><div class='del'>-	Executive-Summary-common.c	\</div><div class='del'>-	Executive-Summary-skels.c	\</div><div class='del'>-	Executive-Summary-stubs.c</div><div class='del'>-</div><div class='del'>-Executive-Summary-impl.o: Executive-Summary.h</div><div class='del'>-</div><div class='del'>-IDLS = \</div><div class='del'>-	$(srcdir)/../idl/Executive-Summary.idl		\</div><div class='del'>-	$(srcdir)/../idl/Summary.idl			\</div><div class='del'>-	$(srcdir)/../idl/SummaryComponent.idl</div><div class='del'>-</div><div class='del'>-$(IDL_GENERATED): $(IDLS)</div><div class='del'>-	$(ORBIT_IDL) -I $(datadir)/idl `$(GNOME_CONFIG) --cflags idl` \</div><div class='del'>-		-I$(srcdir) $(srcdir)/../idl/Executive-Summary.idl</div><div class='del'>-</div><div class='del'>-libevolution_services_la_SOURCES =		\</div><div class='del'>-	$(IDL_GENERATED)		\</div><div class='del'>-	executive-summary.c		\</div><div class='del'>-	executive-summary.h		\</div><div class='del'>-	executive-summary-client.c	\</div><div class='del'>-	executive-summary-client.h	\</div><div class='del'>-	executive-summary-component.c	\</div><div class='del'>-	executive-summary-component.h	\</div><div class='del'>-	executive-summary-component-client.c	\</div><div class='del'>-	executive-summary-component-client.h	\</div><div class='del'>-	executive-summary-component-view.c	\</div><div class='del'>-	executive-summary-component-view.h</div><div class='del'>-</div><div class='del'>-libevolution_services_la_LIBADD = 					\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la		\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)			\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)				\</div><div class='del'>-	$(GTKHTML_LIBS)					\</div><div class='del'>-	$(UNICODE_LIBS)</div><div class='del'>-</div><div class='del'>-BUILT_SOURCES = $(IDL_GENERATED)</div><div class='del'>-CLEANFILES   += $(BUILT_SOURCES)</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-client.c b/executive-summary/evolution-services/executive-summary-client.c<br/>deleted file mode 100644<br/>index 88796d1753..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-client.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,174 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-client.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-#include "executive-summary-client.h"</div><div class='del'>-#include "executive-summary-component.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryClientPrivate {</div><div class='del'>-	int dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_client_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryClient *client;</div><div class='del'>-	ExecutiveSummaryClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	client = EXECUTIVE_SUMMARY_CLIENT (object);</div><div class='del'>-	priv = client-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	client-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_client_init (ExecutiveSummaryClient *client)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (ExecutiveSummaryClientPrivate, 1);</div><div class='del'>-	client-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_client_class_init (ExecutiveSummaryClientClass *client)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (client);</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = executive_summary_client_destroy;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_construct (ExecutiveSummaryClient *client,</div><div class='del'>-				    CORBA_Object corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_CLIENT (client));</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_client, "ExecutiveSummaryClient",</div><div class='del'>-	     ExecutiveSummaryClient, executive_summary_client_class_init,</div><div class='del'>-	     executive_summary_client_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_set_title (ExecutiveSummaryClient *client,</div><div class='del'>-				    int id,</div><div class='del'>-				    const char *title)</div><div class='del'>-{</div><div class='del'>-	Evolution_Summary summary;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	Evolution_Summary_set_title (summary, id, title, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error setting title to %s:%s", title, CORBA_exception_id (&amp;ev));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_set_icon (ExecutiveSummaryClient *client,</div><div class='del'>-				   int id,</div><div class='del'>-				   const char *icon)</div><div class='del'>-{</div><div class='del'>-	Evolution_Summary summary;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	Evolution_Summary_set_icon (summary, id, icon, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error setting icon to %s:%s", icon, CORBA_exception_id (&amp;ev));</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_flash (ExecutiveSummaryClient *client,</div><div class='del'>-				int id)</div><div class='del'>-{</div><div class='del'>-	Evolution_Summary summary;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	Evolution_Summary_flash (summary, id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error flashing");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_client_update (ExecutiveSummaryClient *client,</div><div class='del'>-				 int id,</div><div class='del'>-				 const char *html)</div><div class='del'>-{</div><div class='del'>-	Evolution_Summary summary;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	summary = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	Evolution_Summary_update_component (summary, id, html, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error updating the component");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-		</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-client.h b/executive-summary/evolution-services/executive-summary-client.h<br/>deleted file mode 100644<br/>index c6c138dd69..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-client.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,65 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-client.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_CLIENT_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_CLIENT_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT_TYPE (executive_summary_client_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClient))</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_CLIENT_TYPE, ExecutiveSummaryClientClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_CLIENT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryClientPrivate ExecutiveSummaryClientPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryClient ExecutiveSummaryClient;</div><div class='del'>-typedef struct _ExecutiveSummaryClientClass ExecutiveSummaryClientClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryClient {</div><div class='del'>-	BonoboObjectClient parent;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryClientPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryClientClass {</div><div class='del'>-	BonoboObjectClientClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_client_get_type (void);</div><div class='del'>-void executive_summary_client_construct (ExecutiveSummaryClient *client,</div><div class='del'>-					 CORBA_Object object);</div><div class='del'>-void executive_summary_client_set_title (ExecutiveSummaryClient *client,</div><div class='del'>-					 int id,</div><div class='del'>-					 const char *title);</div><div class='del'>-void executive_summary_client_set_icon (ExecutiveSummaryClient *client,</div><div class='del'>-					int id,</div><div class='del'>-					const char *icon);</div><div class='del'>-void executive_summary_client_flash (ExecutiveSummaryClient *client,</div><div class='del'>-				     int id);</div><div class='del'>-void executive_summary_client_update (ExecutiveSummaryClient *client,</div><div class='del'>-				      int id,</div><div class='del'>-				      const char *html);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-client.c b/executive-summary/evolution-services/executive-summary-component-client.c<br/>deleted file mode 100644<br/>index ecd806af52..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-client.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary-component-client.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,338 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component-client.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;Executive-Summary.h&gt;</div><div class='del'>-#include "executive-summary-component-client.h"</div><div class='del'>-#include "executive-summary-component-view.h"</div><div class='del'>-#include "executive-summary.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE BONOBO_OBJECT_CLIENT_TYPE</div><div class='del'>-static BonoboObjectClass *parent_class = NULL;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentClientPrivate {</div><div class='del'>-	int dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_client_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentClient *client;</div><div class='del'>-	ExecutiveSummaryComponentClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	client = EXECUTIVE_SUMMARY_COMPONENT_CLIENT (object);</div><div class='del'>-	priv = client-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	client-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_client_init (ExecutiveSummaryComponentClient *client)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentClientPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (ExecutiveSummaryComponentClientPrivate, 1);</div><div class='del'>-	client-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_client_class_init (ExecutiveSummaryComponentClientClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = executive_summary_component_client_destroy;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_construct (ExecutiveSummaryComponentClient *client,</div><div class='del'>-					      CORBA_Object corba_object)</div><div class='del'>-{</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_client_construct (BONOBO_OBJECT_CLIENT (client), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ExecutiveSummaryComponentClient*</div><div class='del'>-executive_summary_component_client_new (const char *id)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentClient *client;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	CORBA_Object corba_object;</div><div class='del'>-	</div><div class='del'>-	g_return_val_if_fail (id != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	corba_object = oaf_activate_from_id ((char *)id, 0, NULL, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		g_warning ("Could not start %s\n", id);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (corba_object == CORBA_OBJECT_NIL) {</div><div class='del'>-		g_warning ("Could not activate %s\n", id);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	client = gtk_type_new (executive_summary_component_client_get_type ());</div><div class='del'>-	executive_summary_component_client_construct (client, corba_object);</div><div class='del'>-	</div><div class='del'>-	return client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* External API */</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,</div><div class='del'>-					      ExecutiveSummary *summary)</div><div class='del'>-{</div><div class='del'>-	Evolution_SummaryComponent component;</div><div class='del'>-	Evolution_Summary corba_object;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-	g_return_if_fail (summary != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY (summary));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-	corba_object = bonobo_object_corba_objref (BONOBO_OBJECT (summary));</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	Evolution_SummaryComponent_set_owner (component, corba_object, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error setting owner");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client)</div><div class='del'>-{</div><div class='del'>-	Evolution_SummaryComponent component;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-	</div><div class='del'>-	Evolution_SummaryComponent_unset_owner (component, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error unsetting owner");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client,</div><div class='del'>-					     gboolean *bonobo,</div><div class='del'>-					     gboolean *html)</div><div class='del'>-{</div><div class='del'>-	Evolution_SummaryComponent component;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	Evolution_SummaryComponent_supports (component, bonobo, html, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error checking supports");</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	return;</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-ExecutiveSummaryComponentView *</div><div class='del'>-executive_summary_component_client_create_view (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						int id)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	Evolution_SummaryComponent component;</div><div class='del'>-	char *html, *title, *icon;</div><div class='del'>-	Bonobo_Control control;</div><div class='del'>-	BonoboControl *bc;</div><div class='del'>-	int ret_id;</div><div class='del'>-	CORBA_Environment ev;</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_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client),</div><div class='del'>-			      NULL);</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	if (client)</div><div class='del'>-		component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	/* Get all the details about the view */</div><div class='del'>-	g_print ("In %s\n", __FUNCTION__);</div><div class='del'>-	ret_id = Evolution_SummaryComponent_create_view (component, id, &amp;control, </div><div class='del'>-							 &amp;html, &amp;title, &amp;icon, &amp;ev);</div><div class='del'>-	g_print ("Out %s\n", __FUNCTION__);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error creating view");</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 a local copy of the remote view */</div><div class='del'>-	if (control != CORBA_OBJECT_NIL) {</div><div class='del'>-		bc = BONOBO_CONTROL (bonobo_widget_new_control_from_objref (control, NULL));</div><div class='del'>-	} else {</div><div class='del'>-		bc = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	view = executive_summary_component_view_new (NULL, bc, html, title,</div><div class='del'>-						     icon);</div><div class='del'>-	executive_summary_component_view_set_id (view, ret_id);</div><div class='del'>-	</div><div class='del'>-	return view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-char *</div><div class='del'>-executive_summary_component_client_create_html_view (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						     char **title,</div><div class='del'>-						     char **icon)</div><div class='del'>-{</div><div class='del'>-	CORBA_char *ret_html;</div><div class='del'>-	Evolution_SummaryComponent component;</div><div class='del'>-	CORBA_Environment ev;</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_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client),</div><div class='del'>-			      NULL);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-</div><div class='del'>-	ret_html = Evolution_SummaryComponent_create_html_view (component, title, icon, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error creating HTML view");</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return (char *)g_strdup (ret_html);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client)</div><div class='del'>-{</div><div class='del'>-	Evolution_SummaryComponent component;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-	Evolution_SummaryComponent_configure (component, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error configuring service");</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (client));</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'>-	return;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						 ExecutiveSummaryComponentView *view) </div><div class='del'>-{</div><div class='del'>-	int id;</div><div class='del'>-	Evolution_SummaryComponent component;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (client != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT (client));</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	id = executive_summary_component_view_get_id (view);</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	component = bonobo_object_corba_objref (BONOBO_OBJECT (client));</div><div class='del'>-	Evolution_SummaryComponent_destroy_view (component, id, &amp;ev);</div><div class='del'>-</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_warning ("Error destroying view #%d", id);</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;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_component_client, </div><div class='del'>-	     "ExecutiveSummaryComponentClient", </div><div class='del'>-	     ExecutiveSummaryComponentClient,</div><div class='del'>-	     executive_summary_component_client_class_init,</div><div class='del'>-	     executive_summary_component_client_init, PARENT_TYPE)</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-client.h b/executive-summary/evolution-services/executive-summary-component-client.h<br/>deleted file mode 100644<br/>index 3a9edd7a1c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-client.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary-component-client.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component-client.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_COMPONENT_CLIENT_H__</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-view.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE (executive_summary_component_client_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClient))</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE, ExecutiveSummaryComponentClientClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLIENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_CLIENT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryComponentClientPrivate ExecutiveSummaryComponentClientPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentClient ExecutiveSummaryComponentClient;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentClientClass ExecutiveSummaryComponentClientClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentClient {</div><div class='del'>-  BonoboObjectClient parent;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentClientPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentClientClass {</div><div class='del'>-  BonoboObjectClientClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_component_client_get_type (void);</div><div class='del'>-ExecutiveSummaryComponentClient *executive_summary_component_client_new (const char *id);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_client_set_owner (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						   ExecutiveSummary *summary);</div><div class='del'>-void executive_summary_component_client_unset_owner (ExecutiveSummaryComponentClient *client);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_client_supports (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						  gboolean *bonobo,</div><div class='del'>-						  gboolean *html);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_client_configure (ExecutiveSummaryComponentClient *client);</div><div class='del'>-void executive_summary_component_client_destroy_view (ExecutiveSummaryComponentClient *client,</div><div class='del'>-						      ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-view.c b/executive-summary/evolution-services/executive-summary-component-view.c<br/>deleted file mode 100644<br/>index ebcbeb9e09..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-view.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary-component-view.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,345 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component.c - Bonobo implementation of </div><div class='del'>- *                                 SummaryComponent.idl</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-view.h&gt;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentViewPrivate {</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	BonoboControl *control;</div><div class='del'>-	char *html;</div><div class='del'>-	</div><div class='del'>-	char *title;</div><div class='del'>-	char *icon;</div><div class='del'>-	</div><div class='del'>-	int id;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static GtkObjectClass *parent_class = NULL;</div><div class='del'>-#define PARENT_TYPE (gtk_object_get_type ())</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_view_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	view = EXECUTIVE_SUMMARY_COMPONENT_VIEW (object);</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;component)</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;component));</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;control)</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;control));</div><div class='del'>-</div><div class='del'>-	g_free (priv-&gt;html);</div><div class='del'>-	g_free (priv-&gt;title);</div><div class='del'>-	g_free (priv-&gt;icon);</div><div class='del'>-</div><div class='del'>-	g_free (priv);</div><div class='del'>-	view-&gt;private = NULL;</div><div class='del'>-</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_view_class_init (ExecutiveSummaryComponentViewClass *view_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (view_class);</div><div class='del'>-</div><div class='del'>-	object_class-&gt;destroy = executive_summary_component_view_destroy;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_view_init (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ExecutiveSummaryComponentViewPrivate, 1);</div><div class='del'>-	view-&gt;private = priv;</div><div class='del'>-</div><div class='del'>-	priv-&gt;control = NULL;</div><div class='del'>-	priv-&gt;html = NULL;</div><div class='del'>-	priv-&gt;title = NULL;</div><div class='del'>-	priv-&gt;icon = NULL;</div><div class='del'>-	priv-&gt;id = -1;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_component_view, "ExecutiveSummaryComponentView",</div><div class='del'>-	     ExecutiveSummaryComponentView, </div><div class='del'>-	     executive_summary_component_view_class_init,</div><div class='del'>-	     executive_summary_component_view_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,</div><div class='del'>-					    ExecutiveSummaryComponent *component,</div><div class='del'>-					    BonoboControl *control,</div><div class='del'>-					    const char *html,</div><div class='del'>-					    const char *title,</div><div class='del'>-					    const char *icon)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-	g_return_if_fail (control != NULL || html != NULL);</div><div class='del'>-	</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (component != NULL) {</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (component));</div><div class='del'>-		priv-&gt;component = component;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;component = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (control != NULL) {</div><div class='del'>-		bonobo_object_ref (BONOBO_OBJECT (control));</div><div class='del'>-		priv-&gt;control = control;</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;control = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (html) {</div><div class='del'>-		priv-&gt;html = g_strdup (html);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;html = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (title) {</div><div class='del'>-		priv-&gt;title = g_strdup (title);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;title = NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	if (icon) {</div><div class='del'>-		priv-&gt;icon = g_strdup (icon);</div><div class='del'>-	} else {</div><div class='del'>-		priv-&gt;icon = NULL;</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-ExecutiveSummaryComponentView *</div><div class='del'>-executive_summary_component_view_new (ExecutiveSummaryComponent *component,</div><div class='del'>-				      BonoboControl *control,</div><div class='del'>-				      const char *html,</div><div class='del'>-				      const char *title,</div><div class='del'>-				      const char *icon)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (control != NULL || html != NULL, NULL);</div><div class='del'>-	</div><div class='del'>-	view = gtk_type_new (executive_summary_component_view_get_type ());</div><div class='del'>-	executive_summary_component_view_construct (view, component, control,</div><div class='del'>-						    html, title, icon);</div><div class='del'>-</div><div class='del'>-	return view;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,</div><div class='del'>-					    const char *title)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv-&gt;title)</div><div class='del'>-		g_free (priv-&gt;title);</div><div class='del'>-	priv-&gt;title = g_strdup (title);</div><div class='del'>-</div><div class='del'>-	component = priv-&gt;component;</div><div class='del'>-	if (component == NULL) {</div><div class='del'>-		g_warning ("Calling %s from the wrong side of the CORBA interface", __FUNCTION__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	executive_summary_component_set_title (component, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;title;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,</div><div class='del'>-					   const char *icon)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv-&gt;icon)</div><div class='del'>-		g_free (priv-&gt;icon);</div><div class='del'>-	priv-&gt;icon = g_strdup (icon);</div><div class='del'>-</div><div class='del'>-	component = priv-&gt;component;</div><div class='del'>-	if (component == NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	</div><div class='del'>-	executive_summary_component_set_icon (component, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;icon;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_flash (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-	</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	component = priv-&gt;component;</div><div class='del'>-	if (component == NULL) {</div><div class='del'>-		g_warning ("Calling %s from the wrong side of the CORBA interface", __FUNCTION__);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	executive_summary_component_flash (component, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,</div><div class='del'>-					   const char *html)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	if (priv-&gt;html)</div><div class='del'>-		g_free (priv-&gt;html);</div><div class='del'>-</div><div class='del'>-	priv-&gt;html = g_strdup (html);</div><div class='del'>-</div><div class='del'>-	component = priv-&gt;component;</div><div class='del'>-	if (component == NULL) {</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	executive_summary_component_update (component, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-const char *</div><div class='del'>-executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;html;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, NULL);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), NULL);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	return priv-&gt;control;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_view_set_id (ExecutiveSummaryComponentView *view,</div><div class='del'>-					 int id)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (view != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-</div><div class='del'>-	priv-&gt;id = id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentViewPrivate *priv;</div><div class='del'>-</div><div class='del'>-	g_return_val_if_fail (view != NULL, -1);</div><div class='del'>-	g_return_val_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW (view), -1);</div><div class='del'>-</div><div class='del'>-	priv = view-&gt;private;</div><div class='del'>-	</div><div class='del'>-	return priv-&gt;id;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component-view.h b/executive-summary/evolution-services/executive-summary-component-view.h<br/>deleted file mode 100644<br/>index ecd0c7ab33..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component-view.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary-component-view.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,83 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__</div><div class='del'>-#define __EXECUTIVE_SUMMARY_COMPONENT_VIEW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE (executive_summary_component_view_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentView))</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE, ExecutiveSummaryComponentClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_VIEW_CLASS_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryComponentViewPrivate ExecutiveSummaryComponentViewPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentView ExecutiveSummaryComponentView;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentViewClass ExecutiveSummaryComponentViewClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentView {</div><div class='del'>-  GtkObject object;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentViewPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentViewClass {</div><div class='del'>-  GtkObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_component_view_get_type (void);</div><div class='del'>-void </div><div class='del'>-executive_summary_component_view_construct (ExecutiveSummaryComponentView *view,</div><div class='del'>-					    ExecutiveSummaryComponent *component,</div><div class='del'>-					    BonoboControl *control,</div><div class='del'>-					    const char *html,</div><div class='del'>-					    const char *title,</div><div class='del'>-					    const char *icon);</div><div class='del'>-ExecutiveSummaryComponentView *</div><div class='del'>-executive_summary_component_view_new (ExecutiveSummaryComponent *component,</div><div class='del'>-				      BonoboControl *control,</div><div class='del'>-				      const char *html,</div><div class='del'>-				      const char *title,</div><div class='del'>-				      const char *icon);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_view_set_title (ExecutiveSummaryComponentView *view,</div><div class='del'>-						 const char *title);</div><div class='del'>-const char *executive_summary_component_view_get_title (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_view_set_icon (ExecutiveSummaryComponentView *view,</div><div class='del'>-						const char *icon);</div><div class='del'>-const char *executive_summary_component_view_get_icon (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_view_flash (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_view_set_html (ExecutiveSummaryComponentView *view,</div><div class='del'>-						const char *html);</div><div class='del'>-const char *executive_summary_component_view_get_html (ExecutiveSummaryComponentView *view);</div><div class='del'>-BonoboObject *executive_summary_component_view_get_control (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-int executive_summary_component_view_get_id (ExecutiveSummaryComponentView *view);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component.c b/executive-summary/evolution-services/executive-summary-component.c<br/>deleted file mode 100644<br/>index c07afc498a..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary-component.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,502 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component.c - Bonobo implementation of </div><div class='del'>- *                                 SummaryComponent.idl</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-#include "executive-summary.h"</div><div class='del'>-#include "executive-summary-component.h"</div><div class='del'>-#include "executive-summary-component-view.h"</div><div class='del'>-#include "executive-summary-client.h"</div><div class='del'>-</div><div class='del'>-static void executive_summary_component_destroy (GtkObject *object);</div><div class='del'>-static void executive_summary_component_init (ExecutiveSummaryComponent *component);</div><div class='del'>-static void executive_summary_component_class_init (ExecutiveSummaryComponentClass *esc_class);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (bonobo_object_get_type ())</div><div class='del'>-</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentPrivate {</div><div class='del'>-	EvolutionServicesCreateViewFn create_view;</div><div class='del'>-	EvolutionServicesConfigureFn configure;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryClient *owner_client;</div><div class='del'>-	</div><div class='del'>-	void *closure;</div><div class='del'>-</div><div class='del'>-	GHashTable *id_to_view;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* CORBA interface */</div><div class='del'>-static POA_Evolution_SummaryComponent__vepv SummaryComponent_vepv;</div><div class='del'>-</div><div class='del'>-static POA_Evolution_SummaryComponent *</div><div class='del'>-create_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_SummaryComponent *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	servant = (POA_Evolution_SummaryComponent *)g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;SummaryComponent_vepv;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	POA_Evolution_SummaryComponent__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_SummaryComponent_supports (PortableServer_Servant servant,</div><div class='del'>-					  CORBA_boolean *html,</div><div class='del'>-					  CORBA_boolean *bonobo,</div><div class='del'>-					  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	*html = (priv-&gt;create_html_view != NULL);</div><div class='del'>-	*bonobo = (priv-&gt;create_bonobo_view != NULL);</div><div class='del'>-}</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_SummaryComponent_set_owner (PortableServer_Servant servant,</div><div class='del'>-					   Evolution_Summary summary,</div><div class='del'>-					   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	ExecutiveSummaryClient *client;</div><div class='del'>-	Evolution_Summary summary_duplicate;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	/* Create a summary client */</div><div class='del'>-	client = gtk_type_new (executive_summary_client_get_type ());</div><div class='del'>-</div><div class='del'>-	summary_duplicate = CORBA_Object_duplicate (summary, ev);</div><div class='del'>-	executive_summary_client_construct (client, summary_duplicate);</div><div class='del'>-</div><div class='del'>-	priv-&gt;owner_client = client;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_SummaryComponent_unset_owner (PortableServer_Servant servant,</div><div class='del'>-					     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;owner_client == NULL)</div><div class='del'>-		return;</div><div class='del'>-</div><div class='del'>-	bonobo_object_unref (BONOBO_OBJECT (priv-&gt;owner_client));</div><div class='del'>-	priv-&gt;owner_client = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static CORBA_long</div><div class='del'>-impl_Evolution_SummaryComponent_create_view (PortableServer_Servant servant,</div><div class='del'>-					     CORBA_long id,</div><div class='del'>-					     Bonobo_Control *control,</div><div class='del'>-					     CORBA_char **html,</div><div class='del'>-					     CORBA_char **title,</div><div class='del'>-					     CORBA_char **icon,</div><div class='del'>-					     CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	BonoboObject *initial_control;</div><div class='del'>-	const char *initial_title, *initial_icon, *initial_html;</div><div class='del'>-	</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-	</div><div class='del'>-	view = gtk_type_new (executive_summary_component_view_get_type ());</div><div class='del'>-	executive_summary_component_view_set_id (view, id);</div><div class='del'>-</div><div class='del'>-	(* priv-&gt;create_view) (component, view, priv-&gt;closure);</div><div class='del'>-	</div><div class='del'>-	/* Extract the values */</div><div class='del'>-	initial_title = executive_summary_component_view_get_title (view);</div><div class='del'>-	initial_icon = executive_summary_component_view_get_icon (view);</div><div class='del'>-	initial_html = executive_summary_component_view_get_html (view);</div><div class='del'>-	initial_control = executive_summary_component_view_get_control (view);</div><div class='del'>-</div><div class='del'>-	/* Put the view in the hash table so it can be found later */</div><div class='del'>-	g_hash_table_insert (priv-&gt;id_to_view, GINT_TO_POINTER (id), view);</div><div class='del'>-</div><div class='del'>-	/* Duplicate the values */</div><div class='del'>-	if (initial_control != NULL) {</div><div class='del'>-		*control = bonobo_object_corba_objref (BONOBO_OBJECT (initial_control));</div><div class='del'>-	} else {</div><div class='del'>-		*control = CORBA_OBJECT_NIL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	*html = CORBA_string_dup (initial_html ? initial_html:"");</div><div class='del'>-	*title = CORBA_string_dup (initial_title ? initial_title:"");</div><div class='del'>-	*icon = CORBA_string_dup (initial_icon ? initial_icon:"");</div><div class='del'>-</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-#if 0</div><div class='del'>-static CORBA_char *</div><div class='del'>-impl_Evolution_SummaryComponent_create_html_view (PortableServer_Servant servant,</div><div class='del'>-						  CORBA_char **title,</div><div class='del'>-						  CORBA_char **icon,</div><div class='del'>-						  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	CORBA_char *ret_str;</div><div class='del'>-	char *ret_html;</div><div class='del'>-	char *initial_title, *initial_icon;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	ret_html = (* priv-&gt;create_html_view) (component, &amp;initial_title,</div><div class='del'>-					       &amp;initial_icon,</div><div class='del'>-					       priv-&gt;closure);</div><div class='del'>-</div><div class='del'>-	*title = CORBA_string_dup (initial_title ? initial_title:"");</div><div class='del'>-	*icon = CORBA_string_dup (initial_icon ? initial_icon:"");</div><div class='del'>-	g_free (initial_title);</div><div class='del'>-	g_free (initial_icon);</div><div class='del'>-</div><div class='del'>-	ret_str = CORBA_string_dup (ret_html ? ret_html:"");</div><div class='del'>-	g_free (ret_html);</div><div class='del'>-	return ret_str;</div><div class='del'>-}</div><div class='del'>-#endif	</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_SummaryComponent_destroy_view (PortableServer_Servant servant,</div><div class='del'>-					      CORBA_long id,</div><div class='del'>-					      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-</div><div class='del'>-	g_print ("%s\n", __FUNCTION__);</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	view = g_hash_table_lookup (priv-&gt;id_to_view, GINT_TO_POINTER (id));</div><div class='del'>-	if (view == NULL) {</div><div class='del'>-		g_warning ("Unknown view: %d. Emit exception", id);</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	/* Destroy the view */</div><div class='del'>-	gtk_object_unref (GTK_OBJECT (view));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_SummaryComponent_configure (PortableServer_Servant servant,</div><div class='del'>-					   CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (bonobo_object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-	</div><div class='del'>-	(* priv-&gt;configure) (component, priv-&gt;closure);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-	</div><div class='del'>-	component = EXECUTIVE_SUMMARY_COMPONENT (object);</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-	</div><div class='del'>-	if (priv-&gt;owner_client != NULL) {</div><div class='del'>-		bonobo_object_unref (BONOBO_OBJECT (priv-&gt;owner_client));</div><div class='del'>-		priv-&gt;owner_client = 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'>-	g_free (priv);</div><div class='del'>-	component-&gt;private = NULL;</div><div class='del'>-	</div><div class='del'>-	(* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Init */</div><div class='del'>-static void</div><div class='del'>-corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_SummaryComponent__vepv *vepv;</div><div class='del'>-	POA_Evolution_SummaryComponent__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-	</div><div class='del'>-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private = NULL;</div><div class='del'>-	base_epv-&gt;finalize = NULL;</div><div class='del'>-	base_epv-&gt;default_POA = NULL;</div><div class='del'>-	</div><div class='del'>-	epv = g_new0 (POA_Evolution_SummaryComponent__epv, 1);</div><div class='del'>-	epv-&gt;set_owner = impl_Evolution_SummaryComponent_set_owner;</div><div class='del'>-	epv-&gt;unset_owner = impl_Evolution_SummaryComponent_unset_owner;</div><div class='del'>-	epv-&gt;create_view = impl_Evolution_SummaryComponent_create_view;</div><div class='del'>-	epv-&gt;destroy_view = impl_Evolution_SummaryComponent_destroy_view;</div><div class='del'>-	epv-&gt;configure = impl_Evolution_SummaryComponent_configure;</div><div class='del'>-	</div><div class='del'>-	vepv = &amp;SummaryComponent_vepv;</div><div class='del'>-	vepv-&gt;_base_epv = base_epv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;Evolution_SummaryComponent_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_class_init (ExecutiveSummaryComponentClass *klass)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = GTK_OBJECT_CLASS (klass);</div><div class='del'>-	object_class-&gt;destroy = executive_summary_component_destroy;</div><div class='del'>-</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-	</div><div class='del'>-	corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_init (ExecutiveSummaryComponent *component)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	priv = g_new0 (ExecutiveSummaryComponentPrivate, 1);</div><div class='del'>-	</div><div class='del'>-	priv-&gt;create_view = NULL;</div><div class='del'>-	priv-&gt;configure = NULL;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;owner_client = NULL;</div><div class='del'>-	priv-&gt;closure = NULL;</div><div class='del'>-</div><div class='del'>-	priv-&gt;id_to_view = g_hash_table_new (NULL, NULL);</div><div class='del'>-	component-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_component_construct (ExecutiveSummaryComponent *component,</div><div class='del'>-				       Evolution_SummaryComponent corba_object,</div><div class='del'>-				       EvolutionServicesCreateViewFn create_view,</div><div class='del'>-				       EvolutionServicesConfigureFn configure,</div><div class='del'>-				       void *closure)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	g_return_if_fail (component != NULL);</div><div class='del'>-	g_return_if_fail (corba_object != CORBA_OBJECT_NIL);</div><div class='del'>-	</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (component), corba_object);</div><div class='del'>-	</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;create_view = create_view;</div><div class='del'>-	priv-&gt;configure = configure;</div><div class='del'>-	</div><div class='del'>-	priv-&gt;closure = closure;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_component_new (EvolutionServicesCreateViewFn create_view,</div><div class='del'>-				 EvolutionServicesConfigureFn configure,</div><div class='del'>-				 void *closure)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	POA_Evolution_SummaryComponent *servant;</div><div class='del'>-	Evolution_SummaryComponent corba_object;</div><div class='del'>-	</div><div class='del'>-	servant = create_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-	</div><div class='del'>-	component = gtk_type_new (executive_summary_component_get_type ());</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (component),</div><div class='del'>-						       servant);</div><div class='del'>-	</div><div class='del'>-	executive_summary_component_construct (component, corba_object,</div><div class='del'>-					       create_view, configure, closure);</div><div class='del'>-	</div><div class='del'>-	return BONOBO_OBJECT (component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary_component, "ExecutiveSummaryComponent", </div><div class='del'>-	     ExecutiveSummaryComponent, executive_summary_component_class_init,</div><div class='del'>-	     executive_summary_component_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_set_title (ExecutiveSummaryComponent *component,</div><div class='del'>-				       gpointer view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	int id;</div><div class='del'>-	const char *title;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (component != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));</div><div class='del'>-</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;owner_client == NULL) {</div><div class='del'>-		g_warning ("Component not owned!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-	title = executive_summary_component_view_get_title (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	executive_summary_client_set_title (priv-&gt;owner_client, id, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_set_icon (ExecutiveSummaryComponent *component,</div><div class='del'>-				      gpointer view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	int id;</div><div class='del'>-	const char *icon;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (component != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));</div><div class='del'>-</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;owner_client == NULL) {</div><div class='del'>-		g_warning ("Component not owned!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-	icon = executive_summary_component_view_get_icon (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	executive_summary_client_set_icon (priv-&gt;owner_client, id, icon);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_flash (ExecutiveSummaryComponent *component,</div><div class='del'>-				   gpointer view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	int id;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (component != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));</div><div class='del'>-</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;owner_client == NULL) {</div><div class='del'>-		g_warning ("Component not owned!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	executive_summary_client_flash (priv-&gt;owner_client, id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_component_update (ExecutiveSummaryComponent *component,</div><div class='del'>-				    gpointer view)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentPrivate *priv;</div><div class='del'>-	int id;</div><div class='del'>-	const char *html;</div><div class='del'>-</div><div class='del'>-	g_return_if_fail (component != NULL);</div><div class='del'>-	g_return_if_fail (IS_EXECUTIVE_SUMMARY_COMPONENT (component));</div><div class='del'>-</div><div class='del'>-	priv = component-&gt;private;</div><div class='del'>-</div><div class='del'>-	if (priv-&gt;owner_client == NULL) {</div><div class='del'>-		g_warning ("Component not ownded!");</div><div class='del'>-		return;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	id = executive_summary_component_view_get_id (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-	html = executive_summary_component_view_get_html (EXECUTIVE_SUMMARY_COMPONENT_VIEW (view));</div><div class='del'>-</div><div class='del'>-	executive_summary_client_update (priv-&gt;owner_client, id, html);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-executive_summary_component_create_unique_id (void)</div><div class='del'>-{</div><div class='del'>-	static int id = 0;</div><div class='del'>-</div><div class='del'>-	id++;</div><div class='del'>-	g_print ("%s -- %d\n", __FUNCTION__, id);</div><div class='del'>-	return id;</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary-component.h b/executive-summary/evolution-services/executive-summary-component.h<br/>deleted file mode 100644<br/>index 7d5ab904cc..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary-component.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary-component.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,73 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary-component.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_COMPONENT_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_COMPONENT_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_TYPE (executive_summary_component_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponent))</div><div class='del'>-#define EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_COMPONENT_TYPE, ExecutiveSummaryComponentClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_COMPONENT_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_COMPONENT_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryComponentPrivate ExecutiveSummaryComponentPrivate;</div><div class='del'>-typedef struct _ExecutiveSummaryComponent ExecutiveSummaryComponent;</div><div class='del'>-typedef struct _ExecutiveSummaryComponentClass ExecutiveSummaryComponentClass;</div><div class='del'>-</div><div class='del'>-/* view is a ExecutiveSummaryComponentView * */</div><div class='del'>-typedef void (* EvolutionServicesCreateViewFn) (ExecutiveSummaryComponent *component,</div><div class='del'>-						gpointer view,</div><div class='del'>-						void *closure);</div><div class='del'>-typedef void (* EvolutionServicesConfigureFn) (ExecutiveSummaryComponent *component,</div><div class='del'>-					       void *closure);</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponent {</div><div class='del'>-  BonoboObject parent;</div><div class='del'>-</div><div class='del'>-  ExecutiveSummaryComponentPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryComponentClass {</div><div class='del'>-  BonoboObjectClass parent_class;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_component_get_type (void);</div><div class='del'>-</div><div class='del'>-BonoboObject *executive_summary_component_new (EvolutionServicesCreateViewFn create_view,</div><div class='del'>-					       EvolutionServicesConfigureFn configure,</div><div class='del'>-					       void *closure);</div><div class='del'>-void executive_summary_component_set_title (ExecutiveSummaryComponent *component,</div><div class='del'>-					    gpointer view);</div><div class='del'>-void executive_summary_component_set_icon (ExecutiveSummaryComponent *component,</div><div class='del'>-					   gpointer view);</div><div class='del'>-</div><div class='del'>-void executive_summary_component_flash (ExecutiveSummaryComponent *component,</div><div class='del'>-					gpointer view);</div><div class='del'>-void executive_summary_component_update (ExecutiveSummaryComponent *component,</div><div class='del'>-					 gpointer view);</div><div class='del'>-int executive_summary_component_create_unique_id (void);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary.c b/executive-summary/evolution-services/executive-summary.c<br/>deleted file mode 100644<br/>index f8a0f7ecf8..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,271 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary.c - Bonobo implementation of Summary.idl</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-#include "executive-summary.h"</div><div class='del'>-</div><div class='del'>-static void executive_summary_destroy (GtkObject *object);</div><div class='del'>-static void executive_summary_class_init (ExecutiveSummaryClass *es_class);</div><div class='del'>-static void executive_summary_init (ExecutiveSummary *es);</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (bonobo_object_get_type ())</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-	UPDATE,</div><div class='del'>-	SET_TITLE,</div><div class='del'>-	SET_ICON,</div><div class='del'>-	FLASH,</div><div class='del'>-	LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint32 summary_signals [LAST_SIGNAL] = { 0 };</div><div class='del'>-static BonoboObjectClass *parent_class;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryPrivate {</div><div class='del'>-	int dummy;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-/* CORBA interface implementation */</div><div class='del'>-static POA_Evolution_Summary__vepv Summary_vepv;</div><div class='del'>-</div><div class='del'>-static POA_Evolution_Summary *</div><div class='del'>-create_servant (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Summary *servant;</div><div class='del'>-	CORBA_Environment ev;</div><div class='del'>-</div><div class='del'>-	servant = (POA_Evolution_Summary *)g_new0 (BonoboObjectServant, 1);</div><div class='del'>-	servant-&gt;vepv = &amp;Summary_vepv;</div><div class='del'>-</div><div class='del'>-	CORBA_exception_init (&amp;ev);</div><div class='del'>-</div><div class='del'>-	POA_Evolution_Summary__init ((PortableServer_Servant) servant, &amp;ev);</div><div class='del'>-	if (ev._major != CORBA_NO_EXCEPTION) {</div><div class='del'>-		g_free (servant);</div><div class='del'>-		CORBA_exception_free (&amp;ev);</div><div class='del'>-		return NULL;</div><div class='del'>-	}</div><div class='del'>-</div><div class='del'>-	CORBA_exception_free (&amp;ev);</div><div class='del'>-</div><div class='del'>-	return servant;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_Summary_set_title (PortableServer_Servant servant,</div><div class='del'>-				  CORBA_long id,</div><div class='del'>-				  const CORBA_char *title,</div><div class='del'>-				  CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_TITLE], </div><div class='del'>-			 id, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_Summary_set_icon (PortableServer_Servant servant,</div><div class='del'>-				 CORBA_long id,</div><div class='del'>-				 const CORBA_char *title,</div><div class='del'>-				 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[SET_ICON],</div><div class='del'>-			 id, title);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_Summary_flash (PortableServer_Servant servant,</div><div class='del'>-			      CORBA_long id,</div><div class='del'>-			      CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[FLASH], id);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-impl_Evolution_Summary_update_component (PortableServer_Servant servant,</div><div class='del'>-					 CORBA_long id,</div><div class='del'>-					 CORBA_char *html,</div><div class='del'>-					 CORBA_Environment *ev)</div><div class='del'>-{</div><div class='del'>-	BonoboObject *bonobo_object;</div><div class='del'>-	ExecutiveSummary *summary;</div><div class='del'>-</div><div class='del'>-	bonobo_object = bonobo_object_from_servant (servant);</div><div class='del'>-	summary = EXECUTIVE_SUMMARY (bonobo_object);</div><div class='del'>-</div><div class='del'>-	gtk_signal_emit (GTK_OBJECT (summary), summary_signals[UPDATE],</div><div class='del'>-			 id, html);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* GtkObject methods */</div><div class='del'>-static void</div><div class='del'>-executive_summary_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummary *es;</div><div class='del'>-	ExecutiveSummaryPrivate *priv;</div><div class='del'>-	</div><div class='del'>-	es = EXECUTIVE_SUMMARY (object);</div><div class='del'>-	priv = es-&gt;private;</div><div class='del'>-	</div><div class='del'>-	if (priv == NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	g_free (priv);</div><div class='del'>-	es-&gt;private = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Initialisation */</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-corba_class_init (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Summary__vepv *vepv;</div><div class='del'>-	POA_Evolution_Summary__epv *epv;</div><div class='del'>-	PortableServer_ServantBase__epv *base_epv;</div><div class='del'>-	</div><div class='del'>-	base_epv = g_new0 (PortableServer_ServantBase__epv, 1);</div><div class='del'>-	base_epv-&gt;_private = NULL;</div><div class='del'>-	base_epv-&gt;finalize = NULL;</div><div class='del'>-	base_epv-&gt;default_POA = NULL;</div><div class='del'>-</div><div class='del'>-	epv = g_new0 (POA_Evolution_Summary__epv, 1);</div><div class='del'>-	epv-&gt;set_title = impl_Evolution_Summary_set_title;</div><div class='del'>-	epv-&gt;set_icon = impl_Evolution_Summary_set_icon;</div><div class='del'>-	epv-&gt;flash = impl_Evolution_Summary_flash;</div><div class='del'>-	epv-&gt;update_component = impl_Evolution_Summary_update_component;</div><div class='del'>-</div><div class='del'>-	vepv = &amp;Summary_vepv;</div><div class='del'>-	vepv-&gt;_base_epv = base_epv;</div><div class='del'>-	vepv-&gt;Bonobo_Unknown_epv = bonobo_object_get_epv ();</div><div class='del'>-	vepv-&gt;Evolution_Summary_epv = epv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_class_init (ExecutiveSummaryClass *es_class)</div><div class='del'>-{</div><div class='del'>-	GtkObjectClass *object_class;</div><div class='del'>-	</div><div class='del'>-	object_class = (GtkObjectClass *) es_class;</div><div class='del'>-	</div><div class='del'>-	object_class-&gt;destroy = executive_summary_destroy;</div><div class='del'>-	</div><div class='del'>-	parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-	summary_signals[UPDATE] = gtk_signal_new ("update",</div><div class='del'>-						  GTK_RUN_LAST,</div><div class='del'>-						  object_class-&gt;type,</div><div class='del'>-						  GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, update),</div><div class='del'>-						  gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-						  GTK_TYPE_NONE, 2,</div><div class='del'>-						  GTK_TYPE_POINTER,</div><div class='del'>-						  GTK_TYPE_POINTER);</div><div class='del'>-	summary_signals[SET_TITLE] = gtk_signal_new ("set_title",</div><div class='del'>-						     GTK_RUN_LAST,</div><div class='del'>-						     object_class-&gt;type,</div><div class='del'>-						     GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_title),</div><div class='del'>-						     gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-						     GTK_TYPE_NONE, 2,</div><div class='del'>-						     GTK_TYPE_POINTER,</div><div class='del'>-						     GTK_TYPE_POINTER);</div><div class='del'>-	summary_signals[SET_ICON] = gtk_signal_new ("set_icon",</div><div class='del'>-						    GTK_RUN_LAST,</div><div class='del'>-						    object_class-&gt;type,</div><div class='del'>-						    GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, set_icon),</div><div class='del'>-						    gtk_marshal_NONE__POINTER_POINTER,</div><div class='del'>-						    GTK_TYPE_NONE, 2,</div><div class='del'>-						    GTK_TYPE_POINTER,</div><div class='del'>-						    GTK_TYPE_POINTER);</div><div class='del'>-	summary_signals[FLASH] = gtk_signal_new ("flash",</div><div class='del'>-						 GTK_RUN_LAST,</div><div class='del'>-						 object_class-&gt;type,</div><div class='del'>-						 GTK_SIGNAL_OFFSET (ExecutiveSummaryClass, flash),</div><div class='del'>-						 gtk_marshal_NONE__POINTER,</div><div class='del'>-						 GTK_TYPE_NONE, 1,</div><div class='del'>-						 GTK_TYPE_POINTER);</div><div class='del'>-	gtk_object_class_add_signals (object_class, summary_signals, LAST_SIGNAL);</div><div class='del'>-</div><div class='del'>-	corba_class_init ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-executive_summary_init (ExecutiveSummary *es)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryPrivate *priv;</div><div class='del'>-</div><div class='del'>-	priv = g_new (ExecutiveSummaryPrivate, 1);</div><div class='del'>-	es-&gt;private = priv;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (executive_summary, "ExecutiveSummary", ExecutiveSummary,</div><div class='del'>-	     executive_summary_class_init, executive_summary_init, PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-executive_summary_construct (ExecutiveSummary *es,</div><div class='del'>-			     Evolution_Summary corba_object)</div><div class='del'>-{</div><div class='del'>-	bonobo_object_construct (BONOBO_OBJECT (es), corba_object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-BonoboObject *</div><div class='del'>-executive_summary_new (void)</div><div class='del'>-{</div><div class='del'>-	POA_Evolution_Summary *servant;</div><div class='del'>-	Evolution_Summary corba_object;</div><div class='del'>-	ExecutiveSummary *es;</div><div class='del'>-</div><div class='del'>-	servant = create_servant ();</div><div class='del'>-	if (servant == NULL)</div><div class='del'>-		return NULL;</div><div class='del'>-</div><div class='del'>-	es = gtk_type_new (executive_summary_get_type ());</div><div class='del'>-	</div><div class='del'>-	corba_object = bonobo_object_activate_servant (BONOBO_OBJECT (es), </div><div class='del'>-						       servant);</div><div class='del'>-	executive_summary_construct (es, corba_object);</div><div class='del'>-	</div><div class='del'>-	return BONOBO_OBJECT (es);</div><div class='del'>-}  </div><div class='head'>diff --git a/executive-summary/evolution-services/executive-summary.h b/executive-summary/evolution-services/executive-summary.h<br/>deleted file mode 100644<br/>index 4f6b959a9c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/evolution-services/executive-summary.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/evolution-services/executive-summary.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* executive-summary.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _EXECUTIVE_SUMMARY_H__</div><div class='del'>-#define _EXECUTIVE_SUMMARY_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-#include "Executive-Summary.h"</div><div class='del'>-</div><div class='del'>-#define EXECUTIVE_SUMMARY_TYPE (executive_summary_get_type ())</div><div class='del'>-#define EXECUTIVE_SUMMARY(obj) (GTK_CHECK_CAST ((obj), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummary))</div><div class='del'>-#define EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), EXECUTIVE_SUMMARY_TYPE, ExecutiveSummaryClass))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY(obj) (GTK_CHECK_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))</div><div class='del'>-#define IS_EXECUTIVE_SUMMARY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), EXECUTIVE_SUMMARY_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ExecutiveSummaryPrivate ExecutiveSummaryPrivate;</div><div class='del'>-typedef struct _ExecutiveSummary ExecutiveSummary;</div><div class='del'>-typedef struct _ExecutiveSummaryClass ExecutiveSummaryClass;</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummary {</div><div class='del'>-	BonoboObject parent;</div><div class='del'>-	</div><div class='del'>-	ExecutiveSummaryPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ExecutiveSummaryClass {</div><div class='del'>-	BonoboObjectClass parent_class;</div><div class='del'>-</div><div class='del'>-	void (* update) (ExecutiveSummary *summary,</div><div class='del'>-			 const Evolution_SummaryComponent component,</div><div class='del'>-			 const char *html);</div><div class='del'>-	void (* set_title) (ExecutiveSummary *summary,</div><div class='del'>-			    const Evolution_SummaryComponent component,</div><div class='del'>-			    const char *title);</div><div class='del'>-	void (* set_icon) (ExecutiveSummary *summary,</div><div class='del'>-			   const Evolution_SummaryComponent component,</div><div class='del'>-			   const char *icon);</div><div class='del'>-	void (* flash) (ExecutiveSummary *summary,</div><div class='del'>-			const Evolution_SummaryComponent component);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType executive_summary_get_type (void);</div><div class='del'>-void executive_summary_construct (ExecutiveSummary *es,</div><div class='del'>-				  Evolution_Summary corba_object);</div><div class='del'>-BonoboObject *executive_summary_new (void);</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/idl/.cvsignore b/executive-summary/idl/.cvsignore<br/>deleted file mode 100644<br/>index b840c21800..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/idl/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,2 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/idl/Executive-Summary.idl b/executive-summary/idl/Executive-Summary.idl<br/>deleted file mode 100644<br/>index ac3809e299..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/Executive-Summary.idl?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/idl/Executive-Summary.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,3 +0,0 @@</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-#include &lt;SummaryComponent.idl&gt;</div><div class='del'>-#include &lt;Summary.idl&gt;</div><div class='head'>diff --git a/executive-summary/idl/Makefile.am b/executive-summary/idl/Makefile.am<br/>deleted file mode 100644<br/>index e45784d49c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/idl/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,31 +0,0 @@</div><div class='del'>-INCLUDES = \</div><div class='del'>-	-I$(top_srcdir)/widgets				\</div><div class='del'>-	-I$(top_srcdir)/widgets/e-text			\</div><div class='del'>-	-I$(top_srcdir)					\</div><div class='del'>-	-I$(top_builddir)/shell				\</div><div class='del'>-	-I$(top_srcdir)/shell				\</div><div class='del'>-	$(GNOME_VFS_CFLAGS)				\</div><div class='del'>-	$(UNICODE_CFLAGS)				\</div><div class='del'>-	$(GTKHTML_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=\""$(localedir)"\"	\</div><div class='del'>-	-DEVOLUTION_DATADIR=\""$(datadir)"\"            \</div><div class='del'>-	-DG_LOG_DOMAIN=\"evolution-executive-summary\"</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(IDLS)</div><div class='del'>-</div><div class='del'>-CLEANFILES = $(IDL_GENERATED)</div><div class='del'>-</div><div class='del'>-IDLS = \</div><div class='del'>-	Executive-Summary.idl		\</div><div class='del'>-	Summary.idl			\</div><div class='del'>-	SummaryComponent.idl</div><div class='del'>-</div><div class='del'>-IDL_GENERATED = \</div><div class='del'>-	Executive-Summary.h		\</div><div class='del'>-	Executive-Summary-common.c	\</div><div class='del'>-	Executive-Summary-skels.c	\</div><div class='del'>-	Executive-Summary-stubs.c</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/idl/Summary.idl b/executive-summary/idl/Summary.idl<br/>deleted file mode 100644<br/>index 76f98dd537..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/Summary.idl?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/idl/Summary.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,54 +0,0 @@</div><div class='del'>-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * CORBA interface for the Evolution shell.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Iain Holmes  &lt;iain@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'>-</div><div class='del'>-#include &lt;Bonobo.idl&gt;</div><div class='del'>-</div><div class='del'>-module Evolution {</div><div class='del'>-	interface Summary: Bonobo::Unknown {</div><div class='del'>-		exception NoSubWindow {};</div><div class='del'>-		</div><div class='del'>-		/**</div><div class='del'>-		 * set_title:</div><div class='del'>-		 * @component: The SummaryComponent whose window to set the title.</div><div class='del'>-		 * @title: The title.</div><div class='del'>-		 *</div><div class='del'>-		 * Sets the title of the subwindow that displays @component</div><div class='del'>-		 * to @title</div><div class='del'>-		 */</div><div class='del'>-		void set_title (in long id, </div><div class='del'>-				in string title)</div><div class='del'>-			raises (NoSubWindow);</div><div class='del'>-</div><div class='del'>-		void set_icon (in long id,</div><div class='del'>-			       in string icon)</div><div class='del'>-			raises (NoSubWindow);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * flash:</div><div class='del'>-		 * @component: The SummaryComponent that owns a subwindow.</div><div class='del'>-		 *</div><div class='del'>-		 * Flashes the subwindow that displays @component.</div><div class='del'>-		 */</div><div class='del'>-		 void flash (in long id)</div><div class='del'>-			raises (NoSubWindow);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * update_html_component:</div><div class='del'>-		 * @component: The SummaryComponent that owns a subwindow.</div><div class='del'>-		 * @html: The new html that defines a component.</div><div class='del'>-		 *</div><div class='del'>-		 * Requests that the html that displays @component is changed</div><div class='del'>-		 * to @html.</div><div class='del'>-		 */</div><div class='del'>-		void update_component (in long id,</div><div class='del'>-				       in string html)</div><div class='del'>-			raises (NoSubWindow);</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/executive-summary/idl/SummaryComponent.idl b/executive-summary/idl/SummaryComponent.idl<br/>deleted file mode 100644<br/>index 1c60314fb2..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/idl/SummaryComponent.idl?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/idl/SummaryComponent.idl</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,67 +0,0 @@</div><div class='del'>-/*-*- Mode: IDL; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */</div><div class='del'>-/*</div><div class='del'>- * CORBA interface for the Evolution Executive Summary Components.</div><div class='del'>- *</div><div class='del'>- * Authors:</div><div class='del'>- *   Iain Holmes  &lt;iain@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'>-</div><div class='del'>-/* TODO: Needs Exceptions */</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'>-	interface Summary;</div><div class='del'>-</div><div class='del'>-	interface SummaryComponent: Bonobo::Unknown {</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * set_owner:</div><div class='del'>-		 * @summary: A Summary object.</div><div class='del'>-		 *</div><div class='del'>-		 * Sets the owner of the component.</div><div class='del'>-		 */</div><div class='del'>-		void set_owner (in Summary owner);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * unset_owner:</div><div class='del'>-		 *</div><div class='del'>-		 * Unsets the owner of the component.</div><div class='del'>-		 */</div><div class='del'>-		void unset_owner ();</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * create_view:</div><div class='del'>-		 * @control: A Bonobo_Control</div><div class='del'>-		 * @html: HTML of the view.</div><div class='del'>-		 * @title: Title of the view.</div><div class='del'>-		 * @icon: Icon to be used for the view.</div><div class='del'>-	 	 *</div><div class='del'>-		 * Creates a summary of the data that the component has.</div><div class='del'>-		 * Returns: The ID of the view.</div><div class='del'>-		 */</div><div class='del'>-		long create_view (in long id,</div><div class='del'>-				  out Bonobo::Control control,</div><div class='del'>-		                  out string html,</div><div class='del'>-				  out string title,</div><div class='del'>-			          out string icon);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * destroy_view:</div><div class='del'>-		 * @id: ID of the view to be destroyed.</div><div class='del'>-		 *</div><div class='del'>-		 * Tells a service that a view has been destroyed.</div><div class='del'>-		 */</div><div class='del'>-		void destroy_view (in long id);</div><div class='del'>-</div><div class='del'>-		/**</div><div class='del'>-		 * configure:</div><div class='del'>-		 * </div><div class='del'>-		 * Instructs the component to open a preferences dialog.</div><div class='del'>-		 */</div><div class='del'>-		void configure ();</div><div class='del'>-</div><div class='del'>-	};</div><div class='del'>-};</div><div class='head'>diff --git a/executive-summary/test-service/.cvsignore b/executive-summary/test-service/.cvsignore<br/>deleted file mode 100644<br/>index 2473a602c4..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/test-service/.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'>-core</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-test-service
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in b/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in<br/>deleted file mode 100644<br/>index 2c2329255d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/test-service/GNOME_Evolution_Summary_test.oaf.in</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,27 +0,0 @@</div><div class='del'>-&lt;oaf_info&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="test-service"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME:GenericFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			value="Factory for the test component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"</div><div class='del'>-		type="factory"</div><div class='del'>-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			value="Test service"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo b/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo<br/>deleted file mode 100644<br/>index 2c2329255d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/GNOME_Evolution_Summary_test.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/test-service/GNOME_Evolution_Summary_test.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:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="test-service"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME:GenericFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			value="Factory for the test component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"</div><div class='del'>-		type="factory"</div><div class='del'>-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			value="Test service"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/test-service/Makefile.am b/executive-summary/test-service/Makefile.am<br/>deleted file mode 100644<br/>index e294a3ea49..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/test-service/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,21 +0,0 @@</div><div class='del'>-bin_PROGRAMS = test-service</div><div class='del'>-</div><div class='del'>-CFLAGS += -g </div><div class='del'>-INCLUDES = \</div><div class='del'>-	-I$(top_srcdir)			\</div><div class='del'>-	-I$(top_srcdir)/executive-summary	\</div><div class='del'>-	$(EXTRA_GNOME_CFLAGS)		\</div><div class='del'>-	$(BONOBO_HTML_GNOME_CFLAGS)	\</div><div class='del'>-	$(UNICODE_CFLAGS)</div><div class='del'>-</div><div class='del'>-test_service_SOURCES = 			\</div><div class='del'>-	main.c</div><div class='del'>-</div><div class='del'>-test_service_LDADD = 			\</div><div class='del'>-	$(top_builddir)/executive-summary/evolution-services/libevolution-services.la	\</div><div class='del'>-	$(BONOBO_VFS_GNOME_LIBS)	\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)</div><div class='del'>-oafdir = $(datadir)/oaf</div><div class='del'>-oaf_DATA = test-service.oafinfo</div><div class='del'>-</div><div class='del'>-EXTRA_DIST = $(oaf_DATA) </div><div class='head'>diff --git a/executive-summary/test-service/main.c b/executive-summary/test-service/main.c<br/>deleted file mode 100644<br/>index 75bbc3199b..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/main.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/test-service/main.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,196 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* main.c</div><div class='del'>- * Test Service that counts the number of seconds since it was started.</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;bonobo.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;evolution-services/executive-summary-component.h&gt;</div><div class='del'>-#include &lt;evolution-services/executive-summary-component-view.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;liboaf/liboaf.h&gt;</div><div class='del'>-</div><div class='del'>-static int running_views = 0;</div><div class='del'>-</div><div class='del'>-struct userdata {</div><div class='del'>-	int i;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-#define TEST_SERVICE_ID "OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"</div><div class='del'>-</div><div class='del'>-static BonoboGenericFactory *factory = NULL;</div><div class='del'>-</div><div class='del'>-/* The "do something interesting" function */</div><div class='del'>-int</div><div class='del'>-add_one (ExecutiveSummaryComponentView *view) </div><div class='del'>-{</div><div class='del'>-	char *html;</div><div class='del'>-	struct userdata *ud;</div><div class='del'>-	</div><div class='del'>-	/* Get the user data from the view */</div><div class='del'>-	ud = gtk_object_get_data (GTK_OBJECT (view), "timer-data");</div><div class='del'>-	if (ud == NULL) {</div><div class='del'>-		g_warning ("No user data");</div><div class='del'>-		return FALSE;</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Generate the new html */</div><div class='del'>-	html = g_strdup_printf ("Since you started this service&lt;br&gt;"</div><div class='del'>-				"&lt;center&gt;%d&lt;/center&gt;&lt;br&gt;seconds have passed.", ud-&gt;i);</div><div class='del'>-	</div><div class='del'>-	/* Change the html on the view</div><div class='del'>-	   which will tell the Executive Summary that something needs updating */</div><div class='del'>-	executive_summary_component_view_set_html (view, html);</div><div class='del'>-	</div><div class='del'>-	/* executive_summary_component_view_set_html () makes a copy of the HTML</div><div class='del'>-	   passed into it, so we don't need to keep it around */</div><div class='del'>-	g_free (html);</div><div class='del'>-	</div><div class='del'>-	/* Do something "fun" */</div><div class='del'>-	ud-&gt;i++;</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'>-view_destroyed (GtkObject *object,</div><div class='del'>-		gpointer data)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponentView *view;</div><div class='del'>-	struct userdata *ud;</div><div class='del'>-	int id;</div><div class='del'>-	</div><div class='del'>-	/* Free the user data for this view*/</div><div class='del'>-	ud = gtk_object_get_data (object, "timer-data");</div><div class='del'>-	gtk_object_set_data (object, "timer-data", NULL);</div><div class='del'>-	g_free (ud);</div><div class='del'>-	</div><div class='del'>-	/* Remove one running view */</div><div class='del'>-	running_views--;</div><div class='del'>-	</div><div class='del'>-	/* If there are no running views left, quit */</div><div class='del'>-	if (running_views &lt;= 0)</div><div class='del'>-		gtk_main_quit ();</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* Create the view:</div><div class='del'>-   HTML only */</div><div class='del'>-static void</div><div class='del'>-create_view (ExecutiveSummaryComponent *component,</div><div class='del'>-	     ExecutiveSummaryComponentView *view,</div><div class='del'>-	     void *closure)</div><div class='del'>-{</div><div class='del'>-	char *html = "Since you started this service&lt;br&gt;&lt;center&gt;0&lt;/center&gt;&lt;br&gt;seconds have passed.";</div><div class='del'>-	struct userdata *ud;</div><div class='del'>-	</div><div class='del'>-	g_print ("In: %s\n", __FUNCTION__);</div><div class='del'>-	/* Create the userdata structure */</div><div class='del'>-	ud = g_new (struct userdata, 1);</div><div class='del'>-	</div><div class='del'>-	ud-&gt;i = 1;</div><div class='del'>-	executive_summary_component_view_construct (view, component, NULL,</div><div class='del'>-						    html, "The Magic Counter",</div><div class='del'>-						    "gnome-clock.png");</div><div class='del'>-	g_print ("Out: %s\n", __FUNCTION__);</div><div class='del'>-	/* Set the user data on the object */</div><div class='del'>-	gtk_object_set_data (GTK_OBJECT (view), "timer-data", ud);</div><div class='del'>-	</div><div class='del'>-	/* Connect the the destroyed signal to find out </div><div class='del'>-	   when the view is destroyed */</div><div class='del'>-	gtk_signal_connect (GTK_OBJECT (view), "destroy",</div><div class='del'>-			    GTK_SIGNAL_FUNC (view_destroyed), NULL);</div><div class='del'>-	</div><div class='del'>-	/* Increase the number of running views */</div><div class='del'>-	running_views++;</div><div class='del'>-	</div><div class='del'>-	/* Do something "interesting" once a second */</div><div class='del'>-	gtk_timeout_add (1000, add_one, view);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-configure (ExecutiveSummaryComponent *component,</div><div class='del'>-	   void *closure)</div><div class='del'>-{</div><div class='del'>-	GtkWidget *window, *label;</div><div class='del'>-	</div><div class='del'>-	window = gtk_window_new (GTK_WINDOW_TOPLEVEL);</div><div class='del'>-	label = gtk_label_new ("This is a configuration dialog.\nNo it really is");</div><div class='del'>-	</div><div class='del'>-	gtk_container_add (GTK_CONTAINER (window), label);</div><div class='del'>-	gtk_widget_show_all (window);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static BonoboObject *</div><div class='del'>-factory_fn (BonoboGenericFactory *_factory,</div><div class='del'>-	    void *closure)</div><div class='del'>-{</div><div class='del'>-	ExecutiveSummaryComponent *component;</div><div class='del'>-	</div><div class='del'>-	/* Create an executive summary component for this factory */</div><div class='del'>-	component = executive_summary_component_new (create_view,</div><div class='del'>-						     configure,</div><div class='del'>-						     NULL);</div><div class='del'>-	return BONOBO_OBJECT (component);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-test_service_factory_init (void)</div><div class='del'>-{</div><div class='del'>-	if (factory != NULL)</div><div class='del'>-		return;</div><div class='del'>-	</div><div class='del'>-	/* Register the factory creation function and the IID */</div><div class='del'>-	factory = bonobo_generic_factory_new (TEST_SERVICE_ID, factory_fn, NULL);</div><div class='del'>-	if (factory == NULL) {</div><div class='del'>-		g_warning ("Cannot initialize test service");</div><div class='del'>-		exit (0);</div><div class='del'>-	}</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-int</div><div class='del'>-main (int argc, char **argv)</div><div class='del'>-{</div><div class='del'>-	CORBA_ORB orb;</div><div class='del'>-	</div><div class='del'>-	/* Init GNOME, oaf and bonobo */</div><div class='del'>-	gnome_init_with_popt_table ("Test service", VERSION,</div><div class='del'>-				    argc, argv, oaf_popt_options, 0, NULL);</div><div class='del'>-	orb = oaf_init (argc, argv);</div><div class='del'>-	</div><div class='del'>-	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE) {</div><div class='del'>-		g_error ("Could not initialize Bonobo");</div><div class='del'>-	}</div><div class='del'>-	</div><div class='del'>-	/* Register the factory */</div><div class='del'>-	test_service_factory_init ();</div><div class='del'>-	</div><div class='del'>-	/* Enter main */</div><div class='del'>-	bonobo_main ();</div><div class='del'>-	</div><div class='del'>-	return 0;</div><div class='del'>-}</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/test-service/test-service.oafinfo b/executive-summary/test-service/test-service.oafinfo<br/>deleted file mode 100644<br/>index 2c2329255d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/test-service/test-service.oafinfo?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/test-service/test-service.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:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"</div><div class='del'>-		type="exe"</div><div class='del'>-		location="test-service"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:GNOME:GenericFactory:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			value="Factory for the test component."/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;oaf_server iid="OAFIID:evolution-summary-component:test-service:d3cb3ed6-a654-4337-8aa0-f443751d6d1b"</div><div class='del'>-		type="factory"</div><div class='del'>-		location="OAFIID:evolution-summary-component-factory:test-service:0ea887d5-622b-4b8c-b525-18aa1cbe18a6"&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="repo_ids" type="stringv"&gt;</div><div class='del'>-		&lt;item value="IDL:Evolution:SummaryComponent:1.0"/&gt;</div><div class='del'>-	&lt;/oaf_attribute&gt;</div><div class='del'>-</div><div class='del'>-	&lt;oaf_attribute name="description" type="string"</div><div class='del'>-			value="Test service"/&gt;</div><div class='del'>-&lt;/oaf_server&gt;</div><div class='del'>-</div><div class='del'>-&lt;/oaf_info&gt;</div><div class='head'>diff --git a/executive-summary/widgets/.cvsignore b/executive-summary/widgets/.cvsignore<br/>deleted file mode 100644<br/>index ddca354b6d..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/.cvsignore?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/widgets/.cvsignore</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,5 +0,0 @@</div><div class='del'>-Makefile.in</div><div class='del'>-Makefile</div><div class='del'>-.deps</div><div class='del'>-.libs</div><div class='del'>-esummary-window-test
\ No newline at end of file</div><div class='head'>diff --git a/executive-summary/widgets/Makefile.am b/executive-summary/widgets/Makefile.am<br/>deleted file mode 100644<br/>index f83d956d63..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/Makefile.am?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/widgets/Makefile.am</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,32 +0,0 @@</div><div class='del'>-INCLUDES = 	\</div><div class='del'>-	-I$(top_srcdir) 	\</div><div class='del'>-	-I$(includedir)		\</div><div class='del'>-	$(GNOME_INCLUDEDIR)	\</div><div class='del'>-	-DG_LOG_DOMAIN=\"Executive-Summary-Widgets\"	\</div><div class='del'>-	-g 	\</div><div class='del'>-	-Wall	\</div><div class='del'>-	-Wmissing-prototypes	\</div><div class='del'>-	-Wmissing-declarations</div><div class='del'>-</div><div class='del'>-noinst_LIBRARIES = libesummary-widgets.a</div><div class='del'>-</div><div class='del'>-libesummary_widgets_a_SOURCES = 	\</div><div class='del'>-	e-summary-subwindow.c		\</div><div class='del'>-	e-summary-subwindow.h		\</div><div class='del'>-	e-summary-titlebar.c		\</div><div class='del'>-	e-summary-titlebar.h		\</div><div class='del'>-	e-summary-title-button.c	\</div><div class='del'>-	e-summary-title-button.h</div><div class='del'>-</div><div class='del'>-noinst_PROGRAMS =		\</div><div class='del'>-	esummary-window-test</div><div class='del'>-</div><div class='del'>-esummary_window_test_SOURCES =	\</div><div class='del'>-	esummary-window-test.c</div><div class='del'>-</div><div class='del'>-esummary_window_test_LDADD =	\</div><div class='del'>-	$(EXTRA_GNOME_LIBS)	\</div><div class='del'>-	libesummary-widgets.a	\</div><div class='del'>-	$(BONOBO_GNOME_LIBS)	\</div><div class='del'>-	$(top_builddir)/e-util/libeutil.la</div><div class='del'>-</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-subwindow.c b/executive-summary/widgets/e-summary-subwindow.c<br/>deleted file mode 100644<br/>index bf5bcb1eba..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-subwindow.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/widgets/e-summary-subwindow.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,299 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div><div class='del'>-#include &lt;config.h&gt;</div><div class='del'>-#endif</div><div class='del'>-</div><div class='del'>-#include &lt;gnome.h&gt;</div><div class='del'>-#include &lt;gal/util/e-util.h&gt;</div><div class='del'>-#include &lt;gal/widgets/e-font.h&gt;</div><div class='del'>-</div><div class='del'>-#include &lt;gal/e-text/e-text.h&gt;</div><div class='del'>-</div><div class='del'>-#include "e-summary-subwindow.h"</div><div class='del'>-</div><div class='del'>-#define PARENT_TYPE (gnome_canvas_group_get_type ())</div><div class='del'>-#define TITLEBAR_BORDER_WIDTH 2</div><div class='del'>-</div><div class='del'>-static void e_summary_subwindow_destroy (GtkObject *object);</div><div class='del'>-static void e_summary_subwindow_class_init (GtkObjectClass *object_class);</div><div class='del'>-static void e_summary_subwindow_init (GtkObject *object);</div><div class='del'>-</div><div class='del'>-static GnomeCanvasGroupClass *parent_class;</div><div class='del'>-</div><div class='del'>-struct _ESummarySubwindowPrivate {</div><div class='del'>-  GnomeCanvasItem *titlebar;</div><div class='del'>-  GnomeCanvasItem *contents;</div><div class='del'>-</div><div class='del'>-  GtkWidget *container;</div><div class='del'>-</div><div class='del'>-  char *title;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-  ARG_0,</div><div class='del'>-  ARG_X,</div><div class='del'>-  ARG_Y,</div><div class='del'>-  ARG_WIDTH,</div><div class='del'>-  ARG_HEIGHT,</div><div class='del'>-  ARG_STATE</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-enum {</div><div class='del'>-  CLOSE_CLICKED,</div><div class='del'>-  SHADE_CLICKED,</div><div class='del'>-  EDIT_CLICKED,</div><div class='del'>-  LAST_SIGNAL</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-static guint32 e_summary_subwindow_signals[LAST_SIGNAL] = { 0 };</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_destroy (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  if (priv == NULL)</div><div class='del'>-    return;</div><div class='del'>-</div><div class='del'>-  if (priv-&gt;container) {</div><div class='del'>-    gtk_widget_destroy (priv-&gt;container);</div><div class='del'>-    priv-&gt;container = NULL;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  if (priv-&gt;title) {</div><div class='del'>-    g_free (priv-&gt;title);</div><div class='del'>-    priv-&gt;title = NULL;</div><div class='del'>-  }</div><div class='del'>-</div><div class='del'>-  g_free (subwindow-&gt;private);</div><div class='del'>-  subwindow-&gt;private = NULL;</div><div class='del'>-</div><div class='del'>-  if (GTK_OBJECT_CLASS (parent_class)-&gt;destroy)</div><div class='del'>-  (* GTK_OBJECT_CLASS (parent_class)-&gt;destroy) (object);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_realize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;realize)</div><div class='del'>-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;realize) (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_unrealize (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  if (GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;unrealize)</div><div class='del'>-    (* GNOME_CANVAS_ITEM_CLASS (parent_class)-&gt;unrealize) (item);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_class_init (GtkObjectClass *object_class)</div><div class='del'>-{</div><div class='del'>-  GnomeCanvasItemClass *item_class;</div><div class='del'>-</div><div class='del'>-  item_class = (GnomeCanvasItemClass *) object_class;</div><div class='del'>-</div><div class='del'>-  object_class-&gt;destroy = e_summary_subwindow_destroy;</div><div class='del'>-</div><div class='del'>-  item_class-&gt;realize = e_summary_subwindow_realize;</div><div class='del'>-  item_class-&gt;unrealize = e_summary_subwindow_unrealize;</div><div class='del'>-</div><div class='del'>-  parent_class = gtk_type_class (PARENT_TYPE);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-e_summary_subwindow_init (GtkObject *object)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindow *subwindow = E_SUMMARY_SUBWINDOW (object);</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  subwindow-&gt;private = g_new0 (ESummarySubwindowPrivate, 1);</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  priv-&gt;title = NULL;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-E_MAKE_TYPE (e_summary_subwindow, "ESummarySubwindow", ESummarySubwindow,</div><div class='del'>-	     e_summary_subwindow_class_init, e_summary_subwindow_init,</div><div class='del'>-	     PARENT_TYPE);</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-container_size_allocate (GtkWidget *widget,</div><div class='del'>-			 GtkAllocation *allocation,</div><div class='del'>-			 ESummarySubwindow *subwindow)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (subwindow != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  gnome_canvas_item_set (priv-&gt;titlebar,</div><div class='del'>-			 "width", (double) allocation-&gt;width - 1,</div><div class='del'>-			 NULL);</div><div class='del'>-</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-edit_cb (GnomeCanvasItem *item,</div><div class='del'>-	 ESummarySubwindow *subwindow)</div><div class='del'>-{</div><div class='del'>-	g_print ("EDIT!\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-shade_cb (GnomeCanvasItem *item,</div><div class='del'>-	  ESummarySubwindow *subwindow)</div><div class='del'>-{</div><div class='del'>-	g_print ("SHADE!\n");</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-static void</div><div class='del'>-close_cb (GnomeCanvasItem *item,</div><div class='del'>-	  ESummarySubwindow *subwindow)</div><div class='del'>-{</div><div class='del'>-	g_print ("CLOSE!\n");</div><div class='del'>-	gtk_object_destroy (GTK_OBJECT (subwindow));</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_subwindow_construct (GnomeCanvasItem *item)</div><div class='del'>-{</div><div class='del'>-  GnomeCanvasGroup *group;</div><div class='del'>-  ESummarySubwindow *subwindow;</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-  EFont *font;</div><div class='del'>-  int titlebar_height;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (item != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (item));</div><div class='del'>-</div><div class='del'>-  subwindow = E_SUMMARY_SUBWINDOW (item);</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  group = GNOME_CANVAS_GROUP (item);</div><div class='del'>-</div><div class='del'>-  font = e_font_from_gdk_font ( ((GtkWidget *) item-&gt;canvas)-&gt;style-&gt;font);</div><div class='del'>-</div><div class='del'>-  titlebar_height = 18 + 2 * TITLEBAR_BORDER_WIDTH; /* FIXME: Not hardcoded */</div><div class='del'>-</div><div class='del'>-  priv-&gt;titlebar = gnome_canvas_item_new (group,</div><div class='del'>-					  e_summary_titlebar_get_type (),</div><div class='del'>-					  "text", "Titlebar",</div><div class='del'>-					  "width", 100.0,</div><div class='del'>-					  NULL);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (priv-&gt;titlebar), "edit",</div><div class='del'>-		      GTK_SIGNAL_FUNC (edit_cb), subwindow);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (priv-&gt;titlebar), "shade",</div><div class='del'>-		      GTK_SIGNAL_FUNC (shade_cb), subwindow);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (priv-&gt;titlebar), "close",</div><div class='del'>-		      GTK_SIGNAL_FUNC (close_cb), subwindow);</div><div class='del'>-</div><div class='del'>-  priv-&gt;container = gtk_frame_new (NULL);</div><div class='del'>-  gtk_frame_set_shadow_type (GTK_FRAME (priv-&gt;container), GTK_SHADOW_ETCHED_IN);</div><div class='del'>-  gtk_widget_show (priv-&gt;container);</div><div class='del'>-  </div><div class='del'>-  priv-&gt;contents = gnome_canvas_item_new (group,</div><div class='del'>-					  gnome_canvas_widget_get_type (),</div><div class='del'>-					  "x", (double) 0,</div><div class='del'>-					  "y", (double) titlebar_height + 1,</div><div class='del'>-					  "widget", priv-&gt;container,</div><div class='del'>-					  NULL);</div><div class='del'>-  gtk_signal_connect (GTK_OBJECT (priv-&gt;container), "size_allocate",</div><div class='del'>-		      GTK_SIGNAL_FUNC (container_size_allocate), subwindow);</div><div class='del'>-  </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-GnomeCanvasItem *</div><div class='del'>-e_summary_subwindow_new (GnomeCanvasGroup *parent,</div><div class='del'>-			 double x,</div><div class='del'>-			 double y)</div><div class='del'>-{</div><div class='del'>-  GnomeCanvasItem *item;</div><div class='del'>-</div><div class='del'>-  item = gnome_canvas_item_new (parent, e_summary_subwindow_get_type (), </div><div class='del'>-				"x", x,</div><div class='del'>-				"y", y,</div><div class='del'>-				NULL);</div><div class='del'>-  e_summary_subwindow_construct (item);</div><div class='del'>-</div><div class='del'>-  return item;</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-/* These functions mimic the GtkContainer methods */</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_subwindow_add (ESummarySubwindow *subwindow,</div><div class='del'>-			 GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (subwindow != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));</div><div class='del'>-  g_return_if_fail (widget != NULL);</div><div class='del'>-  g_return_if_fail (GTK_IS_WIDGET (widget));</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  gtk_container_add (GTK_CONTAINER (priv-&gt;container), widget);</div><div class='del'>-  </div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_subwindow_remove (ESummarySubwindow *subwindow,</div><div class='del'>-			    GtkWidget *widget)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (subwindow != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));</div><div class='del'>-  g_return_if_fail (widget != NULL);</div><div class='del'>-  g_return_if_fail (GTK_IS_WIDGET (widget));</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-</div><div class='del'>-  gtk_container_remove (GTK_CONTAINER (priv-&gt;container), widget);</div><div class='del'>-}</div><div class='del'>-</div><div class='del'>-void</div><div class='del'>-e_summary_subwindow_set_title (ESummarySubwindow *subwindow,</div><div class='del'>-			       const char *title)</div><div class='del'>-{</div><div class='del'>-  ESummarySubwindowPrivate *priv;</div><div class='del'>-</div><div class='del'>-  g_return_if_fail (subwindow != NULL);</div><div class='del'>-  g_return_if_fail (IS_E_SUMMARY_SUBWINDOW (subwindow));</div><div class='del'>-  g_return_if_fail (title != NULL);</div><div class='del'>-</div><div class='del'>-  priv = subwindow-&gt;private;</div><div class='del'>-  if (priv-&gt;title)</div><div class='del'>-    g_free (priv-&gt;title);</div><div class='del'>-</div><div class='del'>-  priv-&gt;title = g_strdup (title);</div><div class='del'>-}</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-subwindow.h b/executive-summary/widgets/e-summary-subwindow.h<br/>deleted file mode 100644<br/>index daad080a9c..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-subwindow.h?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/widgets/e-summary-subwindow.h</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,68 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-subwindow.h</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifndef _E_SUMMARY_SUBWINDOW_H__</div><div class='del'>-#define _E_SUMMARY_SUBWINDIW_H__</div><div class='del'>-</div><div class='del'>-#include &lt;gtk/gtksignal.h&gt;</div><div class='del'>-#include &lt;libgnomeui/gnome-canvas.h&gt;</div><div class='del'>-</div><div class='del'>-#define E_SUMMARY_SUBWINDOW_TYPE (e_summary_subwindow_get_type ())</div><div class='del'>-#define E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_CAST ((obj), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindow))</div><div class='del'>-#define E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), E_SUMMARY_SUBWINDOW_TYPE, ESummarySubwindowClass))</div><div class='del'>-#define IS_E_SUMMARY_SUBWINDOW(obj) (GTK_CHECK_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))</div><div class='del'>-#define IS_E_SUMMARY_SUBWINDOW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), E_SUMMARY_SUBWINDOW_TYPE))</div><div class='del'>-</div><div class='del'>-typedef struct _ESummarySubwindowPrivate ESummarySubwindowPrivate;</div><div class='del'>-typedef struct _ESummarySubwindow ESummarySubwindow;</div><div class='del'>-typedef struct _ESummarySubwindowClass ESummarySubwindowClass;</div><div class='del'>-</div><div class='del'>-struct _ESummarySubwindow {</div><div class='del'>-  GnomeCanvasGroup parent;</div><div class='del'>-</div><div class='del'>-  ESummarySubwindowPrivate *private;</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-struct _ESummarySubwindowClass {</div><div class='del'>-  GnomeCanvasGroupClass parent_class;</div><div class='del'>-</div><div class='del'>-  void (*close_clicked) (ESummarySubwindow *window);</div><div class='del'>-  void (*shade_clicked) (ESummarySubwindow *window);</div><div class='del'>-  void (*edit_clicked) (ESummarySubwindow *window);</div><div class='del'>-};</div><div class='del'>-</div><div class='del'>-GtkType e_summary_subwindow_get_type (void);</div><div class='del'>-</div><div class='del'>-void e_summary_subwindow_construct (GnomeCanvasItem *subwindow);</div><div class='del'>-GnomeCanvasItem *e_summary_subwindow_new (GnomeCanvasGroup *parent,</div><div class='del'>-					  double x,</div><div class='del'>-					  double y);</div><div class='del'>-</div><div class='del'>-void e_summary_subwindow_add (ESummarySubwindow *subwindow,</div><div class='del'>-			      GtkWidget *widget);</div><div class='del'>-void e_summary_subwindow_remove (ESummarySubwindow *subwindow,</div><div class='del'>-				 GtkWidget *widget);</div><div class='del'>-void e_summary_subwindow_set_title (ESummarySubwindow *subwindow,</div><div class='del'>-				    const char *title);</div><div class='del'>-</div><div class='del'>-#endif</div><div class='head'>diff --git a/executive-summary/widgets/e-summary-title-button.c b/executive-summary/widgets/e-summary-title-button.c<br/>deleted file mode 100644<br/>index 81fa8e5923..0000000000<br/>--- a/<a href='/~lantw44/cgit/gsoc2013-evolution/tree/executive-summary/widgets/e-summary-title-button.c?h=BUG_BUDDY_1_2&amp;id=b4c61eba8055f666fd8a2270879a6f9722faa2b3'>executive-summary/widgets/e-summary-title-button.c</a><br/>+++ /dev/null</div><div class='hunk'>@@ -1,403 +0,0 @@</div><div class='del'>-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */</div><div class='del'>-/* e-summary-title-buttons.c</div><div class='del'>- *</div><div class='del'>- * Authors: Iain Holmes &lt;iain@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 GNU</div><div class='del'>- * General Public License for more details.</div><div class='del'>- *</div><div class='del'>- * You should have received a copy of the GNU General Public</div><div class='del'>- * License along with this program; if not, write to the</div><div class='del'>- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,</div><div class='del'>- * Boston, MA 02111-1307, USA.</div><div class='del'>- */</div><div class='del'>-</div><div class='del'>-#ifdef HAVE_CONFIG_H</div>